diff --git a/Our.Iconic.Core/IconicPackagesConfiguration.cs b/Our.Iconic.Core/IconicPackagesConfiguration.cs
index b8e4dbc..0605130 100644
--- a/Our.Iconic.Core/IconicPackagesConfiguration.cs
+++ b/Our.Iconic.Core/IconicPackagesConfiguration.cs
@@ -7,7 +7,7 @@ namespace Our.Iconic.Core
 {
     public class IconicPackagesConfiguration
     {
-        [ConfigurationField("packages", "Packages configuration", "/App_Plugins/Iconic/Views/iconic.prevalues.html", Description = "Add the font packages you want to use")]
+        [ConfigurationField("packages", "Packages configuration", "/app_plugins/Iconic/Views/iconic.prevalues.html", Description = "Add the font packages you want to use")]
         public IEnumerable<Package> Packages { get; set; }        
     }
 }
diff --git a/Our.Iconic.Core/IconicPropertyEditor.cs b/Our.Iconic.Core/IconicPropertyEditor.cs
index 6285b1d..9075984 100644
--- a/Our.Iconic.Core/IconicPropertyEditor.cs
+++ b/Our.Iconic.Core/IconicPropertyEditor.cs
@@ -8,7 +8,7 @@ namespace Our.Iconic.RCL
     [DataEditor(
         alias: "our.iconic",
         name: "Iconic",
-        view: "/App_Plugins/Iconic/Views/iconic.html",
+        view: "/app_plugins/Iconic/Views/iconic.html",
         Icon = "icon-binoculars",
         Group = "Pickers",
         ValueType = ValueTypes.Json)]
diff --git a/Our.Iconic.Core/Our.Iconic.Core.csproj b/Our.Iconic.Core/Our.Iconic.Core.csproj
index 1278d7f..91d65ff 100644
--- a/Our.Iconic.Core/Our.Iconic.Core.csproj
+++ b/Our.Iconic.Core/Our.Iconic.Core.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
 	  <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-	  <Version>5.0.0</Version>
+	  <Version>5.1.0-beta1</Version>
 	  <Authors>Mario Lopez</Authors>
 	  <Description>Highly configurable icon picker for Umbraco. 
 With Iconic you will be able to create a property editor that can use virtually any font package out there and not only that, you will be able to select your icon from more than one package on the same property.
diff --git a/Our.Iconic/LoadManifest.cs b/Our.Iconic/LoadManifest.cs
index a44f708..5eae393 100644
--- a/Our.Iconic/LoadManifest.cs
+++ b/Our.Iconic/LoadManifest.cs
@@ -14,17 +14,17 @@ public void Filter(List<PackageManifest> manifests)
                 PackageName = "Iconic",
                 Scripts = new[]
                 {
-                    "/App_Plugins/Iconic/js/build/findPolyfill.min.js",
-                    "/App_Plugins/Iconic/js/src/iconic.models.js",
-                    "/App_Plugins/Iconic/js/src/iconic.controller.js",
-                    "/App_Plugins/Iconic/js/src/iconic.dialog.controller.js",
-                    "/App_Plugins/Iconic/js/src/iconic.prevalues.controller.js",
-                    "/App_Plugins/Iconic/js/src/iconic.directives.js",
-                    "/App_Plugins/Iconic/js/src/iconic.prevalues.editor.controller.js"
+                    "/app_plugins/Iconic/js/build/findPolyfill.min.js",
+                    "/app_plugins/Iconic/js/src/iconic.models.js",
+                    "/app_plugins/Iconic/js/src/iconic.controller.js",
+                    "/app_plugins/Iconic/js/src/iconic.dialog.controller.js",
+                    "/app_plugins/Iconic/js/src/iconic.prevalues.controller.js",
+                    "/app_plugins/Iconic/js/src/iconic.directives.js",
+                    "/app_plugins/Iconic/js/src/iconic.prevalues.editor.controller.js"
                 },
                 Stylesheets = new[]
                 {
-                    "/App_Plugins/Iconic/Styles/iconic.css"
+                    "/app_plugins/Iconic/Styles/iconic.css"
                 }
             });
         }
diff --git a/Our.Iconic/Our.Iconic.csproj b/Our.Iconic/Our.Iconic.csproj
index cb3f9cf..dcdf9f4 100644
--- a/Our.Iconic/Our.Iconic.csproj
+++ b/Our.Iconic/Our.Iconic.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-	<StaticWebAssetBasePath>App_Plugins/Iconic</StaticWebAssetBasePath>
+	<StaticWebAssetBasePath>app_plugins/Iconic</StaticWebAssetBasePath>
 	<ContentTargetFolders>.</ContentTargetFolders>
 	<Description>
 		Highly configurable icon picker for Umbraco.
@@ -12,7 +12,7 @@
 	</Description>
 	<Product>$(AssemblyName)</Product>
 	<PackageTags>umbraco plugin package icon picker editor backoffice umbraco-marketplace</PackageTags>
-	<Version>5.1.0</Version>
+	<Version>5.2.0-beta1</Version>
 	<Authors>Mario Lopez</Authors>
 	<PackageProjectUrl>https://github.com/Skartknet/Iconic</PackageProjectUrl>
 	<PackageIcon>iconic_logo.png</PackageIcon>
