Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs
===================================================================
diff -u -rc36957d0b7c7da0c4e5d5c0bb5e186b49d493d97 -rc98d492dce8852440455fa4fbb373faf68839a77
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs	(.../MapThemeFactory.cs)	(revision c36957d0b7c7da0c4e5d5c0bb5e186b49d493d97)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs	(.../MapThemeFactory.cs)	(revision c98d492dce8852440455fa4fbb373faf68839a77)
@@ -19,15 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
 using Core.Common.Util;
 using Core.Components.Gis.Style;
 using Core.Components.Gis.Theme;
-using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Forms;
-using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.Properties;
 
 namespace Riskeer.Common.Forms.Factories
@@ -41,24 +37,24 @@
         private const LineDashStyle lineDashStyle = LineDashStyle.Solid;
 
         /// <summary>
-        /// Creates a <see cref="MapTheme{T}"/> based on the values of <see cref="FailureMechanismSectionAssemblyGroup"/>.
+        /// Creates a <see cref="MapTheme{T}"/> based on the values of <see cref="DisplayFailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <returns>The created <see cref="MapTheme{T}"/>.</returns>
-        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionAssemblyGroup"/>
-        /// is a valid value, but unsupported.</exception>
         public static MapTheme<LineCategoryTheme> CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme()
         {
-            var categoryThemes = new List<LineCategoryTheme>();
-
-            foreach (FailureMechanismSectionAssemblyGroup enumValue in Enum.GetValues(typeof(FailureMechanismSectionAssemblyGroup)))
+            return new MapTheme<LineCategoryTheme>(Resources.AssemblyGroup_DisplayName, new[]
             {
-                LineCategoryTheme theme = CreateCategoryTheme(AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor(enumValue),
-                                                              DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(enumValue));
-
-                categoryThemes.Add(theme);
-            }
-
-            return new MapTheme<LineCategoryTheme>(Resources.AssemblyGroup_DisplayName, categoryThemes);
+                CreateCategoryTheme(Color.FromArgb(255, 192, 192, 192), DisplayFailureMechanismSectionAssemblyGroup.NotDominant),
+                CreateCategoryTheme(Color.FromArgb(255, 34, 139, 34), DisplayFailureMechanismSectionAssemblyGroup.III),
+                CreateCategoryTheme(Color.FromArgb(255, 146, 208, 80), DisplayFailureMechanismSectionAssemblyGroup.II),
+                CreateCategoryTheme(Color.FromArgb(255, 198, 224, 180), DisplayFailureMechanismSectionAssemblyGroup.I),
+                CreateCategoryTheme(Color.FromArgb(255, 255, 255, 0), DisplayFailureMechanismSectionAssemblyGroup.Zero),
+                CreateCategoryTheme(Color.FromArgb(255, 255, 165, 0), DisplayFailureMechanismSectionAssemblyGroup.IMin),
+                CreateCategoryTheme(Color.FromArgb(255, 255, 0, 0), DisplayFailureMechanismSectionAssemblyGroup.IIMin),
+                CreateCategoryTheme(Color.FromArgb(255, 178, 34, 34), DisplayFailureMechanismSectionAssemblyGroup.IIIMin),
+                CreateCategoryTheme(Color.FromArgb(255, 255, 90, 172), DisplayFailureMechanismSectionAssemblyGroup.Dominant),
+                CreateCategoryTheme(Color.FromArgb(0, 0, 0, 0), DisplayFailureMechanismSectionAssemblyGroup.GR)
+            });
         }
 
         private static LineCategoryTheme CreateCategoryTheme(Color color, DisplayFailureMechanismSectionAssemblyGroup categoryGroup)
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs
===================================================================
diff -u -rbf8325a96ad94571f35d7e745e30b6e1d634949b -rc98d492dce8852440455fa4fbb373faf68839a77
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs	(.../MapThemeTestHelper.cs)	(revision bf8325a96ad94571f35d7e745e30b6e1d634949b)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs	(.../MapThemeTestHelper.cs)	(revision c98d492dce8852440455fa4fbb373faf68839a77)
@@ -57,7 +57,7 @@
             AssertCategoryTheme("-II", Color.FromArgb(255, 255, 0, 0), theme.CategoryThemes.ElementAt(6));
             AssertCategoryTheme("-III", Color.FromArgb(255, 178, 34, 34), theme.CategoryThemes.ElementAt(7));
             AssertCategoryTheme("D", Color.FromArgb(255, 255, 90, 172), theme.CategoryThemes.ElementAt(8));
-            AssertCategoryTheme(string.Empty, Color.FromArgb(255, 255, 255, 255), theme.CategoryThemes.ElementAt(9));
+            AssertCategoryTheme(string.Empty, Color.FromArgb(0, 0, 0, 0), theme.CategoryThemes.ElementAt(9));
         }
 
         private static void AssertCategoryTheme(string expectedValue, Color expectedColor, LineCategoryTheme categoryTheme)