Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenThematicalMapViewCommand.cs
===================================================================
diff -u -rc279724bfcdc57cc60fbdf65794bd50c0da646f2 -r4f5c5afab904ec8570bb482a9845b56f074a26e4
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenThematicalMapViewCommand.cs	(.../OpenThematicalMapViewCommand.cs)	(revision c279724bfcdc57cc60fbdf65794bd50c0da646f2)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenThematicalMapViewCommand.cs	(.../OpenThematicalMapViewCommand.cs)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
@@ -31,6 +31,7 @@
 using Core.Components.Gis.Geometries;
 using Core.Components.Gis.Theme;
 using Core.Components.Gis.Theme.Criteria;
+using Demo.Ringtoets.Properties;
 
 namespace Demo.Ringtoets.Commands
 {
@@ -55,52 +56,52 @@
 
         public void Execute()
         {
-            var mapDataCollection = new MapDataCollection("Demo kaart categorial theming");
+            var mapDataCollection = new MapDataCollection(Resources.OpenThematicalMapViewCommand_Execute_Demo_map_with_theming);
 
-            var mapPointDataEqualCriteria = new MapPointData("Punt data met gelijk criterium")
+            var mapPointDataEqualCriteria = new MapPointData(Resources.OpenThematicalMapViewCommand_Execute_MapPointData_with_EqualValueCriteria)
             {
-                Features = CreateMapPointFeaturesWithMetaData(40),
+                Features = CreateMapPointFeaturesWithMetaData(100),
                 Style =
                 {
-                    Size = 10
+                    Size = 5
                 }
             };
             SetEqualCriteria(mapPointDataEqualCriteria);
             mapDataCollection.Add(mapPointDataEqualCriteria);
 
-            var mapPointDataUnequalCriteria = new MapPointData("Punt data met ongelijk criterium")
+            var mapPointDataUnequalCriteria = new MapPointData(Resources.OpenThematicalMapViewCommand_Execute_MapPointData_with_UnequalValueCriteria)
             {
                 Features = CreateMapPointFeaturesWithMetaData(15),
                 Style =
                 {
-                    Size = 10
+                    Size = 5
                 }
             };
             SetUnequalCriteria(mapPointDataUnequalCriteria);
             mapDataCollection.Add(mapPointDataUnequalCriteria);
 
-            var mapLineDataEqualCriteria = new MapLineData("Lijn data met gelijk criterium")
+            var mapLineDataEqualCriteria = new MapLineData(Resources.OpenThematicalMapViewCommand_Execute_MapLineData_with_EqualValueCriteria)
             {
-                Features = CreateMapLineFeaturesWithMetaData(40)
+                Features = CreateMapLineFeaturesWithMetaData(100)
             };
             SetEqualCriteria(mapLineDataEqualCriteria);
             mapDataCollection.Add(mapLineDataEqualCriteria);
 
-            var mapLineDataUnequalCriteria = new MapLineData("Lijn data met ongelijk criterium")
+            var mapLineDataUnequalCriteria = new MapLineData(Resources.OpenThematicalMapViewCommand_Execute_MapLineData_with_UnequalValueCriteria)
             {
                 Features = CreateMapLineFeaturesWithMetaData(10)
             };
             SetUnequalCriteria(mapLineDataUnequalCriteria);
             mapDataCollection.Add(mapLineDataUnequalCriteria);
 
-            var mapPolygonDataEqualCriteria = new MapPolygonData("Polygon data met gelijk criterium")
+            var mapPolygonDataEqualCriteria = new MapPolygonData(Resources.OpenThematicalMapViewCommand_Execute_MapPolygonData_with_EqualValueCriteria)
             {
                 Features = CreatePolygonFeaturesWithMetaData(40)
             };
             SetEqualCriteria(mapPolygonDataEqualCriteria);
             mapDataCollection.Add(mapPolygonDataEqualCriteria);
 
-            var mapPolygonDataUnequalCriteria = new MapPolygonData("Polygon data met ongelijk criterium")
+            var mapPolygonDataUnequalCriteria = new MapPolygonData(Resources.OpenThematicalMapViewCommand_Execute_MapPolygonData_with_UnequalValueCriteria)
             {
                 Features = CreatePolygonFeaturesWithMetaData(10)
             };
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs
===================================================================
diff -u -r21debbdc1d176c418e0b1f17adcf997e7794ff0b -r4f5c5afab904ec8570bb482a9845b56f074a26e4
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 21debbdc1d176c418e0b1f17adcf997e7794ff0b)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
@@ -40,7 +40,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -195,6 +195,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Thematische Kaart.
+        /// </summary>
+        public static string General_ThematicMap {
+            get {
+                return ResourceManager.GetString("General_ThematicMap", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap map {
@@ -383,5 +392,68 @@
                 return ResourceManager.GetString("OpenMapViewCommand_Execute_Vlieland", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Demo kaart categorial theming.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_Demo_map_with_theming {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_Demo_map_with_theming", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lijn data met gelijk criterium.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_MapLineData_with_EqualValueCriteria {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_MapLineData_with_EqualValueCriteria", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lijn data met ongelijk criterium.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_MapLineData_with_UnequalValueCriteria {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_MapLineData_with_UnequalValueCriteria", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Punt data met gelijk criterium.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_MapPointData_with_EqualValueCriteria {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_MapPointData_with_EqualValueCriteria", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Punt data met ongelijk criterium.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_MapPointData_with_UnequalValueCriteria {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_MapPointData_with_UnequalValueCriteria", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Polygon data met gelijk criterium.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_MapPolygonData_with_EqualValueCriteria {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_MapPolygonData_with_EqualValueCriteria", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Polygon data met ongelijk criterium.
+        /// </summary>
+        public static string OpenThematicalMapViewCommand_Execute_MapPolygonData_with_UnequalValueCriteria {
+            get {
+                return ResourceManager.GetString("OpenThematicalMapViewCommand_Execute_MapPolygonData_with_UnequalValueCriteria", resourceCulture);
+            }
+        }
     }
 }
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx
===================================================================
diff -u -r21debbdc1d176c418e0b1f17adcf997e7794ff0b -r4f5c5afab904ec8570bb482a9845b56f074a26e4
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx	(.../Resources.resx)	(revision 21debbdc1d176c418e0b1f17adcf997e7794ff0b)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx	(.../Resources.resx)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
@@ -217,4 +217,28 @@
   <data name="FaultTreeIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\chart_organisation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="General_ThematicMap" xml:space="preserve">
+    <value>Thematische Kaart</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_Demo_map_with_theming" xml:space="preserve">
+    <value>Demo kaart categorial theming</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_MapPointData_with_EqualValueCriteria" xml:space="preserve">
+    <value>Punt data met gelijk criterium</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_MapPointData_with_UnequalValueCriteria" xml:space="preserve">
+    <value>Punt data met ongelijk criterium</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_MapLineData_with_EqualValueCriteria" xml:space="preserve">
+    <value>Lijn data met gelijk criterium</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_MapLineData_with_UnequalValueCriteria" xml:space="preserve">
+    <value>Lijn data met ongelijk criterium</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_MapPolygonData_with_EqualValueCriteria" xml:space="preserve">
+    <value>Polygon data met gelijk criterium</value>
+  </data>
+  <data name="OpenThematicalMapViewCommand_Execute_MapPolygonData_with_UnequalValueCriteria" xml:space="preserve">
+    <value>Polygon data met ongelijk criterium</value>
+  </data>
 </root>
\ No newline at end of file
Index: Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml
===================================================================
diff -u -r21debbdc1d176c418e0b1f17adcf997e7794ff0b -r4f5c5afab904ec8570bb482a9845b56f074a26e4
--- Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml	(.../RingtoetsDemoProjectRibbon.xaml)	(revision 21debbdc1d176c418e0b1f17adcf997e7794ff0b)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml	(.../RingtoetsDemoProjectRibbon.xaml)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
@@ -29,7 +29,7 @@
              xmlns:resx="clr-namespace:Demo.Ringtoets.Properties"
              xmlns:converters="clr-namespace:Core.Common.Gui.Converters;assembly=Core.Common.Gui"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="300" d:DesignWidth="350">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -47,6 +47,7 @@
             </fluent:RibbonGroupBox>
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.General_Map}" fluent:KeyTip.Keys="M" Height="Auto">
                 <fluent:Button x:Name="OpenMapViewButton" Header="{x:Static resx:Resources.General_Map}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenMapView_Click" fluent:KeyTip.Keys="K"/>
+                <fluent:Button x:Name="OpenThematicMapViewButton" Header="{x:Static resx:Resources.General_ThematicMap}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenThematicMapView_Click" fluent:KeyTip.Keys="K"/>
             </fluent:RibbonGroupBox>
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.General_Chart}" fluent:KeyTip.Keys="C">
                 <fluent:Button x:Name="OpenChartViewButton" Header="{x:Static resx:Resources.General_Chart}" ToolTip="{x:Static resx:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.ChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenChartView_Click" fluent:KeyTip.Keys="O"/>
Index: Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -r21debbdc1d176c418e0b1f17adcf997e7794ff0b -r4f5c5afab904ec8570bb482a9845b56f074a26e4
--- Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 21debbdc1d176c418e0b1f17adcf997e7794ff0b)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
@@ -34,7 +34,8 @@
     /// </summary>
     public partial class RingtoetsDemoProjectRibbon : IRibbonCommandHandler
     {
-        private readonly ICommand addNewAssessmentSection, openMapViewCommand, openChartViewCommand, openStackChartViewCommand, openPointedTreeGraphViewCommand;
+        private readonly ICommand addNewAssessmentSection, openMapViewCommand, openThematicMapViewCommand,
+                                  openChartViewCommand, openStackChartViewCommand, openPointedTreeGraphViewCommand;
 
         public RingtoetsDemoProjectRibbon(IProjectOwner projectOwner, IViewCommands viewCommands)
         {
@@ -43,6 +44,7 @@
             addNewAssessmentSection = new AddNewDemoAssessmentSectionCommand(projectOwner, viewCommands);
             openChartViewCommand = new OpenChartViewCommand(viewCommands);
             openMapViewCommand = new OpenMapViewCommand(viewCommands);
+            openThematicMapViewCommand = new OpenThematicalMapViewCommand(viewCommands);
             openStackChartViewCommand = new OpenStackChartViewCommand(viewCommands);
             openPointedTreeGraphViewCommand = new OpenPointedTreeGraphViewCommand(viewCommands);
         }
@@ -69,6 +71,11 @@
             openMapViewCommand.Execute();
         }
 
+        private void ButtonOpenThematicMapView_Click(object sender, RoutedEventArgs e)
+        {
+            openThematicMapViewCommand.Execute();
+        }
+
         private void ButtonOpenStackChartView_Click(object sender, RoutedEventArgs e)
         {
             openStackChartViewCommand.Execute();
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs
===================================================================
diff -u -r21debbdc1d176c418e0b1f17adcf997e7794ff0b -r4f5c5afab904ec8570bb482a9845b56f074a26e4
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs	(.../RingtoetsDemoProjectRibbonTest.cs)	(revision 21debbdc1d176c418e0b1f17adcf997e7794ff0b)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoetsDemoProjectRibbonTest.cs	(.../RingtoetsDemoProjectRibbonTest.cs)	(revision 4f5c5afab904ec8570bb482a9845b56f074a26e4)
@@ -106,6 +106,32 @@
 
         [Test]
         [Apartment(ApartmentState.STA)]
+        public void OpenThematicMapViewButton_OnClick_OpensView()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var projectOwner = mocks.Stub<IProjectOwner>();
+            var viewCommands = mocks.Stub<IViewCommands>();
+            viewCommands.Expect(vc => vc.OpenView(null)).IgnoreArguments();
+
+            mocks.ReplayAll();
+
+            var ribbon = new RingtoetsDemoProjectRibbon(projectOwner, viewCommands);
+
+            var button = ribbon.GetRibbonControl().FindName("OpenThematicMapViewButton") as Button;
+
+            // Precondition
+            Assert.IsNotNull(button, "Ribbon should have an open thematic map view button");
+
+            // Call
+            button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent));
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [Apartment(ApartmentState.STA)]
         public void OpenStackChartViewButton_OnClick_ExecutesOpenStackChartViewCommand()
         {
             // Setup