Index: Application/Application.Ringtoets/Forms/MainWindow/MainWindow.Designer.cs
===================================================================
diff -u -r6e613570fb69ad93ca5fe269e6f48c8f6ceb1bab -r65bfb1219a93e52029335ce32f697ea1fd946961
--- Application/Application.Ringtoets/Forms/MainWindow/MainWindow.Designer.cs	(.../MainWindow.Designer.cs)	(revision 6e613570fb69ad93ca5fe269e6f48c8f6ceb1bab)
+++ Application/Application.Ringtoets/Forms/MainWindow/MainWindow.Designer.cs	(.../MainWindow.Designer.cs)	(revision 65bfb1219a93e52029335ce32f697ea1fd946961)
@@ -2,11 +2,11 @@
 using System.Collections;
 using System.Drawing;
 using System.Reflection;
-using DelftTools.Utils.Aop;
+using Core.Common.Utils.Aop;
 using DevComponents.DotNetBar;
 using Microsoft.Win32;
 
-namespace DeltaShell.Gui.Forms.MainWindow
+namespace Application.Ringtoets.Forms.MainWindow
 {
     partial class MainWindow
     {
@@ -350,7 +350,7 @@
             // 
             // btnCancelProcess
             // 
-            this.btnCancelProcess.Image = global::DeltaShell.Gui.Properties.Resources.cancel;
+            this.btnCancelProcess.Image = global::Application.Ringtoets.Properties.Resources.cancel;
             this.btnCancelProcess.Name = "btnCancelProcess";
             this.btnCancelProcess.ThemeAware = true;
             resources.ApplyResources(this.btnCancelProcess, "btnCancelProcess");
@@ -423,7 +423,7 @@
             // 
             resources.ApplyResources(this.buttonMenuFileNewProject, "buttonMenuFileNewProject");
             this.buttonMenuFileNewProject.GlobalName = "fileNew";
-            this.buttonMenuFileNewProject.Image = global::DeltaShell.Gui.Properties.Resources.DocumentHS;
+            this.buttonMenuFileNewProject.Image = global::Application.Ringtoets.Properties.Resources.DocumentHS;
             this.buttonMenuFileNewProject.Name = "buttonMenuFileNewProject";
             this.buttonMenuFileNewProject.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlN);
             this.buttonMenuFileNewProject.ThemeAware = true;
@@ -433,7 +433,7 @@
             // 
             resources.ApplyResources(this.buttonMenuFileOpenProject, "buttonMenuFileOpenProject");
             this.buttonMenuFileOpenProject.GlobalName = "fileOpen";
-            this.buttonMenuFileOpenProject.Image = global::DeltaShell.Gui.Properties.Resources.openfolderHS;
+            this.buttonMenuFileOpenProject.Image = global::Application.Ringtoets.Properties.Resources.openfolderHS;
             this.buttonMenuFileOpenProject.Name = "buttonMenuFileOpenProject";
             this.buttonMenuFileOpenProject.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlO);
             this.buttonMenuFileOpenProject.ThemeAware = true;
@@ -444,7 +444,7 @@
             resources.ApplyResources(this.buttonMenuFileSaveProject, "buttonMenuFileSaveProject");
             this.buttonMenuFileSaveProject.BeginGroup = true;
             this.buttonMenuFileSaveProject.GlobalName = "fileSave";
-            this.buttonMenuFileSaveProject.Image = global::DeltaShell.Gui.Properties.Resources.saveHS;
+            this.buttonMenuFileSaveProject.Image = global::Application.Ringtoets.Properties.Resources.saveHS;
             this.buttonMenuFileSaveProject.Name = "buttonMenuFileSaveProject";
             this.buttonMenuFileSaveProject.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlS);
             this.buttonMenuFileSaveProject.ThemeAware = true;
@@ -524,7 +524,7 @@
             // 
             // buttonMenuEditUndo
             // 
-            this.buttonMenuEditUndo.Image = global::DeltaShell.Gui.Properties.Resources.Edit_UndoHS;
+            this.buttonMenuEditUndo.Image = global::Application.Ringtoets.Properties.Resources.Edit_UndoHS;
             this.buttonMenuEditUndo.Name = "buttonMenuEditUndo";
             this.buttonMenuEditUndo.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlZ);
             resources.ApplyResources(this.buttonMenuEditUndo, "buttonMenuEditUndo");
@@ -533,7 +533,7 @@
             // 
             // buttonMenuEditRedo
             // 