diff --git a/Our.Iconic/wwwroot/js/src/iconic.controller.js b/Our.Iconic/wwwroot/js/src/iconic.controller.js
index 4db660e..3c80b8b 100644
--- a/Our.Iconic/wwwroot/js/src/iconic.controller.js
+++ b/Our.Iconic/wwwroot/js/src/iconic.controller.js
@@ -23,7 +23,7 @@ angular.module("umbraco")
             };
 
             $scope.overlay = {
-                view: umbRequestHelper.convertVirtualToAbsolutePath("~/App_plugins/Iconic/Views/iconic.dialog.html"),
+                view: umbRequestHelper.convertVirtualToAbsolutePath("~/app_plugins/Iconic/Views/iconic.dialog.html"),
                 title: "Select an icon",
                 size: 'small',
                 iconsLimit: 1,
diff --git a/Our.Iconic/wwwroot/js/src/iconic.prevalues.editor.controller.js b/Our.Iconic/wwwroot/js/src/iconic.prevalues.editor.controller.js
index a5bc264..8186d2f 100644
--- a/Our.Iconic/wwwroot/js/src/iconic.prevalues.editor.controller.js
+++ b/Our.Iconic/wwwroot/js/src/iconic.prevalues.editor.controller.js
@@ -89,7 +89,7 @@
 
 
         $scope.filterIconsOverlay = {
-            view: umbRequestHelper.convertVirtualToAbsolutePath("~/App_plugins/Iconic/Views/iconic.dialog.html"),
+            view: umbRequestHelper.convertVirtualToAbsolutePath("~/app_plugins/Iconic/Views/iconic.dialog.html"),
             title: "Select icons",
             size: "small",
             submit: function(icons) {
@@ -140,7 +140,7 @@
         }
 
         function loadPreconfigs() {
-            $http.get(umbRequestHelper.convertVirtualToAbsolutePath("~/App_Plugins/Iconic/preconfigs.json")).then(
+            $http.get(umbRequestHelper.convertVirtualToAbsolutePath("~/app_plugins/Iconic/preconfigs.json")).then(
                 function(response) {
                     $scope.preconfig = response.data.preconfigs;
                 },
diff --git a/Our.Iconic/wwwroot/package.manifest b/Our.Iconic/wwwroot/package.manifest
index 1561336..7e87440 100644
--- a/Our.Iconic/wwwroot/package.manifest
+++ b/Our.Iconic/wwwroot/package.manifest
@@ -6,7 +6,7 @@
       "icon": "icon-binoculars",
       "group": "Pickers",
       "editor": {
-        "view": "~/App_Plugins/Iconic/Views/iconic.html",
+        "view": "~/app_plugins/Iconic/Views/iconic.html",
         "valueType": "JSON"
       },
       "prevalues": {
@@ -15,7 +15,7 @@
             "label": "Packages configuration",
             "description": "Add the font packages you want to use",
             "key": "packages",
-            "view": "~/App_Plugins/Iconic/Views/iconic.prevalues.html"
+            "view": "~/app_plugins/Iconic/Views/iconic.prevalues.html"
           }
         ]
       }
@@ -23,16 +23,16 @@
   ],
 
   "javascript": [
-    "~/App_Plugins/Iconic/js/build/findPolyfill.min.js",
-    "~/App_Plugins/Iconic/js/src/iconic.models.js",
-    "~/App_Plugins/Iconic/js/src/iconic.controller.js",
-    "~/App_Plugins/Iconic/js/src/iconic.dialog.controller.js",
-    "~/App_Plugins/Iconic/js/src/iconic.prevalues.controller.js",
-    "~/App_Plugins/Iconic/js/src/iconic.directives.js",
-    "~/App_Plugins/Iconic/js/src/iconic.prevalues.editor.controller.js"
+    "~/app_plugins/Iconic/js/build/findPolyfill.min.js",
+    "~/app_plugins/Iconic/js/src/iconic.models.js",
+    "~/app_plugins/Iconic/js/src/iconic.controller.js",
+    "~/app_plugins/Iconic/js/src/iconic.dialog.controller.js",
+    "~/app_plugins/Iconic/js/src/iconic.prevalues.controller.js",
+    "~/app_plugins/Iconic/js/src/iconic.directives.js",
+    "~/app_plugins/Iconic/js/src/iconic.prevalues.editor.controller.js"
   ],
   "css": [
-    "~/App_Plugins/Iconic/Styles/iconic.css"
+    "~/app_plugins/Iconic/Styles/iconic.css"
   ]
 
 
diff --git a/README.md b/README.md
index 16544f8..4a6c160 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ Use V2 for Umbraco 8\
 Use V1 for Umbraco 7
 
 ### Upgrading to Iconic V5
-The new version 5 of Iconic is built as a <a href="https://learn.microsoft.com/en-us/aspnet/core/razor-pages/ui-class?view=aspnetcore-6.0&tabs=visual-studio" target="_blank">Razor Class Library</a> (RCL). The dll generated contains all the files that otherwise would go into your `App_Plugins` folder.
-If you are upgrading from previous Iconic versions, you will need to remove the Iconic files contained in the `App_Plugins` folder.
+The new version 5 of Iconic is built as a <a href="https://learn.microsoft.com/en-us/aspnet/core/razor-pages/ui-class?view=aspnetcore-6.0&tabs=visual-studio" target="_blank">Razor Class Library</a> (RCL). The dll generated contains all the files that otherwise would go into your `app_plugins` folder.
+If you are upgrading from previous Iconic versions, you will need to remove the Iconic files contained in the `app_plugins` folder.
 
 
 
diff --git a/UmbracoV10/umbraco/Data/Umbraco.sqlite.db b/UmbracoV10/umbraco/Data/Umbraco.sqlite.db
index 792d2fa..ee3ebf9 100644
Binary files a/UmbracoV10/umbraco/Data/Umbraco.sqlite.db and b/UmbracoV10/umbraco/Data/Umbraco.sqlite.db differ