diff --git a/.gitignore b/.gitignore
index dc2edc5..cb96301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,3 +173,4 @@ package/nuPickers*.zip
 # Exclude local test sites
 www*/
 source/nuWebTestSite/
+source/.idea/
diff --git a/build-appveyor.cmd b/build-appveyor.cmd
index 6aec105..ee7b222 100644
--- a/build-appveyor.cmd
+++ b/build-appveyor.cmd
@@ -16,10 +16,11 @@ IF NOT EXIST "%toolsFolder%" (
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
 	nuget install vswhere -Version 2.3.2 -Source nuget.org -OutputDirectory tools
+	FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A"
+  MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
 )
 
-FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
-MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
+
 
 for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
 	if /i "%%i"=="installationPath" set InstallDir=%%j
@@ -31,7 +32,7 @@ ECHO.
 ECHO Visual Studio is installed in: %InstallDir%
 
 CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
-
+//CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err
diff --git a/build/nuPickers.proj b/build/nuPickers.proj
index 2caa835..5ef5444 100644
--- a/build/nuPickers.proj
+++ b/build/nuPickers.proj
@@ -15,8 +15,8 @@
   <!-- SHARED PROPERTIES -->
   <PropertyGroup>
     <PackageName>nuPickers</PackageName>
-    <MinUmbracoVersion>7.2.3</MinUmbracoVersion>
-    <Readme>nuPickers is a collection of Umbraco v7 Property Editors</Readme>
+    <MinUmbracoVersion>8.1.1</MinUmbracoVersion>
+    <Readme>nuPickers is a collection of Umbraco v8 Property Editors</Readme>
     <AuthorName>The nuPickers Team</AuthorName>
     <AuthorUrl>https://github.com/uComponents/nuPickers/graphs/contributors</AuthorUrl>
     <PackageLicenseName>MIT license</PackageLicenseName>
diff --git a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
index 9896dfb..8af6f3d 100644
--- a/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
+++ b/source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs
@@ -1,69 +1,68 @@
-namespace nuPickers.Tests.EmbeddedResource
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using nuPickers.EmbeddedResource;
+using nuPickers.EmbeddedResource;
 
-    [TestClass]
+namespace nuPickers.Tests.EmbeddedResource
+{
+    using NUnit.Framework;
     public class HelperEmbeddedResourceHelperTests
     {
         // reference to known embedded resources (picked first folder in shared)
-        private const string HTML_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.html";
-        private const string CSS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.css";
-        private const string JS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditorController.js";
+        private const string HtmlResource = "CheckBoxPicker.CheckBoxPickerEditor.html";
+        private const string CssResource = "CheckBoxPicker.CheckBoxPickerEditor.css";
+        private const string JsResource = "CheckBoxPicker.CheckBoxPickerEditorController.js";
 
-        [TestMethod]
+        [Test]
         public void ResourceNamesThatDoNotExist()
         {
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(null));
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(string.Empty));
             // file extension is for client dependency framework, so used not needed for html files
-            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
-            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
+            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void ResourceNamesThatExist()
         {
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE));
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + HtmlResource));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourcesThatDoNotExist()
         {
             Assert.IsNull(EmbeddedResourceHelper.GetResource(null));
             Assert.IsNull(EmbeddedResourceHelper.GetResource(string.Empty));
             // file extension is for client dependency framework, so used not needed for html files
-            Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
-            Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourcesThatExist()
         {
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE));
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + HtmlResource));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourceNameFromValidPath()
         {
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX,
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX,
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL));
 
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext"));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL + "folder/file.ext"));
 
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL + "folder/file.ext" + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourceNameFromInvalidPath()
         {
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath(null));
@@ -71,7 +70,7 @@ public void GetResourceNameFromInvalidPath()
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("folder/file.ext"));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("/folder/file.ext"));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext"));
-            Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext" + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers.Tests/nuPickers.Tests.csproj b/source/nuPickers.Tests/nuPickers.Tests.csproj
index 4311ae8..51756ea 100644
--- a/source/nuPickers.Tests/nuPickers.Tests.csproj
+++ b/source/nuPickers.Tests/nuPickers.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nuPickers.Tests</RootNamespace>
     <AssemblyName>nuPickers.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -35,6 +36,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <Choose>
@@ -61,6 +66,12 @@
       <Name>nuPickers</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="DataSources" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -81,6 +92,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/nuPickers.Tests/packages.config b/source/nuPickers.Tests/packages.config
