Index: Core/Gui/src/Core.Gui/Core.Gui.csproj
===================================================================
diff -u -ra91b94077e89808e1b4cb489c431e2493a793111 -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision a91b94077e89808e1b4cb489c431e2493a793111)
+++ Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -1,5 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <Import Project="$(SolutionDir)build\Source.targets" />
+  <PropertyGroup>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <EnableDefaultPageItems>false</EnableDefaultPageItems>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
Index: Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartAreaDataProperties.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartAreaDataProperties.cs	(.../ChartAreaDataProperties.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartAreaDataProperties.cs	(.../ChartAreaDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -27,7 +27,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Chart
 {
@@ -49,7 +49,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_FillColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color FillColor
         {
@@ -69,7 +69,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartLineDataProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartLineDataProperties.cs	(.../ChartLineDataProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartLineDataProperties.cs	(.../ChartLineDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -29,7 +29,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Chart
 {
@@ -51,7 +51,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartLineData_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartMultipleAreaDataProperties.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartMultipleAreaDataProperties.cs	(.../ChartMultipleAreaDataProperties.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartMultipleAreaDataProperties.cs	(.../ChartMultipleAreaDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -27,7 +27,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Chart
 {
@@ -69,7 +69,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartMultipleLineDataProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartMultipleLineDataProperties.cs	(.../ChartMultipleLineDataProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartMultipleLineDataProperties.cs	(.../ChartMultipleLineDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -29,7 +29,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Chart
 {
@@ -51,7 +51,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartLineData_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartPointDataProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartPointDataProperties.cs	(.../ChartPointDataProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Chart/ChartPointDataProperties.cs	(.../ChartPointDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -29,7 +29,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Chart
 {
@@ -51,7 +51,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartPointData_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
@@ -71,7 +71,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartPointData_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Map/LineCategoryThemeProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Map/LineCategoryThemeProperties.cs	(.../LineCategoryThemeProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Map/LineCategoryThemeProperties.cs	(.../LineCategoryThemeProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -31,7 +31,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Map
 {
@@ -55,7 +55,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.LineCategoryTheme_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Map/MapLineDataProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Map/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Map/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -33,7 +33,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Map
 {
@@ -75,7 +75,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapLineData_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Map/MapPointDataProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Map/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Map/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -33,7 +33,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Map
 {
@@ -75,7 +75,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
@@ -95,7 +95,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPointData_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Map/MapPolygonDataProperties.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Map/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Map/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -31,7 +31,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Map
 {
@@ -73,7 +73,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_FillColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color FillColor
         {
@@ -93,7 +93,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Map/PointCategoryThemeProperties.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Map/PointCategoryThemeProperties.cs	(.../PointCategoryThemeProperties.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Map/PointCategoryThemeProperties.cs	(.../PointCategoryThemeProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -31,7 +31,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Map
 {
@@ -55,7 +55,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.PointCategoryTheme_Color_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color Color
         {
@@ -74,7 +74,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.PointCategoryTheme_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {
Index: Core/Gui/src/Core.Gui/PropertyClasses/Map/PolygonCategoryThemeProperties.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f
--- Core/Gui/src/Core.Gui/PropertyClasses/Map/PolygonCategoryThemeProperties.cs	(.../PolygonCategoryThemeProperties.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Core/Gui/src/Core.Gui/PropertyClasses/Map/PolygonCategoryThemeProperties.cs	(.../PolygonCategoryThemeProperties.cs)	(revision 9168d9fa2e8d4969c6622e3b3b3d965fac1fca9f)
@@ -29,7 +29,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.Converters;
 using Core.Gui.Properties;
-using Core.Gui.UITypeEditors;
+using CoreGUIColorEditor = Core.Gui.UITypeEditors.ColorEditor;
 
 namespace Core.Gui.PropertyClasses.Map
 {
@@ -53,7 +53,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.PolygonCategoryTheme_FillColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color FillColor
         {
@@ -72,7 +72,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.PolygonCategoryTheme_StrokeColor_Description))]
-        [Editor(typeof(ColorEditor), typeof(UITypeEditor))]
+        [Editor(typeof(CoreGUIColorEditor), typeof(UITypeEditor))]
         [TypeConverter(typeof(ColorTypeConverter))]
         public Color StrokeColor
         {