Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r687f68519e8e01e867ffbd3dbba58d52f7e9e2e9 -r00bf02e3c099d01fbdb84735d8fc64de0fb98aaa
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 687f68519e8e01e867ffbd3dbba58d52f7e9e2e9)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -163,11 +163,11 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="Forms\MessageWindow\MessageWindowLogAppender.cs" />
-    <Compile Include="Forms\OptionsDialog\GeneralOptionsControl.cs">
+    <Compile Include="Forms\Options\OptionsDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\OptionsDialog\GeneralOptionsControl.Designer.cs">
-      <DependentUpon>GeneralOptionsControl.cs</DependentUpon>
+    <Compile Include="Forms\Options\OptionsDialog.Designer.cs">
+      <DependentUpon>OptionsDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\PropertyGridView\PropertyGridView.cs">
       <SubType>Component</SubType>
@@ -322,8 +322,8 @@
       <DependentUpon>MessageWindow.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OptionsDialog\GeneralOptionsControl.resx">
-      <DependentUpon>GeneralOptionsControl.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Options\OptionsDialog.resx">
+      <DependentUpon>OptionsDialog.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\ProgressDialog\ActivityProgressDialog.resx">
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r687f68519e8e01e867ffbd3dbba58d52f7e9e2e9 -r00bf02e3c099d01fbdb84735d8fc64de0fb98aaa
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 687f68519e8e01e867ffbd3dbba58d52f7e9e2e9)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -19,7 +19,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf;
 using Core.Common.Gui.Forms.MessageWindow;