-            this.buttonMenuEditRedo.Image = global::DeltaShell.Gui.Properties.Resources.Edit_RedoHS;
+            this.buttonMenuEditRedo.Image = global::Application.Ringtoets.Properties.Resources.Edit_RedoHS;
             this.buttonMenuEditRedo.Name = "buttonMenuEditRedo";
             this.buttonMenuEditRedo.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlY);
             resources.ApplyResources(this.buttonMenuEditRedo, "buttonMenuEditRedo");
@@ -543,31 +543,31 @@
             // buttonMenuEditCut
             // 
             this.buttonMenuEditCut.BeginGroup = true;
-            this.buttonMenuEditCut.Image = global::DeltaShell.Gui.Properties.Resources.cut;
+            this.buttonMenuEditCut.Image = global::Application.Ringtoets.Properties.Resources.cut;
             this.buttonMenuEditCut.Name = "buttonMenuEditCut";
             resources.ApplyResources(this.buttonMenuEditCut, "buttonMenuEditCut");
             this.buttonMenuEditCut.ThemeAware = true;
             this.buttonMenuEditCut.Click += new System.EventHandler(this.buttonMenuEditCut_Click);
             // 
             // buttonMenuEditCopy
             // 
-            this.buttonMenuEditCopy.Image = global::DeltaShell.Gui.Properties.Resources.CopyHS;
+            this.buttonMenuEditCopy.Image = global::Application.Ringtoets.Properties.Resources.CopyHS;
             this.buttonMenuEditCopy.Name = "buttonMenuEditCopy";
             resources.ApplyResources(this.buttonMenuEditCopy, "buttonMenuEditCopy");
             this.buttonMenuEditCopy.ThemeAware = true;
             this.buttonMenuEditCopy.Click += new System.EventHandler(this.buttonMenuEditCopy_Click);
             // 
             // buttonMenuEditPaste
             // 
-            this.buttonMenuEditPaste.Image = global::DeltaShell.Gui.Properties.Resources.PasteHS;
+            this.buttonMenuEditPaste.Image = global::Application.Ringtoets.Properties.Resources.PasteHS;
             this.buttonMenuEditPaste.Name = "buttonMenuEditPaste";
             resources.ApplyResources(this.buttonMenuEditPaste, "buttonMenuEditPaste");
             this.buttonMenuEditPaste.ThemeAware = true;
             this.buttonMenuEditPaste.Click += new System.EventHandler(this.buttonMenuEditPaste_Click);
             // 
             // buttonMenuEditDelete
             // 
-            this.buttonMenuEditDelete.Image = global::DeltaShell.Gui.Properties.Resources.DeleteHS;
+            this.buttonMenuEditDelete.Image = global::Application.Ringtoets.Properties.Resources.DeleteHS;
             this.buttonMenuEditDelete.Name = "buttonMenuEditDelete";
             resources.ApplyResources(this.buttonMenuEditDelete, "buttonMenuEditDelete");
             this.buttonMenuEditDelete.ThemeAware = true;
@@ -576,15 +576,15 @@
             // buttonMenuEditFind
             // 
             resources.ApplyResources(this.buttonMenuEditFind, "buttonMenuEditFind");
-            this.buttonMenuEditFind.Image = global::DeltaShell.Gui.Properties.Resources.FindView;
+            this.buttonMenuEditFind.Image = global::Application.Ringtoets.Properties.Resources.FindView;
             this.buttonMenuEditFind.Name = "buttonMenuEditFind";
             this.buttonMenuEditFind.ThemeAware = true;
             this.buttonMenuEditFind.Click += new System.EventHandler(this.buttonMenuEditFind_Click);
             // 
             // buttonMenuEditFindInProject
             // 
             resources.ApplyResources(this.buttonMenuEditFindInProject, "buttonMenuEditFindInProject");
-            this.buttonMenuEditFindInProject.Image = global::DeltaShell.Gui.Properties.Resources.FindProject;
+            this.buttonMenuEditFindInProject.Image = global::Application.Ringtoets.Properties.Resources.FindProject;
             this.buttonMenuEditFindInProject.Name = "buttonMenuEditFindInProject";
             this.buttonMenuEditFindInProject.ThemeAware = true;
             this.buttonMenuEditFindInProject.Click += new System.EventHandler(this.buttonMenuEditFindInProject_Click);
