Index: Application/Application.Ringtoets/DeltaShellGui.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Application/Application.Ringtoets/DeltaShellGui.cs	(.../DeltaShellGui.cs)	(revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Application/Application.Ringtoets/DeltaShellGui.cs	(.../DeltaShellGui.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -24,7 +24,6 @@
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Forms.MainWindow;
-using Core.Common.Gui.Forms.SplashScreen;
 using Core.Common.Utils;
 using Core.Common.Utils.Aop;
 using Core.Common.Utils.Collections;
Index: Application/Application.Ringtoets/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Application/Application.Ringtoets/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -7,6 +7,7 @@
 using Application.Ringtoets.Properties;
 using Core.Common.Controls;
 using Core.Common.Gui.Forms;
+using Core.Common.Gui.Forms.MessageWindow;
 using log4net.Core;
 
 namespace Application.Ringtoets.Forms.MessageWindow
Index: Application/Application.Ringtoets/Forms/MessageWindow/MessageWindowLogAppender.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Application/Application.Ringtoets/Forms/MessageWindow/MessageWindowLogAppender.cs	(.../MessageWindowLogAppender.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Forms/MessageWindow/MessageWindowLogAppender.cs	(.../MessageWindowLogAppender.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -5,6 +5,7 @@
 using System.Resources;
 using Application.Ringtoets.Properties;
 using Core.Common.Gui.Forms;
+using Core.Common.Gui.Forms.MessageWindow;
 using log4net.Appender;
 using log4net.Core;
 
Index: Application/Application.Ringtoets/Forms/OptionsDialog/GeneralOptionsControl.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Application/Application.Ringtoets/Forms/OptionsDialog/GeneralOptionsControl.cs	(.../GeneralOptionsControl.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Forms/OptionsDialog/GeneralOptionsControl.cs	(.../GeneralOptionsControl.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using Application.Ringtoets.Properties;
 using Core.Common.Gui.Forms;
+using Core.Common.Gui.Forms.OptionsDialog;
 using Core.Common.Utils.Globalization;
 
 namespace Application.Ringtoets.Forms.OptionsDialog
Index: Application/Application.Ringtoets/Forms/OptionsDialog/OptionsDialog.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Application/Application.Ringtoets/Forms/OptionsDialog/OptionsDialog.cs	(.../OptionsDialog.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Forms/OptionsDialog/OptionsDialog.cs	(.../OptionsDialog.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -5,6 +5,7 @@
 using Application.Ringtoets.Properties;
 using Core.Common.Controls.Swf;
 using Core.Common.Gui.Forms;
+using Core.Common.Gui.Forms.OptionsDialog;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
 
Index: Application/Application.Ringtoets/Forms/SplashScreen.xaml.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Application/Application.Ringtoets/Forms/SplashScreen.xaml.cs	(.../SplashScreen.xaml.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Forms/SplashScreen.xaml.cs	(.../SplashScreen.xaml.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -5,7 +5,6 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using Core.Common.Base;
-using Core.Common.BaseDelftTools;
 using log4net;
 
 namespace Application.Ringtoets.Forms
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -128,7 +128,6 @@
     <Compile Include="Forms\MainWindow\IMainWindow.cs" />
     <Compile Include="Forms\MessageWindow\IMessageWindow.cs" />
     <Compile Include="Forms\OptionsDialog\IOptionsControl.cs" />
-    <Compile Include="Forms\SplashScreen\SplashScreen.xaml.cs" />
     <Compile Include="IConfigureDialog.cs" />
     <Compile Include="IGuiCommand.cs" />
     <Compile Include="ILayerEditorView.cs" />
@@ -141,7 +140,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Resources.nl-NL.Designer.cs" />
     <Compile Include="PropertyInfo.cs" />
     <Compile Include="IViewList.cs" />
     <Compile Include="ItemEventArgs.cs" />
@@ -206,22 +204,16 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Forms\ProgressDialog\" />
+    <Folder Include="Forms\SplashScreen\" />
     <Folder Include="Forms\ViewManager\" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="Forms\SplashScreen\SplashScreen.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\build\DeltaShell.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Fisheye: Tag 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/IMainWindow.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/IMessageWindow.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/IOptionsControl.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -0,0 +1,51 @@
+using Core.Common.Gui.Forms.MessageWindow;
+
+namespace Core.Common.Gui.Forms.MainWindow
+{
+    /// <summary>
+    /// Main window of a shell application
+    /// </summary>
+    public interface IMainWindow
+    {
+        /// <summary>
+        /// Project explorer tool window. See also <seealso cref="IGui.ToolWindowViews"/>.
+        /// </summary>
+        IProjectExplorer ProjectExplorer { get; }
+
+        /// <summary>
+        /// Property grid tool window. See also <seealso cref="IGui.ToolWindowViews"/>.
+        /// </summary>
+        IPropertyGrid PropertyGrid { get; }
+
+        /// <summary>
+        /// Tool window containing log messages. See also <seealso cref="IGui.ToolWindowViews"/>.
+        /// </summary>
+        IMessageWindow MessageWindow { get; }
+
+        //TODO: This is  inconsistent with the form title which is called .Text
+        /// <summary>
+        /// The window title
+        /// </summary>
+        string Title { get; set; }
+
+        /// <summary>
+        /// Is the window visible?
+        /// </summary>
+        bool Visible { get; }
+
+        string StatusBarMessage { get; set; }
+
+        void Show();
+
+        /// <summary>
+        /// Closes main window
+        /// </summary>
+        void Close();
+
+        void ValidateItems();
+
+        void SetWaitCursorOn();
+
+        void SetWaitCursorOff();
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -0,0 +1,30 @@
+using System;
+using Core.Common.Controls;
+using log4net.Core;
+
+namespace Core.Common.Gui.Forms.MessageWindow
+{
+    public interface IMessageWindow : IView
+    {
+        /// <summary>
+        /// Adds logging event as a log4net event to the window.
+        /// Only some columns are added.
+        /// </summary>
+        /// <param name="level"></param>
+        /// <param name="time"></param>
+        /// <param name="message"></param>
+        void AddMessage(Level level, DateTime time, string message);
+
+        /// <summary>
+        /// Clears all messages in the window.
+        /// </summary>
+        void Clear();
+
+        /// <summary>
+        /// Returns true if message level is enabled in the window (can be shown).
+        /// </summary>
+        /// <param name="level"></param>
+        /// <returns></returns>
+        bool IsMessageLevelEnabled(Level level);
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/IOptionsControl.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/IOptionsControl.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Forms/OptionsDialog/IOptionsControl.cs	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
@@ -0,0 +1,30 @@
+namespace Core.Common.Gui.Forms.OptionsDialog
+{
+    /// <summary>
+    /// Interface to specify controls that are incorporated in the Options dialog. Each implementation should derive from System.Windows.Forms.Control
+    /// </summary>
+    public interface IOptionsControl
+    {
+        /// <summary>
+        /// Title of the control. Empty titels will be skipped. Controls with a title that matches a category are used as visualization of a category. Others are places as a child of a category node.
+        /// </summary>
+        string Title { get; }
+
+        /// <summary>
+        /// Category where this options control should be placed. Empty categories will be skipped.
+        /// </summary>
+        string Category { get; }
+
+        /// <summary>
+        /// Called when the user presses the OK button. Changed values should now be committed such that it has an effect on the GUI
+        /// </summary>
+        void AcceptChanges();
+
+        /// <summary>
+        /// Called when the user presses the Cancel button. Settings should be reverted back to what they were before.
+        /// </summary>
+        void DeclineChanges();
+
+        // TODO: support Image Image { get; } / Image Icon { get; }
+    }
+}
\ No newline at end of file