-using Core.Common.Gui.Forms.OptionsDialog;
+using Core.Common.Gui.Forms.Options;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Interop;
@@ -1008,7 +1008,7 @@
 
         private void OnFileOptionsClicked(object sender, RoutedEventArgs e)
         {
-            var optionsDialog = new GeneralOptionsControl
+            var optionsDialog = new OptionsDialog
             {
                 UserSettings = Gui.UserSettings,
                 ColorTheme = (ColorTheme) Gui.UserSettings["colorTheme"],
@@ -1018,9 +1018,9 @@
             optionsDialog.ShowDialog();
         }
 
-        private void ApplyColorTheme(GeneralOptionsControl control)
+        private void ApplyColorTheme(OptionsDialog dialog)
         {
-            SetColorTheme(control.ColorTheme);
+            SetColorTheme(dialog.ColorTheme);
         }
 
         private void SetColorTheme(ColorTheme colorTheme)
Index: Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.Designer.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.Designer.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.Designer.cs	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -0,0 +1,115 @@
+namespace Core.Common.Gui.Forms.Options
+{
+    partial class OptionsDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionsDialog));
+            this.groupBoxUserSettings = new System.Windows.Forms.GroupBox();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.comboBoxTheme = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.checkBoxStartPage = new System.Windows.Forms.CheckBox();
+            this.groupBoxUserSettings.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBoxUserSettings
+            // 
+            resources.ApplyResources(this.groupBoxUserSettings, "groupBoxUserSettings");
+            this.groupBoxUserSettings.Controls.Add(this.buttonCancel);
+            this.groupBoxUserSettings.Controls.Add(this.buttonOk);
+            this.groupBoxUserSettings.Controls.Add(this.comboBoxTheme);
+            this.groupBoxUserSettings.Controls.Add(this.label1);
+            this.groupBoxUserSettings.Controls.Add(this.checkBoxStartPage);
+            this.groupBoxUserSettings.Name = "groupBoxUserSettings";
+            this.groupBoxUserSettings.TabStop = false;
+            // 
+            // buttonCancel
+            // 
+            resources.ApplyResources(this.buttonCancel, "buttonCancel");
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonOk
+            // 
+            resources.ApplyResources(this.buttonOk, "buttonOk");
+            this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            // 
+            // comboBoxTheme
+            // 
+            this.comboBoxTheme.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTheme.FormattingEnabled = true;
+            resources.ApplyResources(this.comboBoxTheme, "comboBoxTheme");
+            this.comboBoxTheme.Name = "comboBoxTheme";
+            this.comboBoxTheme.SelectedIndexChanged += new System.EventHandler(this.comboBoxTheme_SelectedIndexChanged);
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // checkBoxStartPage
+            // 
+            resources.ApplyResources(this.checkBoxStartPage, "checkBoxStartPage");
+            this.checkBoxStartPage.Checked = true;
+            this.checkBoxStartPage.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.checkBoxStartPage.Name = "checkBoxStartPage";
+            this.checkBoxStartPage.UseVisualStyleBackColor = true;
+            // 
+            // OptionsDialog
+            // 
+            this.AcceptButton = this.buttonOk;
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.buttonCancel;
+            this.Controls.Add(this.groupBoxUserSettings);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "OptionsDialog";
+            this.ShowInTaskbar = false;
+            this.groupBoxUserSettings.ResumeLayout(false);
+            this.groupBoxUserSettings.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBoxUserSettings;
+        private System.Windows.Forms.CheckBox checkBoxStartPage;
+        private System.Windows.Forms.ComboBox comboBoxTheme;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button buttonCancel;
+        private System.Windows.Forms.Button buttonOk;
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Security.Permissions;
+using System.Windows.Forms;
+using Core.Common.Utils.Reflection;
+
+namespace Core.Common.Gui.Forms.Options
+{
+    public partial class OptionsDialog : Form
+    {
+        private ApplicationSettingsBase userSettings;
+
+        public OptionsDialog()
+        {
+            InitializeComponent();
+            SetColorThemeOptions();
+        }
+
+        public ApplicationSettingsBase UserSettings
+        {
+            get
+            {
+                return userSettings;
+            }
+            set
+            {
+                UpdateUserSettings(value);
+            }
+        }
+
+        public ColorTheme ColorTheme
+        {
+            get
+            {
+                return (ColorTheme) comboBoxTheme.SelectedValue;
+            }
+            set
+            {
+                comboBoxTheme.SelectedValue = value;
+            }
+        }
+
+        // TODO: Call this method
+        public Action<OptionsDialog> OnAcceptChanges { get; set; }
+
+        private void AcceptChanges()
+        {
+            SetValuesToSettings();
+            if (OnAcceptChanges != null)
+            {
+                OnAcceptChanges(this);
+            }
+        }
+
+        private void DeclineChanges()
+        {
+            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 = TypeUtils.GetMemberName<ColorThemeItem>(cti => cti.Theme);
+            comboBoxTheme.DisplayMember = TypeUtils.GetMemberName<ColorThemeItem>(cti => cti.DisplayName);
+        }
+
+        /// <summary>
+        /// Safe call because of linkdemand
+        /// </summary>
+        /// <param name="settings"></param>
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        private void UpdateUserSettings(ApplicationSettingsBase settings)
+        {
+            userSettings = settings;
+            SetSettingsValuesToControls();
+        }
+
+        /// <summary>
+        /// Dialog created.
+        /// </summary>
+        private void SetSettingsValuesToControls()
+        {
+            checkBoxStartPage.Checked = (bool) userSettings["showStartPage"];
+        }
+
+        /// <summary>
+        /// Ok clicked.
+        /// </summary>
+        private void SetValuesToSettings()
+        {
+            if ((bool) userSettings["showStartPage"] != checkBoxStartPage.Checked)
+            {
+                userSettings["showStartPage"] = checkBoxStartPage.Checked;
+            }
+        }
+
+        private void comboBoxTheme_SelectedIndexChanged(object sender, EventArgs e) {}
+
+        /// <summary>
+        /// Used for localizing the items in the theme selection combo box.
+        /// </summary>
+        private class ColorThemeItem
+        {
+            /// <summary>
+            /// Gets or sets the <see cref="ColorTheme"/> for this item.
+            /// </summary>
+            public ColorTheme Theme { get; set; }
+
+            /// <summary>
+            /// Gets or sets the name to display for the <see cref="ColorTheme"/>.
+            /// </summary>
+            public string DisplayName { get; set; }
+        }
+
+        protected override void OnFormClosed(FormClosedEventArgs e)
+        {
+            if (DialogResult != DialogResult.OK)
+            {
+                DeclineChanges();
+            }
+
+            base.OnFormClosed(e);
+        }
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            AcceptChanges();
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DeclineChanges();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.resx
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.resx	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.resx	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="groupBoxUserSettings.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="buttonCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="buttonCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>386, 156</value>
+  </data>
+  <data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="buttonCancel.Text" xml:space="preserve">
+    <value>Annuleren</value>
+  </data>
+  <data name="&gt;&gt;buttonCancel.Name" xml:space="preserve">
+    <value>buttonCancel</value>
+  </data>
+  <data name="&gt;&gt;buttonCancel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;buttonCancel.Parent" xml:space="preserve">
+    <value>groupBoxUserSettings</value>
+  </data>
+  <data name="&gt;&gt;buttonCancel.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="buttonOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="buttonOk.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="buttonOk.Location" type="System.Drawing.Point, System.Drawing">
+    <value>305, 155</value>
+  </data>
+  <data name="buttonOk.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="buttonOk.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="buttonOk.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="&gt;&gt;buttonOk.Name" xml:space="preserve">
+    <value>buttonOk</value>
+  </data>
+  <data name="&gt;&gt;buttonOk.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;buttonOk.Parent" xml:space="preserve">
+    <value>groupBoxUserSettings</value>
+  </data>
+  <data name="&gt;&gt;buttonOk.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboBoxTheme.Location" type="System.Drawing.Point, System.Drawing">
+    <value>83, 45</value>
+  </data>
+  <data name="comboBoxTheme.Size" type="System.Drawing.Size, System.Drawing">
+    <value>86, 21</value>
+  </data>
+  <data name="comboBoxTheme.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;comboBoxTheme.Name" xml:space="preserve">
+    <value>comboBoxTheme</value>
+  </data>
+  <data name="&gt;&gt;comboBoxTheme.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;comboBoxTheme.Parent" xml:space="preserve">
+    <value>groupBoxUserSettings</value>
+  </data>
+  <data name="&gt;&gt;comboBoxTheme.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>7, 48</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 13</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Kleurenthema:</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>groupBoxUserSettings</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="checkBoxStartPage.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="checkBoxStartPage.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 21</value>
+  </data>
+  <data name="checkBoxStartPage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 17</value>
+  </data>
+  <data name="checkBoxStartPage.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="checkBoxStartPage.Text" xml:space="preserve">
+    <value>Toon startpagina</value>
+  </data>
+  <data name="&gt;&gt;checkBoxStartPage.Name" xml:space="preserve">
+    <value>checkBoxStartPage</value>
+  </data>
+  <data name="&gt;&gt;checkBoxStartPage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;checkBoxStartPage.Parent" xml:space="preserve">
+    <value>groupBoxUserSettings</value>
+  </data>
+  <data name="&gt;&gt;checkBoxStartPage.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="groupBoxUserSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="groupBoxUserSettings.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="groupBoxUserSettings.Size" type="System.Drawing.Size, System.Drawing">
+    <value>473, 191</value>
+  </data>
+  <data name="groupBoxUserSettings.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="groupBoxUserSettings.Text" xml:space="preserve">
+    <value>Algemeen</value>
+  </data>
+  <data name="&gt;&gt;groupBoxUserSettings.Name" xml:space="preserve">
+    <value>groupBoxUserSettings</value>
+  </data>
+  <data name="&gt;&gt;groupBoxUserSettings.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBoxUserSettings.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBoxUserSettings.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>473, 191</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
+        AAD///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af//
+        /wH///8B////Af///wG3opP/Y0k1/2NJNf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/2NJNf9jSTX/Y0k1////
+        /wH///8B////Af///wH///8Bt6KT//////+3opP/t6KT/7eik/+3opP/t6KT/7eik/+3opP/t6KT/2NJ
+        Nf////8B////Af///wH///8B////Abeik/////////////z6+f/38e7/8efh/+zd1f/m08n/4cq9/7ei
+        k/9jSTX/////Af///wH///8B////Af///wG3opP//////9zc3P+ZmZn/6+rp//Xt6f/f1M3/2svE/9rH
+        vf/Br6P/Y0k1/////wH///8B////Af///wH///8Bt6KT//////9nZ2f//////5eXl//48/D/o5iQ/52R
+        h/+XioD/ybit/2ZNOf////8B////Af///wH///8B////Abqllv//////zs7O/2lpaf/e3t7/+/j3//bv
+        6//w5d//69vT/72qnf9mTDj/////Af///wH///8B////Af///wG+qZr///////////////////////79
+        /P/59fL/9Ovm/+7h2v+3opP/ZEo2/////wH///8B////Af///wH///8Bw66e//////+0r6r/Qzw7/8C6
+        t///////4t3a/9zU0P/b0cv/vaqc/2NJNf////8B////Af///wH///8B////Aciyo///////JiQi/83N
+        zf9gVlP//////6idlf+jmZH/qqCX/8W1qf9jSTX/////Af///wH///8B////Af///wHMtqf//////6yk
+        nv8oJST/tbCs/////////////f38/82/tP/Ht6v/ZEo2/////wH///8B////Af///wH///8B0bur////
+        /////////////////////////////7eik/9kSjb/ZEo2/2RKNv////8B////Af///wH///8B////AdW/
+        r/////////////////////////////////+5pJX/1MW6/2RKNv/Js6SN////Af///wH///8B////Af//
+        /wHYwrL/////////////////////////////////wKuc/2RKNv/Js6SL////Af///wH///8B////Af//
+        /wH///8B2MKy/9jCsv/YwrL/2MKy/9jCsv/Uvq7/z7mp/8mzpP/Js6SL////Af///wH///8B////Af//
+        /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af//
+        /wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
+        //8AAP//AAD//w==
+</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Opties</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>OptionsDialog</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>
\ No newline at end of file
Fisheye: Tag 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/GeneralOptionsControl.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -rc27aa10e3d9924c856ba3ed81ca12c96a56fe635 -r00bf02e3c099d01fbdb84735d8fc64de0fb98aaa
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision c27aa10e3d9924c856ba3ed81ca12c96a56fe635)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -60,8 +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\Options\ColorThemeTest.cs" />
+    <Compile Include="Forms\Options\OptionsDialogTest.cs" />
     <Compile Include="Forms\SplashScreenTest.cs" />
     <Compile Include="GuiCommandHandlerTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Common/test/Core.Common.Gui.Test/Forms/Options/ColorThemeTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Forms/Options/ColorThemeTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/Options/ColorThemeTest.cs	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.ObjectModel;
+using Core.Common.Gui.Properties;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Forms.Options
+{
+    [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/Options/OptionsDialogTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Forms/Options/OptionsDialogTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/Options/OptionsDialogTest.cs	(revision 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa)
@@ -0,0 +1,35 @@
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Forms.Options
+{
+    [TestFixture]
+    public class OptionsDialogTest
+    {
+        [Test]
+        public void GivenGeneralOptionsControlCreated_WhenRetrievingOptionsItems_ThenOptionsShouldBeTranslated()
+        {
+            using (var control = new Gui.Forms.Options.OptionsDialog())
+            {
+                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++) 
+                {
+                    Assert.AreEqual(localizedThemes[i], subControl.GetItemText(subControl.Items[i]));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/ColorThemeTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 00bf02e3c099d01fbdb84735d8fc64de0fb98aaa refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.Test/Forms/OptionsDialog/GeneralOptionsControlTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?