Index: Core/Common/src/Core.Common.Gui/ColorTheme.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/ColorTheme.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/ColorTheme.cs	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -0,0 +1,23 @@
+using System;
+using Core.Common.Gui.Properties;
+
+namespace Core.Common.Gui
+{
+    public enum ColorTheme
+    {
+        Dark,
+        Light,
+        Metro,
+        Aero,
+        VS2010,
+        Generic
+    }
+
+    public static class ColorThemeExtensions
+    {
+        public static string Localized(this ColorTheme theme)
+        {
+            return Resources.ResourceManager.GetString(Enum.GetName(typeof(ColorTheme), theme));
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -115,8 +115,10 @@
     </Compile>
     <Compile Include="Appenders\RingtoetsUserDataFolderConverter.cs" />
     <Compile Include="Appenders\RunReportLogAppender.cs" />
+    <Compile Include="ColorTheme.cs" />
     <Compile Include="ContextMenu\ContextMenuBuilderException.cs" />
     <Compile Include="ContextMenu\IContextMenuBuilder.cs" />
+    <Compile Include="Forms\OptionsDialog\ColorThemeItem.cs" />
     <Compile Include="Forms\ProgressDialog\ActivityProgressDialogRunner.cs" />
     <Compile Include="Commands\MainWindowCommands.cs" />
     <Compile Include="ContextMenu\ContextMenuBuilder.cs" />
@@ -289,6 +291,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Forms\MessageWindow\MessageWindowData.xsc">
       <DependentUpon>MessageWindowData.xsd</DependentUpon>
     </None>
@@ -390,7 +393,7 @@
     <Resource Include="Resources\application_form1.png" />
     <Resource Include="Resources\application_form2.png" />
     <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <Resource Include="Resources\application_import_blue.ico" />
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -869,7 +869,8 @@
         {
             AddRecentlyOpenedProjectsToFileMenu();
 
-            SetColorTheme((string) Gui.UserSettings["colorTheme"]);
+            SetColorTheme((ColorTheme) Gui.UserSettings["colorTheme"]);
+
             FileManualButton.IsEnabled = File.Exists(Gui.FixedSettings.ManualFilePath);
 
             // TODO: Enable as soon as relevant/implemented
@@ -1023,7 +1024,7 @@
             return new GeneralOptionsControl
             {
                 UserSettings = Gui.UserSettings,
-                ColorTheme = (string) Gui.UserSettings["colorTheme"],
+                ColorTheme = (ColorTheme) Gui.UserSettings["colorTheme"],
                 OnAcceptChanges = ApplyColorTheme
             };
         }
@@ -1033,29 +1034,29 @@
             SetColorTheme(control.ColorTheme);
         }
 
-        private void SetColorTheme(string colorTheme)
+        private void SetColorTheme(ColorTheme colorTheme)
         {
-            if (colorTheme == "Dark" && !(DockingManager.Theme is ExpressionDarkTheme))
+            if (colorTheme == ColorTheme.Dark && !(DockingManager.Theme is ExpressionDarkTheme))
             {
                 DockingManager.Theme = new ExpressionDarkTheme();
             }
-            else if (colorTheme == "Light" && !(DockingManager.Theme is ExpressionLightTheme))
+            else if (colorTheme == ColorTheme.Light && !(DockingManager.Theme is ExpressionLightTheme))
             {
                 DockingManager.Theme = new ExpressionLightTheme();
             }
-            else if (colorTheme == "Metro" && !(DockingManager.Theme is MetroTheme))
+            else if (colorTheme == ColorTheme.Metro && !(DockingManager.Theme is MetroTheme))
             {
                 DockingManager.Theme = new MetroTheme();
             }
-            else if (colorTheme == "Aero" && !(DockingManager.Theme is AeroTheme))
+            else if (colorTheme == ColorTheme.Aero && !(DockingManager.Theme is AeroTheme))
             {
                 DockingManager.Theme = new AeroTheme();
             }
-            else if (colorTheme == "VS2010" && !(DockingManager.Theme is VS2010Theme))
+            else if (colorTheme == ColorTheme.VS2010 && !(DockingManager.Theme is VS2010Theme))
             {
                 DockingManager.Theme = new VS2010Theme();
             }
-            else if (colorTheme == "Generic" && !(DockingManager.Theme is GenericTheme))
+            else if (colorTheme == ColorTheme.Generic && !(DockingManager.Theme is GenericTheme))
             {
                 DockingManager.Theme = new GenericTheme();
             }
Index: Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/ColorThemeItem.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/ColorThemeItem.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/ColorThemeItem.cs	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -0,0 +1,11 @@
+namespace Core.Common.Gui.Forms.OptionsDialog
+{
+    /// <summary>
+    /// Used for localizing the items in the theme selection combo box.
+    /// </summary>
+    public class ColorThemeItem
+    {
+        public ColorTheme Theme { get; set; }
+        public string DisplayName { get; set; }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.Designer.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.Designer.cs	(.../GeneralOptionsControl.Designer.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.Designer.cs	(.../GeneralOptionsControl.Designer.cs)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -61,13 +61,6 @@
             // 
             this.comboBoxTheme.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxTheme.FormattingEnabled = true;
-            this.comboBoxTheme.Items.AddRange(new object[] {
-            resources.GetString("comboBoxTheme.Items"),
-            resources.GetString("comboBoxTheme.Items1"),
-            resources.GetString("comboBoxTheme.Items2"),
-            resources.GetString("comboBoxTheme.Items3"),
-            resources.GetString("comboBoxTheme.Items4"),
-            resources.GetString("comboBoxTheme.Items5")});
             resources.ApplyResources(this.comboBoxTheme, "comboBoxTheme");
             this.comboBoxTheme.Name = "comboBoxTheme";
             this.comboBoxTheme.SelectedIndexChanged += new System.EventHandler(this.comboBoxTheme_SelectedIndexChanged);
Index: Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs	(.../GeneralOptionsControl.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs	(.../GeneralOptionsControl.cs)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Security.Permissions;
 using System.Windows.Forms;
@@ -16,6 +17,7 @@
         public GeneralOptionsControl()
         {
             InitializeComponent();
+            SetColorThemeOptions();
         }
 
         public ApplicationSettingsBase UserSettings
@@ -30,15 +32,15 @@
             }
         }
 
-        public string ColorTheme
+        public ColorTheme ColorTheme
         {
             get
             {
-                return (string) comboBoxTheme.SelectedItem;
+                return (ColorTheme) comboBoxTheme.SelectedValue;
             }
             set
             {
-                comboBoxTheme.SelectedItem = value;
+                comboBoxTheme.SelectedValue = value;
             }
         }
 
@@ -75,6 +77,22 @@
             SetSettingsValuesToControls();
         }
 
+        private void SetColorThemeOptions()
+        {
+            var colorThemeItems = new Collection<ColorThemeItem>();
+            foreach (var theme in (ColorTheme[]) Enum.GetValues(typeof(ColorTheme)))
+            {
+                colorThemeItems.Add(new ColorThemeItem
+                {
+                    Theme = theme,
+                    DisplayName = theme.Localized()
+                });
+            }
+            comboBoxTheme.DataSource = colorThemeItems;
+            comboBoxTheme.ValueMember = "Theme";
+            comboBoxTheme.DisplayMember = "DisplayName";
+        }
+
         /// <summary>
         /// Safe call because of linkdemand
         /// </summary>
@@ -191,7 +209,7 @@
 
         private void RadioButtonCompactNotationCheckedChanged(object sender, EventArgs e)
         {
-            lblDecimalsOrSignificants.Text = radioButtonCompactNotation.Checked ? Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits: Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Decimal_places;
+            lblDecimalsOrSignificants.Text = radioButtonCompactNotation.Checked ? Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Significant_digits : Resources.GeneralOptionsControl_RadioButtonCompactNotationCheckedChanged_Decimal_places;
             UpdateRealNumberFormattingSample();
         }
 
Index: Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.resx
===================================================================
diff -u -r83b9621346f7f3ca887096468de965815eb609ac -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.resx	(.../GeneralOptionsControl.resx)	(revision 83b9621346f7f3ca887096468de965815eb609ac)
+++ Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.resx	(.../GeneralOptionsControl.resx)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -121,24 +121,6 @@
   <data name="groupBoxUserSettings.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
-  <data name="comboBoxTheme.Items" xml:space="preserve">
-    <value>Licht</value>
-  </data>
-  <data name="comboBoxTheme.Items1" xml:space="preserve">
-    <value>Donker</value>
-  </data>
-  <data name="comboBoxTheme.Items2" xml:space="preserve">
-    <value>Metro</value>
-  </data>
-  <data name="comboBoxTheme.Items3" xml:space="preserve">
-    <value>Aero</value>
-  </data>
-  <data name="comboBoxTheme.Items4" xml:space="preserve">
-    <value>VS2010</value>
-  </data>
-  <data name="comboBoxTheme.Items5" xml:space="preserve">
-    <value>Generiek</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="comboBoxTheme.Location" type="System.Drawing.Point, System.Drawing">
     <value>83, 45</value>
@@ -468,9 +450,9 @@
   <data name="&gt;&gt;groupBoxUserSettings.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -98,6 +98,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Aero.
+        /// </summary>
+        public static string Aero {
+            get {
+                return ResourceManager.GetString("Aero", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Ringtoets wordt gestart....
         /// </summary>
         public static string App_App_Starting_Ringtoets {
@@ -686,6 +695,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Donker.
+        /// </summary>
+        public static string Dark {
+            get {
+                return ResourceManager.GetString("Dark", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap data_item {
@@ -1077,6 +1095,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Generiek.
+        /// </summary>
+        public static string Generic {
+            get {
+                return ResourceManager.GetString("Generic", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap graphhs {
@@ -1323,6 +1350,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Licht.
+        /// </summary>
+        public static string Light {
+            get {
+                return ResourceManager.GetString("Light", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap link {
@@ -1503,6 +1539,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Metro.
+        /// </summary>
+        public static string Metro {
+            get {
+                return ResourceManager.GetString("Metro", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Nieuw project succesvol geopend..
         /// </summary>
         public static string New_project_successfully_opened {
@@ -2534,6 +2579,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to VS2010.
+        /// </summary>
+        public static string VS2010 {
+            get {
+                return ResourceManager.GetString("VS2010", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap WebInsertHyperlinkHS {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r85af6861f16df8c5d57e3e39d0d2874e7bd16b8e -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 85af6861f16df8c5d57e3e39d0d2874e7bd16b8e)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -902,4 +902,28 @@
   <data name="ProjectExplorerGuiPlugin_FillProjectTreeViewNodePresentersFromPlugins_Could_not_retrieve_NodePresenters_for_a_plugin" xml:space="preserve">
     <value>Er ging iets fout bij het ophalen van de NodePresenters van alle plugins.</value>
   </data>
+  <data name="Light" xml:space="preserve">
+    <value>Licht</value>
+    <comment>Used for displaying ColorTheme.Light in combo box.</comment>
+  </data>
+  <data name="Dark" xml:space="preserve">
+    <value>Donker</value>
+    <comment>Used for displaying ColorTheme.Dark in combo box.</comment>
+  </data>
+  <data name="Metro" xml:space="preserve">
+    <value>Metro</value>
+    <comment>Used for displaying ColorTheme.Metro in combo box.</comment>
+  </data>
+  <data name="Aero" xml:space="preserve">
+    <value>Aero</value>
+    <comment>Used for displaying ColorTheme.Aero in combo box.</comment>
+  </data>
+  <data name="VS2010" xml:space="preserve">
+    <value>VS2010</value>
+    <comment>Used for displaying ColorTheme.VS2010 in combo box.</comment>
+  </data>
+  <data name="Generic" xml:space="preserve">
+    <value>Generiek</value>
+    <comment>Used for displaying ColorTheme.Generic in combo box.</comment>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs
===================================================================
diff -u -rec61b187052d8d8ae6cddd3fc1d0546608d9b0c2 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs	(.../Settings.Designer.cs)	(revision ec61b187052d8d8ae6cddd3fc1d0546608d9b0c2)
+++ Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs	(.../Settings.Designer.cs)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -214,9 +214,9 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Generic")]
-        public string colorTheme {
+        public global::Core.Common.Gui.ColorTheme colorTheme {
             get {
-                return ((string)(this["colorTheme"]));
+                return ((global::Core.Common.Gui.ColorTheme)(this["colorTheme"]));
             }
             set {
                 this["colorTheme"] = value;
Index: Core/Common/src/Core.Common.Gui/Properties/Settings.settings
===================================================================
diff -u -rec61b187052d8d8ae6cddd3fc1d0546608d9b0c2 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/src/Core.Common.Gui/Properties/Settings.settings	(.../Settings.settings)	(revision ec61b187052d8d8ae6cddd3fc1d0546608d9b0c2)
+++ Core/Common/src/Core.Common.Gui/Properties/Settings.settings	(.../Settings.settings)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -50,7 +50,7 @@
     <Setting Name="realNumberFormat" Type="System.String" Scope="User">
       <Value Profile="(Default)">G5</Value>
     </Setting>
-    <Setting Name="colorTheme" Type="System.String" Scope="User">
+    <Setting Name="colorTheme" Type="Core.Common.Gui.ColorTheme" Scope="User">
       <Value Profile="(Default)">Generic</Value>
     </Setting>
   </Settings>
Index: Core/Common/src/Core.Common.Gui/app.config
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/app.config	(revision 0)
+++ Core/Common/src/Core.Common.Gui/app.config	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="Core.Common.Gui.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <Core.Common.Gui.Properties.Settings>
+            <setting name="autosaveWindowLayout" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="lastVisitedPath" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="MainWindow_FullScreen" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="MainWindow_X" serializeAs="String">
+                <value>50</value>
+            </setting>
+            <setting name="MainWindow_Y" serializeAs="String">
+                <value>50</value>
+            </setting>
+            <setting name="MainWindow_Width" serializeAs="String">
+                <value>1024</value>
+            </setting>
+            <setting name="MainWindow_Height" serializeAs="String">
+                <value>768</value>
+            </setting>
+            <setting name="startPageName" serializeAs="String">
+                <value>Startpagina</value>
+            </setting>
+            <setting name="showStartPage" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="showSplashScreen" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="showHiddenDataItems" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="realNumberFormat" serializeAs="String">
+                <value>G5</value>
+            </setting>
+            <setting name="colorTheme" serializeAs="String">
+                <value>Generic</value>
+            </setting>
+        </Core.Common.Gui.Properties.Settings>
+    </userSettings>
+</configuration>
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -re392d6abff8f363ed6fbcef2b7ddd1dd54c77348 -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision e392d6abff8f363ed6fbcef2b7ddd1dd54c77348)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -60,6 +60,8 @@
     <Compile Include="ContextMenu\TreeViewContextMenuItemFactoryTest.cs" />
     <Compile Include="ContextMenu\GuiContextMenuItemFactoryTest.cs" />
     <Compile Include="ExpandableArrayConverterTest.cs" />
+    <Compile Include="Forms\OptionsDialog\ColorThemeTest.cs" />
+    <Compile Include="Forms\OptionsDialog\GeneralOptionsControlTest.cs" />
     <Compile Include="Forms\SplashScreenTest.cs" />
     <Compile Include="GuiCommandHandlerTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/ColorThemeTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/ColorThemeTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/ColorThemeTest.cs	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Core.Common.Gui.Properties;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Forms.OptionsDialog
+{
+    [TestFixture]
+    public class ColorThemeTest
+    {
+        [Test]
+        public void ColorTheme_Values_HasSix()
+        {
+            // Call & Assert
+            Assert.AreEqual(6, Enum.GetValues(typeof(ColorTheme)).Length);
+        }
+
+        [Test]
+        public void ColorTheme_GetNames_HasSix()
+        {
+            // Setup
+            var nameList = new[]
+            {
+                "Dark",
+                "Light",
+                "Metro",
+                "Aero",
+                "VS2010",
+                "Generic"
+            };
+
+            // Call & Assert
+            CollectionAssert.AreEqual(nameList, Enum.GetNames(typeof(ColorTheme)));
+        }
+
+        [Test]
+        public void Localized_ForEveryItem_ExpectedTranslatedString()
+        {
+            // Setup
+            var nameList = new[]
+            {
+                Resources.Dark,
+                Resources.Light,
+                Resources.Metro,
+                Resources.Aero,
+                Resources.VS2010,
+                Resources.Generic
+            };
+            var translations = new Collection<string>();
+
+            // Call
+            foreach(ColorTheme item in Enum.GetValues(typeof(ColorTheme)))
+            {
+                translations.Add(item.Localized());
+            }
+
+            // Assert
+            CollectionAssert.AreEqual(nameList, translations);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/GeneralOptionsControlTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/GeneralOptionsControlTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/GeneralOptionsControlTest.cs	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
@@ -0,0 +1,36 @@
+using System.Windows.Forms;
+using Core.Common.Gui.Forms.OptionsDialog;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Forms.OptionsDialog
+{
+    [TestFixture]
+    public class GeneralOptionsControlTest
+    {
+        [Test]
+        public void GivenGeneralOptionsControlCreated_WhenRetrievingOptionsItems_ThenOptionsShouldBeTranslated()
+        {
+            using (var control = new GeneralOptionsControl())
+            {
+                var subControl = (ComboBox)control.Controls.Find("comboBoxTheme", true)[0];
+
+                Assert.AreEqual(6, subControl.Items.Count);
+
+                var localizedThemes = new[]
+                {
+                    "Donker",
+                    "Licht",
+                    "Metro",
+                    "Aero",
+                    "VS2010",
+                    "Generiek"
+                };
+                for (var i = 0; i < subControl.Items.Count; i++)
+                {
+                    var themeItem = (ColorThemeItem) subControl.Items[i];
+                    Assert.AreEqual(localizedThemes[i], themeItem.DisplayName);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file