Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs
===================================================================
diff -u -r7b668a4bcdebad4df255dd80606334480d8d73de -r221d02db0c4b0c3a9cb21433f277a37fbf827537
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision 7b668a4bcdebad4df255dd80606334480d8d73de)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision 221d02db0c4b0c3a9cb21433f277a37fbf827537)
@@ -81,7 +81,7 @@
         }
 
         [PropertyOrder(9)]
-        [DynamicReadOnly]
+        [DynamicVisible]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeThickness_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapLineData_Width_Description))]
@@ -99,7 +99,7 @@
         }
 
         [PropertyOrder(10)]
-        [DynamicReadOnly]
+        [DynamicVisible]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapLineData_DashStyle_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapLineData_DashStyle_Description))]
@@ -134,11 +134,19 @@
 
         public override bool DynamicVisibleValidationMethod(string propertyName)
         {
-            if (propertyName == nameof(Color))
+            if (propertyName == nameof(Color) 
+                || propertyName == nameof(Width)
+                || propertyName == nameof(DashStyle)
+            )
             {
                 return data.Theme == null;
             }
 
+            if (propertyName == nameof(CategoryThemes))
+            {
+                return data.Theme != null;
+            }
+
             return base.DynamicVisibleValidationMethod(propertyName);
         }
 
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs
===================================================================
diff -u -r228426bd8eea729b2c21744e7b6e96d0d9007946 -r221d02db0c4b0c3a9cb21433f277a37fbf827537
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 228426bd8eea729b2c21744e7b6e96d0d9007946)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 221d02db0c4b0c3a9cb21433f277a37fbf827537)
@@ -155,6 +155,10 @@
             }
         }
 
+        [PropertyOrder(13)]
+        [DynamicVisible]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Categories_DisplayName))]
         public PointCategoryThemeProperties[] CategoryThemes
         {
             get
@@ -168,11 +172,20 @@
 
         public override bool DynamicVisibleValidationMethod(string propertyName)
         {
-            if (propertyName == nameof(Color))
+            if (propertyName == nameof(Color)
+                || propertyName == nameof(StrokeColor)
+                || propertyName == nameof(StrokeThickness)
+                || propertyName == nameof(Size)
+                || propertyName == nameof(Symbol))
             {
                 return data.Theme == null;
             }
 
+            if (propertyName == nameof(CategoryThemes))
+            {
+                return data.Theme != null;
+            }
+
             return base.DynamicVisibleValidationMethod(propertyName);
         }
     }
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs
===================================================================
diff -u -r106dbc4f4cdf7eff317b52cb99ef3159148bcae0 -r221d02db0c4b0c3a9cb21433f277a37fbf827537
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 106dbc4f4cdf7eff317b52cb99ef3159148bcae0)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 221d02db0c4b0c3a9cb21433f277a37fbf827537)
@@ -79,7 +79,7 @@
         }
 
         [PropertyOrder(9)]
-        [DynamicReadOnly]
+        [DynamicVisible]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeColor_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_StrokeColor_Description))]
@@ -99,7 +99,7 @@
         }
 
         [PropertyOrder(10)]
-        [DynamicReadOnly]
+        [DynamicVisible]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_StrokeThickness_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.MapPolygonData_StrokeThickness_Description))]
@@ -116,6 +116,10 @@
             }
         }
 
+        [PropertyOrder(11)]
+        [DynamicVisible]
+        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Categories_DisplayName))]
         public PolygonCategoryThemeProperties[] CategoryThemes
         {
             get
@@ -127,13 +131,22 @@
             }
         }
 
+
         public override bool DynamicVisibleValidationMethod(string propertyName)
         {
-            if (propertyName == nameof(FillColor))
+            if (propertyName == nameof(FillColor)
+                || propertyName == nameof(StrokeColor)
+                || propertyName == nameof(StrokeThickness)
+            )
             {
                 return data.Theme == null;
             }
 
+            if (propertyName == nameof(CategoryThemes))
+            {
+                return data.Theme != null;
+            }
+
             return base.DynamicVisibleValidationMethod(propertyName);
         }