@@ -601,15 +601,15 @@
             // 
             // buttonMenuViewStartPage
             // 
-            this.buttonMenuViewStartPage.Image = global::DeltaShell.Gui.Properties.Resources.startpage;
+            this.buttonMenuViewStartPage.Image = global::Application.Ringtoets.Properties.Resources.startpage;
             this.buttonMenuViewStartPage.Name = "buttonMenuViewStartPage";
             resources.ApplyResources(this.buttonMenuViewStartPage, "buttonMenuViewStartPage");
             this.buttonMenuViewStartPage.ThemeAware = true;
             this.buttonMenuViewStartPage.Click += new System.EventHandler(this.buttonMenuViewStartPage_Click);
             // 
             // buttonMenuViewMessages
             // 
-            this.buttonMenuViewMessages.Image = global::DeltaShell.Gui.Properties.Resources.application_view_list;
+            this.buttonMenuViewMessages.Image = global::Application.Ringtoets.Properties.Resources.application_view_list;
             this.buttonMenuViewMessages.Name = "buttonMenuViewMessages";
             resources.ApplyResources(this.buttonMenuViewMessages, "buttonMenuViewMessages");
             this.buttonMenuViewMessages.ThemeAware = true;
@@ -618,7 +618,7 @@
             // buttonMenuViewProperties
             // 
             this.buttonMenuViewProperties.BeginGroup = true;
-            this.buttonMenuViewProperties.Image = global::DeltaShell.Gui.Properties.Resources.PropertiesHS;
+            this.buttonMenuViewProperties.Image = global::Application.Ringtoets.Properties.Resources.PropertiesHS;
             this.buttonMenuViewProperties.Name = "buttonMenuViewProperties";
             resources.ApplyResources(this.buttonMenuViewProperties, "buttonMenuViewProperties");
             this.buttonMenuViewProperties.ThemeAware = true;
@@ -643,15 +643,15 @@
             // 
             // buttonMenuProjectAddNewModel
             // 
-            this.buttonMenuProjectAddNewModel.Image = global::DeltaShell.Gui.Properties.Resources.brick_add;
+            this.buttonMenuProjectAddNewModel.Image = global::Application.Ringtoets.Properties.Resources.brick_add;
             this.buttonMenuProjectAddNewModel.Name = "buttonMenuProjectAddNewModel";
             resources.ApplyResources(this.buttonMenuProjectAddNewModel, "buttonMenuProjectAddNewModel");
             this.buttonMenuProjectAddNewModel.ThemeAware = true;
             this.buttonMenuProjectAddNewModel.Click += new System.EventHandler(this.buttonMenuProjectAddNewModel_Click);
             // 
             // buttonMenuProjectAddNewFolder
             // 
-            this.buttonMenuProjectAddNewFolder.Image = global::DeltaShell.Gui.Properties.Resources.folder_add2;
+            this.buttonMenuProjectAddNewFolder.Image = global::Application.Ringtoets.Properties.Resources.folder_add2;
             this.buttonMenuProjectAddNewFolder.Name = "buttonMenuProjectAddNewFolder";
             resources.ApplyResources(this.buttonMenuProjectAddNewFolder, "buttonMenuProjectAddNewFolder");
             this.buttonMenuProjectAddNewFolder.ThemeAware = true;
@@ -672,7 +672,7 @@
             // buttonMenuModelRunAll
             // 
             this.buttonMenuModelRunAll.BeginGroup = true;
-            this.buttonMenuModelRunAll.Image = global::DeltaShell.Gui.Properties.Resources.PlayAll;
+            this.buttonMenuModelRunAll.Image = global::Application.Ringtoets.Properties.Resources.PlayAll;
             this.buttonMenuModelRunAll.Name = "buttonMenuModelRunAll";
             this.buttonMenuModelRunAll.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlF9);
             resources.ApplyResources(this.buttonMenuModelRunAll, "buttonMenuModelRunAll");
@@ -681,7 +681,7 @@
             // 
             // buttonMenuModelStopAll
             // 
-            this.buttonMenuModelStopAll.Image = global::DeltaShell.Gui.Properties.Resources.StopHS;
+            this.buttonMenuModelStopAll.Image = global::Application.Ringtoets.Properties.Resources.StopHS;
             this.buttonMenuModelStopAll.Name = "buttonMenuModelStopAll";
             resources.ApplyResources(this.buttonMenuModelStopAll, "buttonMenuModelStopAll");
             this.buttonMenuModelStopAll.ThemeAware = true;
