Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs
===================================================================
diff -u -rf4f76df643ef6040fa783c726df91fa277b84778 -rf7561a643a1fcf1760116b1bc93055e26f11aa8b
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs	(.../MapLineDataPropertiesTest.cs)	(revision f4f76df643ef6040fa783c726df91fa277b84778)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapLineDataPropertiesTest.cs	(.../MapLineDataPropertiesTest.cs)	(revision f7561a643a1fcf1760116b1bc93055e26f11aa8b)
@@ -113,10 +113,9 @@
         public void Constructor_MapLineDataWithMapTheme_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var mapLineData = new MapLineData("Test")
+            var mapLineData = new MapLineData("Test", new LineStyle(), CreateMapTheme())
             {
-                ShowLabels = true,
-                Theme = CreateMapTheme()
+                ShowLabels = true
             };
 
             // Call
@@ -173,13 +172,12 @@
             // Setup
             const string attributeName = "Attribute";
             var categoryTheme = new LineCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new LineStyle());
-            var mapLineData = new MapLineData("Test", new LineStyle())
-            {
-                Theme = new MapTheme<LineCategoryTheme>(attributeName, new[]
-                {
-                    categoryTheme
-                })
-            };
+            var mapLineData = new MapLineData("Test",
+                                              new LineStyle(),
+                                              new MapTheme<LineCategoryTheme>(attributeName, new[]
+                                              {
+                                                  categoryTheme
+                                              }));
 
             // Call
             var properties = new MapLineDataProperties(mapLineData, Enumerable.Empty<MapDataCollection>());
@@ -210,13 +208,12 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var mapLineData = new MapLineData("Test", new LineStyle())
-            {
-                Theme = new MapTheme<LineCategoryTheme>("Attribute", new[]
-                {
-                    new LineCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new LineStyle())
-                })
-            };
+            var mapLineData = new MapLineData("Test",
+                                              new LineStyle(),
+                                              new MapTheme<LineCategoryTheme>("Attribute", new[]
+                                              {
+                                                  new LineCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new LineStyle())
+                                              }));
             mapLineData.Attach(observer);
 
             var properties = new MapLineDataProperties(mapLineData, Enumerable.Empty<MapDataCollection>());
@@ -326,12 +323,10 @@
         public void DynamicVisibleValidationMethod_MapLineDataWithMapTheme_ReturnsExpectedValuesForRelevantProperties(bool hasMapTheme)
         {
             // Setup
-            var mapLineData = new MapLineData("Test")
-            {
-                Theme = hasMapTheme
-                            ? CreateMapTheme()
-                            : null
-            };
+            MapTheme<LineCategoryTheme> mapTheme = hasMapTheme
+                               ? CreateMapTheme()
+                               : null;
+            var mapLineData = new MapLineData("Test", new LineStyle(), mapTheme);
 
             var properties = new MapLineDataProperties(mapLineData, Enumerable.Empty<MapDataCollection>());
 
@@ -355,14 +350,14 @@
         [Test]
         public void DynamicVisibleValidationMethod_AnyOtherProperty_ReturnsTrue()
         {
-            var mapLineData = new MapLineData("Test")
+            // Setup
+            var mapLineData = new MapLineData("Test", new LineStyle(), CreateMapTheme())
             {
                 Features = new[]
                 {
                     new MapFeature(Enumerable.Empty<MapGeometry>())
                 },
-                ShowLabels = true,
-                Theme = CreateMapTheme()
+                ShowLabels = true
             };
 
             var properties = new MapLineDataProperties(mapLineData, Enumerable.Empty<MapDataCollection>());
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs
===================================================================
diff -u -rf4f76df643ef6040fa783c726df91fa277b84778 -rf7561a643a1fcf1760116b1bc93055e26f11aa8b
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs	(.../MapPointDataPropertiesTest.cs)	(revision f4f76df643ef6040fa783c726df91fa277b84778)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPointDataPropertiesTest.cs	(.../MapPointDataPropertiesTest.cs)	(revision f7561a643a1fcf1760116b1bc93055e26f11aa8b)
@@ -132,14 +132,13 @@
         public void Constructor_MapPointDataWithMapTheme_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var mapPointData = new MapPointData("Test")
+            var mapPointData = new MapPointData("Test", new PointStyle(), CreateMapTheme())
             {
                 Features = new[]
                 {
                     new MapFeature(Enumerable.Empty<MapGeometry>())
                 },
-                ShowLabels = true,
-                Theme = CreateMapTheme()
+                ShowLabels = true
             };
 
             // Call
@@ -200,13 +199,12 @@
             // Setup
             const string attributeName = "Attribute";
             var categoryTheme = new PointCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new PointStyle());
-            var mapPointData = new MapPointData("Test", new PointStyle())
-            {
-                Theme = new MapTheme<PointCategoryTheme>(attributeName, new[]
-                {
-                    categoryTheme
-                })
-            };
+            var mapPointData = new MapPointData("Test",
+                                                new PointStyle(),
+                                                new MapTheme<PointCategoryTheme>(attributeName, new[]
+                                                {
+                                                    categoryTheme
+                                                }));
 
             // Call
             var properties = new MapPointDataProperties(mapPointData, Enumerable.Empty<MapDataCollection>());
@@ -237,13 +235,12 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var mapPointData = new MapPointData("Test", new PointStyle())
-            {
-                Theme = new MapTheme<PointCategoryTheme>("Attribute", new[]
-                {
-                    new PointCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new PointStyle())
-                })
-            };
+            var mapPointData = new MapPointData("Test",
+                                                new PointStyle(),
+                                                new MapTheme<PointCategoryTheme>("Attribute", new[]
+                                                {
+                                                    new PointCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new PointStyle())
+                                                }));
             mapPointData.Attach(observer);
 
             var properties = new MapPointDataProperties(mapPointData, Enumerable.Empty<MapDataCollection>());