new file mode 100644
index 0000000..4157381
--- /dev/null
+++ b/source/nuPickers.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/source/nuPickers/Caching/CacheInvalidation.cs b/source/nuPickers/Caching/CacheInvalidation.cs
deleted file mode 100644
index a2a055e..0000000
--- a/source/nuPickers/Caching/CacheInvalidation.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace nuPickers.Caching
-{
-    using Umbraco.Core;
-    using Umbraco.Core.Events;
-    using Umbraco.Core.Services;
-    using Umbraco.Core.Models;
-
-    public class CacheInvalidation : ApplicationEventHandler
-    {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            ContentService.Saved += this.ContentService_Saved;
-            ContentService.Deleted += this.ContentService_Deleted;
-
-            DataTypeService.Saved += this.DataTypeService_Saved;
-            DataTypeService.Deleted += this.DataTypeService_Deleted;
-        }
-
-        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
-        {
-            e.SavedEntities.ForEach(x => Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
-        }
-
-        private void ContentService_Deleted(IContentService sender, DeleteEventArgs<IContent> e)
-        {
-            e.DeletedEntities.ForEach(x => Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
-        }
-
-        private void DataTypeService_Saved(IDataTypeService sender, SaveEventArgs<IDataTypeDefinition> e)
-        {
-            e.SavedEntities.ForEach(x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
-        }
-
-        private void DataTypeService_Deleted(IDataTypeService sender, DeleteEventArgs<IDataTypeDefinition> e)
-        {
-            e.DeletedEntities.ForEach(x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/Components/CacheInvalidationComponent.cs b/source/nuPickers/Components/CacheInvalidationComponent.cs
new file mode 100644
index 0000000..2c9741c
--- /dev/null
+++ b/source/nuPickers/Components/CacheInvalidationComponent.cs
@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using nuPickers.Caching;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+
+namespace nuPickers.Components
+{
+    public class CacheInvalidationComponent : IComponent, Umbraco.Core.Composing.IComponent
+    {
+        private ContentService _contentService;
+        private DataTypeService _dataTypeService;
+
+        public CacheInvalidationComponent(ContentService contentService, DataTypeService dataTypeService)
+        {
+            _contentService = contentService;
+            _dataTypeService = dataTypeService;
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
+        {
+            ContentService.Saved += this.ContentService_Saved;
+            ContentService.Deleted += this.ContentService_Deleted;
+
+            DataTypeService.Saved += this.DataTypeService_Saved;
+            DataTypeService.Deleted += this.DataTypeService_Deleted;
+        }
+
+        public void Terminate()
+        {
+
+        }
+
+        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
+        {
+            e.SavedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
+        }
+
+        private void ContentService_Deleted(IContentService sender, DeleteEventArgs<IContent> e)
+        {
+            e.DeletedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
+        }
+
+        private void DataTypeService_Saved(IDataTypeService sender, SaveEventArgs<IDataType> e)
+        {
+            e.SavedEntities.ToList().ForEach(
+                x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
+        }
+
+        private void DataTypeService_Deleted(IDataTypeService sender, DeleteEventArgs<IDataType> e)
+        {
+            e.DeletedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/Components/EmbeddedResourceCompontent.cs b/source/nuPickers/Components/EmbeddedResourceCompontent.cs
new file mode 100644
index 0000000..a9369f2
--- /dev/null
+++ b/source/nuPickers/Components/EmbeddedResourceCompontent.cs
@@ -0,0 +1,52 @@
+using System;
+using System.ComponentModel;
+using System.Web.Mvc;
+using System.Web.Routing;
+using ClientDependency.Core;
+using nuPickers.EmbeddedResource;
+using Umbraco.Core.Logging;
+
+namespace nuPickers.Components
+{
+    public class EmbeddedResourceCompontent : IComponent, Umbraco.Core.Composing.IComponent
+    {
+        private readonly IProfilingLogger _logger;
+
+        public EmbeddedResourceCompontent(IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
+
+        public void Dispose()
+        {
+
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
+        {
+            RouteTable
+                .Routes
+                .MapRoute(
+                    name: "nuPickersShared",
+                    url: EmbeddedResource.EmbeddedResource.ROOT_URL.TrimStart("~/".ToCharArray()) + "{folder}/{file}",
+                    defaults: new
+                    {
+                        controller = "EmbeddedResource",
+                        action = "GetSharedResource"
+                    },
+                    namespaces: new[] {"nuPickers.EmbeddedResource"});
+
+            FileWriters.AddWriterForExtension(EmbeddedResource.EmbeddedResource.FILE_EXTENSION,
+                new EmbeddedResourceVirtualFileWriter(_logger));
+        }
+
+        public void Terminate()
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs b/source/nuPickers/Components/RelationMappingComponent.cs
similarity index 65%
rename from source/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs
rename to source/nuPickers/Components/RelationMappingComponent.cs
index 0f89801..8c0d4b7 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMappingEvent.cs
+++ b/source/nuPickers/Components/RelationMappingComponent.cs
@@ -1,28 +1,50 @@
-namespace nuPickers.Shared.RelationMapping
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using nuPickers.Caching;
+using nuPickers.Shared.RelationMapping;
+using nuPickers.Shared.SaveFormat;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+
+namespace nuPickers.Components
 {
-    using nuPickers.Shared.SaveFormat;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Umbraco.Core;
-    using Umbraco.Core.Events;
-    using Umbraco.Core.Models;
-    using Umbraco.Core.Services;
-
-    /// <summary>
-    /// server side event to update relations on change of any content / media / member using a nuPicker with relation mapping
-    /// </summary>
-    public class RelationMappingEvent : ApplicationEventHandler
+    public class RelationMappingComponent
     {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+          private ContentService _contentService;
+        private DataTypeService _dataTypeService;
+
+        public RelationMappingComponent(ContentService contentService, DataTypeService dataTypeService)
+        {
+            _contentService = contentService;
+            _dataTypeService = dataTypeService;
+        }
+
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
         {
             ContentService.Saved += this.ContentService_Saved;
             MediaService.Saved += this.MediaService_Saved;
             MemberService.Saved += this.MemberService_Saved;
-            
-            // NOTE: all relations to an id are automatically deleted when emptying the recycle bin
         }
 
-        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
+        public void Terminate()
+        {
+
+        }
+
+       private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
         {
             this.Saved((IService)sender, e.SavedEntities);
         }
@@ -38,7 +60,7 @@ private void MemberService_Saved(IMemberService sender, SaveEventArgs<IMember> e
         }
 
         /// <summary>
-        /// combined event for content / media / member 
+        /// combined event for content / media / member
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="savedEntities"></param>
@@ -47,22 +69,22 @@ private void Saved(IService sender, IEnumerable<IContentBase> savedEntities)
             foreach (IContentBase savedEntity in savedEntities)
             {
                 // for each property
-                foreach (PropertyType propertyType in savedEntity.PropertyTypes.Where(x => PickerPropertyValueConverter.IsPicker(x.PropertyEditorAlias)))
+                foreach (IPublishedProperty propertyType in savedEntity.Properties.Where(x => PickerPropertyValueConverter.IsPicker(x.PropertyType.PropertyEditorAlias)))
                 {
                     // create picker supplying all values
                     Picker picker = new Picker(
-                                            savedEntity.Id, 
+                                            savedEntity.Id,
                                             savedEntity.ParentId,
-                                            propertyType.Alias, 
-                                            propertyType.DataTypeDefinitionId, 
-                                            propertyType.PropertyEditorAlias,
+                                            propertyType.PropertyType.Alias,
+                                            propertyType.PropertyType.DataType.Id,
+                                            propertyType.PropertyType.EditorAlias,
                                             savedEntity.GetValue(propertyType.Alias));
 
                     if (!string.IsNullOrWhiteSpace(picker.RelationTypeAlias))
                     {
-                        bool isRelationsOnly = picker.GetDataTypePreValue("saveFormat").Value == "relationsOnly";
+                        bool isRelationsOnly = picker.GetEditorDataItems().GetType().GetProperty("saveFormat").ToString() == "relationsOnly";
 
-                        if (isRelationsOnly) 
+                        if (isRelationsOnly)
                         {
                             if (picker.SavedValue == null)
                             {
@@ -90,7 +112,7 @@ private void Saved(IService sender, IEnumerable<IContentBase> savedEntities)
                                 }
                             }
                         }
-                       
+
                         // update database
                         RelationMapping.UpdateRelationMapping(
                                                 picker.ContextId,           // savedEntity.Id
diff --git a/source/nuPickers/Components/nuPickerCompontent.cs b/source/nuPickers/Components/nuPickerCompontent.cs
new file mode 100644
index 0000000..2d0956c
--- /dev/null
+++ b/source/nuPickers/Components/nuPickerCompontent.cs
@@ -0,0 +1,7 @@
+namespace nuPickers.Components
+{
+    public class nuPickerCompontent
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/BaseDataEditor.cs b/source/nuPickers/DataEditors/BaseDataEditor.cs
new file mode 100644
index 0000000..308c09f
--- /dev/null
+++ b/source/nuPickers/DataEditors/BaseDataEditor.cs
@@ -0,0 +1,17 @@
+
+using nuPickers.Shared.SaveFormat;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors
+{
+    public abstract class BaseDataEditor : DataEditor
+    {
+        protected override IDataValueEditor CreateValueEditor()  => new SaveFormatPropertyValueEditor(Attribute);
+
+
+        protected BaseDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/PropertyEditorConstants.cs b/source/nuPickers/DataEditors/DataEditorConstants.cs
similarity index 96%
rename from source/nuPickers/PropertyEditors/PropertyEditorConstants.cs
rename to source/nuPickers/DataEditors/DataEditorConstants.cs
index 0b497b8..cf80206 100644
--- a/source/nuPickers/PropertyEditors/PropertyEditorConstants.cs
+++ b/source/nuPickers/DataEditors/DataEditorConstants.cs
@@ -1,9 +1,9 @@
-namespace nuPickers.PropertyEditors
+namespace nuPickers.DataEditors
 {
     /// <summary>
     /// Class used to define constants (avoided more generic Contants class as conflicts with the use of ClientDependency)
     /// </summary>
-    public static class PropertyEditorConstants
+    public static class DataEditorConstants
     {
         public const string DotNetCheckBoxPickerAlias = "nuPickers.DotNetCheckBoxPicker";
         public const string DotNetDropDownPickerAlias = "nuPickers.DotNetDropDownPicker";
@@ -51,6 +51,6 @@ public static class PropertyEditorConstants
         public const string XmlPagedListPickerAlias = "nuPickers.XmlPagedListPicker";
         public const string XmlPrefetchListPickerAlias = "nuPickers.XmlPrefetchListPicker";
         public const string XmlRadioButtonPickerAlias = "nuPickers.XmlRadioButtonPicker";
-        public const string XmlTypeaheadListPickerAlias = "nuPickers.XmlTypeaheadListPicker";        
+        public const string XmlTypeaheadListPickerAlias = "nuPickers.XmlTypeaheadListPicker";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..adc9d92
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfiguration.cs
@@ -0,0 +1,32 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetCheckBoxPicker
+{
+    internal class DotNetCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel =
+                true)]
+        public object DataSource { get; set; }
+
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..9a1b78f
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,165 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetCheckBoxPicker
+{
+    internal class DotNetCheckBoxPickerConfigurationEditor : ConfigurationEditor<DotNetCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override DotNetCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, DotNetCheckBoxPickerConfiguration configuration)
+        {
+            var output = new DotNetCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
new file mode 100644
index 0000000..e996c64
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerDataEditor.cs
@@ -0,0 +1,34 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetCheckBoxPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetCheckBoxPickerConfigurationEditor();
+
+        public DotNetCheckBoxPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..257cd4b
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfiguration.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetDropDownPicker
+{
+    internal class DotNetDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..d596b21
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,141 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetDropDownPicker
+{
+    internal class DotNetDropDownPickerConfigurationEditor : ConfigurationEditor<DotNetDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "saveFormat", saveFormat }
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetDropDownPickerConfiguration configuration)
+        {
+            var output = new DotNetDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
new file mode 100644
index 0000000..9322976
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetDropDownPicker/DotNetDropDownPickerDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetDropDownPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetDropDownPickerConfigurationEditor();
+
+        public DotNetDropDownPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
new file mode 100644
index 0000000..a063da8
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfiguration.cs
@@ -0,0 +1,29 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetLabels
+{
+    internal class DotNetLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
+            true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..8c4f530
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsConfigurationEditor.cs
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.EnumLabels;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetLabels
+{
+    internal class DotNetLabelsConfigurationEditor : ConfigurationEditor<DotNetLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetLabelsConfiguration configuration)
+        {
+            var output = new DotNetLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("labels", out var labelsObj))
+            {
+                var convertString = labelsObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.Labels = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
new file mode 100644
index 0000000..9365a0e
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetLabels/DotNetLabelsDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetLabels
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetLabelsDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new DotNetLabelsConfigurationEditor();
+
+        public DotNetLabelsDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
new file mode 100644
index 0000000..4902830
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfiguration.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPagedListPicker
+{
+    internal class DotNetPagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..86c4cf2
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerConfigurationEditor.cs
@@ -0,0 +1,176 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPagedListPicker
+{
+    internal class DotNetPagedListPickerConfigurationEditor : ConfigurationEditor<DotNetPagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetPagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetPagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetPagedListPickerConfiguration configuration)
+        {
+            var output = new DotNetPagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerDataEditor.cs
new file mode 100644
index 0000000..41265e1
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPagedListPicker/DotNetPagedListPickerDataEditor.cs
@@ -0,0 +1,38 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPagedListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetPagedListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetPagedListPickerConfigurationEditor();
+
+
+        public DotNetPagedListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..07b1200
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfiguration.cs
@@ -0,0 +1,31 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPrefetchListPicker
+{
+    internal class DotNetPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..865c06d
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,168 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPrefetchListPicker
+{
+    internal class DotNetPrefetchListPickerConfigurationEditor : ConfigurationEditor<DotNetPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetPrefetchListPickerConfiguration configuration)
+        {
+            var output = new DotNetPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerDataEditor.cs
new file mode 100644
index 0000000..f5a2ccd
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerDataEditor.cs
@@ -0,0 +1,37 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetPrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetPrefetchListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetPrefetchListPickerConfigurationEditor();
+
+
+        public DotNetPrefetchListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..ce2254c
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfiguration.cs
@@ -0,0 +1,21 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetRadioButtonPicker
+{
+    internal class DotNetRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..cd38405
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.EnumRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetRadioButtonPicker
+{
+    internal class DotNetRadioButtonPickerConfigurationEditor : ConfigurationEditor<DotNetRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "layoutDirection", layoutDirection },
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetRadioButtonPickerConfiguration configuration)
+        {
+            var output = new DotNetRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs
new file mode 100644
index 0000000..48eb5eb
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetRadioButtonPicker/DotnetRadioButtonPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetRadioButtonPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetRadioButtonPickerAlias, "nuPickers: DotNet RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotnetRadioButtonPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetRadioButtonPickerConfigurationEditor();
+
+
+        public DotnetRadioButtonPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
new file mode 100644
index 0000000..2766654
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfiguration.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
+{
+    internal class DotNetTypeaheadListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..7d58082
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
+{
+    internal class DotNetTypeaheadListPickerConfigurationEditor : ConfigurationEditor<DotNetTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(DotNetTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override DotNetTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, DotNetTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new DotNetTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
new file mode 100644
index 0000000..54778ea
--- /dev/null
+++ b/source/nuPickers/DataEditors/DotNetTypeaheadListPicker/DotNetTypeaheadPickerDataEditor.cs
@@ -0,0 +1,38 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.DotNetTypeaheadListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.DotNetTypeaheadListPickerAlias, "nuPickers: DotNet TypeaheadList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class DotNetTypeaheadPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new DotNetTypeaheadListPickerConfigurationEditor();
+
+
+        public DotNetTypeaheadPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..d0566f5
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfiguration.cs
@@ -0,0 +1,30 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumCheckBoxPicker
+{
+    internal class EnumCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..9ce7bfa
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,165 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumCheckBoxPicker
+{
+    internal class EnumCheckBoxPickerConfigurationEditor : ConfigurationEditor<EnumCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override EnumCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, EnumCheckBoxPickerConfiguration configuration)
+        {
+            var output = new EnumCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerDataEditor.cs b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerDataEditor.cs
new file mode 100644
index 0000000..55bfc5f
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumCheckBoxPicker/EnumCheckBoxPickerDataEditor.cs
@@ -0,0 +1,48 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker",
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumCheckBoxPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumCheckBoxPickerConfigurationEditor();
+
+        public EnumCheckBoxPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..2a8d025
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfiguration.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumDropDownPicker
+{
+    public class EnumDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..d91e56c
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,141 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumDropDownPicker
+{
+    internal class EnumDropDownPickerConfigurationEditor : ConfigurationEditor<EnumDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "saveFormat", saveFormat }
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumDropDownPickerConfiguration configuration)
+        {
+            var output = new EnumDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerDataEditor.cs
new file mode 100644
index 0000000..82433fe
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumDropDownPicker/EnumDropDownPickerDataEditor.cs
@@ -0,0 +1,32 @@
+
+
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumDropDownPickerDataEditor  : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumDropDownPickerConfigurationEditor();
+
+        public EnumDropDownPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
new file mode 100644
index 0000000..5e9f2a7
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfiguration.cs
@@ -0,0 +1,29 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumLabels
+{
+    internal class EnumLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel =
+            true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..8c44b09
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsConfigurationEditor.cs
@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumLabels
+{
+    internal class EnumLabelsConfigurationEditor : ConfigurationEditor<EnumLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumLabelsConfiguration configuration)
+        {
+            var output = new EnumLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("labels", out var labelsObj))
+            {
+                var convertString = labelsObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.Labels = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumLabels/EnumLabelsDataEditor.cs b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsDataEditor.cs
new file mode 100644
index 0000000..5ebde79
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumLabels/EnumLabelsDataEditor.cs
@@ -0,0 +1,44 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumLabels
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels",
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumLabelsDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new EnumLabelsConfigurationEditor();
+
+        public EnumLabelsDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..d4c1ea6
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfiguration.cs
@@ -0,0 +1,30 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumPrefetchListPicker
+{
+    internal class EnumPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..933badf
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,168 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumPrefetchListPicker
+{
+    internal class EnumPrefetchListPickerConfigurationEditor : ConfigurationEditor<EnumPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumPrefetchListPickerConfiguration configuration)
+        {
+            var output = new EnumPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerDataEditor.cs b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerDataEditor.cs
new file mode 100644
index 0000000..fd54313
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumPrefetchListPicker/EnumPrefetchListPickerDataEditor.cs
@@ -0,0 +1,51 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumPrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker",
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT" )]
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" +
+        EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript,
+        EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumPrefetchListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumPrefetchListPickerConfigurationEditor();
+
+
+        public EnumPrefetchListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..f5efb7e
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfiguration.cs
@@ -0,0 +1,21 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumRadioButtonPicker
+{
+    internal class EnumRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..c393429
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumRadioButtonPicker
+{
+    internal class EnumRadioButtonPickerConfigurationEditor : ConfigurationEditor<EnumRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(EnumRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "layoutDirection", layoutDirection },
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override EnumRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, EnumRadioButtonPickerConfiguration configuration)
+        {
+            var output = new EnumRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerDataEditor.cs b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerDataEditor.cs
new file mode 100644
index 0000000..9e30490
--- /dev/null
+++ b/source/nuPickers/DataEditors/EnumRadioButtonPicker/EnumRadioButtonPickerDataEditor.cs
@@ -0,0 +1,34 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.EnumRadioButtonPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class EnumRadioButtonPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new EnumRadioButtonPickerConfigurationEditor();
+
+
+        public EnumRadioButtonPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..d13f497
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfiguration.cs
@@ -0,0 +1,27 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonCheckBoxPicker
+{
+    internal class JsonCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", " Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..06d6189
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,174 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonCheckBoxPicker
+{
+    internal class JsonCheckBoxPickerConfigurationEditor : ConfigurationEditor<JsonCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override JsonCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues,
+            JsonCheckBoxPickerConfiguration configuration)
+        {
+            var output = new JsonCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerDataEditor.cs
new file mode 100644
index 0000000..783cf14
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonCheckBoxPicker/JsonCheckBoxPickerDataEditor.cs
@@ -0,0 +1,34 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonCheckBoxPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonCheckBoxPickerConfigurationEditor();
+
+        public JsonCheckBoxPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..a9998c4
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfiguration.cs
@@ -0,0 +1,22 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonDropDownPicker
+{
+    internal class JsonDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..c6fdee5
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,148 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonDropDownPicker
+{
+    internal class JsonDropDownPickerConfigurationEditor : ConfigurationEditor<JsonDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override JsonDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            JsonDropDownPickerConfiguration configuration)
+        {
+            var output = new JsonDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerDataEditor.cs
new file mode 100644
index 0000000..32bf1c7
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonDropDownPicker/JsonDropDownPickerDataEditor.cs
@@ -0,0 +1,31 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonDropDownPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonDropDownPickerConfigurationEditor();
+
+        public JsonDropDownPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
new file mode 100644
index 0000000..0dda6d3
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfiguration.cs
@@ -0,0 +1,28 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonLabels
+{
+    internal class JsonLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html",
+            HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        public object Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..0921d3d
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsConfigurationEditor.cs
@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonLabels
+{
+    internal class JsonLabelsConfigurationEditor : ConfigurationEditor<JsonLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonLabelsConfiguration configuration)
+        {
+            var output = new JsonLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("labels", out var labelsObj))
+            {
+                var convertString = labelsObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.Labels = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonLabels/JsonLabelsDataEditor.cs b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsDataEditor.cs
new file mode 100644
index 0000000..338d93d
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonLabels/JsonLabelsDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonLabels
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonLabelsDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonLabelsConfigurationEditor();
+
+        public JsonLabelsDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
new file mode 100644
index 0000000..cf814c7
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfiguration.cs
@@ -0,0 +1,34 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPagedListPicker
+{
+    internal class JsonPagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Page List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..b46b08e
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerConfigurationEditor.cs
@@ -0,0 +1,176 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPagedListPicker
+{
+    internal class JsonPagedListPickerConfigurationEditor : ConfigurationEditor<JsonPagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonPagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonPagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonPagedListPickerConfiguration configuration)
+        {
+            var output = new JsonPagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerDataEditor.cs
new file mode 100644
index 0000000..cb91c8e
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPagedListPicker/JsonPagedListPickerDataEditor.cs
@@ -0,0 +1,36 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPagedListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonPagedListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new JsonPagedListPickerConfigurationEditor();
+
+        public JsonPagedListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..1a4a802
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfiguration.cs
@@ -0,0 +1,34 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPrefetchListPicker
+{
+    internal class JsonPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..855fbc1
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,168 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPrefetchListPicker
+{
+    internal class JsonPrefetchListPickerConfigurationEditor : ConfigurationEditor<JsonPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonPrefetchListPickerConfiguration configuration)
+        {
+            var output = new JsonPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerDataEditor.cs
new file mode 100644
index 0000000..0d5bdea
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonPrefetchListPicker/JsonPrefetchListPickerDataEditor.cs
@@ -0,0 +1,37 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonPrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonPrefetchListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonPrefetchListPickerConfigurationEditor();
+
+
+        public JsonPrefetchListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..0e90d46
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfiguration.cs
@@ -0,0 +1,24 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonRadioButtonPicker
+{
+    internal class JsonRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..444372d
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,162 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonRadioButtonPicker
+{
+    internal class JsonRadioButtonPickerConfigurationEditor : ConfigurationEditor<JsonRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+            var relationMapping = configuration?.RelationMapping;
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "layoutDirection", layoutDirection },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonRadioButtonPickerConfiguration configuration)
+          {
+
+            var output = new JsonRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs
new file mode 100644
index 0000000..1859534
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonRadioButtonPicker/JsonRadioButtonPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonRadioButtonPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonRadioButtonPickerAlias, "nuPickers: Json RadioButton Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonRadioButtonPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonRadioButtonPickerConfigurationEditor();
+
+
+        public JsonRadioButtonPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
new file mode 100644
index 0000000..64d8c20
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfiguration.cs
@@ -0,0 +1,36 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonTypeaheadListPicker
+{
+    internal class JsonTypeaheadListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html",
+            HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel =
+                true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..eae63d3
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetTypeaheadListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonTypeaheadListPicker
+{
+    internal class JsonTypeaheadListPickerConfigurationEditor : ConfigurationEditor<JsonTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(JsonTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override JsonTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, JsonTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new JsonTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs
new file mode 100644
index 0000000..22de0c7
--- /dev/null
+++ b/source/nuPickers/DataEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerDataEditor.cs
@@ -0,0 +1,38 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.JsonTypeaheadListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.JsonTypeaheadListPickerAlias, "nuPickers: Json TypeaheadList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class JsonTypeaheadPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new JsonTypeaheadListPickerConfigurationEditor();
+
+
+        public JsonTypeaheadPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..4116078
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfiguration.cs
@@ -0,0 +1,36 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneCheckBoxPicker
+{
+    internal class LuceneCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel =
+                true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel =
+                true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..e1c99d6
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,166 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetCheckBoxPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneCheckBoxPicker
+{
+    internal class LuceneCheckBoxPickerConfigurationEditor : ConfigurationEditor<LuceneCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override LuceneCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, LuceneCheckBoxPickerConfiguration configuration)
+        {
+            var output = new LuceneCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs
new file mode 100644
index 0000000..8a00797
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneCheckBoxPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.LuceneCheckBoxPickerAlias, "nuPickers: Lucene CheckBox Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LuceneCheckBoxPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new LuceneCheckBoxPickerConfigurationEditor();
+
+        public LuceneCheckBoxPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..32a7ea8
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfiguration.cs
@@ -0,0 +1,18 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneDropDownPicker
+{
+    internal class LuceneDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..600f4d3
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,148 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneDropDownPicker
+{
+    internal class LuceneDropDownPickerConfigurationEditor : ConfigurationEditor<LuceneDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override LuceneDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            LuceneDropDownPickerConfiguration configuration)
+        {
+            var output = new LuceneDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerDataEditor.cs
new file mode 100644
index 0000000..8625034
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneDropDownPicker/LuceneDropDownPickerDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LuceneDropDownPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneDropDownPickerConfigurationEditor();
+
+        public LuceneDropDownPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+
+}
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
new file mode 100644
index 0000000..68b3def
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfiguration.cs
@@ -0,0 +1,24 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneLabels
+{
+    internal class LuceneLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..2e73819
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsConfigurationEditor.cs
@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneLabels
+{
+    internal class LuceneLabelsConfigurationEditor : ConfigurationEditor<LuceneLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var customLabel = configuration?.CustomLabel;
+
+
+            var dataSource = configuration?.DataSource;
+            var labels = configuration?.Labels;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "labels", labels },
+                {"layoutDirection",layoutDirection},
+                {"customLabel",customLabel}
+
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override LuceneLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            LuceneLabelsConfiguration configuration)
+        {
+            var output = new LuceneLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+
+                    output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customLabelObj))
+            {
+
+                    output.CustomLabel = customLabelObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsDataEditor.cs b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsDataEditor.cs
new file mode 100644
index 0000000..c96e111
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneLabels/LuceneLabelsDataEditor.cs
@@ -0,0 +1,32 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneLabels
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LuceneLabelsDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneLabelsConfigurationEditor();
+
+        public LuceneLabelsDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
new file mode 100644
index 0000000..089682c
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfiguration.cs
@@ -0,0 +1,34 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePagedListPicker
+{
+    internal class LucenePagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Page List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html",
+            HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..18e8321
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerConfigurationEditor.cs
@@ -0,0 +1,176 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePagedListPicker
+{
+    internal class LucenePagedListPickerConfigurationEditor : ConfigurationEditor<LucenePagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LucenePagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LucenePagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LucenePagedListPickerConfiguration configuration)
+        {
+            var output = new LucenePagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerDataEditor.cs b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerDataEditor.cs
new file mode 100644
index 0000000..428a422
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePagedListPicker/LucenePagedListPickerDataEditor.cs
@@ -0,0 +1,36 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePagedListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LucenePagedListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePagedListPickerConfigurationEditor();
+
+        public LucenePagedListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..654cdaa
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfiguration.cs
@@ -0,0 +1,37 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePrefetchListPicker
+{
+    internal class LucenePrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel =
+                true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel =
+                true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel =
+                true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..50f0970
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePrefetchListPicker
+{
+    internal class LucenePrefetchListPickerConfigurationEditor : ConfigurationEditor<LucenePrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LucenePrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LucenePrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LucenePrefetchListPickerConfiguration configuration)
+        {
+            var output = new LucenePrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
new file mode 100644
index 0000000..cad478a
--- /dev/null
+++ b/source/nuPickers/DataEditors/LucenePrefetchListPicker/LucenePrefetchListPickerDataEditor.cs
@@ -0,0 +1,35 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.LucenePrefetchListPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class LucenePrefetchListPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LucenePrefetchListPickerConfigurationEditor();
+
+        public LucenePrefetchListPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..d056f3d
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfiguration.cs
@@ -0,0 +1,31 @@
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class LuceneRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source",
+            EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",
+            EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction",
+            EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping",
+            EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format",
+            EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..86509ca
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,160 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.EnumRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
+{
+    internal class LuceneRadioButtonPickerConfigurationEditor : ConfigurationEditor<LuceneRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+                { "dataSource", dataSource },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LuceneRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LuceneRadioButtonPickerConfiguration configuration)
+        {
+            var output = new LuceneRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerDataEditor.cs
similarity index 76%
rename from source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerDataEditor.cs
index 27c1a8b..b78d20a 100644
--- a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.LuceneRadioButtonPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.LuceneRadioButtonPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneRadioButtonPickerAlias, "nuPickers: Lucene RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LuceneRadioButtonPickerAlias, "nuPickers: Lucene RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,11 +25,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class LuceneRadioButtonPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new LuceneRadioButtonPickerConfigurationEditor();
+
+        public LuceneRadioButtonPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new LuceneRadioButtonPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
new file mode 100644
index 0000000..ed260eb
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfiguration.cs
@@ -0,0 +1,28 @@
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class LuceneTypeaheadListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "Type ahead list Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..e5608fa
--- /dev/null
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.DotNetTypeaheadListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
+{
+    internal class LuceneTypeaheadListPickerConfigurationEditor : ConfigurationEditor<LuceneTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(LuceneTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override LuceneTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, LuceneTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new LuceneTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerDataEditor.cs
similarity index 80%
rename from source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerDataEditor.cs
index b1735a7..a6863e0 100644
--- a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/LuceneTypeaheadPicker/LuceneTypeaheadPickerDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.LuceneTypeaheadListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.LuceneTypeaheadListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneTypeaheadListPickerAlias, "nuPickers: Lucene TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.LuceneTypeaheadListPickerAlias, "nuPickers: Lucene TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,11 +28,16 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneTypeaheadPickerPropertyEditor : BasePropertyEditor
+    public class LuceneTypeaheadPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new LuceneTypeaheadListPickerConfigurationEditor();
+
+
+        public LuceneTypeaheadPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new LuceneTypeaheadListPickerPreValueEditor();
         }
+
+
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs b/source/nuPickers/DataEditors/PickerDataEditor.cs
similarity index 65%
rename from source/nuPickers/PropertyEditors/PickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/PickerDataEditor.cs
index 14f0dd8..43487aa 100644
--- a/source/nuPickers/PropertyEditors/PickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/PickerDataEditor.cs
@@ -1,4 +1,8 @@
 // left this file here for reference - would be handy if PropertyEditorAsset attributes worked with inheritance, as all pickers share these resources:
+
+using nuPickers.EmbeddedResource;
+using Umbraco.Core.Logging;
+
 namespace nuComponents.DataTypes.PropertyEditors
 {
     using ClientDependency.Core;
@@ -6,14 +10,17 @@ namespace nuComponents.DataTypes.PropertyEditors
     using Umbraco.Web.PropertyEditors;
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "Editor/EditorResource.js")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "DataSource/DataSourceResource.js")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "RelationMapping/RelationMappingResource.js")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.RootUrl + "SaveFormat/SaveFormatResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js")]
 
     // CONFIG
     [PropertyEditorAsset(ClientDependencyType.Javascript, "App_Plugins/nuComponents/DataTypes/Shared/RelationTypeMapping/RelationMappingConfigController.js")]
-    public abstract class PickerPropertyEditor : BasePropertyEditor
+    public abstract class PickerDataEditor : DataEditor
     {
+        protected PickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
     }
 }
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
new file mode 100644
index 0000000..173b11f
--- /dev/null
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfiguration.cs
@@ -0,0 +1,19 @@
+namespace nuPickers.DataEditors.RelationLabels
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class RelationLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..555a39b
--- /dev/null
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsConfigurationEditor.cs
@@ -0,0 +1,148 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.RelationLabels
+{
+    internal class RelationLabelsConfigurationEditor : ConfigurationEditor<RelationLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(RelationLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                {"layoutDirection",layoutDirection}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override RelationLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, RelationLabelsConfiguration configuration)
+        {
+            var output = new RelationLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsDataEditor.cs
similarity index 75%
rename from source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/RelationLabels/RelationLabelsDataEditor.cs
index 130deb6..939a205 100644
--- a/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/RelationLabels/RelationLabelsDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.RelationLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.RelationLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.RelationLabelsAlias, "nuPickers: Relation Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.RelationLabelsAlias, "nuPickers: Relation Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -21,11 +23,14 @@
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class RelationLabelsPropertyEditor : BasePropertyEditor
+    public class RelationLabelsDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new RelationLabelsConfigurationEditor();
+
+
+        public RelationLabelsDataEditor(ILogger logger) : base(logger)
         {
-            return new RelationLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
new file mode 100644
index 0000000..da3876c
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfiguration.cs
@@ -0,0 +1,28 @@
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlCheckBoxPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public object CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
new file mode 100644
index 0000000..b0053da
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerConfigurationEditor.cs
@@ -0,0 +1,166 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneCheckBoxPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
+{
+    internal class SqlCheckBoxPickerConfigurationEditor : ConfigurationEditor<SqlCheckBoxPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlCheckBoxPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var layoutDirection = configuration?.LayoutDirection;
+            var checkBoxPicker = configuration?.CheckBoxPicker;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+
+            return new Dictionary<string, object>
+            {
+                {"items", editorItems},
+                {"useLabel", useLabel},
+                {"dataSource", dataSource},
+                {"saveFormat", saveFormat},
+                {"customLabel", customLabel},
+                {"layoutDirection", layoutDirection},
+                {"checkBoxPicker", checkBoxPicker}
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override SqlCheckBoxPickerConfiguration FromConfigurationEditor(
+            IDictionary<string, object> editorValues, SqlCheckBoxPickerConfiguration configuration)
+        {
+            var output = new SqlCheckBoxPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+
+            if (editorValues.TryGetValue("checkBoxPicker", out var checkBoxPickerObj))
+            {
+                output.CheckBoxPicker = checkBoxPickerObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerDataEditor.cs
similarity index 78%
rename from source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerDataEditor.cs
index f480e3b..d0fc6c9 100644
--- a/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlCheckBoxPicker/SqlCheckBoxPickerDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.SqlCheckBoxPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlCheckBoxPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlCheckBoxPickerAlias, "nuPickers: Sql CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlCheckBoxPickerAlias, "nuPickers: Sql CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -24,11 +26,13 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class SqlCheckBoxPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() =>
+            new SqlCheckBoxPickerConfigurationEditor();
+
+        public SqlCheckBoxPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlCheckBoxPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
new file mode 100644
index 0000000..dd5f173
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfiguration.cs
@@ -0,0 +1,20 @@
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlDropDownPicker
+{
+    internal class SqlDropDownPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
new file mode 100644
index 0000000..a2ee87e
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerConfigurationEditor.cs
@@ -0,0 +1,147 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlDropDownPicker
+{
+    internal class SqlDropDownPickerConfigurationEditor : ConfigurationEditor<SqlDropDownPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlDropDownPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var useLabel = configuration?.UseLabel ?? false;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                { "saveFormat", saveFormat },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlDropDownPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlDropDownPickerConfiguration configuration)
+        {
+            var output = new SqlDropDownPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerDataEditor.cs b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerDataEditor.cs
new file mode 100644
index 0000000..8632090
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlDropDownPicker/SqlDropDownPickerDataEditor.cs
@@ -0,0 +1,31 @@
+using ClientDependency.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlDropDownPicker
+{
+    // EDITOR UI
+    [DataEditor(DataEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // RESOURCES (all are referenced as EditorResource consumes the others)
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+
+    // CONFIG
+    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.EmbeddedResource.FILE_EXTENSION)]
+    public class SqlDropDownPickerDataEditor : DataEditor
+    {
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlDropDownPickerConfigurationEditor();
+
+        public SqlDropDownPickerDataEditor(ILogger logger) : base(logger)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfiguration.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfiguration.cs
new file mode 100644
index 0000000..6c0ba24
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfiguration.cs
@@ -0,0 +1,20 @@
+namespace nuPickers.DataEditors.SqlLabels
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlLabelsConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs
new file mode 100644
index 0000000..42d715b
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsConfigurationEditor.cs
@@ -0,0 +1,151 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneLabels;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlLabels
+{
+    internal class SqlLabelsConfigurationEditor : ConfigurationEditor<SqlLabelsConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlLabelsConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var customLabel = configuration?.CustomLabel;
+
+
+            var dataSource = configuration?.DataSource;
+            var useLabel = configuration?.UseLabel ?? false;
+            var layoutDirection = configuration?.LayoutDirection;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                { "dataSource", dataSource },
+                {"layoutDirection",layoutDirection},
+                {"customLabel",customLabel}
+
+            };
+        }
+
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+                }
+            }
+
+            return new ItemValue {Source = item.Value, Label = item.Value, SortOrder = sortOrder};
+        }
+
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")] public string Source { get; set; }
+
+            [JsonProperty("label")] public string Label { get; set; }
+
+            [JsonProperty("sortOrder")] public int SortOrder { get; set; }
+        }
+
+        public override SqlLabelsConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues,
+            SqlLabelsConfiguration configuration)
+        {
+            var output = new SqlLabelsConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+
+                    output.DataSource = dataSourceObj;
+            }
+
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                var convertString = layoutDirectionObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.LayoutDirection = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customLabelObj))
+            {
+
+                    output.CustomLabel = customLabelObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new {value, label});
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem {Id = id, Value = value});
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsDateEditor.cs
similarity index 78%
rename from source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlLabels/SqlLabelsDateEditor.cs
index f5b808c..e2b59fe 100644
--- a/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlLabels/SqlLabelsDateEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.SqlLabels
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlLabelsAlias, "nuPickers: Sql Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlLabelsAlias, "nuPickers: Sql Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,11 +24,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlLabelsPropertyEditor : BasePropertyEditor
+    public class SqlLabelsDateEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlLabelsConfigurationEditor();
+
+        public SqlLabelsDateEditor(ILogger logger) : base(logger)
         {
-            return new SqlLabelsPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
new file mode 100644
index 0000000..51a171b
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfiguration.cs
@@ -0,0 +1,29 @@
+namespace nuPickers.DataEditors.SqlPagedListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlPagedListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Paged List Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public object PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..5e8ff6f
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerConfigurationEditor.cs
@@ -0,0 +1,176 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlPagedListPicker
+{
+    internal class SqlPagedListPickerConfigurationEditor : ConfigurationEditor<SqlPagedListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlPagedListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var pagedListPicker = configuration?.PagedListPicker;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"pagedListPicker",pagedListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlPagedListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlPagedListPickerConfiguration configuration)
+        {
+            var output = new SqlPagedListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("pagedListPicker", out var pagedListPickerObj))
+            {
+                var convertString = pagedListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PagedListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerEditorEditor.cs
similarity index 81%
rename from source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerEditorEditor.cs
index 1ec4eef..b469483 100644
--- a/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPagedListPicker/SqlPagedListPickerEditorEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.SqlPagedListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlPagedListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlPagedListPickerAlias, "nuPickers: Sql PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlPagedListPickerAlias, "nuPickers: Sql PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,11 +28,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlPagedListPickerPropertyEditor : BasePropertyEditor
+    public class SqlPagedListPickerEditorEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlPagedListPickerConfigurationEditor();
+
+        public SqlPagedListPickerEditorEditor(ILogger logger) : base(logger)
         {
-            return new SqlPagedListPickerPreValueEditor();
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
new file mode 100644
index 0000000..76c0b93
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfiguration.cs
@@ -0,0 +1,29 @@
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlPrefetchListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public object PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..6f36ee8
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerConfigurationEditor.cs
@@ -0,0 +1,174 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LucenePrefetchListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
+{
+    internal class SqlPrefetchListPickerConfigurationEditor : ConfigurationEditor<SqlPrefetchListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlPrefetchListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var prefetchListPicker = configuration?.PrefetchListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"prefetchListPicker",prefetchListPicker},
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlPrefetchListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlPrefetchListPickerConfiguration configuration)
+        {
+            var output = new SqlPrefetchListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var prefetchListPickerObj))
+            {
+                var convertString = prefetchListPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.PrefetchListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerDataEditor.cs
similarity index 79%
rename from source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerDataEditor.cs
index bc9f8a6..a7f8ae2 100644
--- a/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlPrefetchListPicker/SqlPrefetchListPickerDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.SqlPrefetchListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlPrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlPrefetchListPickerAlias, "nuPickers: Sql PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlPrefetchListPickerAlias, "nuPickers: Sql PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,11 +27,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlPrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class SqlPrefetchListPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlPrefetchListPickerConfigurationEditor();
+
+        public SqlPrefetchListPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlPrefetchListPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
new file mode 100644
index 0000000..c80cc7a
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfiguration.cs
@@ -0,0 +1,26 @@
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlRadioButtonPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public object LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
new file mode 100644
index 0000000..d3d8142
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerConfigurationEditor.cs
@@ -0,0 +1,160 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneRadioButtonPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
+{
+    internal class SqlRadioButtonPickerConfigurationEditor : ConfigurationEditor<SqlRadioButtonPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlRadioButtonPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var useLabel = configuration?.UseLabel ?? false;
+            var relationMapping = configuration?.RelationMapping;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+                { "dataSource", dataSource },
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlRadioButtonPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlRadioButtonPickerConfiguration configuration)
+        {
+            var output = new SqlRadioButtonPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                    output.DataSource = dataSourceObj;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("layoutDirection", out var layoutDirectionObj))
+            {
+                output.LayoutDirection = layoutDirectionObj;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                var convertString = relationMappingObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.RelationMapping = convertString.Result;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerDataEditor.cs
similarity index 77%
rename from source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerDataEditor.cs
index 82ebf29..345ac31 100644
--- a/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlRadioButtonPicker/SqlRadioButtonPickerDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.SqlRadioButtonPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlRadioButtonPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlRadioButtonPickerAlias, "nuPickers: Sql RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlRadioButtonPickerAlias, "nuPickers: Sql RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,11 +25,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class SqlRadioButtonPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlRadioButtonPickerConfigurationEditor();
+
+        public SqlRadioButtonPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlRadioButtonPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
new file mode 100644
index 0000000..e29f1f6
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfiguration.cs
@@ -0,0 +1,29 @@
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class SqlTypeaheadListPickerConfiguration : ValueListConfiguration
+    {
+        [ConfigurationField("useLabel", "Include labels?", "boolean", Description = "")]
+        public bool UseLabel { get; set; }
+
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
+        public object DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public object CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        public object TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public object ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public object RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
new file mode 100644
index 0000000..c2ae269
--- /dev/null
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerConfigurationEditor.cs
@@ -0,0 +1,173 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using nuPickers.DataEditors.LuceneTypeaheadListPicker;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
+{
+    internal class SqlTypeaheadListPickerConfigurationEditor : ConfigurationEditor<SqlTypeaheadListPickerConfiguration>
+    {
+        public override Dictionary<string, object> ToConfigurationEditor(SqlTypeaheadListPickerConfiguration configuration)
+        {
+            var configuredItems = configuration?.Items; // ordered
+            object editorItems;
+
+            if (configuredItems == null)
+            {
+                editorItems = new object();
+            }
+            else
+            {
+                var d = new Dictionary<string, object>();
+                editorItems = d;
+                var sortOrder = 0;
+                foreach (var item in configuredItems)
+                    d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+            }
+
+            var dataSource = configuration?.DataSource;
+            var saveFormat = configuration?.SaveFormat;
+            var customLabel = configuration?.CustomLabel;
+            var relationMapping = configuration?.RelationMapping;
+            var listPicker = configuration?.ListPicker;
+            var useLabel = configuration?.UseLabel ?? false;
+            var typeaheadListPicker = configuration?.TypeaheadListPicker;
+
+            return new Dictionary<string, object>
+            {
+                { "items", editorItems },
+                { "useLabel", useLabel },
+                {"saveFormat",saveFormat},
+                {"customLabel", customLabel},
+
+                { "dataSource", dataSource },
+                { "listPicker", listPicker },
+                {"typeaheadListPicker",typeaheadListPicker},
+
+                {"relationMapping",relationMapping}
+
+            };
+        }
+        private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
+        {
+            // in:  ValueListItem, Id = <id>, Value = <color> | { "value": "<color>", "label": "<label>" }
+            //                                        (depending on useLabel)
+            // out: { "value": "<color>", "label": "<label>", "sortOrder": <sortOrder> }
+
+            var v = new ItemValue
+            {
+                Source = item.Value,
+                Label = item.Value,
+                SortOrder = sortOrder
+            };
+
+            if (item.Value.DetectIsJson())
+            {
+                try
+                {
+                    var o = JsonConvert.DeserializeObject<ItemValue>(item.Value);
+                    o.SortOrder = sortOrder;
+                    return o;
+                }
+                catch
+                {
+                    // parsing Json failed, don't do anything, get the value (sure?)
+                    return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+                }
+            }
+
+            return new ItemValue { Source = item.Value, Label = item.Value, SortOrder = sortOrder };
+        }
+        // represents an item we are exchanging with the editor
+        private class ItemValue
+        {
+            [JsonProperty("value")]
+            public string Source { get; set; }
+
+            [JsonProperty("label")]
+            public string Label { get; set; }
+
+            [JsonProperty("sortOrder")]
+            public int SortOrder { get; set; }
+        }
+          public override SqlTypeaheadListPickerConfiguration FromConfigurationEditor(IDictionary<string, object> editorValues, SqlTypeaheadListPickerConfiguration configuration)
+        {
+            var output = new SqlTypeaheadListPickerConfiguration();
+
+            if (!editorValues.TryGetValue("items", out var jjj) || !(jjj is JArray jItems))
+                return output; // oops
+
+            // handle useLabel
+            if (editorValues.TryGetValue("useLabel", out var useLabelObj))
+            {
+                var convertBool = useLabelObj.TryConvertTo<bool>();
+                if (convertBool.Success)
+                    output.UseLabel = convertBool.Result;
+            }
+            if (editorValues.TryGetValue("dataSource", out var dataSourceObj))
+            {
+                var convertString = dataSourceObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.DataSource = convertString.Result;
+            }
+            if (editorValues.TryGetValue("saveFormat", out var saveFormatObj))
+            {
+                var convertString = saveFormatObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.SaveFormat = convertString.Result;
+            }
+            if (editorValues.TryGetValue("customLabel", out var customlabelObj))
+            {
+                var convertString = customlabelObj.TryConvertTo<string>();
+                if (convertString.Success)
+                    output.CustomLabel = convertString.Result;
+            }
+            if (editorValues.TryGetValue("prefetchListPicker", out var typeaheadListPickerObj))
+            {
+
+                    output.TypeaheadListPicker = typeaheadListPickerObj;
+            }
+            if (editorValues.TryGetValue("listPicker", out var listPickerObj))
+            {
+                var convertString = listPickerObj.TryConvertTo<object>();
+                if (convertString.Success)
+                    output.ListPicker = convertString.Result;
+            }
+            if (editorValues.TryGetValue("relationMapping", out var relationMappingObj))
+            {
+                output.RelationMapping = relationMappingObj;
+            }
+            // auto-assigning our ids, get next id from existing values
+            var nextId = 1;
+            if (configuration?.Items != null && configuration.Items.Count > 0)
+                nextId = configuration.Items.Max(x => x.Id) + 1;
+
+            // create ValueListItem instances - ordered (items get submitted in the sorted order)
+            foreach (var item in jItems.OfType<JObject>())
+            {
+
+
+                var value = item.Property("value")?.Value?.Value<string>();
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                var id = item.Property("id")?.Value?.Value<int>() ?? 0;
+                if (id >= nextId) nextId = id + 1;
+
+                var label = item.Property("label")?.Value?.Value<string>();
+                value = JsonConvert.SerializeObject(new { value, label });
+
+                output.Items.Add(new ValueListConfiguration.ValueListItem { Id = id, Value = value });
+            }
+
+            // ensure ids
+            foreach (var item in output.Items)
+                if (item.Id == 0)
+                    item.Id = nextId++;
+
+            return output;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerDataEditor.cs
similarity index 80%
rename from source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerDataEditor.cs
index 30368b6..db52446 100644
--- a/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerDataEditor.cs
@@ -1,13 +1,15 @@
-namespace nuPickers.PropertyEditors.SqlTypeaheadListPicker
+using Umbraco.Core.Logging;
+
+namespace nuPickers.DataEditors.SqlTypeaheadListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlTypeaheadListPickerAlias, "nuPickers: Sql TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.SqlTypeaheadListPickerAlias, "nuPickers: Sql TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,11 +28,12 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlTypeaheadListPickerPropertyEditor : BasePropertyEditor
+    public class SqlTypeaheadListPickerDataEditor : DataEditor
     {
-        protected override PreValueEditor CreatePreValueEditor()
+        protected override IConfigurationEditor CreateConfigurationEditor() => new SqlTypeaheadListPickerConfigurationEditor();
+
+        public SqlTypeaheadListPickerDataEditor(ILogger logger) : base(logger)
         {
-            return new SqlTypeaheadListPickerPreValueEditor();
         }
     }
 }
diff --git a/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
new file mode 100644
index 0000000..201a903
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
@@ -0,0 +1,26 @@
+namespace nuPickers.DataEditors.XmlCheckBoxPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlCheckBoxPickerPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("checkBoxPicker", "Checkbox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
+        public string CheckBoxPicker { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
similarity index 85%
rename from source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
index 7fa26b4..3b7de23 100644
--- a/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlCheckBoxPicker
+namespace nuPickers.DataEditors.XmlCheckBoxPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlCheckBoxPickerAlias, "nuPickers: Xml CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlCheckBoxPickerAlias, "nuPickers: Xml CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -24,7 +24,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlCheckBoxPickerPropertyEditor : BasePropertyEditor
+    public class XmlCheckBoxPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
new file mode 100644
index 0000000..c779e2a
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
@@ -0,0 +1,17 @@
+namespace nuPickers.DataEditors.XmlDropDownPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlDropDownPickerPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
similarity index 82%
rename from source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
index bc98363..55908e0 100644
--- a/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlDropDownPicker/XmlDropDownPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlDropDownPicker
+namespace nuPickers.DataEditors.XmlDropDownPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlDropDownPickerAlias, "nuPickers: Xml DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlDropDownPickerAlias, "nuPickers: Xml DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
     // RESOURCES (all are referenced as EditorResource consumes the others)
@@ -21,7 +21,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlDropDownPickerPropertyEditor : BasePropertyEditor
+    public class XmlDropDownPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
new file mode 100644
index 0000000..a83d884
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPreValueEditor.cs
@@ -0,0 +1,23 @@
+namespace nuPickers.DataEditors.XmlLabels
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlLabelsPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        /// <summary>
+        /// currently no ui, but forces controller to be loaded
+        /// </summary>
+        [ConfigurationField("labels", "Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
+        public string Labels { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPropertyEditor.cs b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
similarity index 84%
rename from source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
index 078409b..782d944 100644
--- a/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlLabels/XmlLabelsPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlLabels
+namespace nuPickers.DataEditors.XmlLabels
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlLabelsAlias, "nuPickers: Xml Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlLabelsAlias, "nuPickers: Xml Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -22,7 +22,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlLabelsPropertyEditor : BasePropertyEditor
+    public class XmlLabelsPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
new file mode 100644
index 0000000..91edbf8
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
@@ -0,0 +1,26 @@
+namespace nuPickers.DataEditors.XmlPagedListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlPagedListPickerPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("pagedListPicker", "Paged List Picker, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
+        public string PagedListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public string ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
similarity index 86%
rename from source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
index 3e64db8..9f40aac 100644
--- a/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPagedListPicker/XmlPagedListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlPagedListPicker
+namespace nuPickers.DataEditors.XmlPagedListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlPagedListPickerAlias, "nuPickers: Xml PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlPagedListPickerAlias, "nuPickers: Xml PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlPagedListPickerPropertyEditor : BasePropertyEditor
+    public class XmlPagedListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
new file mode 100644
index 0000000..093ff61
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
@@ -0,0 +1,26 @@
+namespace nuPickers.DataEditors.XmlPrefetchListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlPrefetchListPickerPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro",  EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("prefetchListPicker", "Prefetch List Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
+        public string PrefetchListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public string ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
similarity index 85%
rename from source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
index 274e354..9f2ec99 100644
--- a/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlPrefetchListPicker
+namespace nuPickers.DataEditors.XmlPrefetchListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlPrefetchListPickerAlias, "nuPickers: Xml PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlPrefetchListPickerAlias, "nuPickers: Xml PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -25,7 +25,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlPrefetchListPickerPropertyEditor : BasePropertyEditor
+    public class XmlPrefetchListPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
new file mode 100644
index 0000000..990159a
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
@@ -0,0 +1,23 @@
+namespace nuPickers.DataEditors.XmlRadioButtonPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlRadioButtonPickerPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
+        public string LayoutDirection { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
similarity index 84%
rename from source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
index b4f9479..5e36fc6 100644
--- a/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlRadioButtonPicker
+namespace nuPickers.DataEditors.XmlRadioButtonPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlRadioButtonPickerAlias, "nuPickers: Xml RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlRadioButtonPickerAlias, "nuPickers: Xml RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
 
@@ -23,7 +23,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlRadioButtonPickerPropertyEditor : BasePropertyEditor
+    public class XmlRadioButtonPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
new file mode 100644
index 0000000..99f68b0
--- /dev/null
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
@@ -0,0 +1,26 @@
+namespace nuPickers.DataEditors.XmlTypeaheadListPicker
+{
+    using EmbeddedResource;
+    using Umbraco.Core.PropertyEditors;
+
+    internal class XmlTypeaheadListPickerPreValueEditor ValueListConfiguration
+    {
+        [ConfigurationField("dataSource", "Data Source", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
+        public string DataSource { get; set; }
+
+        [ConfigurationField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
+        public string CustomLabel { get; set; }
+
+        [ConfigurationField("typeaheadListPicker", "Type a Head List Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
+        public string TypeaheadListPicker { get; set; }
+
+        [ConfigurationField("listPicker", "List Picker", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
+        public string ListPicker { get; set; }
+
+        [ConfigurationField("relationMapping", "Relation Mapping", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
+        public string RelationMapping { get; set; }
+
+        [ConfigurationField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
+        public string SaveFormat { get; set; }
+    }
+}
diff --git a/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
similarity index 86%
rename from source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
rename to source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
index b356567..d46814e 100644
--- a/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
+++ b/source/nuPickers/DataEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPropertyEditor.cs
@@ -1,13 +1,13 @@
-namespace nuPickers.PropertyEditors.XmlTypeaheadListPicker
+namespace nuPickers.DataEditors.XmlTypeaheadListPicker
 {
     using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
+    using EmbeddedResource;
+    using DataEditors;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web.PropertyEditors;
 
     // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.XmlTypeaheadListPickerAlias, "nuPickers: Xml TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
+    [DataEditor(DataEditorConstants.XmlTypeaheadListPickerAlias, "nuPickers: Xml TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
     [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
@@ -26,7 +26,7 @@
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
     [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class XmlTypeaheadPickerPropertyEditor : BasePropertyEditor
+    public class XmlTypeaheadPickerPropertyEditor : DataEditor
     {
         protected override PreValueEditor CreatePreValueEditor()
         {
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
index f007e30..6ddb2c1 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResource.cs
@@ -13,8 +13,8 @@ internal static class EmbeddedResource
         internal const string RESOURCE_PREFIX = "nuPickers.Shared.";
 
         /// <summary>
-        /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content 
+        /// Custom extension so ClientDependency framework can delegate handling back to nuPickers for the embedded content
         /// </summary>
-        internal const string FILE_EXTENSION = ".nu";      
+        internal const string FILE_EXTENSION = ".nu";
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs b/source/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs
deleted file mode 100644
index a9d3ec1..0000000
--- a/source/nuPickers/EmbeddedResource/EmbeddedResourceStartup.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace nuPickers.EmbeddedResource
-{
-    using ClientDependency.Core;
-    using System.Web.Mvc;
-    using System.Web.Routing;
-    using Umbraco.Core;
-
-    public class EmbeddedResourceStartup : ApplicationEventHandler
-    {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            base.ApplicationStarted(umbracoApplication, applicationContext);
-
-            RouteTable
-                .Routes
-                .MapRoute(
-                    name: "nuPickersShared",
-                    url:  EmbeddedResource.ROOT_URL.TrimStart("~/") + "{folder}/{file}",
-                    defaults: new
-                    {
-                        controller = "EmbeddedResource",
-                        action = "GetSharedResource"
-                    },
-                    namespaces: new[] { "nuPickers.EmbeddedResource" });
-
-            FileWriters.AddWriterForExtension(EmbeddedResource.FILE_EXTENSION, new EmbeddedResourceVirtualFileWriter());
-        }
-
-        protected override bool ExecuteWhenApplicationNotConfigured
-        {
-            get { return true; }
-        }
-    }
-}
diff --git a/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs b/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs
index 010121e..b8fb980 100644
--- a/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs
+++ b/source/nuPickers/EmbeddedResource/EmbeddedResourceVirtualFileWriter.cs
@@ -13,6 +13,12 @@
     /// </summary>
     public sealed class EmbeddedResourceVirtualFileWriter : IVirtualFileWriter
     {
+        private readonly IProfilingLogger _logger;
+        public EmbeddedResourceVirtualFileWriter(  IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
         public bool WriteToStream(BaseCompositeFileProcessingProvider provider, StreamWriter sw, IVirtualFile vf, ClientDependencyType type, string origUrl, HttpContextBase http)
         {
             try
@@ -27,7 +33,7 @@ public bool WriteToStream(BaseCompositeFileProcessingProvider provider, StreamWr
             }
             catch (Exception exception)
             {
-                LogHelper.Warn(typeof(EmbeddedResourceVirtualFileWriter), exception.Message);
+                _logger.Info<EmbeddedResourceVirtualFileWriter>(exception.Message);
 
                 return false;
             }
diff --git a/source/nuPickers/Extensions/IEnumerableStringExtensions.cs b/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
index 7038db1..35c40ff 100644
--- a/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
+++ b/source/nuPickers/Extensions/IEnumerableStringExtensions.cs
@@ -1,4 +1,7 @@
-namespace nuPickers.Extensions
+using Umbraco.Web.Composing;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers.Extensions
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -7,6 +10,7 @@
 
     internal static class IEnumerableStringExtensions
     {
+
         /// <summary>
         /// TODO: migrate out of Picker obj
         /// parse a collection of strings, and attempt to return a collection of IPublishedContent
@@ -15,11 +19,13 @@ internal static class IEnumerableStringExtensions
         /// <returns>a collection (populated, or empty)</returns>
         internal static IEnumerable<IPublishedContent> AsPublishedContent(this IEnumerable<string> keys)
         {
-            UmbracoHelper umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
 
-            return keys
-                    .Select(x => umbracoHelper.GetPublishedContent(x))
+
+
+                return keys
+                    .Select(x =>  Current.UmbracoHelper.Content(x))
                     .Where(x => x != null);
+
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Extensions/IPublishedContentExtensions.cs b/source/nuPickers/Extensions/IPublishedContentExtensions.cs
index dcf8c2d..a9ad081 100644
--- a/source/nuPickers/Extensions/IPublishedContentExtensions.cs
+++ b/source/nuPickers/Extensions/IPublishedContentExtensions.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Extensions
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers.Extensions
 {
     using System.Linq;
     using Umbraco.Core.Models;
@@ -13,10 +15,10 @@ public static class IPublishedContentExtensions
         /// <returns>A <see cref="Picker"/> or null</returns>
         public static Picker GetPicker(this IPublishedContent publishedContent, string propertyAlias)
         {
-            var propertyType = publishedContent.ContentType.PropertyTypes.SingleOrDefault(x => x.PropertyTypeAlias == propertyAlias);
+            var propertyType = publishedContent.ContentType.PropertyTypes.SingleOrDefault(x => x.EditorAlias == propertyAlias);
             if (propertyType != null)
             {
-                if (PickerPropertyValueConverter.IsPicker(propertyType.PropertyEditorAlias))
+                if (PickerPropertyValueConverter.IsPicker(propertyType.EditorAlias))
                 {
                     return new Picker(publishedContent.Id, propertyAlias);
                 }
diff --git a/source/nuPickers/Extensions/UmbracoHelperExtensions.cs b/source/nuPickers/Extensions/UmbracoHelperExtensions.cs
index 479452d..b01f04f 100644
--- a/source/nuPickers/Extensions/UmbracoHelperExtensions.cs
+++ b/source/nuPickers/Extensions/UmbracoHelperExtensions.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Extensions
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers.Extensions
 {
     using Umbraco.Core.Models;
     using Umbraco.Web;
@@ -26,12 +28,12 @@ internal static IPublishedContent GetPublishedContent(this UmbracoHelper umbraco
         {
             IPublishedContent publishedContent = null;
 
-            publishedContent = umbracoHelper.TypedContent(id);
+            publishedContent = umbracoHelper.Content(id);
 
             if (publishedContent == null)
             {
                 // fallback to attempting to get media
-                publishedContent = umbracoHelper.TypedMedia(id);
+                publishedContent = umbracoHelper.Media(id);
             }
 
             if (publishedContent == null)
@@ -39,7 +41,7 @@ internal static IPublishedContent GetPublishedContent(this UmbracoHelper umbraco
                 // fallback to attempting to get member
                 try
                 {
-                    publishedContent = umbracoHelper.TypedMember(id);
+                    publishedContent = umbracoHelper.Member(id);
                 }
                 catch
                 {
diff --git a/source/nuPickers/NuHandler.cs b/source/nuPickers/NuHandler.cs
index 23942d5..8a16f9c 100644
--- a/source/nuPickers/NuHandler.cs
+++ b/source/nuPickers/NuHandler.cs
@@ -1,4 +1,6 @@
 
+using nuPickers.EmbeddedResource;
+
 namespace nuPickers
 {
     using System;
@@ -27,8 +29,8 @@ public void ProcessRequest(HttpContext context)
                 var pos = directoryName.LastIndexOf("\\", StringComparison.Ordinal);
                 var folder = directoryName.Substring(pos + 1);
 
-                string resourceName;
-                var resourceStream = EmbeddedResourceHelper.GetResource("nuPickers.Shared." + folder + "." + fileName, out resourceName);
+                string resourceName = EmbeddedResourceHelper.GetResourceNameFromPath("nuPickers.Shared." + folder + "." + fileName);
+                var resourceStream = EmbeddedResourceHelper.GetResource("nuPickers.Shared." + folder + "." + fileName);
 
                 if (resourceStream != null)
                 {
diff --git a/source/nuPickers/Picker.cs b/source/nuPickers/Picker.cs
index 0831bd6..2f82ec2 100644
--- a/source/nuPickers/Picker.cs
+++ b/source/nuPickers/Picker.cs
@@ -1,4 +1,7 @@
-namespace nuPickers
+using Umbraco.Web.Composing;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace nuPickers
 {
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
@@ -21,7 +24,7 @@
     /// Umbraco Models Builder will return this class automatically (for the current context)
     /// </summary>
     public class Picker
-    {        
+    {
         /// <summary>
         /// cache var, stores value after querying relations or parsing a save format
         /// </summary>
@@ -30,7 +33,7 @@ public class Picker
         #region Constructors
 
         /// <summary>
-        /// public constructor - picker value is calculated from lookup, either the published value from cache, or the latest saved db value 
+        /// public constructor - picker value is calculated from lookup, either the published value from cache, or the latest saved db value
         /// </summary>
         /// <param name="contextId">the id of the content, media or member</param>
         /// <param name="propertyAlias">the property alias</param>
@@ -39,29 +42,29 @@ public Picker(int contextId, string propertyAlias, bool usePublishedValue = true
         {
             bool success = false;
 
-            var publishedContent = new UmbracoHelper(UmbracoContext.Current).GetPublishedContent(contextId);
+            var publishedContent = Current.UmbracoHelper.Content(contextId);
 
             if (usePublishedValue && publishedContent != null)
-            {                
+            {
                 var property = publishedContent.GetProperty(propertyAlias);
 
                 if (property != null)
                 {
-                    var propertyType = publishedContent.ContentType.PropertyTypes.Single(x => x.PropertyTypeAlias == property.PropertyTypeAlias);
+                    var propertyType = publishedContent.ContentType.PropertyTypes.Single(x => x.Alias == property.Alias);
 
                     this.ContextId = publishedContent.Id;
-                    this.ParentId = (publishedContent.Parent != null) ? publishedContent.Parent.Id : -1;
+                    this.ParentId = publishedContent.Parent?.Id ?? -1;
                     this.PropertyAlias = propertyAlias;
-                    this.DataTypeId = propertyType.DataTypeId;
-                    this.PropertyEditorAlias = propertyType.PropertyEditorAlias;
-                    this.SavedValue = property.Value;
+                    this.DataTypeId = propertyType.DataType.Id;
+                    this.PropertyEditorAlias = propertyType.EditorAlias;
+                    this.SavedValue = property.GetValue();
 
                     success = true;
                 }
             }
             else // use unpublished data
             {
-                var content = ApplicationContext.Current.Services.ContentService.GetById(contextId);
+                var content = Current.Services.ContentService.GetById(contextId);
 
                 if (content != null)
                 {
@@ -69,13 +72,13 @@ public Picker(int contextId, string propertyAlias, bool usePublishedValue = true
 
                     if (property != null)
                     {
-                        var propertyType = content.PropertyTypes.Single(x => x.Alias == property.Alias);
+                        var propertyType = content.Properties.Single(x => x.Alias == property.Alias);
 
                         this.ContextId = content.Id;
                         this.ParentId = content.ParentId;
                         this.PropertyAlias = propertyAlias;
-                        this.DataTypeId = propertyType.DataTypeDefinitionId;
-                        this.PropertyEditorAlias = propertyType.PropertyEditorAlias;
+                        this.DataTypeId = propertyType.PropertyType.DataTypeId;
+                        this.PropertyEditorAlias = propertyType.PropertyType.PropertyEditorAlias;
                         this.SavedValue = content.GetValue(PropertyAlias);
 
                         success = true;
@@ -127,7 +130,7 @@ public IEnumerable<string> PickedKeys
             {
                 if (this.pickedKeys == null)
                 {
-                    if (this.GetDataTypePreValue("saveFormat").Value == "relationsOnly")
+                    if (this.DataTypePreValues.GetType().GetProperty("saveFormat")?.ToString() == "relationsOnly")
                     {
                         // attempt to find relations data in memory cache
                         this.pickedKeys = Cache.Instance.GetSet(CacheConstants.PickedKeysPrefix + this.ContextId.ToString() + "_" + this.PropertyAlias, () =>
@@ -176,11 +179,11 @@ internal string RelationTypeAlias
             get
             {
                 // not all pickers support relation mapping, so null check required
-                PreValue relationMappingPreValue = this.GetDataTypePreValue("relationMapping");
-                if (relationMappingPreValue != null && !string.IsNullOrWhiteSpace(relationMappingPreValue.Value))
+                object relationMappingPreValue = this.GetType().GetProperty("relationMapping");
+                if (relationMappingPreValue != null && !string.IsNullOrWhiteSpace(relationMappingPreValue.ToString()))
                 {
                     // parse the json config to get a relationType alias
-                    return JObject.Parse(relationMappingPreValue.Value).GetValue("relationTypeAlias").ToString();
+                    return JObject.Parse(relationMappingPreValue.ToString()).GetValue("relationTypeAlias").ToString();
                 }
 
                 return null;
@@ -193,7 +196,7 @@ internal string RelationTypeAlias
         internal int ContextId { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         private int ParentId { get; set; }
 
@@ -216,19 +219,14 @@ internal string RelationTypeAlias
         /// <summary>
         /// Property accessor to ensure the query to populate the data-type configruation options is only done once per server
         /// </summary>
-        private IDictionary<string, PreValue> DataTypePreValues
+        private object DataTypePreValues
         {
             get
             {
-                return Cache.Instance.GetSet(CacheConstants.DataTypePreValuesPrefix + this.DataTypeId, () =>
-                {
-                    return  ApplicationContext
-                                .Current
-                                .Services
-                                .DataTypeService
-                                .GetPreValuesCollectionByDataTypeId(this.DataTypeId)
-                                .PreValuesAsDictionary;
-                });
+                return Cache.Instance.GetSet(CacheConstants.DataTypePreValuesPrefix + DataTypeId, () =>
+                    {
+                        return Current.Services.DataTypeService.GetDataType(DataTypeId).Configuration;
+                    });
             }
         }
 
@@ -237,23 +235,20 @@ private IDictionary<string, PreValue> DataTypePreValues
         #region Methods
 
         /// <summary>
-        /// Get all the prevalues for this picker 
+        /// Get all the prevalues for this picker
         /// </summary>
         /// <returns>collection of all <see cref="PreValue"/> for this datatype</returns>
-        public IDictionary<string, PreValue> GetDataTypePreValues()
+        public object GetDataTypePreValues()
         {
             return this.DataTypePreValues;
         }
 
         /// <summary>
-        /// Find a specific prevalue for this picker 
+        /// Find a specific prevalue for this picker
         /// </summary>
         /// <param name="key"></param>
         /// <returns>the <see cref="PreValue"/> if found, or null</returns>
-        public PreValue GetDataTypePreValue(string key)
-        {
-            return this.DataTypePreValues.SingleOrDefault(x => string.Equals(x.Key, key, StringComparison.InvariantCultureIgnoreCase)).Value;
-        }
+
 
         /// <summary>
         /// Get a collection of all (key/label) items for this picker
@@ -268,8 +263,8 @@ public IEnumerable<EditorDataItem> GetEditorDataItems(string typeahead = null)
                             this.ContextId,
                             this.ParentId,
                             this.PropertyAlias,
-                            DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").Value),
-                            this.GetDataTypePreValue("customLabel").Value,
+                            DataSource.GetDataSource(this.PropertyEditorAlias, DataTypePreValues.GetType().GetProperty("dataSource").ToString()),
+                            DataTypePreValues.GetType().GetProperty("customLabel").ToString(),
                             typeahead);
         }
 
@@ -288,8 +283,8 @@ public IEnumerable<EditorDataItem> GetPickedEditorDataItems()
                                     this.ContextId,
                                     this.ParentId,
                                     this.PropertyAlias,
-                                    DataSource.GetDataSource(this.PropertyEditorAlias, this.GetDataTypePreValue("dataSource").Value),
-                                    this.GetDataTypePreValue("customLabel").Value,
+                                    DataSource.GetDataSource(this.PropertyEditorAlias, DataTypePreValues.GetType().GetProperty("dataSource").ToString()),
+                                    DataTypePreValues.GetType().GetProperty("customLabel").ToString(),
                                     this.PickedKeys.ToArray());
             }
 
@@ -307,13 +302,13 @@ public IEnumerable<IPublishedContent> AsPublishedContent()
         }
 
         /// <summary>
-        /// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic) 
+        /// Get all picked items, objects may be typed Content, Media or Member (but all returned as dynamic)
         /// </summary>
         /// <returns></returns>
         //[Obsolete("[v2.0.0]")]
         public IEnumerable<dynamic> AsDynamicPublishedContent()
         {
-            return this.AsPublishedContent().Select(x => x.AsDynamic());
+            return this.AsPublishedContent();
         }
 
         /// <summary>
@@ -355,11 +350,11 @@ public IEnumerable<T> AsEnums<T>() where T : struct, IConvertible
         public IEnumerable<Enum> AsEnums()
         {
             List<Enum> enums = new List<Enum>();
-            PreValue dataSourceJson = this.GetDataTypePreValue("dataSource");
+            Object dataSourceJson = this.GetType().GetProperty("dataSource");
 
             if (dataSourceJson != null)
             {
-                EnumDataSource enumDataSouce = JsonConvert.DeserializeObject<EnumDataSource>(dataSourceJson.Value);
+                EnumDataSource enumDataSouce = JsonConvert.DeserializeObject<EnumDataSource>(dataSourceJson.ToString());
 
                 Type enumType = Helper.GetAssembly(enumDataSouce.AssemblyName).GetType(enumDataSouce.EnumName);
 
diff --git a/source/nuPickers/PickerPropertyValueConverter.cs b/source/nuPickers/PickerPropertyValueConverter.cs
index f45c520..3dde894 100644
--- a/source/nuPickers/PickerPropertyValueConverter.cs
+++ b/source/nuPickers/PickerPropertyValueConverter.cs
@@ -1,26 +1,39 @@
-namespace nuPickers
+using System;
+using nuPickers.DataEditors;
+using Umbraco.Core;
+using Umbraco.Web.Composing;
+
+namespace nuPickers
 {
-    using nuPickers.PropertyEditors;
     using System.Linq;
     using Umbraco.Core.Models;
     using Umbraco.Core.Models.PublishedContent;
     using Umbraco.Core.PropertyEditors;
     using Umbraco.Web;
 
-    [PropertyValueType(typeof(Picker))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
     public class PickerPropertyValueConverter : PropertyValueConverterBase
     {
+        public PickerPropertyValueConverter()
+        {
+        }
+
         /// <summary>
         /// This is a generic converter for all nuPicker Picker PropertyEditors
         /// </summary>
         /// <param name="publishedPropertyType"></param>
         /// <returns></returns>
-        public override bool IsConverter(PublishedPropertyType publishedPropertyType)
+        public override bool IsConverter(IPublishedPropertyType propertyType)
+        {
+            return IsPicker(propertyType.EditorAlias);
+        }
+
+        public override bool? IsValue(object value, PropertyValueLevel level)
         {
-            return PickerPropertyValueConverter.IsPicker(publishedPropertyType.PropertyEditorAlias);
+            // otherwise use the old magic null & string comparisons
+            return value != null && (!(value is string) || string.IsNullOrWhiteSpace((string) value) == false);
         }
 
+
         /// <summary>
         /// Helper to check to see if the supplied propertyEditorAlias corresponds with a nuPicker Picker
         /// </summary>
@@ -28,45 +41,59 @@ public override bool IsConverter(PublishedPropertyType publishedPropertyType)
         /// <returns></returns>
         public static bool IsPicker(string propertyEditorAlias)
         {
-            return new string[] { 
-                        PropertyEditorConstants.DotNetCheckBoxPickerAlias,
-                        PropertyEditorConstants.DotNetDropDownPickerAlias,
-                        PropertyEditorConstants.DotNetPagedListPickerAlias,
-                        PropertyEditorConstants.DotNetPrefetchListPickerAlias,
-                        PropertyEditorConstants.DotNetRadioButtonPickerAlias,
-                        PropertyEditorConstants.DotNetTypeaheadListPickerAlias,
-                        PropertyEditorConstants.EnumCheckBoxPickerAlias,
-                        PropertyEditorConstants.EnumDropDownPickerAlias,
-                        PropertyEditorConstants.EnumPrefetchListPickerAlias,
-                        PropertyEditorConstants.EnumRadioButtonPickerAlias,
-                        PropertyEditorConstants.JsonCheckBoxPickerAlias,
-                        PropertyEditorConstants.JsonDropDownPickerAlias,
-                        PropertyEditorConstants.JsonPagedListPickerAlias,
-                        PropertyEditorConstants.JsonPrefetchListPickerAlias,
-                        PropertyEditorConstants.JsonRadioButtonPickerAlias,
-                        PropertyEditorConstants.JsonTypeaheadListPickerAlias,
-                        PropertyEditorConstants.LuceneCheckBoxPickerAlias,
-                        PropertyEditorConstants.LuceneDropDownPickerAlias,
-                        PropertyEditorConstants.LucenePagedListPickerAlias,
-                        PropertyEditorConstants.LucenePrefetchListPickerAlias,
-                        PropertyEditorConstants.LuceneRadioButtonPickerAlias,
-                        PropertyEditorConstants.LuceneTypeaheadListPickerAlias,
-                        PropertyEditorConstants.SqlCheckBoxPickerAlias,
-                        PropertyEditorConstants.SqlDropDownPickerAlias,
-                        PropertyEditorConstants.SqlPagedListPickerAlias,
-                        PropertyEditorConstants.SqlPrefetchListPickerAlias,
-                        PropertyEditorConstants.SqlRadioButtonPickerAlias,
-                        PropertyEditorConstants.SqlTypeaheadListPickerAlias,
-                        PropertyEditorConstants.XmlCheckBoxPickerAlias,
-                        PropertyEditorConstants.XmlDropDownPickerAlias,
-                        PropertyEditorConstants.XmlPagedListPickerAlias,
-                        PropertyEditorConstants.XmlPrefetchListPickerAlias,
-                        PropertyEditorConstants.XmlRadioButtonPickerAlias,
-                        PropertyEditorConstants.XmlTypeaheadListPickerAlias
-                    }
-                 .Contains(propertyEditorAlias);
+            return new string[]
+                {
+                    DataEditorConstants.DotNetCheckBoxPickerAlias,
+                    DataEditorConstants.DotNetDropDownPickerAlias,
+                    DataEditorConstants.DotNetPagedListPickerAlias,
+                    DataEditorConstants.DotNetPrefetchListPickerAlias,
+                    DataEditorConstants.DotNetRadioButtonPickerAlias,
+                    DataEditorConstants.DotNetTypeaheadListPickerAlias,
+                    DataEditorConstants.EnumCheckBoxPickerAlias,
+                    DataEditorConstants.EnumDropDownPickerAlias,
+                    DataEditorConstants.EnumPrefetchListPickerAlias,
+                    DataEditorConstants.EnumRadioButtonPickerAlias,
+                    DataEditorConstants.JsonCheckBoxPickerAlias,
+                    DataEditorConstants.JsonDropDownPickerAlias,
+                    DataEditorConstants.JsonPagedListPickerAlias,
+                    DataEditorConstants.JsonPrefetchListPickerAlias,
+                    DataEditorConstants.JsonRadioButtonPickerAlias,
+                    DataEditorConstants.JsonTypeaheadListPickerAlias,
+                    DataEditorConstants.LuceneCheckBoxPickerAlias,
+                    DataEditorConstants.LuceneDropDownPickerAlias,
+                    DataEditorConstants.LucenePagedListPickerAlias,
+                    DataEditorConstants.LucenePrefetchListPickerAlias,
+                    DataEditorConstants.LuceneRadioButtonPickerAlias,
+                    DataEditorConstants.LuceneTypeaheadListPickerAlias,
+                    DataEditorConstants.SqlCheckBoxPickerAlias,
+                    DataEditorConstants.SqlDropDownPickerAlias,
+                    DataEditorConstants.SqlPagedListPickerAlias,
+                    DataEditorConstants.SqlPrefetchListPickerAlias,
+                    DataEditorConstants.SqlRadioButtonPickerAlias,
+                    DataEditorConstants.SqlTypeaheadListPickerAlias,
+                    DataEditorConstants.XmlCheckBoxPickerAlias,
+                    DataEditorConstants.XmlDropDownPickerAlias,
+                    DataEditorConstants.XmlPagedListPickerAlias,
+                    DataEditorConstants.XmlPrefetchListPickerAlias,
+                    DataEditorConstants.XmlRadioButtonPickerAlias,
+                    DataEditorConstants.XmlTypeaheadListPickerAlias
+                }
+                .Contains(propertyEditorAlias);
+        }
+
+        public override object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+        {
+            // source should come from ConvertSource and be a string (or null) already
+            return inter;
         }
 
+        public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => PropertyCacheLevel.Element;
+
+        public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
+            => typeof(Picker);
+
         /// <summary>
         /// WARNING: currently PropertyValueConverters are unaware of their context, as such this should only be used by the current page
         /// https://our.umbraco.org/forum/developing-packages/85047-context-property-value-converters
@@ -75,51 +102,48 @@ public static bool IsPicker(string propertyEditorAlias)
         /// <param name="source">expected as a string</param>
         /// <param name="preview"></param>
         /// <returns></returns>
-        public override object ConvertSourceToObject(PublishedPropertyType publishedPropertyType, object source, bool preview)
+        public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
         {
             int contextId = -1;
             int parentId = -1;
-            IPublishedContent assignedContentItem;
 
-            try
-            {
-                assignedContentItem = new UmbracoHelper(UmbracoContext.Current).AssignedContentItem;
-            }
-            catch
-            {
-                assignedContentItem = null;
-            }
+            IPublishedContent assignedContentItem = owner as IPublishedContent;
 
             if (assignedContentItem != null)
             {
                 contextId = assignedContentItem.Id;
-
-                if (assignedContentItem.Parent != null)
-                {
-                    parentId = assignedContentItem.Parent.Id;
-                }
+                var pathIds = assignedContentItem.Path?.Split(new char[] { ',' }).Select(id => Convert.ToInt32(id)).ToArray();
+                parentId = pathIds.Count() >= 2 ? pathIds[pathIds.Count() - 2] : parentId;
             }
 
             return new Picker(
-                        contextId, 
-                        parentId,
-                        publishedPropertyType.PropertyTypeAlias, 
-                        publishedPropertyType.DataTypeId, 
-                        publishedPropertyType.PropertyEditorAlias, 
-                        source);
+                contextId,
+                parentId,
+                propertyType.EditorAlias,
+                propertyType.DataType.Id,
+                propertyType.Alias,
+                inter);
         }
 
         /// <summary>
-        /// Override the default behavour which duck types (converting a string that looks like a number into a number)
+        /// Override the default behav our which duck types (converting a string that looks like a number into a number)
         /// to always return a string (or null)
         /// </summary>
         /// <param name="propertyType"></param>
         /// <param name="source">expected as a string</param>
         /// <param name="preview">flag to indicate if in preview mode</param>
         /// <returns>source as a string, or null</returns>
-        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType,
+            object source,
+            bool preview)
         {
-            return source as string;
+            var attempt = source.TryConvertTo<string>();
+
+            if (attempt.Success)
+                return attempt.Result;
+
+            return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs b/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
deleted file mode 100644
index 7ed81e2..0000000
--- a/source/nuPickers/PropertyEditors/BasePropertyEditor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace nuPickers.PropertyEditors
-{
-    using nuPickers.Shared.SaveFormat;
-    using Umbraco.Core.PropertyEditors;
-
-    public abstract class BasePropertyEditor : PropertyEditor
-    {
-        protected override PropertyValueEditor CreateValueEditor()
-        {
-            return new SaveFormatPropertyValueEditor(base.CreateValueEditor());
-        }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 5fe72c2..0000000
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index d70281a..0000000
--- a/source/nuPickers/PropertyEditors/DotNetCheckBoxPicker/DotNetCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-    
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetCheckBoxPickerAlias, "nuPickers: DotNet CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetCheckBoxPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetCheckBoxPickerPreValueEditor();
-        }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs
deleted file mode 100644
index 29fb8a9..0000000
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 4414418..0000000
--- a/source/nuPickers/PropertyEditors/DotNetDropDownPicker/DotNetDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetDropDownPickerAlias, "nuPickers: DotNet DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetDropDownPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetDropDownPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotLabelsPropertyEditor.cs
deleted file mode 100644
index 8dcea1e..0000000
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetLabels
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetLabelsAlias, "nuPickers: DotNet Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetLabelsPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetLabelsPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs
deleted file mode 100644
index 49e3f9d..0000000
--- a/source/nuPickers/PropertyEditors/DotNetLabels/DotNetLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs
deleted file mode 100644
index 70c614c..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPagedListPicker
-{
-    using Umbraco.Core.PropertyEditors;
-    using nuPickers.EmbeddedResource;
-
-    internal class DotNetPagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
deleted file mode 100644
index 21edc1e..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPagedListPicker/DotNetPagedListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPagedListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetPagedListPickerAlias, "nuPickers: DotNet PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPagedListPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetPagedListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index a2c1562..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
-{
-    using Umbraco.Core.PropertyEditors;
-    using nuPickers.EmbeddedResource;
-
-    internal class DotNetPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
deleted file mode 100644
index 6150435..0000000
--- a/source/nuPickers/PropertyEditors/DotNetPrefetchListPicker/DotNetPrefetchListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetPrefetchListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetPrefetchListPickerAlias, "nuPickers: DotNet PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetPrefetchListPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetPrefetchListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 94f0c44..0000000
--- a/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
deleted file mode 100644
index a288c8d..0000000
--- a/source/nuPickers/PropertyEditors/DotNetRadioButtonPicker/DotNetRadioButtonPickerPropertyEditor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetRadioButtonPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetRadioButtonPickerAlias, "nuPickers: DotNet RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotnetRadioButtonPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetRadioButtonPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index 30e26d8..0000000
--- a/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class DotNetTypeaheadListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
deleted file mode 100644
index 3662cc5..0000000
--- a/source/nuPickers/PropertyEditors/DotNetTypeaheadListPicker/DotNetTypeaheadListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace nuPickers.PropertyEditors.DotNetTypeaheadListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.DotNetTypeaheadListPickerAlias, "nuPickers: DotNet TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DotNetDataSource/DotNetDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class DotNetTypeaheadPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new DotNetTypeaheadListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index a76107e..0000000
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index 9869b1f..0000000
--- a/source/nuPickers/PropertyEditors/EnumCheckBoxPicker/EnumCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumCheckBoxPickerAlias, "nuPickers: Enum CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumCheckBoxPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new EnumCheckBoxPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
deleted file mode 100644
index 667a78b..0000000
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
deleted file mode 100644
index c014214..0000000
--- a/source/nuPickers/PropertyEditors/EnumDropDownPicker/EnumDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumDropDownPickerAlias, "nuPickers: Enum DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumDropDownPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new EnumDropDownPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs
deleted file mode 100644
index 1f13501..0000000
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
deleted file mode 100644
index c5803e5..0000000
--- a/source/nuPickers/PropertyEditors/EnumLabels/EnumLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumLabels
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumLabelsAlias, "nuPickers: Enum Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumLabelsPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new EnumLabelsPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index 58fffc3..0000000
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
deleted file mode 100644
index 9c20ea3..0000000
--- a/source/nuPickers/PropertyEditors/EnumPrefetchListPicker/EnumPrefetchListPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumPrefetchListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumPrefetchListPickerAlias, "nuPickers: Enum PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumPrefetchListPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new EnumPrefetchListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 84d3be2..0000000
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class EnumRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
deleted file mode 100644
index f015932..0000000
--- a/source/nuPickers/PropertyEditors/EnumRadioButtonPicker/EnumRadioButtonPickerPropertyEditor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace nuPickers.PropertyEditors.EnumRadioButtonPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.EnumRadioButtonPickerAlias, "nuPickers: Enum RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "EnumDataSource/EnumDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class EnumRadioButtonPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new EnumRadioButtonPickerPreValueEditor();
-        }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 34b85a7..0000000
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index 9d69e05..0000000
--- a/source/nuPickers/PropertyEditors/JsonCheckBoxPicker/JsonCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonCheckBoxPickerAlias, "nuPickers: Json CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonCheckBoxPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonCheckBoxPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs
deleted file mode 100644
index ec99def..0000000
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
deleted file mode 100644
index 41f10a7..0000000
--- a/source/nuPickers/PropertyEditors/JsonDropDownPicker/JsonDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonDropDownPickerAlias, "nuPickers: Json DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonDropDownPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonDropDownPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs
deleted file mode 100644
index 353e3e9..0000000
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
deleted file mode 100644
index 1d6dd91..0000000
--- a/source/nuPickers/PropertyEditors/JsonLabels/JsonLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonLabels
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonLabelsAlias, "nuPickers: Json Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonLabelsPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonLabelsPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs
deleted file mode 100644
index 0909759..0000000
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonPagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
deleted file mode 100644
index 0a9a66d..0000000
--- a/source/nuPickers/PropertyEditors/JsonPagedListPicker/JsonPagedListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonPagedListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonPagedListPickerAlias, "nuPickers: Json PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPagedListPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonPagedListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index 74023ca..0000000
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
deleted file mode 100644
index 0484f4c..0000000
--- a/source/nuPickers/PropertyEditors/JsonPrefetchListPicker/JsonPrefetchListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonPrefetchListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonPrefetchListPickerAlias, "nuPickers: Json PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonPrefetchListPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonPrefetchListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 4fa07c8..0000000
--- a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
deleted file mode 100644
index 3e4c489..0000000
--- a/source/nuPickers/PropertyEditors/JsonRadioButtonPicker/JsonRadioButtonPickerPropertyEditor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonRadioButtonPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonRadioButtonPickerAlias, "nuPickers: Json RadioButton Picker", EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RadioButtonPicker/RadioButtonPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonRadioButtonPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonRadioButtonPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index 2a157b1..0000000
--- a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class JsonTypeaheadListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
deleted file mode 100644
index 64ae1a7..0000000
--- a/source/nuPickers/PropertyEditors/JsonTypeaheadListPicker/JsonTypeaheadPickerPropertyEditor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace nuPickers.PropertyEditors.JsonTypeaheadListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.JsonTypeaheadListPickerAlias, "nuPickers: Json TypeaheadList Picker", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "JsonDataSource/JsonDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class JsonTypeaheadPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new JsonTypeaheadListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index ccb50c0..0000000
--- a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
deleted file mode 100644
index bb79e03..0000000
--- a/source/nuPickers/PropertyEditors/LuceneCheckBoxPicker/LuceneCheckBoxPickerPropertyEditor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneCheckBoxPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneCheckBoxPickerAlias, "nuPickers: Lucene CheckBox Picker", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneCheckBoxPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new LuceneCheckBoxPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs
deleted file mode 100644
index 32845ee..0000000
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
deleted file mode 100644
index fbcb568..0000000
--- a/source/nuPickers/PropertyEditors/LuceneDropDownPicker/LuceneDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneDropDownPickerAlias, "nuPickers: Lucene DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneDropDownPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new LuceneDropDownPickerPreValueEditor();
-        }
-    }
-
-}
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs
deleted file mode 100644
index cc21763..0000000
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs b/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
deleted file mode 100644
index 796fb3e..0000000
--- a/source/nuPickers/PropertyEditors/LuceneLabels/LuceneLabelsPropertyEditor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneLabels
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LuceneLabelsAlias, "nuPickers: Lucene Labels", EmbeddedResource.ROOT_URL + "Labels/LabelsEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirection.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Labels/LabelsConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LuceneLabelsPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new LuceneLabelsPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
deleted file mode 100644
index a0cb1bf..0000000
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LucenePagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
deleted file mode 100644
index 29b7b69..0000000
--- a/source/nuPickers/PropertyEditors/LucenePagedListPicker/LucenePagedListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace nuPickers.PropertyEditors.LucenePagedListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LucenePagedListPickerAlias, "nuPickers: Lucene PagedList Picker", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePagedListPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new LucenePagedListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index b480b25..0000000
--- a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LucenePrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LucenePrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
deleted file mode 100644
index cd35baa..0000000
--- a/source/nuPickers/PropertyEditors/LucenePrefetchListPicker/LucenePrefetchListPickerPropertyEditor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace nuPickers.PropertyEditors.LucenePrefetchListPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.LucenePrefetchListPickerAlias, "nuPickers: Lucene PrefetchList Picker", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditor.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "ListPicker/ListPickerEditorDirectives.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class LucenePrefetchListPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new LucenePrefetchListPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index dde0771..0000000
--- a/source/nuPickers/PropertyEditors/LuceneRadioButtonPicker/LuceneRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index 2e70dc9..0000000
--- a/source/nuPickers/PropertyEditors/LuceneTypeaheadPicker/LuceneTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.LuceneTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class LuceneTypeaheadListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "LuceneDataSource/LuceneDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPreValueEditor.cs
deleted file mode 100644
index 630ee84..0000000
--- a/source/nuPickers/PropertyEditors/RelationLabels/RelationLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.RelationLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class RelationLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "RelationDataSource/RelationDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index 499ed07..0000000
--- a/source/nuPickers/PropertyEditors/SqlCheckBoxPicker/SqlCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs
deleted file mode 100644
index db9a470..0000000
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs b/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
deleted file mode 100644
index da1d541..0000000
--- a/source/nuPickers/PropertyEditors/SqlDropDownPicker/SqlDropDownPickerPropertyEditor.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlDropDownPicker
-{
-    using ClientDependency.Core;
-    using nuPickers.EmbeddedResource;
-    using nuPickers.PropertyEditors;
-    using Umbraco.Core.PropertyEditors;
-    using Umbraco.Web.PropertyEditors;
-
-    // EDITOR UI
-    [PropertyEditor(PropertyEditorConstants.SqlDropDownPickerAlias, "nuPickers: Sql DropDown Picker", EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditor.html", ValueType = "TEXT")]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DropDownPicker/DropDownPickerEditorController.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // RESOURCES (all are referenced as EditorResource consumes the others)
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "Editor/EditorResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "DataSource/DataSourceResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingResource.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatResource.js" + EmbeddedResource.FILE_EXTENSION)]
-
-    // CONFIG
-    [PropertyEditorAsset(ClientDependencyType.Css, EmbeddedResource.ROOT_URL + "PropertyEditor/PropertyEditorConfig.css" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    [PropertyEditorAsset(ClientDependencyType.Javascript, EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfigController.js" + EmbeddedResource.FILE_EXTENSION)]
-    public class SqlDropDownPickerPropertyEditor : BasePropertyEditor
-    {
-        protected override PreValueEditor CreatePreValueEditor()
-        {
-            return new SqlDropDownPickerPreValueEditor();
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPreValueEditor.cs
deleted file mode 100644
index 514dd1b..0000000
--- a/source/nuPickers/PropertyEditors/SqlLabels/SqlLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
deleted file mode 100644
index 0dbb0ff..0000000
--- a/source/nuPickers/PropertyEditors/SqlPagedListPicker/SqlPagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlPagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlPagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index 7c955f1..0000000
--- a/source/nuPickers/PropertyEditors/SqlPrefetchListPicker/SqlPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index 88988e8..0000000
--- a/source/nuPickers/PropertyEditors/SqlRadioButtonPicker/SqlRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index edca708..0000000
--- a/source/nuPickers/PropertyEditors/SqlTypeaheadListPicker/SqlTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.SqlTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class SqlTypeaheadListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "SqlDataSource/SqlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
deleted file mode 100644
index b121f62..0000000
--- a/source/nuPickers/PropertyEditors/XmlCheckBoxPicker/XmlCheckBoxPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlCheckBoxPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlCheckBoxPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("checkBoxPicker", "", EmbeddedResource.ROOT_URL + "CheckBoxPicker/CheckBoxPickerConfig.html", HideLabel = true)]
-        public string CheckBoxPicker { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
deleted file mode 100644
index f02965c..0000000
--- a/source/nuPickers/PropertyEditors/XmlDropDownPicker/XmlDropDownPickerPreValueEditor.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlDropDownPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlDropDownPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPreValueEditor.cs
deleted file mode 100644
index 3a9a5f3..0000000
--- a/source/nuPickers/PropertyEditors/XmlLabels/XmlLabelsPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlLabels
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlLabelsPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        /// <summary>
-        /// currently no ui, but forces controller to be loaded
-        /// </summary>
-        [PreValueField("labels", "", EmbeddedResource.ROOT_URL + "Labels/LabelsConfig.html", HideLabel = true)]
-        public string Labels { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
deleted file mode 100644
index aa15650..0000000
--- a/source/nuPickers/PropertyEditors/XmlPagedListPicker/XmlPagedListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlPagedListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlPagedListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("pagedListPicker", "", EmbeddedResource.ROOT_URL + "PagedListPicker/PagedListPickerConfig.html", HideLabel = true)]
-        public string PagedListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
deleted file mode 100644
index 553bd93..0000000
--- a/source/nuPickers/PropertyEditors/XmlPrefetchListPicker/XmlPrefetchListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlPrefetchListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlPrefetchListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("prefetchListPicker", "", EmbeddedResource.ROOT_URL + "PrefetchListPicker/PrefetchListPickerConfig.html", HideLabel = true)]
-        public string PrefetchListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
deleted file mode 100644
index e840829..0000000
--- a/source/nuPickers/PropertyEditors/XmlRadioButtonPicker/XmlRadioButtonPickerPreValueEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlRadioButtonPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlRadioButtonPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("layoutDirection", "Layout Direction", EmbeddedResource.ROOT_URL + "LayoutDirection/LayoutDirectionConfig.html")]
-        public string LayoutDirection { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs b/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
deleted file mode 100644
index b9bb447..0000000
--- a/source/nuPickers/PropertyEditors/XmlTypeaheadListPicker/XmlTypeaheadListPickerPreValueEditor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace nuPickers.PropertyEditors.XmlTypeaheadListPicker
-{
-    using nuPickers.EmbeddedResource;
-    using Umbraco.Core.PropertyEditors;
-
-    internal class XmlTypeaheadListPickerPreValueEditor : PreValueEditor
-    {
-        [PreValueField("dataSource", "", EmbeddedResource.ROOT_URL + "XmlDataSource/XmlDataSourceConfig.html", HideLabel = true)]
-        public string DataSource { get; set; }
-
-        [PreValueField("customLabel", "Label Macro", EmbeddedResource.ROOT_URL + "CustomLabel/CustomLabelConfig.html", HideLabel = true)]
-        public string CustomLabel { get; set; }
-
-        [PreValueField("typeaheadListPicker", "", EmbeddedResource.ROOT_URL + "TypeaheadListPicker/TypeaheadListPickerConfig.html", HideLabel = true)]
-        public string TypeaheadListPicker { get; set; }
-
-        [PreValueField("listPicker", "", EmbeddedResource.ROOT_URL + "ListPicker/ListPickerConfig.html", HideLabel = true)]
-        public string ListPicker { get; set; }
-
-        [PreValueField("relationMapping", "", EmbeddedResource.ROOT_URL + "RelationMapping/RelationMappingConfig.html", HideLabel = true)]
-        public string RelationMapping { get; set; }
-
-        [PreValueField("saveFormat", "Save Format", EmbeddedResource.ROOT_URL + "SaveFormat/SaveFormatConfig.html")]
-        public string SaveFormat { get; set; }
-    }
-}
diff --git a/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html b/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
index 8a1879e..0796e6b 100644
--- a/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
+++ b/source/nuPickers/Shared/CheckBoxPicker/CheckBoxPickerEditor.html
@@ -19,11 +19,11 @@
         <li ng-repeat="option in checkBoxPickerOptions">
 
             <label>
-                <input type="checkbox" 
-                       value="{{option.key}}" 
-                       ng-model="option.isChecked" 
+                <input type="checkbox"
+                       value="{{option.key}}"
+                       ng-model="option.isChecked"
                        ng-change="checkBoxChange()" />
-                <span ng-bind-html-unsafe="option.label"></span>
+                <span ng-bind-html="option.label"></span>
             </label>
 
         </li>
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
index 4101ef4..a3fe6fb 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabel.cs
@@ -1,18 +1,16 @@
-
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web;
+using nuPickers.Shared.Editor;
+using Umbraco.Core.Dictionary;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
+using Umbraco.Web.Composing;
+
 namespace nuPickers.Shared.CustomLabel
 {
-    using nuPickers.Shared.Editor;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Web;
-    using System.Web.UI;
-    using umbraco;
-    using umbraco.NodeFactory;
-    using umbraco.presentation.templateControls;
-
     internal class CustomLabel
     {
         private string MacroAlias { get; set; }
@@ -27,62 +25,71 @@ internal class CustomLabel
 
         private string PropertyAlias { get; set; }
 
+        
+
+        private readonly IUmbracoComponentRenderer _componentRenderer;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="macroAlias">alias of Macro to execute</param>
         /// <param name="contextId">node, media or member id</param>
         /// <param name="propertyAlias">property alias</param>
-        internal CustomLabel(string macroAlias, int contextId, string propertyAlias)
+        internal CustomLabel(string macroAlias, int contextId, string propertyAlias, IUmbracoComponentRenderer componentRenderer)
         {
-            this.MacroAlias = macroAlias;
-            this.ContextId = contextId;
-            this.PropertyAlias = propertyAlias;
+            _componentRenderer = componentRenderer;
+
+            MacroAlias = macroAlias;
+            ContextId = contextId;
+            PropertyAlias = propertyAlias;
 
             // the macro requires a published context to run in
-            Node currentNode = uQuery.GetNode(contextId);
+            IPublishedContent currentNode = Current.UmbracoContext.Content.GetById(contextId);
             if (currentNode != null)
             {
                 // current page is published so use this as the macro context
                 HttpContext.Current.Items["pageID"] = contextId;
-                this.HasMacroContext = true;
+                HasMacroContext = true;
             }
             else
             {
-                 // fallback nd find first published page to use as host
-                 Node contextNode = uQuery.GetNodesByXPath(string.Concat("descendant::*[@parentID = ", uQuery.RootNodeId, "]")).FirstOrDefault();
-                 if (contextNode != null)
-                 {
-                     HttpContext.Current.Items["pageID"] = contextNode.Id;
-                     this.HasMacroContext = true;
-                 }
+                // fallback nd find first published page to use as host
+                IPublishedContent contextNode = Current.UmbracoContext.Content.GetSingleByXPath(
+                    string.Concat("descendant::*[@parentID = ",
+                        Current.Services.ContentService.GetRootContent().FirstOrDefault(), "]"));
+                if (contextNode != null)
+                {
+                    HttpContext.Current.Items["pageID"] = contextNode.Id;
+                    ContextId = contextNode.Id;
+                    HasMacroContext = true;
+                }
             }
-
         }
 
         /// <summary>
         /// parses the collection of options, potentially transforming the content of the label
         /// </summary>
-        /// <param name="contextId">the content / media or member being edited</param>
         /// <param name="editorDataItems">collection of options</param>
         /// <returns></returns>
         internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDataItem> editorDataItems)
         {
-            string keys = string.Join(", ", editorDataItems.Select(x => x.Key)); // csv of all keys
+            var dataItems = editorDataItems.ToList();
+            string keys = string.Join(", ", dataItems.Select(x => x.Key)); // csv of all keys
             int counter = 0;
-            int total = editorDataItems.Count();
+            int total = dataItems.Count();
 
-            foreach (EditorDataItem editorDataItem in editorDataItems)
+            foreach (EditorDataItem editorDataItem in dataItems)
             {
                 counter++;
-                editorDataItem.Label = this.ProcessMacro(editorDataItem.Key, editorDataItem.Label, keys, counter, total);
+                editorDataItem.Label =
+                    ProcessMacro(editorDataItem.Key, editorDataItem.Label, keys, counter, total);
             }
 
-            return editorDataItems.Where(x => !string.IsNullOrWhiteSpace(x.Label)); // remove any options without a label
+            return dataItems.Where(x => !string.IsNullOrWhiteSpace(x.Label)); // remove any options without a label
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="key">passed by parameter into the macro</param>
         /// <param name="label">value to return if macro fails</param>
@@ -92,21 +99,22 @@ internal IEnumerable<EditorDataItem> ProcessEditorDataItems(IEnumerable<EditorDa
         /// <returns>the output of the macro as a string</returns>
         private string ProcessMacro(string key, string label, string keys, int counter, int total)
         {
-            if (!string.IsNullOrWhiteSpace(this.MacroAlias) && this.HasMacroContext)
+            if (!string.IsNullOrWhiteSpace(MacroAlias) && HasMacroContext)
             {
-                Macro macro = new Macro() { Alias = this.MacroAlias };
+                Macro macro = new Macro {Alias = MacroAlias};
+                Dictionary<string, object> properties = new Dictionary<string, object>();
 
-                macro.MacroAttributes.Add("contextId".ToLower(), this.ContextId);
-                macro.MacroAttributes.Add("propertyAlias".ToLower(), this.PropertyAlias);
+                properties.Add("contextId".ToLower(), ContextId.ToString());
+                properties.Add("propertyAlias".ToLower(), PropertyAlias);
 
-                macro.MacroAttributes.Add("key", key);
-                macro.MacroAttributes.Add("label", label);
+                properties.Add("key", key);
+                properties.Add("label", label);
 
-                macro.MacroAttributes.Add("keys", keys);
-                macro.MacroAttributes.Add("counter", counter);
-                macro.MacroAttributes.Add("total", total);
+                properties.Add("keys", keys);
+                properties.Add("counter", counter);
+                properties.Add("total", total);
 
-                label = this.RenderToString(macro);
+                label = RenderToString(macro, properties);
             }
 
             return label;
@@ -116,16 +124,10 @@ private string ProcessMacro(string key, string label, string keys, int counter,
         /// Method added here to remove the need for the more generic ControlExtensions (as unlikely to need this functionality elsewhere)
         /// </summary>
         /// <param name="macro"></param>
-        private string RenderToString(Macro macro)
+        /// <param name="properties"></param>
+        private string RenderToString(Macro macro, Dictionary<string, object> properties)
         {
-            StringBuilder stringBuilder = new StringBuilder();
-            using (StringWriter stringWriter = new StringWriter(stringBuilder))
-            using (HtmlTextWriter htmlTextWriter = new HtmlTextWriter(stringWriter))
-            {
-                macro.RenderControl(htmlTextWriter);
-            }
-
-            return stringBuilder.ToString();
+            return _componentRenderer.RenderMacro(ContextId, macro.Alias, properties).ToHtmlString();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
index 60dd2a0..0c3894f 100644
--- a/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
+++ b/source/nuPickers/Shared/CustomLabel/CustomLabelApiController.cs
@@ -1,18 +1,18 @@
-namespace nuPickers.Shared
-{
-    using System.Collections.Generic;
-    using System.Linq;
-    using umbraco.cms.businesslogic.macro;
-    using Umbraco.Web.Editors;
-    using Umbraco.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Mvc;
 
+namespace nuPickers.Shared.CustomLabel
+{
     [PluginController("nuPickers")]
     public class CustomLabelApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetMacros()
         {
-            //using legacy api as no method on Umbraco.Core.Services.MacroSerivce to get all macros
-            return Macro.GetAll()
+
+            return Current.Services.MacroService.GetAll()
                         .Select(x => new
                         {
                             name = x.Name,
diff --git a/source/nuPickers/Shared/DataSource/DataSource.cs b/source/nuPickers/Shared/DataSource/DataSource.cs
index 8375285..f51e4dd 100644
--- a/source/nuPickers/Shared/DataSource/DataSource.cs
+++ b/source/nuPickers/Shared/DataSource/DataSource.cs
@@ -1,71 +1,64 @@
-namespace nuPickers.Shared.DataSource
-{
-    using Newtonsoft.Json;
-    using nuPickers.PropertyEditors;
-    using nuPickers.Shared.DotNetDataSource;
-    using nuPickers.Shared.EnumDataSource;
-    using nuPickers.Shared.JsonDataSource;
-    using nuPickers.Shared.LuceneDataSource;
-    using nuPickers.Shared.RelationDataSource;
-    using nuPickers.Shared.SqlDataSource;
-    using nuPickers.Shared.XmlDataSource;
+using Newtonsoft.Json;
+using nuPickers.DataEditors;
 
+namespace nuPickers.Shared.DataSource
+{
     internal static class DataSource
     {
         internal static IDataSource GetDataSource(string propertyEditorAlias, string dataSourceConfig)
-        {            
+        {
             switch (propertyEditorAlias)
             {
-                case PropertyEditorConstants.DotNetCheckBoxPickerAlias:
-                case PropertyEditorConstants.DotNetDropDownPickerAlias:
-                case PropertyEditorConstants.DotNetLabelsAlias:
-                case PropertyEditorConstants.DotNetPagedListPickerAlias:
-                case PropertyEditorConstants.DotNetPrefetchListPickerAlias:
-                case PropertyEditorConstants.DotNetRadioButtonPickerAlias:
-                case PropertyEditorConstants.DotNetTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<DotNetDataSource>(dataSourceConfig);
+                case DataEditorConstants.DotNetCheckBoxPickerAlias:
+                case DataEditorConstants.DotNetDropDownPickerAlias:
+                case DataEditorConstants.DotNetLabelsAlias:
+                case DataEditorConstants.DotNetPagedListPickerAlias:
+                case DataEditorConstants.DotNetPrefetchListPickerAlias:
+                case DataEditorConstants.DotNetRadioButtonPickerAlias:
+                case DataEditorConstants.DotNetTypeaheadListPickerAlias:
+                    return JsonConvert.DeserializeObject<DotNetDataSource.DotNetDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.EnumCheckBoxPickerAlias:
-                case PropertyEditorConstants.EnumDropDownPickerAlias:
-                case PropertyEditorConstants.EnumLabelsAlias:
-                case PropertyEditorConstants.EnumPrefetchListPickerAlias:
-                case PropertyEditorConstants.EnumRadioButtonPickerAlias:
-                    return JsonConvert.DeserializeObject<EnumDataSource>(dataSourceConfig);
+                case DataEditorConstants.EnumCheckBoxPickerAlias:
+                case DataEditorConstants.EnumDropDownPickerAlias:
+                case DataEditorConstants.EnumLabelsAlias:
+                case DataEditorConstants.EnumPrefetchListPickerAlias:
+                case DataEditorConstants.EnumRadioButtonPickerAlias:
+                    return JsonConvert.DeserializeObject<EnumDataSource.EnumDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.JsonCheckBoxPickerAlias:
-                case PropertyEditorConstants.JsonDropDownPickerAlias:
-                case PropertyEditorConstants.JsonLabelsAlias:
-                case PropertyEditorConstants.JsonPrefetchListPickerAlias:
-                case PropertyEditorConstants.JsonRadioButtonPickerAlias:
-                case PropertyEditorConstants.JsonTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<JsonDataSource>(dataSourceConfig);
+                case DataEditorConstants.JsonCheckBoxPickerAlias:
+                case DataEditorConstants.JsonDropDownPickerAlias:
+                case DataEditorConstants.JsonLabelsAlias:
+                case DataEditorConstants.JsonPrefetchListPickerAlias:
+                case DataEditorConstants.JsonRadioButtonPickerAlias:
+                case DataEditorConstants.JsonTypeaheadListPickerAlias:
+                    return JsonConvert.DeserializeObject<JsonDataSource.JsonDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.LuceneCheckBoxPickerAlias:
-                case PropertyEditorConstants.LuceneDropDownPickerAlias:
-                case PropertyEditorConstants.LuceneLabelsAlias:
-                case PropertyEditorConstants.LucenePrefetchListPickerAlias:
-                case PropertyEditorConstants.LuceneRadioButtonPickerAlias:
-                case PropertyEditorConstants.LuceneTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<LuceneDataSource>(dataSourceConfig);
+                case DataEditorConstants.LuceneCheckBoxPickerAlias:
+                case DataEditorConstants.LuceneDropDownPickerAlias:
+                case DataEditorConstants.LuceneLabelsAlias:
+                case DataEditorConstants.LucenePrefetchListPickerAlias:
+                case DataEditorConstants.LuceneRadioButtonPickerAlias:
+                case DataEditorConstants.LuceneTypeaheadListPickerAlias:
+                    return JsonConvert.DeserializeObject<LuceneDataSource.LuceneDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.RelationLabelsAlias:
-                    return JsonConvert.DeserializeObject<RelationDataSource>(dataSourceConfig);                   
+                case DataEditorConstants.RelationLabelsAlias:
+                    return JsonConvert.DeserializeObject<RelationDataSource.RelationDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.SqlCheckBoxPickerAlias:
-                case PropertyEditorConstants.SqlDropDownPickerAlias:
-                case PropertyEditorConstants.SqlLabelsAlias:
-                case PropertyEditorConstants.SqlPrefetchListPickerAlias:
-                case PropertyEditorConstants.SqlRadioButtonPickerAlias:
-                case PropertyEditorConstants.SqlTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<SqlDataSource>(dataSourceConfig);
+                case DataEditorConstants.SqlCheckBoxPickerAlias:
+                case DataEditorConstants.SqlDropDownPickerAlias:
+                case DataEditorConstants.SqlLabelsAlias:
+                case DataEditorConstants.SqlPrefetchListPickerAlias:
+                case DataEditorConstants.SqlRadioButtonPickerAlias:
+                case DataEditorConstants.SqlTypeaheadListPickerAlias:
+                    return JsonConvert.DeserializeObject<SqlDataSource.SqlDataSource>(dataSourceConfig);
 
-                case PropertyEditorConstants.XmlCheckBoxPickerAlias:
-                case PropertyEditorConstants.XmlDropDownPickerAlias:
-                case PropertyEditorConstants.XmlLabelsAlias:
-                case PropertyEditorConstants.XmlPrefetchListPickerAlias:
-                case PropertyEditorConstants.XmlRadioButtonPickerAlias:
-                case PropertyEditorConstants.XmlTypeaheadListPickerAlias:
-                    return JsonConvert.DeserializeObject<XmlDataSource>(dataSourceConfig);
+              /*  case DataEditorConstants.XmlCheckBoxPickerAlias:
+                case DataEditorConstants.XmlDropDownPickerAlias:
+                case DataEditorConstants.XmlLabelsAlias:
+                case DataEditorConstants.XmlPrefetchListPickerAlias:
+                case DataEditorConstants.XmlRadioButtonPickerAlias:
+                case DataEditorConstants.XmlTypeaheadListPickerAlias:
+                    return JsonConvert.DeserializeObject<XmlDataSource.XmlDataSource>(dataSourceConfig);*/
             }
 
             return null;
diff --git a/source/nuPickers/Shared/DataSource/DataSourceApiController.cs b/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
index 115d8e2..0e7eefb 100644
--- a/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
+++ b/source/nuPickers/Shared/DataSource/DataSourceApiController.cs
@@ -1,7 +1,7 @@
 namespace nuPickers.Shared.DataSource
 {
     using Newtonsoft.Json.Linq;
-    using nuPickers.Shared.Editor;
+    using Editor;
     using System.Linq;
     using System.Web.Http;
     using Umbraco.Web.Editors;
@@ -12,7 +12,7 @@
     using LuceneDataSource = LuceneDataSource.LuceneDataSource;
     using RelationDataSource = RelationDataSource.RelationDataSource;
     using SqlDataSource = SqlDataSource.SqlDataSource;
-    using XmlDataSource = XmlDataSource.XmlDataSource;
+    //using XmlDataSource = XmlDataSource.XmlDataSource;
 
     [PluginController("nuPickers")]
     public class DataSourceApiController : UmbracoAuthorizedJsonController
@@ -48,7 +48,7 @@ public DataSourceApiResponse GetEditorDataItems([FromUri] int currentId, [FromUr
                 case "LuceneDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<LuceneDataSource>(); break;
                 case "RelationDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<RelationDataSource>(); break;
                 case "SqlDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<SqlDataSource>(); break;
-                case "XmlDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<XmlDataSource>(); break;
+                //case "XmlDataSourceApi": dataSource = ((JObject)data.config.dataSource).ToObject<XmlDataSource>(); break;
             }
 
             if (dataSource != null)
@@ -91,7 +91,7 @@ public DataSourceApiResponse GetEditorDataItems([FromUri] int currentId, [FromUr
                                                         dataSource,
                                                         (string)data.config.customLabel,
                                                         (int)data.config.pagedListPicker.itemsPerPage,
-                                                        (int)data.page, 
+                                                        (int)data.page,
                                                         out total);
 
                     response.Total = total;
diff --git a/source/nuPickers/Shared/DataSource/IDataSource.cs b/source/nuPickers/Shared/DataSource/IDataSource.cs
index a46b001..9fe2d17 100644
--- a/source/nuPickers/Shared/DataSource/IDataSource.cs
+++ b/source/nuPickers/Shared/DataSource/IDataSource.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.DataSource
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.Shared.DataSource
 {
     using nuPickers.Shared.Editor;
     using Paging;
diff --git a/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs b/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
index 075b279..f388c99 100644
--- a/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
+++ b/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
@@ -11,6 +11,11 @@
 
     public class DotNetDataSource : IDataSource
     {
+        private readonly IProfilingLogger _logger;
+        public DotNetDataSource(  IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
         private bool handledTypeahead = false;
 
         public string AssemblyName { get; set; }
@@ -136,7 +141,8 @@ private void SetProperties(ref IDotNetDataSource dotNetDataSource, int contextId
                 }
                 else
                 {
-                    LogHelper.Warn(typeof(DotNetDataSource), "Unexpected PropertyType, " + propertyInfo.Name + " is not a string");
+                    _logger.Info<DotNetDataSource>(  "Unexpected PropertyType, {PropertyName} is not a string)",propertyInfo.Name );
+
                 }
             }
         }
diff --git a/source/nuPickers/Shared/Editor/Editor.cs b/source/nuPickers/Shared/Editor/Editor.cs
index 0bdd157..998933d 100644
--- a/source/nuPickers/Shared/Editor/Editor.cs
+++ b/source/nuPickers/Shared/Editor/Editor.cs
@@ -1,4 +1,7 @@
-namespace nuPickers.Shared.Editor
+using System.Web.UI;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.Shared.Editor
 {
     using DataSource;
     using nuPickers.Shared.CustomLabel;
@@ -7,9 +10,20 @@
     using System.Collections.Generic;
     using System.Linq;
     using Umbraco.Core;
+    using Umbraco.Core.Composing;
+    using Umbraco.Web;
 
     internal static class Editor
     {
+
+        public static IFactory Factory
+        => Umbraco.Core.Composing.Current.Factory;
+
+        public static IUmbracoComponentRenderer UmbracoComponentRenderer
+                 => Factory.GetInstance<IUmbracoComponentRenderer>();
+
+
+
         /// <summary>
         /// Get a collection of all the (key/label) items for a picker (with optional typeahead)
         /// </summary>
@@ -20,11 +34,11 @@ internal static class Editor
         /// <param name="customLabelMacro">an optional macro to use for custom labels</param>
         /// <param name="typeahead">optional typeahead text to filter down on items returned</param>
         /// <returns>a collection of <see cref="EditorDataItem"/></returns>
-        internal static IEnumerable<EditorDataItem> GetEditorDataItems(                                                        
+        internal static IEnumerable<EditorDataItem> GetEditorDataItems(
                                                         int currentId,
                                                         int parentId,
                                                         string propertyAlias,
-                                                        IDataSource dataSource, 
+                                                        IDataSource dataSource,
                                                         string customLabelMacro,
                                                         string typeahead = null)
         {
@@ -36,7 +50,7 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
                 {
-                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias).ProcessEditorDataItems(editorDataItems);
+                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias, UmbracoComponentRenderer).ProcessEditorDataItems(editorDataItems);
                 }
 
                 // if the datasource didn't handle the typeahead text, then it needs to be done here (post custom label processing ?)
@@ -75,7 +89,7 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
                 {
-                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias).ProcessEditorDataItems(editorDataItems);
+                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias, UmbracoComponentRenderer).ProcessEditorDataItems(editorDataItems);
                 }
 
                 // ensure sort order matches order of keys supplied
@@ -112,14 +126,14 @@ internal static IEnumerable<EditorDataItem> GetEditorDataItems(
             if (dataSource != null)
             {
                 editorDataItems = dataSource.GetEditorDataItems(
-                                                currentId, 
-                                                parentId, 
-                                                new PageMarker(itemsPerPage, page), 
+                                                currentId,
+                                                parentId,
+                                                new PageMarker(itemsPerPage, page),
                                                 out total);
 
                 if (!string.IsNullOrWhiteSpace(customLabelMacro))
                 {
-                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias).ProcessEditorDataItems(editorDataItems);
+                    editorDataItems = new CustomLabel(customLabelMacro, currentId, propertyAlias, UmbracoComponentRenderer).ProcessEditorDataItems(editorDataItems);
                 }
             }
 
diff --git a/source/nuPickers/Shared/Editor/EditorDataItem.cs b/source/nuPickers/Shared/Editor/EditorDataItem.cs
index 254781a..5ed788d 100644
--- a/source/nuPickers/Shared/Editor/EditorDataItem.cs
+++ b/source/nuPickers/Shared/Editor/EditorDataItem.cs
@@ -9,7 +9,7 @@ public class EditorDataItem
     {
         [JsonProperty("key")]
         public string Key { get; set; }
-     
+
         [JsonProperty("label")]
         public string Label { get; set; }
     }
diff --git a/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs b/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
index cd549c9..6ca42f6 100644
--- a/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
+++ b/source/nuPickers/Shared/EnumDataSource/EnumDataSource.cs
@@ -31,7 +31,7 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
             var editorDataItems = this.GetEditorDataItems();
 
             total = editorDataItems.Count();
-            
+
             return editorDataItems.Skip(pageMarker.Skip).Take(pageMarker.Take);
         }
 
@@ -50,7 +50,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems()
 
                 foreach(CustomAttributeData customAttributeData in CustomAttributeData.GetCustomAttributes(fieldInfo))
                 {
-                    if (customAttributeData.Constructor.DeclaringType != null 
+                    if (customAttributeData.Constructor.DeclaringType != null
                         && customAttributeData.Constructor.DeclaringType.Name == "EnumDataSourceAttribute"
                         && customAttributeData.NamedArguments != null)
                     {
diff --git a/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs b/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs
index 86ab297..3a51d0f 100644
--- a/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs
+++ b/source/nuPickers/Shared/JsonDataSource/JsonDataSource.cs
@@ -11,6 +11,12 @@
 
     public class JsonDataSource : IDataSource
     {
+        private readonly IProfilingLogger _logger;
+        public JsonDataSource(  IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
         public string Url { get; set; }
 
         public string JsonPath { get; set; }
@@ -44,7 +50,7 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
         /// Main method for retrieving nuPicker data items.
         /// </summary>
         /// <param name="contextId">Current context node Id</param>
-        /// <returns>List of items for displaying inside a nuPicker JSON data type.</returns>        
+        /// <returns>List of items for displaying inside a nuPicker JSON data type.</returns>
         private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
         {
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>(); // prepare return value
@@ -54,12 +60,13 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
             JToken jToken = null; // object representation of all json source data
 
             try
-            {                
+            {
                 jToken = JToken.Parse(Helper.GetDataFromUrl(url));
             }
             catch (JsonException jsonException)
             {
-                LogHelper.Warn(typeof(JsonDataSource), jsonException.Message + " (Check JSON at Url: " + url + ")");
+                _logger.Info<JsonDataSource>(  "{Message} (Check JSON at Url: {URL})",jsonException.Message, url  );
+
             }
 
             if (jToken != null)
@@ -85,7 +92,8 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
                     }
                     catch (JsonException jsonException)
                     {
-                        LogHelper.Warn(typeof(JsonDataSource), jsonException.Message + " (Check JSONPath: " + this.JsonPath + ")");
+                        _logger.Info<JsonDataSource>(  "{Message} (Check JSONPath: {JsonPath})",jsonException.Message, JsonPath  );
+
                     }
 
                     if (jTokens != null)
diff --git a/source/nuPickers/Shared/Labels/LabelsEditor.html b/source/nuPickers/Shared/Labels/LabelsEditor.html
index cfbcc32..d7bd276 100644
--- a/source/nuPickers/Shared/Labels/LabelsEditor.html
+++ b/source/nuPickers/Shared/Labels/LabelsEditor.html
@@ -1,6 +1,6 @@
 
 <ul ng-controller="nuPickers.Shared.Labels.LabelsEditorController" class="layout-direction" ng-class="model.config.layoutDirection">
     <li ng-repeat="option in options"
-        ng-bind-html-unsafe="option.label">
+        ng-bind-html="option.label">
     </li>
 </ul>
\ No newline at end of file
diff --git a/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html b/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
index 8323e8a..eeb7e85 100644
--- a/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
+++ b/source/nuPickers/Shared/ListPicker/ListPickerSelectablePartial.html
@@ -7,7 +7,7 @@
     <li ng-repeat="option in selectableOptions"
         ng-hide="model.config.listPicker.hideUsed && !isSelectable(option)"
         ng-class="{lit:lit, disabled:!isValidSelection(option), used:isUsed(option)}">
-        <div class="option-label" ng-bind-html-unsafe="option.label">
+        <div class="option-label" ng-bind-html="option.label">
         </div>
 
         <a href=""
diff --git a/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html b/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
index 69c4894..3f017a7 100644
--- a/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
+++ b/source/nuPickers/Shared/ListPicker/ListPickerSelectedPartial.html
@@ -17,7 +17,7 @@
             <div ng-mouseenter="lit = isSortable()"
                  ng-mouseleave="lit = false"
                  ng-class="{'option-label':true, sort:isSortable()}"
-                 ng-bind-html-unsafe="option.label">
+                 ng-bind-html="option.label">
             </div>
         </li>
     </ul>
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
index c85ce93..23abfa6 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSource.cs
@@ -1,9 +1,12 @@
-namespace nuPickers.Shared.LuceneDataSource
+using Examine.Search;
+using Umbraco.Web.Composing;
+using Umbraco.Examine;
+
+namespace nuPickers.Shared.LuceneDataSource
 {
     using DataSource;
     using Examine;
     using Examine.Providers;
-    using Examine.SearchCriteria;
     using nuPickers.Shared.Editor;
     using Paging;
     using System;
@@ -12,12 +15,20 @@
 
     public class LuceneDataSource : IDataSource
     {
+
+        private readonly IExamineManager _examineManager;
+
+        public LuceneDataSource(IExamineManager examineManager)
+        {
+            _examineManager = examineManager;
+        }
+
         public string ExamineSearcher { get; set; }
 
         public string RawQuery { get; set; }
-        
+
         public string KeyField { get; set; }
-        
+
         public string LabelField { get; set; }
 
         bool IDataSource.HandledTypeahead { get { return false; } } // TODO: Implement token replacement for Lucene queries
@@ -44,21 +55,26 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
         private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId)
         {
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
+            var examineManager =  ExamineManager.Instance;
+            if(!examineManager.TryGetSearcher(ExamineSearcher, out var searchProvider));
+            {
+                examineManager.TryGetIndex(ExamineSearcher.Replace("Searcher", "Index"), out var internalsearch);
 
-            BaseSearchProvider searchProvider = ExamineManager.Instance.SearchProviderCollection[this.ExamineSearcher];
-
+                searchProvider =  internalsearch.GetSearcher();
+            }
             if (searchProvider != null)
             {
-                ISearchCriteria searchCriteria = searchProvider.CreateSearchCriteria().RawQuery(this.RawQuery);
-                ISearchResults searchResults = searchProvider.Search(searchCriteria);
+                IQuery searchCriteria = searchProvider.CreateQuery();
+                var query = searchCriteria.NativeQuery(this.RawQuery);
+                ISearchResults searchResults = query.Execute();
 
                 foreach (SearchResult searchResult in searchResults)
                 {
                     editorDataItems.Add(
-                        new EditorDataItem() 
-                            { 
-                                Key = searchResult.Fields.ContainsKey(this.KeyField) ? searchResult.Fields[this.KeyField] : null,
-                                Label = searchResult.Fields.ContainsKey(this.LabelField) ? searchResult.Fields[this.LabelField] : null
+                        new EditorDataItem()
+                            {
+                                Key = searchResult.AllValues.ContainsKey(this.KeyField) ? searchResult.AllValues[this.KeyField][0] : null,
+                                Label = searchResult.AllValues.ContainsKey(this.LabelField) ? searchResult.AllValues[this.LabelField][0] : null
                             });
                 }
             }
diff --git a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
index 875271f..85ddd1b 100644
--- a/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
+++ b/source/nuPickers/Shared/LuceneDataSource/LuceneDataSourceApiController.cs
@@ -1,17 +1,21 @@
-namespace nuPickers.Shared.LuceneDataSource
+using Umbraco.Examine;
+
+namespace nuPickers.Shared.LuceneDataSource
 {
     using System.Collections.Generic;
     using System.Linq;
     using Umbraco.Web.Editors;
     using Umbraco.Web.Mvc;
-    using UmbracoExamine;
 
     [PluginController("nuPickers")]
     public class LuceneDataSourceApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetExamineSearchers()
         {
-            return Examine.ExamineManager.Instance.SearchProviderCollection.OfType<UmbracoExamineSearcher>().Select(x => x.Name);            
+            var configuredSearchers = Examine.ExamineManager.Instance.RegisteredSearchers.Select(x => x.Name).ToList();
+            var indexSearchers = Examine.ExamineManager.Instance.Indexes.Select(x => x.GetSearcher().Name).ToList();
+
+            return configuredSearchers.Concat(indexSearchers);
         }
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html b/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
index a9a7ce6..4d797bc 100644
--- a/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
+++ b/source/nuPickers/Shared/RadioButtonPicker/RadioButtonPickerEditor.html
@@ -11,7 +11,7 @@
                        ng-model="$parent.pickedKey"
                        ng-checked="option.key == $parent.pickedKey" />
 
-                <span ng-bind-html-unsafe="option.label"></span>
+                <span ng-bind-html="option.label"></span>
             </label>
 
         </li>
diff --git a/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs b/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
index 48942da..5c417a9 100644
--- a/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
+++ b/source/nuPickers/Shared/RelationDataSource/RelationDataSource.cs
@@ -1,4 +1,7 @@
-namespace nuPickers.Shared.RelationDataSource
+using System.Web.UI;
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.RelationDataSource
 {
     using DataSource;
     using Editor;
@@ -34,7 +37,7 @@ IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int pa
 
         private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parentId)
         {
-            var relationService = ApplicationContext.Current.Services.RelationService;
+            var relationService = Current.Services.RelationService;
 
             return relationService.GetEntitiesFromRelations(
                                                 relationService.GetByRelationTypeAlias(this.RelationType)
diff --git a/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs b/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs
index 6ce8d3c..16ce603 100644
--- a/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs
+++ b/source/nuPickers/Shared/RelationDataSource/RelationDataSourceApiController.cs
@@ -1,8 +1,10 @@
-namespace nuPickers.Shared.RelationDataSource
+using Umbraco.Core.Composing;
+using Umbraco.Core.Models;
+
+namespace nuPickers.Shared.RelationDataSource
 {
     using System.Collections.Generic;
     using System.Linq;
-    using umbraco.cms.businesslogic.relation;
     using Umbraco.Web.Editors;
     using Umbraco.Web.Mvc;
 
@@ -11,13 +13,14 @@ public class RelationDataSourceApiController : UmbracoAuthorizedJsonController
     {
         public IEnumerable<object> GetRelationTypes()
         {
-            return RelationType.GetAll()
+            var relationService = Current.Services.RelationService;
+            return relationService.GetAllRelationTypes()
                         .OrderBy(x => x.Name)
                         .Select(x => new
                         {
                             key = x.Alias,
                             label = x.Name,
-                            biDirectional = x.Dual
+                            biDirectional = x.IsBidirectional
                         });
         }
     }
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMapping.cs b/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
index 8ae7cc5..45b8b54 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMapping.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.RelationMapping
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.RelationMapping
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -22,12 +24,12 @@ internal static IEnumerable<int> GetRelatedIds(int contextId, string propertyAli
         {
             if (contextId != 0) // new content / media / members don't have an id (so can't have any relations)
             {
-                IRelationType relationType = ApplicationContext.Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
+                IRelationType relationType = Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
 
                 if (relationType != null)
                 {
                     // get all relations of this type
-                    IEnumerable<IRelation> relations = ApplicationContext.Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id);
+                    IEnumerable<IRelation> relations = Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id);
 
                     // construct object used to identify a relation (this is serialized into the relation comment field)
                     RelationMappingComment relationMappingComment = new RelationMappingComment(contextId, propertyAlias);
@@ -57,7 +59,7 @@ internal static IEnumerable<int> GetRelatedIds(int contextId, string propertyAli
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="contextId">the id of the content, media or member item</param>
         /// <param name="propertyAlias">the property alias of the picker using relation mapping</param>
@@ -66,12 +68,12 @@ internal static IEnumerable<int> GetRelatedIds(int contextId, string propertyAli
         /// <param name="pickedIds">the ids of all picked items that are to be related to the contextId</param>
         internal static void UpdateRelationMapping(int contextId, string propertyAlias, string relationTypeAlias, bool relationsOnly, int[] pickedIds)
         {
-            IRelationType relationType = ApplicationContext.Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
+            IRelationType relationType = Current.Services.RelationService.GetRelationTypeByAlias(relationTypeAlias);
 
             if (relationType != null)
             {
                 // get all relations of this type
-                List<IRelation> relations = ApplicationContext.Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id).ToList();
+                List<IRelation> relations = Current.Services.RelationService.GetAllRelationsByRelationType(relationType.Id).ToList();
 
                 // construct object used to identify a relation (this is serialized into the relation comment field)
                 RelationMappingComment relationMappingComment = new RelationMappingComment(contextId, propertyAlias);
@@ -94,13 +96,13 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                 }
 
                 // check current context is of the correct object type (as according to the relation type)
-                if (ApplicationContext.Current.Services.EntityService.GetObjectType(contextId) == UmbracoObjectTypesExtensions.GetUmbracoObjectType(relationType.ChildObjectType))
+                if (Current.Services.EntityService.GetObjectType(contextId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ChildObjectType.Value))
                 {
-                    // for each picked item 
+                    // for each picked item
                     foreach (int pickedId in pickedIds)
                     {
                         // check picked item context if of the correct object type (as according to the relation type)
-                        if (ApplicationContext.Current.Services.EntityService.GetObjectType(pickedId) == UmbracoObjectTypesExtensions.GetUmbracoObjectType(relationType.ParentObjectType))
+                        if (Current.Services.EntityService.GetObjectType(pickedId) ==  ObjectTypes.GetUmbracoObjectType(relationType.ParentObjectType.Value))
                         {
                             // if relation doesn't already exist (new picked item)
                             if (!relations.Exists(x => x.ParentId == pickedId))
@@ -108,7 +110,7 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                                 // create relation
                                 Relation relation = new Relation(pickedId, contextId, relationType);
                                 relation.Comment = relationMappingComment.GetComment();
-                                ApplicationContext.Current.Services.RelationService.Save(relation);
+                                Current.Services.RelationService.Save(relation);
                             }
 
                             // housekeeping - remove 'the' relation from the list being processed (there should be only one)
@@ -122,7 +124,7 @@ internal static void UpdateRelationMapping(int contextId, string propertyAlias,
                 {
                     foreach (IRelation relation in relations)
                     {
-                        ApplicationContext.Current.Services.RelationService.Delete(relation);
+                        Current.Services.RelationService.Delete(relation);
                     }
                 }
             }
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs b/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs
index fab7b28..6daabba 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMappingApiController.cs
@@ -12,7 +12,7 @@ public class RelationMappingApiController : UmbracoAuthorizedJsonController
         [HttpGet]
         public IEnumerable<object> GetRelationTypes()
         {
-            return ApplicationContext.Services.RelationService.GetAllRelationTypes()
+            return Services.RelationService.GetAllRelationTypes()
                         .OrderBy(x => x.Name)
                         .Select(x => new
                         {
diff --git a/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs b/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs
index d2c9c77..1fbd3aa 100644
--- a/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs
+++ b/source/nuPickers/Shared/RelationMapping/RelationMappingComment.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.RelationMapping
+using Umbraco.Core.Composing;
+
+namespace nuPickers.Shared.RelationMapping
 {
     using System;
     using System.Linq;
@@ -36,27 +38,27 @@ internal RelationMappingComment(int contextId, string propertyAlias)
             PropertyType propertyType = null;
 
             // is there a better way of getting the property types for an id without having to check content / media / members independently ?
-            var content = ApplicationContext.Current.Services.ContentService.GetById(contextId);
+            var content = Current.Services.ContentService.GetById(contextId);
 
             if (content != null)
             {
-                propertyType = content.PropertyTypes.SingleOrDefault(x => x.Alias == propertyAlias);
+                propertyType = content.Properties.SingleOrDefault(x => x.Alias == propertyAlias).PropertyType;
             }
             else
             {
-                var media = ApplicationContext.Current.Services.MediaService.GetById(contextId);
+                var media = Current.Services.MediaService.GetById(contextId);
 
                 if (media != null)
                 {
-                    propertyType = media.PropertyTypes.SingleOrDefault(x => x.Alias == propertyAlias);
+                    propertyType = media.Properties.SingleOrDefault(x => x.Alias == propertyAlias).PropertyType;
                 }
                 else
                 {
-                    var member = ApplicationContext.Current.Services.MemberService.GetById(contextId);
+                    var member = Current.Services.MemberService.GetById(contextId);
 
                     if (member != null)
                     {
-                        propertyType = member.PropertyTypes.SingleOrDefault(x => x.Alias == propertyAlias);
+                        propertyType = member.Properties.SingleOrDefault(x => x.Alias == propertyAlias).PropertyType;
                     }
                 }
             }
@@ -65,7 +67,7 @@ internal RelationMappingComment(int contextId, string propertyAlias)
             {
                 this.PropertyAlias = propertyAlias;
                 this.PropertyTypeId = propertyType.Id;
-                this.DataTypeDefinitionId = propertyType.DataTypeDefinitionId;
+                this.DataTypeDefinitionId = propertyType.DataTypeId;
             }
             else
             {
diff --git a/source/nuPickers/Shared/SaveFormat/SaveFormat.cs b/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
index 65aa88a..6274aeb 100644
--- a/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
+++ b/source/nuPickers/Shared/SaveFormat/SaveFormat.cs
@@ -1,6 +1,10 @@
-namespace nuPickers.Shared.SaveFormat
+using ClientDependency.Core.Logging;
+using nuPickers.Shared.Editor;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.Composing;
+
+namespace nuPickers.Shared.SaveFormat
 {
-    using Editor;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
     using System.Collections.Generic;
@@ -9,6 +13,8 @@
 
     internal static class SaveFormat
     {
+
+
         /// <summary>
         /// Ignore the specified saved format, and try and restore collection directly from the supplied string value
         /// </summary>
@@ -30,7 +36,11 @@ internal static bool TryGetDataEditorItems(string value, out IEnumerable<EditorD
         {
             editorDataItems = SaveFormat.GetKeyValuePairs(value)
                                         .Where(x => x.Value != null)
-                                        .Select(x => new EditorDataItem() { Key = x.Key, Label = x.Value });
+                                        .Select(x => new EditorDataItem()
+                                        {
+                                            Key=x.Key,
+                                            Label = x.Value
+                                        });
 
             return editorDataItems.Count() > 0;
         }
diff --git a/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs b/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
index 4a01a87..73bbf62 100644
--- a/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
+++ b/source/nuPickers/Shared/SaveFormat/SaveFormatPropertyValueEditor.cs
@@ -1,49 +1,41 @@
-namespace nuPickers.Shared.SaveFormat
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Newtonsoft.Json;
+using nuPickers.Validators;
+using Umbraco.Core.Composing.CompositionExtensions;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.PropertyEditors;
+
+namespace nuPickers.Shared.SaveFormat
 {
     using System.Xml.Linq;
     using Umbraco.Core.Models;
-    using Umbraco.Core.PropertyEditors;
     using Umbraco.Core.Services;
 
     /// <summary>
     /// This class exists so as to be able to save xml direclty into the Umbraco xml cache
     /// </summary>
-    public class SaveFormatPropertyValueEditor : PropertyValueEditor
+    public class SaveFormatPropertyValueEditor : DataValueEditor
     {
+        private string _view;
+
         /// <summary>
         /// reconstruct values from original (default) property value editor
         /// </summary>
         /// <param name="propertyValueEditor"></param>
-        public SaveFormatPropertyValueEditor(PropertyValueEditor propertyValueEditor)
+        public SaveFormatPropertyValueEditor(DataEditorAttribute propertyValueEditor) : this()
         {
             this.HideLabel = propertyValueEditor.HideLabel;
             this.View = propertyValueEditor.View;
             this.ValueType = propertyValueEditor.ValueType;
-            foreach (IPropertyValidator propertyValidator in propertyValueEditor.Validators)
-            {
-                this.Validators.Add(propertyValidator);
-            }
         }
 
-        /// <summary>
-        /// when saving to the xml cache, if the value can be converted to xml then ensure it's not wrapped in CData
-        /// </summary>
-        /// <param name="property"></param>
-        /// <param name="propertyType"></param>
-        /// <param name="dataTypeService"></param>
-        /// <returns></returns>
-        public override XNode ConvertDbToXml(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+        public SaveFormatPropertyValueEditor()  // for tests, and manifest
         {
-            string value = this.ConvertDbToString(property, propertyType, dataTypeService);
-
-            try
-            {
-                return XElement.Parse(value);
-            }
-            catch
-            {
-                return new XCData(value);
-            }
         }
+
+
     }
 }
\ No newline at end of file
diff --git a/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs b/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
index f566cab..6d6ae5b 100644
--- a/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
+++ b/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
@@ -1,4 +1,6 @@
-namespace nuPickers.Shared.SqlDataSource
+using NPoco;
+
+namespace nuPickers.Shared.SqlDataSource
 {
     using DataSource;
     using nuPickers.Shared.Editor;
@@ -54,7 +56,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int contextId, string typ
                 string sql = Regex.Replace(this.SqlExpression, "\n|\r", " ")
                              .Replace("@contextId", "@0")
                              .Replace("@typeahead", "@1");
-                
+
                 if (this.SqlExpression.Contains("@typeahead")) // WARNING: not a perfect check !
                 {
                     this.handledTypeahead = true;
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
index e74b1fb..77327d2 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSource.cs
@@ -1,15 +1,15 @@
-namespace nuPickers.Shared.XmlDataSource
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+using System.Xml.XPath;
+using nuPickers.Shared.DataSource;
+using nuPickers.Shared.Editor;
+using nuPickers.Shared.Paging;
+using Umbraco.Core.Models;
+using Umbraco.Web.Composing;
+
+namespace nuPickers.Shared.XmlDataSource
 {
-    using DataSource;
-    using nuPickers.Shared.Editor;
-    using Paging;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Xml;
-    using System.Xml.XPath;
-    using umbraco;
-    using Umbraco.Core;
-
     public class XmlDataSource : IDataSource
     {
         public string XmlData { get; set; }
@@ -25,7 +25,7 @@ public class XmlDataSource : IDataSource
         bool IDataSource.HandledTypeahead { get { return false; } }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="currentId"></param>
         /// <param name="parentId"></param>
@@ -33,17 +33,17 @@ public class XmlDataSource : IDataSource
         /// <returns></returns>
         IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string typeahead)
         {
-            return this.GetEditorDataItems(currentId, parentId);
+            return GetEditorDataItems(currentId, parentId);
         }
 
         IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, string[] keys)
         {
-            return this.GetEditorDataItems(currentId, parentId).Where(x => keys.Contains(x.Key));
+            return GetEditorDataItems(currentId, parentId).Where(x => keys.Contains(x.Key));
         }
 
         IEnumerable<EditorDataItem> IDataSource.GetEditorDataItems(int currentId, int parentId, PageMarker pageMarker, out int total)
         {
-            var editorDataItems = this.GetEditorDataItems(currentId, parentId);
+            var editorDataItems = GetEditorDataItems(currentId, parentId);
 
             total = editorDataItems.Count();
 
@@ -55,24 +55,25 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
             XmlDocument xmlDocument;
             List<EditorDataItem> editorDataItems = new List<EditorDataItem>();
 
-            switch (this.XmlData)
+            switch (XmlData)
             {
+
                 case "content":
-                    xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Document);
+                    xmlDocument = Current.UmbracoHelper.ContentAtXPath(UmbracoObjectTypes.Document.GetName());
                     break;
 
                 case "media":
-                    xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Media);
+                    xmlDocument =Current.UmbracoHelper.ContentAtXPath(uQuery.UmbracoObjectType.Media);
                     break;
 
                 case "members":
-                    xmlDocument = uQuery.GetPublishedXml(uQuery.UmbracoObjectType.Member);
+                    xmlDocument =Current.UmbracoHelper.ContentAtXPath();
                     break;
 
                 case "url":
                     xmlDocument = new XmlDocument();
 
-                    var url = this.Url.Replace("@contextId", currentId.ToString());
+                    var url = Url.Replace("@contextId", currentId.ToString());
 
                     xmlDocument.LoadXml(Helper.GetDataFromUrl(url));
                     break;
@@ -84,7 +85,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
 
             if (xmlDocument != null)
             {
-                string xPath = this.XPath;
+                string xPath = XPath;
 
                 if (xPath.Contains("$ancestorOrSelf"))
                 {
@@ -92,17 +93,17 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                     int ancestorOrSelfId = currentId > 0 ? currentId : parentId > 0 ? parentId : -1;
 
                     // if we have a content id, but it's not published in the xml
-                    if (this.XmlData == "content" && ancestorOrSelfId > 0 && xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null)
+                    if (XmlData == "content" && ancestorOrSelfId > 0 && xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null)
                     {
                         // use Umbraco API to get path of all ids above ancestorOrSelfId to root
-                        Queue<int> path = new Queue<int>(ApplicationContext.Current.Services.ContentService.GetById(ancestorOrSelfId).Path.Split(',').Select(x => int.Parse(x)).Reverse().Skip(1));
+                        Queue<int> path = new Queue<int>(Current.Services.ContentService.GetById(ancestorOrSelfId).Path.Split(',').Select(x => int.Parse(x)).Reverse().Skip(1));
 
                         // find the nearest id in the xml
                         do { ancestorOrSelfId = path.Dequeue(); }
                         while (xmlDocument.SelectSingleNode("/descendant::*[@id='" + ancestorOrSelfId + "']") == null);
                     }
 
-                    xPath = this.XPath.Replace("$ancestorOrSelf", string.Concat("/descendant::*[@id='", ancestorOrSelfId, "']"));
+                    xPath = XPath.Replace("$ancestorOrSelf", string.Concat("/descendant::*[@id='", ancestorOrSelfId, "']"));
                 }
 
                 XPathNavigator xPathNavigator = xmlDocument.CreateNavigator();
@@ -120,7 +121,7 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                         !(xPathNodeIterator.Current.GetAttribute("id", string.Empty) == "-1" &&
                          (xPathNodeIterator.Current.Name == "Media" || xPathNodeIterator.Current.Name == "Members")))
                     {
-                        key = xPathNodeIterator.Current.SelectSingleNode(this.KeyXPath).Value;
+                        key = xPathNodeIterator.Current.SelectSingleNode(KeyXPath).Value;
 
                         // only add item if it has a unique key - failsafe
                         if (!string.IsNullOrWhiteSpace(key) && !keys.Any(x => x == key))
@@ -129,9 +130,9 @@ private IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parent
                             keys.Add(key); // add key so that it's not reused
 
                             // set default markup to use the configured label XPath
-                            label = xPathNodeIterator.Current.SelectSingleNode(this.LabelXPath).Value;
+                            label = xPathNodeIterator.Current.SelectSingleNode(LabelXPath).Value;
 
-                            editorDataItems.Add(new EditorDataItem()
+                            editorDataItems.Add(new EditorDataItem
                             {
                                 Key = key,
                                 Label = label
diff --git a/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html b/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html
index cdd021c..af90848 100644
--- a/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html
+++ b/source/nuPickers/Shared/XmlDataSource/XmlDataSourceConfig.html
@@ -10,8 +10,6 @@
             <select ng-model="model.value.xmlData"
                     ng-init="model.value.xmlData = model.value.xmlData || 'content'">
                 <option value="content">Content</option>
-                <option value="media">Media</option>
-                <option value="members">Members</option>
                 <option value="url">URL</option>
             </select>
         </div>
diff --git a/source/nuPickers/Validators/RegexValidator.cs b/source/nuPickers/Validators/RegexValidator.cs
new file mode 100644
index 0000000..b54d0dd
--- /dev/null
+++ b/source/nuPickers/Validators/RegexValidator.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text.RegularExpressions;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace nuPickers.Validators
+{
+    public class RegexValidator : IValueFormatValidator, IManifestValueValidator
+    {
+        private readonly ILocalizedTextService _textService;
+        private string _regex;
+
+        /// <inheritdoc cref="IManifestValueValidator.ValidationName"/>
+        public string ValidationName => "Regex";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegexValidator"/> class.
+        /// </summary>
+        /// <remarks>Use this constructor when the validator is used as an <see cref="IValueFormatValidator"/>,
+        /// and the regular expression is supplied at validation time. This constructor is also used when
+        /// the validator is used as an <see cref="IManifestValueValidator"/> and the regular expression
+        /// is supplied via the <see cref="Configuration"/> method.</remarks>
+        public RegexValidator() : this(Current.Services.TextService, null)
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegexValidator"/> class.
+        /// </summary>
+        /// <remarks>Use this constructor when the validator is used as an <see cref="IValueValidator"/>,
+        /// and the regular expression must be supplied when the validator is created.</remarks>
+        public RegexValidator(ILocalizedTextService textService, string regex)
+        {
+            _textService = textService;
+            _regex = regex;
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration, when parsed as <see cref="IManifestValueValidator"/>.
+        /// </summary>
+        public string Configuration
+        {
+            get => _regex;
+            set
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                    throw new ArgumentNullOrEmptyException(nameof(value));
+                _regex = value;
+            }
+        }
+
+        /// <inheritdoc cref="IValueValidator.Validate"/>
+        public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+        {
+            if (_regex == null)
+                throw new InvalidOperationException("The validator has not been configured.");
+
+            return ValidateFormat(value, valueType, _regex);
+        }
+
+        /// <inheritdoc cref="IValueFormatValidator.ValidateFormat"/>
+        public IEnumerable<ValidationResult> ValidateFormat(object value, string valueType, string format)
+        {
+            if (string.IsNullOrWhiteSpace(format)) throw new ArgumentNullOrEmptyException(nameof(format));
+            if (value == null || !new Regex(format).IsMatch(value.ToString()))
+                yield return new ValidationResult(_textService.Localize("validation", "invalidPattern"), new[] { "value" });
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/Validators/RequiredValidator.cs b/source/nuPickers/Validators/RequiredValidator.cs
new file mode 100644
index 0000000..1c2e4ff
--- /dev/null
+++ b/source/nuPickers/Validators/RequiredValidator.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text.RegularExpressions;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace nuPickers.Validators
+{
+    public class RequiredValidator : IValueRequiredValidator, IManifestValueValidator
+    {
+        private readonly ILocalizedTextService _textService;
+
+        public RequiredValidator() : this(Current.Services.TextService)
+        {
+        }
+
+        public RequiredValidator(ILocalizedTextService textService)
+        {
+            _textService = textService;
+        }
+
+        /// <inheritdoc cref="IManifestValueValidator.ValidationName"/>
+        public string ValidationName => "Required";
+
+        /// <inheritdoc cref="IValueValidator.Validate"/>
+        public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
+        {
+            return ValidateRequired(value, valueType);
+        }
+
+        /// <inheritdoc cref="IValueRequiredValidator.ValidateRequired"/>
+        public IEnumerable<ValidationResult> ValidateRequired(object value, string valueType)
+        {
+            if (value == null)
+            {
+                yield return new ValidationResult(_textService.Localize("validation", "invalidNull"), new[] {"value"});
+                yield break;
+            }
+
+            if (valueType.InvariantEquals(ValueTypes.Json))
+            {
+                if (DetectIsEmptyJson(value.ToString()))
+                    yield return new ValidationResult(_textService.Localize("validation", "invalidEmpty"), new[] { "value" });
+                yield break;
+            }
+
+            if (value.ToString().IsNullOrWhiteSpace())
+            {
+                yield return new ValidationResult(_textService.Localize("validation", "invalidEmpty"), new[] { "value" });
+            }
+        }
+        static bool DetectIsEmptyJson( string input)
+        {
+            return ((IList) JsonEmpties).Contains(Whitespace.Value.Replace(input, string.Empty));
+        }
+        static readonly string[] JsonEmpties = { "[]", "{}" };
+        static readonly Lazy<Regex> Whitespace = new Lazy<Regex>(() => new Regex(@"\s+", RegexOptions.Compiled));
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickerComposer.cs b/source/nuPickers/nuPickerComposer.cs
new file mode 100644
index 0000000..5531b0e
--- /dev/null
+++ b/source/nuPickers/nuPickerComposer.cs
@@ -0,0 +1,28 @@
+using nuPickers.Components;
+using nuPickers.EmbeddedResource;
+using nuPickers.Shared.DataSource;
+using nuPickers.Shared.EnumDataSource;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Web.Runtime;
+
+namespace nuPickers
+{
+    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
+    [ComposeAfter(typeof(WebFinalComposer))]
+    public class nuPickerComposer :  IComposer
+    {
+        public void Compose(Composition composition)
+        {
+            composition.Register(factory => new EmbeddedResourceController());
+            composition.Components().Append<EmbeddedResourceCompontent>();
+            composition.Register<CacheInvalidationComponent>(
+                Lifetime.Singleton);
+
+            composition.Register<RelationMappingComponent>(Lifetime.Singleton);
+            composition.Register(typeof(DataSourceApiController), Lifetime.Request);
+            composition.Register(typeof(EnumDataSourceApiController), Lifetime.Request);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/nuPickers/nuPickers.csproj b/source/nuPickers/nuPickers.csproj
index 45d946f..fe05688 100644
--- a/source/nuPickers/nuPickers.csproj
+++ b/source/nuPickers/nuPickers.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nuPickers</RootNamespace>
     <AssemblyName>uComponents.nuPickers</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -38,187 +38,326 @@
     <Reference Include="AutoMapper.Net4">
       <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
     </Reference>
-    <Reference Include="businesslogic, Version=1.0.5556.26331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\businesslogic.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+    </Reference>
+    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474">
+      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.2\lib\net452\Examine.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="cms, Version=1.0.5556.26331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\cms.dll</HintPath>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="controls, Version=1.0.5556.26333, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\controls.dll</HintPath>
+    <Reference Include="ImageProcessor.Web, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CookComputing.XmlRpcV2">
-      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Examine, Version=0.1.60.2941, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
+    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll</HintPath>
+    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89">
+      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="interfaces, Version=1.0.5556.26329, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\interfaces.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\log4net.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Lucene.Net">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3">
+      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MiniProfiler">
-      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3">
+      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
+      <Private>True</Private>
     </Reference>
+    <Reference Include="mscorlib" />
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SQLCE4Umbraco, Version=1.0.5556.26332, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\SQLCE4Umbraco.dll</HintPath>
+    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\System.Data.SqlServerCe.dll</HintPath>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
       <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\TidyNet.dll</HintPath>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco, Version=1.0.5556.26334, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.dll</HintPath>
+    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7">
+      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Umbraco.Core, Version=1.0.5556.26329, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\Umbraco.Core.dll</HintPath>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.DataLayer, Version=1.0.5556.26331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.DataLayer.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.editorControls, Version=1.0.5556.26335, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.editorControls.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.MacroEngines, Version=1.0.5556.26336, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.MacroEngines.dll</HintPath>
+    <Reference Include="System.IO" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="umbraco.providers, Version=1.0.5556.26333, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\umbraco.providers.dll</HintPath>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=1.0.5556.26336, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\Umbraco.Web.UI.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="UmbracoExamine, Version=0.7.0.26332, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\UmbracoExamine.dll</HintPath>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.2.3\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.8.6.1\lib\net472\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.ModelsBuilder.Embedded, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Caching\Cache.cs" />
     <Compile Include="Caching\CacheConstants.cs" />
-    <Compile Include="Caching\CacheInvalidation.cs" />
+    <Compile Include="Components\CacheInvalidationComponent.cs" />
+    <Compile Include="Components\EmbeddedResourceCompontent.cs" />
+    <Compile Include="Components\nuPickerCompontent.cs" />
+    <Compile Include="Components\RelationMappingComponent.cs" />
+    <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetRadioButtonPicker\DotnetRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetTypeaheadListPicker\DotNetTypeaheadPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonRadioButtonPicker\JsonRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LucenePrefetchListPicker\LucenePrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerDataEditor.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\RelationLabels\RelationLabelsDataEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlCheckBoxPicker\SqlCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\SqlLabels\SqlLabelsDateEditor.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlPagedListPicker\SqlPagedListPickerEditorEditor.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlPrefetchListPicker\SqlPrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlRadioButtonPicker\SqlRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerDataEditor.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResource.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceController.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceHelper.cs" />
-    <Compile Include="EmbeddedResource\EmbeddedResourceStartup.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceVirtualFile.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceVirtualFileProvider.cs" />
     <Compile Include="EmbeddedResource\EmbeddedResourceVirtualFileWriter.cs" />
@@ -226,83 +365,79 @@
     <Compile Include="Extensions\IPublishedContentExtensions.cs" />
     <Compile Include="Extensions\UmbracoHelperExtensions.cs" />
     <Compile Include="Helper.cs" />
+    <Compile Include="nuPickerComposer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyEditors\BasePropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetDropDownPicker\DotNetDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotNetLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetLabels\DotLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPagedListPicker\DotNetPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetRadioButtonPicker\DotNetRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\DotNetTypeaheadListPicker\DotNetTypeaheadListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumLabels\EnumLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonLabels\JsonLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPagedListPicker\JsonPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonTypeaheadListPicker\JsonTypeaheadPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonRadioButtonPicker\JsonRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonPrefetchListPicker\JsonPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonDropDownPicker\JsonDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\JsonCheckBoxPicker\JsonCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumCheckBoxPicker\EnumCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumDropDownPicker\EnumDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumPrefetchListPicker\EnumPrefetchListPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\EnumRadioButtonPicker\EnumRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneCheckBoxPicker\LuceneCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneDropDownPicker\LuceneDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneLabels\LuceneLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePagedListPicker\LucenePagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LucenePrefetchListPicker\LucenePrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneRadioButtonPicker\LuceneRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\LuceneTypeaheadPicker\LuceneTypeaheadPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorConstants.cs" />
-    <Compile Include="PropertyEditors\SqlLabels\SqlLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlLabels\SqlLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPagedListPicker\SqlPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPagedListPicker\SqlPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlTypeaheadListPicker\SqlTypeaheadListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlLabels\XmlLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlLabels\XmlLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPagedListPicker\XmlPagedListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPagedListPicker\XmlPagedListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlTypeaheadListPicker\XmlTypeaheadListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlTypeaheadListPicker\XmlTypeaheadListPickerPropertyEditor.cs" />
+    <Compile Include="DataEditors\BaseDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetCheckBoxPicker\DotNetCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetDropDownPicker\DotNetDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetDropDownPicker\DotNetDropDownPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetDropDownPicker\DotNetDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetLabels\DotNetLabelsDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetLabels\DotNetLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetLabels\DotNetLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetPagedListPicker\DotNetPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DotNetPrefetchListPicker\DotNetPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\EnumCheckBoxPicker\EnumCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumDropDownPicker\EnumDropDownPickerDataEditor.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\EnumLabels\EnumLabelsDataEditor.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumPrefetchListPicker\EnumPrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerConfiguration.cs" />
+    <Compile Include="DataEditors\EnumRadioButtonPicker\EnumRadioButtonPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonCheckBoxPicker\JsonCheckBoxPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonDropDownPicker\JsonDropDownPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\JsonLabels\JsonLabelsDataEditor.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonPagedListPicker\JsonPagedListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\JsonPrefetchListPicker\JsonPrefetchListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneDropDownPicker\LuceneDropDownPickerDataEditor.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsConfiguration.cs" />
+    <Compile Include="DataEditors\LuceneLabels\LuceneLabelsDataEditor.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerConfiguration.cs" />
+    <Compile Include="DataEditors\LucenePagedListPicker\LucenePagedListPickerDataEditor.cs" />
+    <Compile Include="DataEditors\DataEditorConstants.cs" />
     <Compile Include="Picker.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="PickerPropertyValueConverter.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerConfigurationEditor.cs" />
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerConfiguration.cs" />
+    <Compile Include="DataEditors\SqlDropDownPicker\SqlDropDownPickerDataEditor.cs" />
+    <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
+    <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
     <Compile Include="Shared\DataSource\DataSource.cs" />
+    <Compile Include="Shared\DataSource\DataSourceApiController.cs" />
     <Compile Include="Shared\DataSource\DataSourceApiResponse.cs" />
     <Compile Include="Shared\DataSource\IDataSource.cs" />
-    <Compile Include="Shared\DataSource\DataSourceApiController.cs" />
     <Compile Include="Shared\DotNetDataSource\DotNetDataSource.cs" />
     <Compile Include="Shared\DotNetDataSource\DotNetDataSourceApiController.cs" />
     <Compile Include="Shared\DotNetDataSource\DotNetDataSourceAttribute.cs" />
@@ -312,6 +447,7 @@
     <Compile Include="Shared\DotNetDataSource\IDotNetDataSourcePaged.cs" />
     <Compile Include="Shared\DotNetDataSource\IDotNetDataSourceTypeahead.cs" />
     <Compile Include="Shared\Editor\Editor.cs" />
+    <Compile Include="Shared\Editor\EditorDataItem.cs" />
     <Compile Include="Shared\EnumDataSource\EnumExtensions.cs" />
     <Compile Include="Shared\JsonDataSource\JsonDataSource.cs" />
     <Compile Include="Shared\LuceneDataSource\LuceneDataSource.cs" />
@@ -321,40 +457,17 @@
     <Compile Include="Shared\RelationDataSource\RelationDataSourceApiController.cs" />
     <Compile Include="Shared\RelationMapping\RelationMapping.cs" />
     <Compile Include="Shared\RelationMapping\RelationMappingComment.cs" />
-    <Compile Include="Shared\RelationMapping\RelationMappingEvent.cs" />
     <Compile Include="Shared\SaveFormat\SaveFormatPropertyValueEditor.cs" />
-    <Compile Include="PropertyEditors\RelationLabels\RelationLabelsPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\RelationLabels\RelationLabelsPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlCheckBoxPicker\SqlCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlDropDownPicker\SqlDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlPrefetchListPicker\SqlPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\SqlRadioButtonPicker\SqlRadioButtonPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlCheckBoxPicker\XmlCheckBoxPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlCheckBoxPicker\XmlCheckBoxPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlDropDownPicker\XmlDropDownPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlDropDownPicker\XmlDropDownPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPrefetchListPicker\XmlPrefetchListPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlPrefetchListPicker\XmlPrefetchListPickerPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\XmlRadioButtonPicker\XmlRadioButtonPickerPreValueEditor.cs" />
-    <Compile Include="PropertyEditors\XmlRadioButtonPicker\XmlRadioButtonPickerPropertyEditor.cs" />
     <Compile Include="Shared\EnumDataSource\EnumDataSource.cs" />
     <Compile Include="Shared\EnumDataSource\EnumDataSourceApiController.cs" />
     <Compile Include="Shared\EnumDataSource\EnumDataSourceAttribute.cs" />
-    <Compile Include="Shared\Editor\EditorDataItem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Shared\CustomLabel\CustomLabel.cs" />
-    <Compile Include="Shared\CustomLabel\CustomLabelApiController.cs" />
     <Compile Include="Shared\RelationMapping\RelationMappingApiController.cs" />
     <Compile Include="Shared\SaveFormat\SaveFormat.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSource.cs" />
     <Compile Include="Shared\SqlDataSource\SqlDataSourceApiController.cs" />
     <Compile Include="Shared\TypeaheadListPicker\TypeaheadListPicker.cs" />
-    <Compile Include="Shared\XmlDataSource\XmlDataSource.cs" />
+    <Compile Include="Validators\RegexValidator.cs" />
+    <Compile Include="Validators\RequiredValidator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -364,13 +477,10 @@
     <EmbeddedResource Include="Shared\SaveFormat\SaveFormatConfigController.js" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.html" />
     <EmbeddedResource Include="Shared\PrefetchListPicker\PrefetchListPickerConfig.html" />
     <EmbeddedResource Include="Shared\ListPicker\ListPickerEditor.css" />
     <EmbeddedResource Include="Shared\PrefetchListPicker\PrefetchListPickerEditor.html" />
     <EmbeddedResource Include="Shared\PrefetchListPicker\PrefetchListPickerEditorController.js" />
-    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfig.html" />
-    <EmbeddedResource Include="Shared\XmlDataSource\XmlDataSourceConfigController.js" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\HiddenConstant\HiddenConstantConfig.html" />
@@ -379,13 +489,6 @@
     <EmbeddedResource Include="Shared\DropDownPicker\DropDownPickerEditor.html" />
     <EmbeddedResource Include="Shared\DropDownPicker\DropDownPickerEditorController.js" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfig.html" />
-    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfigController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditorController.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\SqlDataSource\SqlDataSourceConfig.html" />
     <EmbeddedResource Include="Shared\SqlDataSource\SqlDataSourceConfigController.js" />
@@ -423,24 +526,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Shared\PropertyEditor\PropertyEditorConfig.css" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfig.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfigController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\DataSource\DataSourceResource.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\ListPicker\ListPickerEditorDirectives.js" />
   </ItemGroup>
@@ -453,15 +538,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Shared\ListPicker\ListPickerSelectedPartial.html" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerConfig.html" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\RelationMapping\RelationMappingResource.js" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\Editor\EditorResource.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\JsonDataSource\JsonDataSourceConfig.html" />
   </ItemGroup>
@@ -472,16 +551,6 @@
     <EmbeddedResource Include="Shared\LuceneDataSource\LuceneDataSourceConfig.html" />
     <EmbeddedResource Include="Shared\LuceneDataSource\LuceneDataSourceConfigController.js" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfig.html" />
-    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfigController.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerConfig.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.css" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Shared\Labels\LabelsConfigController.js" />
   </ItemGroup>
@@ -499,6 +568,24 @@
   <ItemGroup>
     <EmbeddedResource Include="Shared\PagedListPicker\PagedListPickerEditor.css" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerConfig.html" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.css" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditor.html" />
+    <EmbeddedResource Include="Shared\CheckBoxPicker\CheckBoxPickerEditorController.js" />
+    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfig.html" />
+    <EmbeddedResource Include="Shared\CustomLabel\CustomLabelConfigController.js" />
+    <EmbeddedResource Include="Shared\DataSource\DataSourceResource.js" />
+    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfig.html" />
+    <EmbeddedResource Include="Shared\DotNetDataSource\DotNetDataSourceConfigController.js" />
+    <EmbeddedResource Include="Shared\Editor\EditorResource.js" />
+    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfig.html" />
+    <EmbeddedResource Include="Shared\RelationDataSource\RelationDataSourceConfigController.js" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerConfig.html" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditor.html" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorController.js" />
+    <EmbeddedResource Include="Shared\TypeaheadListPicker\TypeaheadListPickerEditorDirectives.js" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
@@ -510,7 +597,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
   </Target>
+  <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/nuPickers/packages.config b/source/nuPickers/packages.config
index ca92a2c..7c9c87b 100644
--- a/source/nuPickers/packages.config
+++ b/source/nuPickers/packages.config
@@ -1,26 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.60.2941" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.5.0" targetFramework="net45" />
+  <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
+  <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
+  <package id="Examine" version="1.0.2" targetFramework="net472" />
+  <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="LightInject" version="5.4.0" targetFramework="net472" />
+  <package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
+  <package id="LightInject.Mvc" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.WebApi" version="2.0.0" targetFramework="net472" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
+  <package id="Markdown" version="2.2.1" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0-beta1" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net472" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="4.0.138" targetFramework="net472" />
+  <package id="MiniProfiler.Shared" version="4.0.138" targetFramework="net472" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
+  <package id="NPoco" version="3.9.4" targetFramework="net472" />
+  <package id="Owin" version="1.0" targetFramework="net472" />
+  <package id="Semver" version="2.0.4" targetFramework="net472" />
+  <package id="Serilog" version="2.8.0" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net472" />
+  <package id="Serilog.Filters.Expressions" version="2.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
+  <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.2.3" targetFramework="net45" />
+  <package id="Superpower" version="2.0.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.6.1" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.6.1" targetFramework="net472" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
\ No newline at end of file