Index: Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs
===================================================================
diff -u -r16559315c0a64fffd05827d249200c62e353231f -r07c2c40e502eaac198c2cd661f16ef5f7be9da65
--- Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision 16559315c0a64fffd05827d249200c62e353231f)
+++ Core/Components/src/Core.Components.Gis/Data/FeatureBasedMapData.cs	(.../FeatureBasedMapData.cs)	(revision 07c2c40e502eaac198c2cd661f16ef5f7be9da65)
@@ -90,6 +90,11 @@
         }
 
         /// <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/test/Core.Components.DotSpatial.TestUtil.Test/TestFeatureBasedMapDataTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r07c2c40e502eaac198c2cd661f16ef5f7be9da65
--- Core/Components/test/Core.Components.DotSpatial.TestUtil.Test/TestFeatureBasedMapDataTest.cs	(.../TestFeatureBasedMapDataTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil.Test/TestFeatureBasedMapDataTest.cs	(.../TestFeatureBasedMapDataTest.cs)	(revision 07c2c40e502eaac198c2cd661f16ef5f7be9da65)
@@ -44,6 +44,7 @@
             CollectionAssert.IsEmpty(mapData.MetaData);
             Assert.IsNull(mapData.SelectedMetaDataAttribute);
             Assert.IsFalse(mapData.ShowLabels);
+            Assert.IsNull(mapData.MapTheme);
         }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs
===================================================================
diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r07c2c40e502eaac198c2cd661f16ef5f7be9da65
--- Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision fe90a6d174a01975381e6cda55ed1f7f4e831a51)
+++ Core/Components/test/Core.Components.Gis.Test/Data/FeatureBasedMapDataTest.cs	(.../FeatureBasedMapDataTest.cs)	(revision 07c2c40e502eaac198c2cd661f16ef5f7be9da65)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.TestUtil;
-using Core.Components.DotSpatial.TestUtil;
+using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
 using NUnit.Framework;
@@ -36,15 +36,19 @@
         [Test]
         public void Constructor_ValidName_NameAndDefaultValuesSet()
         {
+            // Setup
+            const string name = "test data";
+
             // Call
-            var data = new TestFeatureBasedMapData("test data");
+            var data = new TestFeatureBasedMapData(name);
 
             // Assert
-            Assert.AreEqual("test data", data.Name);
+            Assert.AreEqual(name, data.Name);
             CollectionAssert.IsEmpty(data.Features);
             Assert.IsFalse(data.ShowLabels);
             Assert.IsNull(data.SelectedMetaDataAttribute);
             CollectionAssert.IsEmpty(data.MetaData);
+            Assert.IsNull(data.MapTheme);
         }
 
         [Test]
@@ -143,5 +147,10 @@
                 "Attribute3"
             }, metaData);
         }
+
+        private class TestFeatureBasedMapData : FeatureBasedMapData
+        {
+            public TestFeatureBasedMapData(string name) : base(name) {}
+        }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapThemeTest.cs
===================================================================
diff -u -rf2504e0b8efa6ad3fb972647af872a1072ddc3c6 -r07c2c40e502eaac198c2cd661f16ef5f7be9da65
--- Core/Components/test/Core.Components.Gis.Test/Data/MapThemeTest.cs	(.../MapThemeTest.cs)	(revision f2504e0b8efa6ad3fb972647af872a1072ddc3c6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapThemeTest.cs	(.../MapThemeTest.cs)	(revision 07c2c40e502eaac198c2cd661f16ef5f7be9da65)
@@ -82,7 +82,7 @@
         }
 
         [Test]
-        public void Constructor_ValidArguments_ReturnsExpectedValues()
+        public void Constructor_ValidArguments_SetsExpectedValues()
         {
             // Setup
             var mocks = new MockRepository();