Index: Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj
===================================================================
diff -u -r8b125fe0ebdc0a3b6861dc25e2dd8314bcc5a395 -r0c45ab7d619015e9b177a38b37a01817dd4f2f25
--- Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision 8b125fe0ebdc0a3b6861dc25e2dd8314bcc5a395)
+++ Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -15,6 +15,9 @@
     <Compile Include="Data\MapDataCollectionVisibility.cs" />
     <Compile Include="Helpers\MapDataCollectionHelper.cs" />
     <Compile Include="Theme\CategoryTheme.cs" />
+    <Compile Include="Theme\LineCategoryTheme.cs" />
+    <Compile Include="Theme\PointCategoryTheme.cs" />
+    <Compile Include="Theme\PolygonCategoryTheme.cs" />
     <Compile Include="Theme\ValueCriterion.cs" />
     <Compile Include="Theme\ValueCriterionOperator.cs" />
     <Compile Include="Theme\MapTheme.cs" />
Index: Core/Components/src/Core.Components.Gis/Theme/LineCategoryTheme.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis/Theme/LineCategoryTheme.cs	(revision 0)
+++ Core/Components/src/Core.Components.Gis/Theme/LineCategoryTheme.cs	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -0,0 +1,55 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Style;
+
+namespace Core.Components.Gis.Theme
+{
+    /// <summary>
+    /// Class to define categories for <see cref="MapLineData"/>.
+    /// </summary>
+    public class LineCategoryTheme : CategoryTheme
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="LineCategoryTheme"/>.
+        /// </summary>
+        /// <param name="criterion">The <see cref="ValueCriterion"/> belonging to the category.</param>
+        /// <param name="style">The <see cref="LineStyle"/> belonging to the category.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public LineCategoryTheme(ValueCriterion criterion, LineStyle style) : base(Color.AliceBlue, criterion)
+        {
+            if (style == null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
+
+            Style = style;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="LineStyle"/> of the category.
+        /// </summary>
+        public LineStyle Style { get; }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Theme/PointCategoryTheme.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis/Theme/PointCategoryTheme.cs	(revision 0)
+++ Core/Components/src/Core.Components.Gis/Theme/PointCategoryTheme.cs	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -0,0 +1,55 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Style;
+
+namespace Core.Components.Gis.Theme
+{
+    /// <summary>
+    /// Class to define categories for <see cref="MapPointData"/>.
+    /// </summary>
+    public class PointCategoryTheme : CategoryTheme
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PointCategoryTheme"/>.
+        /// </summary>
+        /// <param name="criterion">The <see cref="ValueCriterion"/> belonging to the category.</param>
+        /// <param name="style">The <see cref="PointStyle"/> belonging to the category.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public PointCategoryTheme(ValueCriterion criterion, PointStyle style) : base(Color.AliceBlue, criterion)
+        {
+            if (style == null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
+
+            Style = style;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="PointStyle"/> of the category.
+        /// </summary>
+        public PointStyle Style { get; }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Theme/PolygonCategoryTheme.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis/Theme/PolygonCategoryTheme.cs	(revision 0)
+++ Core/Components/src/Core.Components.Gis/Theme/PolygonCategoryTheme.cs	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -0,0 +1,55 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Style;
+
+namespace Core.Components.Gis.Theme
+{
+    /// <summary>
+    /// Class to define categories for <see cref="MapPolygonData"/>.
+    /// </summary>
+    public class PolygonCategoryTheme : CategoryTheme
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PolygonCategoryTheme"/>.
+        /// </summary>
+        /// <param name="criterion">The <see cref="ValueCriterion"/> belonging to the category.</param>
+        /// <param name="style">The <see cref="PolygonStyle"/> belonging to the category.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public PolygonCategoryTheme(ValueCriterion criterion, PolygonStyle style) : base(Color.AliceBlue, criterion)
+        {
+            if (style == null)
+            {
+                throw new ArgumentNullException(nameof(style));
+            }
+
+            Style = style;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="PolygonStyle"/> of the category.
+        /// </summary>
+        public PolygonStyle Style { get; }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r8b125fe0ebdc0a3b6861dc25e2dd8314bcc5a395 -r0c45ab7d619015e9b177a38b37a01817dd4f2f25
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 8b125fe0ebdc0a3b6861dc25e2dd8314bcc5a395)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -20,6 +20,9 @@
     <Compile Include="Helpers\MapDataCollectionHelperTest.cs" />
     <Compile Include="TestFeatureBasedMapDataTest.cs" />
     <Compile Include="Theme\CategoryThemeTest.cs" />
+    <Compile Include="Theme\LineCategoryThemeTest.cs" />
+    <Compile Include="Theme\PointCategoryThemeTest.cs" />
+    <Compile Include="Theme\PolygonCategoryThemeTest.cs" />
     <Compile Include="Theme\ValueCriterionOperatorTest.cs" />
     <Compile Include="Theme\ValueCriterionTest.cs" />
     <Compile Include="Theme\MapThemeTest.cs" />
Index: Core/Components/test/Core.Components.Gis.Test/Theme/LineCategoryThemeTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Theme/LineCategoryThemeTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Theme/LineCategoryThemeTest.cs	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -0,0 +1,60 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Components.Gis.Style;
+using Core.Components.Gis.TestUtil;
+using Core.Components.Gis.Theme;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Theme
+{
+    [TestFixture]
+    public class LineCategoryThemeTest
+    {
+        [Test]
+        public void Constructor_StyleNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new LineCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("style", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            ValueCriterion valueCriterion = ValueCriterionTestFactory.CreateValueCriterion();
+            var style = new LineStyle();
+
+            // Call
+            var category = new LineCategoryTheme(valueCriterion, style);
+
+            // Assert
+            Assert.IsInstanceOf<CategoryTheme>(category);
+            Assert.AreSame(valueCriterion, category.Criterion);
+            Assert.AreSame(style, category.Style);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Theme/PointCategoryThemeTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Theme/PointCategoryThemeTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Theme/PointCategoryThemeTest.cs	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -0,0 +1,60 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Components.Gis.Style;
+using Core.Components.Gis.TestUtil;
+using Core.Components.Gis.Theme;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Theme
+{
+    [TestFixture]
+    public class PointCategoryThemeTest
+    {
+        [Test]
+        public void Constructor_StyleNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new PointCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("style", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            ValueCriterion valueCriterion = ValueCriterionTestFactory.CreateValueCriterion();
+            var style = new PointStyle();
+
+            // Call
+            var category = new PointCategoryTheme(valueCriterion, style);
+
+            // Assert
+            Assert.IsInstanceOf<CategoryTheme>(category);
+            Assert.AreSame(valueCriterion, category.Criterion);
+            Assert.AreSame(style, category.Style);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Theme/PolygonCategoryThemeTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Theme/PolygonCategoryThemeTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Theme/PolygonCategoryThemeTest.cs	(revision 0c45ab7d619015e9b177a38b37a01817dd4f2f25)
@@ -0,0 +1,60 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Components.Gis.Style;
+using Core.Components.Gis.TestUtil;
+using Core.Components.Gis.Theme;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Theme
+{
+    [TestFixture]
+    public class PolygonCategoryThemeTest
+    {
+        [Test]
+        public void Constructor_StyleNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new PolygonCategoryTheme(ValueCriterionTestFactory.CreateValueCriterion(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("style", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            ValueCriterion valueCriterion = ValueCriterionTestFactory.CreateValueCriterion();
+            var style = new PolygonStyle();
+
+            // Call
+            var category = new PolygonCategoryTheme(valueCriterion, style);
+
+            // Assert
+            Assert.IsInstanceOf<CategoryTheme>(category);
+            Assert.AreSame(valueCriterion, category.Criterion);
+            Assert.AreSame(style, category.Style);
+        }
+    }
+}
\ No newline at end of file