Index: Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.Theme;
 
 namespace Core.Components.Gis.Data
 {
@@ -91,11 +90,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the map theme of the <see cref="FeatureBasedMapData"/>.
-        /// </summary>
-        public MapTheme MapTheme { get; set; }
-
-        /// <summary>
         /// This method validates newly set features.
         /// </summary>
         /// <param name="featuresToValidate">The new features to validate.</param>
Index: Core/Components/src/Core.Components.Gis/Data/MapLineData.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/src/Core.Components.Gis/Data/MapLineData.cs	(.../MapLineData.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/src/Core.Components.Gis/Data/MapLineData.cs	(.../MapLineData.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -25,6 +25,7 @@
 using System.Linq;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Style;
+using Core.Components.Gis.Theme;
 
 namespace Core.Components.Gis.Data
 {
@@ -66,6 +67,11 @@
         public LineStyle Style { get; }
 
         /// <summary>
+        /// Gets or sets the map theme of the <see cref="MapLineData"/>.
+        /// </summary>
+        public MapTheme<LineCategoryTheme> Theme { get; set; }
+
+        /// <summary>
         /// This method validates newly set features.
         /// </summary>
         /// <param name="featuresToValidate">The new features to validate.</param>
Index: Core/Components/src/Core.Components.Gis/Data/MapPointData.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/src/Core.Components.Gis/Data/MapPointData.cs	(.../MapPointData.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/src/Core.Components.Gis/Data/MapPointData.cs	(.../MapPointData.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -25,6 +25,7 @@
 using System.Linq;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Style;
+using Core.Components.Gis.Theme;
 
 namespace Core.Components.Gis.Data
 {
@@ -66,6 +67,11 @@
         public PointStyle Style { get; }
 
         /// <summary>
+        /// Gets or sets the map theme of the <see cref="MapPointData"/>.
+        /// </summary>
+        public MapTheme<PointCategoryTheme> Theme { get; set; }
+
+        /// <summary>
         /// This method validates newly set features.
         /// </summary>
         /// <param name="featuresToValidate">The new features to validate.</param>
Index: Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs	(.../MapPolygonData.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs	(.../MapPolygonData.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -25,6 +25,7 @@
 using System.Linq;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Style;
+using Core.Components.Gis.Theme;
 
 namespace Core.Components.Gis.Data
 {
@@ -66,6 +67,11 @@
         public PolygonStyle Style { get; }
 
         /// <summary>
+        /// Gets or sets the map theme of the <see cref="MapPolygonData"/>.
+        /// </summary>
+        public MapTheme<PolygonCategoryTheme> Theme { get; set; }
+
+        /// <summary>
         /// This method validates newly set features.
         /// </summary>
         /// <param name="featuresToValidate">The new features to validate.</param>
Index: Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -48,7 +48,6 @@
             Assert.IsFalse(data.ShowLabels);
             Assert.IsNull(data.SelectedMetaDataAttribute);
             CollectionAssert.IsEmpty(data.MetaData);
-            Assert.IsNull(data.MapTheme);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs	(.../MapLineDataTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs	(.../MapLineDataTest.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -39,16 +39,20 @@
         [Test]
         public void Constructor_ValidName_NameAndDefaultValuesSet()
         {
+            // Setup
+            const string name = "test data";
+
             // Call
-            var data = new MapLineData("test data");
+            var data = new MapLineData(name);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreEqual(Color.Black, data.Style.Color);
             Assert.AreEqual(2, data.Style.Width);
             Assert.AreEqual(LineDashStyle.Solid, data.Style.DashStyle);
+            Assert.IsNull(data.Theme);
         }
 
         [Test]
@@ -93,6 +97,7 @@
         public void Constructor_WithStyle_ExpectedValues()
         {
             // Setup
+            const string name = "test data";
             var style = new LineStyle
             {
                 Color = Color.Red,
@@ -104,10 +109,11 @@
             var data = new MapLineData("test data", style);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreSame(style, data.Style);
+            Assert.IsNull(data.Theme);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -39,18 +39,22 @@
         [Test]
         public void Constructor_ValidName_NameAndDefaultValuesSet()
         {
+            // Setup
+            const string name = "test data";
+
             // Call
-            var data = new MapPointData("test data");
+            var data = new MapPointData(name);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreEqual(Color.Black, data.Style.Color);
             Assert.AreEqual(2, data.Style.Size);
             Assert.AreEqual(PointSymbol.Square, data.Style.Symbol);
             Assert.AreEqual(Color.Black, data.Style.StrokeColor);
             Assert.AreEqual(1, data.Style.StrokeThickness);
+            Assert.IsNull(data.Theme);
         }
 
         [Test]
@@ -95,6 +99,7 @@
         public void Constructor_WithStyle_ExpectedValues()
         {
             // Setup
+            const string name = "test data";
             Color color = Color.Aqua;
             var style = new PointStyle
             {
@@ -106,13 +111,14 @@
             };
 
             // Call
-            var data = new MapPointData("test data", style);
+            var data = new MapPointData(name, style);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreSame(style, data.Style);
+            Assert.IsNull(data.Theme);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -39,16 +39,20 @@
         [Test]
         public void Constructor_ValidName_NameAndDefaultValuesSet()
         {
+            // Setup
+            const string name = "test data";
+
             // Call
-            var data = new MapPolygonData("test data");
+            var data = new MapPolygonData(name);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreEqual(Color.DarkGray, data.Style.FillColor);
             Assert.AreEqual(Color.Black, data.Style.StrokeColor);
             Assert.AreEqual(2, data.Style.StrokeThickness);
+            Assert.IsNull(data.Theme);
         }
 
         [Test]
@@ -93,6 +97,7 @@
         public void Constructor_WithStyle_ExpectedValues()
         {
             // Setup
+            const string name = "test data";
             var style = new PolygonStyle
             {
                 FillColor = Color.Aqua,
@@ -101,10 +106,10 @@
             };
 
             // Call
-            var data = new MapPolygonData("test data", style);
+            var data = new MapPolygonData(name, style);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsInstanceOf<FeatureBasedMapData>(data);
             Assert.AreSame(style, data.Style);
Index: Core/Components/test/Core.Components.Gis.Test/TestFeatureBasedMapDataTest.cs
===================================================================
diff -u -r69f8f5c6e3512481ee994af065d6b9d60af2bd71 -rabc02e9330166ed14bdbbb095424ffc9e79a11b8
--- Core/Components/test/Core.Components.Gis.Test/TestFeatureBasedMapDataTest.cs	(.../TestFeatureBasedMapDataTest.cs)	(revision 69f8f5c6e3512481ee994af065d6b9d60af2bd71)
+++ Core/Components/test/Core.Components.Gis.Test/TestFeatureBasedMapDataTest.cs	(.../TestFeatureBasedMapDataTest.cs)	(revision abc02e9330166ed14bdbbb095424ffc9e79a11b8)
@@ -45,7 +45,6 @@
             CollectionAssert.IsEmpty(mapData.MetaData);
             Assert.IsNull(mapData.SelectedMetaDataAttribute);
             Assert.IsFalse(mapData.ShowLabels);
-            Assert.IsNull(mapData.MapTheme);
         }
 
         [Test]
@@ -62,7 +61,6 @@
             CollectionAssert.IsEmpty(mapData.MetaData);
             Assert.IsNull(mapData.SelectedMetaDataAttribute);
             Assert.IsFalse(mapData.ShowLabels);
-            Assert.IsNull(mapData.MapTheme);
         }
     }
 }
\ No newline at end of file