@@ -362,12 +359,10 @@
         public void DynamicVisibleValidationMethod_MapPointDataWithMapTheme_ReturnsExpectedValuesForRelevantProperties(bool hasMapTheme)
         {
             // Setup
-            var mapPointData = new MapPointData("Test")
-            {
-                Theme = hasMapTheme
-                            ? CreateMapTheme()
-                            : null
-            };
+            MapTheme<PointCategoryTheme> mapTheme = hasMapTheme
+                                                        ? CreateMapTheme()
+                                                        : null;
+            var mapPointData = new MapPointData("Test", new PointStyle(), mapTheme);
 
             var properties = new MapPointDataProperties(mapPointData, Enumerable.Empty<MapDataCollection>());
 
@@ -397,14 +392,14 @@
         [Test]
         public void DynamicVisibleValidationMethod_AnyOtherProperty_ReturnsTrue()
         {
-            var mapPointData = new MapPointData("Test")
+            // Setup
+            var mapPointData = new MapPointData("Test", new PointStyle(), CreateMapTheme())
             {
                 Features = new[]
                 {
                     new MapFeature(Enumerable.Empty<MapGeometry>())
                 },
-                ShowLabels = true,
-                Theme = CreateMapTheme()
+                ShowLabels = true
             };
 
             var properties = new MapPointDataProperties(mapPointData, Enumerable.Empty<MapDataCollection>());
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs
===================================================================
diff -u -rf4f76df643ef6040fa783c726df91fa277b84778 -rf7561a643a1fcf1760116b1bc93055e26f11aa8b
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs	(.../MapPolygonDataPropertiesTest.cs)	(revision f4f76df643ef6040fa783c726df91fa277b84778)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapPolygonDataPropertiesTest.cs	(.../MapPolygonDataPropertiesTest.cs)	(revision f7561a643a1fcf1760116b1bc93055e26f11aa8b)
@@ -116,14 +116,13 @@
         public void Constructor_MapPolygonDataWithMapTheme_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var mapPolygonData = new MapPolygonData("Test")
+            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle(), CreateMapTheme())
             {
                 Features = new[]
                 {
                     new MapFeature(Enumerable.Empty<MapGeometry>())
                 },
-                ShowLabels = true,
-                Theme = CreateMapTheme()
+                ShowLabels = true
             };
 
             // Call
@@ -181,13 +180,12 @@
             const string attributeName = "Attribute";
             var categoryTheme = new PolygonCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(),
                                                          new PolygonStyle());
-            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle())
-            {
-                Theme = new MapTheme<PolygonCategoryTheme>(attributeName, new[]
-                {
-                    categoryTheme
-                })
-            };
+            var mapPolygonData = new MapPolygonData("Test",
+                                                    new PolygonStyle(),
+                                                    new MapTheme<PolygonCategoryTheme>(attributeName, new[]
+                                                    {
+                                                        categoryTheme
+                                                    }));
 
             // Call
             var properties = new MapPolygonDataProperties(mapPolygonData, Enumerable.Empty<MapDataCollection>());
@@ -218,13 +216,12 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle())
-            {
-                Theme = new MapTheme<PolygonCategoryTheme>("Attribute", new[]
-                {
-                    new PolygonCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new PolygonStyle())
-                })
-            };
+            var mapPolygonData = new MapPolygonData("Test",
+                                                    new PolygonStyle(),
+                                                    new MapTheme<PolygonCategoryTheme>("Attribute", new[]
+                                                    {
+                                                        new PolygonCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), new PolygonStyle())
+                                                    }));
             mapPolygonData.Attach(observer);
 
             var properties = new MapPolygonDataProperties(mapPolygonData, Enumerable.Empty<MapDataCollection>());
@@ -334,12 +331,10 @@
         public void DynamicVisibleValidationMethod_MapPolygonDataWithMapTheme_ReturnsExpectedValuesForRelevantProperties(bool hasMapTheme)
         {
             // Setup
-            var mapPolygonData = new MapPolygonData("Test")
-            {
-                Theme = hasMapTheme
-                            ? CreateMapTheme()
-                            : null
-            };
+            MapTheme<PolygonCategoryTheme> mapTheme = hasMapTheme
+                                                          ? CreateMapTheme()
+                                                          : null;
+            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle(), mapTheme);
 
             var properties = new MapPolygonDataProperties(mapPolygonData, Enumerable.Empty<MapDataCollection>());
 
@@ -363,14 +358,14 @@
         [Test]
         public void DynamicVisibleValidationMethod_AnyOtherProperty_ReturnsTrue()
         {
-            var mapPolygonData = new MapPolygonData("Test")
+            // Setup
+            var mapPolygonData = new MapPolygonData("Test", new PolygonStyle(), CreateMapTheme())
             {
                 Features = new[]
                 {
                     new MapFeature(Enumerable.Empty<MapGeometry>())
                 },
-                ShowLabels = true,
-                Theme = CreateMapTheme()
+                ShowLabels = true
             };
 
             var properties = new MapPolygonDataProperties(mapPolygonData, Enumerable.Empty<MapDataCollection>());