@@ -690,7 +690,7 @@
             // buttonMenuModelRunModel
             // 
             this.buttonMenuModelRunModel.BeginGroup = true;
-            this.buttonMenuModelRunModel.Image = global::DeltaShell.Gui.Properties.Resources.PlayHS;
+            this.buttonMenuModelRunModel.Image = global::Application.Ringtoets.Properties.Resources.PlayHS;
             this.buttonMenuModelRunModel.Name = "buttonMenuModelRunModel";
             this.buttonMenuModelRunModel.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.F9);
             resources.ApplyResources(this.buttonMenuModelRunModel, "buttonMenuModelRunModel");
@@ -699,7 +699,7 @@
             // 
             // buttonMenuModelStopModel
             // 
-            this.buttonMenuModelStopModel.Image = global::DeltaShell.Gui.Properties.Resources.StopHS;
+            this.buttonMenuModelStopModel.Image = global::Application.Ringtoets.Properties.Resources.StopHS;
             this.buttonMenuModelStopModel.Name = "buttonMenuModelStopModel";
             resources.ApplyResources(this.buttonMenuModelStopModel, "buttonMenuModelStopModel");
             this.buttonMenuModelStopModel.ThemeAware = true;
@@ -716,7 +716,7 @@
             // 
             // buttonMenuToolsPlugins
             // 
-            this.buttonMenuToolsPlugins.Image = global::DeltaShell.Gui.Properties.Resources.plugin;
+            this.buttonMenuToolsPlugins.Image = global::Application.Ringtoets.Properties.Resources.plugin;
             this.buttonMenuToolsPlugins.Name = "buttonMenuToolsPlugins";
             resources.ApplyResources(this.buttonMenuToolsPlugins, "buttonMenuToolsPlugins");
             this.buttonMenuToolsPlugins.ThemeAware = true;
@@ -726,7 +726,7 @@
             // buttonMenuToolsOptions
             // 
             this.buttonMenuToolsOptions.BeginGroup = true;
-            this.buttonMenuToolsOptions.Image = global::DeltaShell.Gui.Properties.Resources.OptionsHS;
+            this.buttonMenuToolsOptions.Image = global::Application.Ringtoets.Properties.Resources.OptionsHS;
             this.buttonMenuToolsOptions.Name = "buttonMenuToolsOptions";
             resources.ApplyResources(this.buttonMenuToolsOptions, "buttonMenuToolsOptions");
             this.buttonMenuToolsOptions.ThemeAware = true;
@@ -743,7 +743,7 @@
             // 
             // buttonViewLog
             // 
-            this.buttonViewLog.Image = global::DeltaShell.Gui.Properties.Resources.application_view_list;
+            this.buttonViewLog.Image = global::Application.Ringtoets.Properties.Resources.application_view_list;
             this.buttonViewLog.Name = "buttonViewLog";
             resources.ApplyResources(this.buttonViewLog, "buttonViewLog");
             this.buttonViewLog.ThemeAware = true;
@@ -752,7 +752,7 @@
             // buttonMenuHelpAbout
             // 
             this.buttonMenuHelpAbout.BeginGroup = true;
-            this.buttonMenuHelpAbout.Image = global::DeltaShell.Gui.Properties.Resources.information;
+            this.buttonMenuHelpAbout.Image = global::Application.Ringtoets.Properties.Resources.information;
             this.buttonMenuHelpAbout.Name = "buttonMenuHelpAbout";
             resources.ApplyResources(this.buttonMenuHelpAbout, "buttonMenuHelpAbout");
             this.buttonMenuHelpAbout.ThemeAware = true;
@@ -780,14 +780,14 @@
             // buttonToolbarMainNewProject
             // 
             resources.ApplyResources(this.buttonToolbarMainNewProject, "buttonToolbarMainNewProject");
-            this.buttonToolbarMainNewProject.Image = global::DeltaShell.Gui.Properties.Resources.DocumentHS;
+            this.buttonToolbarMainNewProject.Image = global::Application.Ringtoets.Properties.Resources.DocumentHS;
             this.buttonToolbarMainNewProject.Name = "buttonToolbarMainNewProject";
             this.buttonToolbarMainNewProject.ThemeAware = true;
             this.buttonToolbarMainNewProject.Click += new System.EventHandler(this.buttonToolbarMainNewProject_Click);
             // 
             // buttonToolbarMainOpenProject
             // 
-            this.buttonToolbarMainOpenProject.Image = global::DeltaShell.Gui.Properties.Resources.openfolderHS;
+            this.buttonToolbarMainOpenProject.Image = global::Application.Ringtoets.Properties.Resources.openfolderHS;
             this.buttonToolbarMainOpenProject.ImageIndex = 28;
             this.buttonToolbarMainOpenProject.Name = "buttonToolbarMainOpenProject";
             resources.ApplyResources(this.buttonToolbarMainOpenProject, "buttonToolbarMainOpenProject");
@@ -796,7 +796,7 @@
             // 
             // buttonToolbarMainSaveProject
             // 
-            this.buttonToolbarMainSaveProject.Image = global::DeltaShell.Gui.Properties.Resources.saveHS;
+            this.buttonToolbarMainSaveProject.Image = global::Application.Ringtoets.Properties.Resources.saveHS;
             this.buttonToolbarMainSaveProject.ImageIndex = 26;
             this.buttonToolbarMainSaveProject.Name = "buttonToolbarMainSaveProject";
             resources.ApplyResources(this.buttonToolbarMainSaveProject, "buttonToolbarMainSaveProject");
@@ -806,22 +806,22 @@
             // buttonToolbarMainCut
             // 
             this.buttonToolbarMainCut.BeginGroup = true;
-            this.buttonToolbarMainCut.Image = global::DeltaShell.Gui.Properties.Resources.cut;
+            this.buttonToolbarMainCut.Image = global::Application.Ringtoets.Properties.Resources.cut;
             this.buttonToolbarMainCut.ImageIndex = 80;
             this.buttonToolbarMainCut.Name = "buttonToolbarMainCut";
             resources.ApplyResources(this.buttonToolbarMainCut, "buttonToolbarMainCut");
             this.buttonToolbarMainCut.ThemeAware = true;
             // 
             // buttonToolbarMainCopy
             // 
-            this.buttonToolbarMainCopy.Image = global::DeltaShell.Gui.Properties.Resources.CopyHS;
+            this.buttonToolbarMainCopy.Image = global::Application.Ringtoets.Properties.Resources.CopyHS;
             this.buttonToolbarMainCopy.Name = "buttonToolbarMainCopy";
             resources.ApplyResources(this.buttonToolbarMainCopy, "buttonToolbarMainCopy");
             this.buttonToolbarMainCopy.ThemeAware = true;
             // 
             // buttonToolbarMainPaste
             // 
-            this.buttonToolbarMainPaste.Image = global::DeltaShell.Gui.Properties.Resources.PasteHS;
+            this.buttonToolbarMainPaste.Image = global::Application.Ringtoets.Properties.Resources.PasteHS;
             this.buttonToolbarMainPaste.Name = "buttonToolbarMainPaste";
             resources.ApplyResources(this.buttonToolbarMainPaste, "buttonToolbarMainPaste");
             this.buttonToolbarMainPaste.ThemeAware = true;
@@ -844,15 +844,15 @@
             // 
             // buttonToolbarRunRunSelectedModel
             // 
-            this.buttonToolbarRunRunSelectedModel.Image = global::DeltaShell.Gui.Properties.Resources.PlayHS;
+            this.buttonToolbarRunRunSelectedModel.Image = global::Application.Ringtoets.Properties.Resources.PlayHS;
             this.buttonToolbarRunRunSelectedModel.Name = "buttonToolbarRunRunSelectedModel";
             resources.ApplyResources(this.buttonToolbarRunRunSelectedModel, "buttonToolbarRunRunSelectedModel");
             this.buttonToolbarRunRunSelectedModel.ThemeAware = true;
             this.buttonToolbarRunRunSelectedModel.Click += new System.EventHandler(this.buttonMenuModelStartSelectedModel_Click);
             // 
             // buttonToolbarRunRunAllModels
             // 
-            this.buttonToolbarRunRunAllModels.Image = global::DeltaShell.Gui.Properties.Resources.PlayAll;
+            this.buttonToolbarRunRunAllModels.Image = global::Application.Ringtoets.Properties.Resources.PlayAll;
             this.buttonToolbarRunRunAllModels.Name = "buttonToolbarRunRunAllModels";
             resources.ApplyResources(this.buttonToolbarRunRunAllModels, "buttonToolbarRunRunAllModels");
             this.buttonToolbarRunRunAllModels.ThemeAware = true;