Index: src/Common/DelftTools.Utils/SettingsHelper.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r2899024e0e552929460b0eb71dbf86852dd40f58
--- src/Common/DelftTools.Utils/SettingsHelper.cs	(.../SettingsHelper.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/DelftTools.Utils/SettingsHelper.cs	(.../SettingsHelper.cs)	(revision 2899024e0e552929460b0eb71dbf86852dd40f58)
@@ -13,6 +13,7 @@
             var info = AssemblyUtils.GetExecutingAssemblyInfo();
             ApplicationName = info.Product;
             ApplicationVersion = info.Version;
+            ApplicationCompany = info.Company;
         }
 
         public static string ApplicationNameAndVersion
@@ -23,8 +24,9 @@
             }
         }
 
-        public static string ApplicationName { get; set; }
-        public static string ApplicationVersion { get; set; }
+        public static string ApplicationName { get; private set; }
+        public static string ApplicationVersion { get; private set; }
+        public static string ApplicationCompany { get; private set; }
 
         public static string GetApplicationLocalUserSettingsDirectory()
         {
Index: src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs
===================================================================
diff -u -rfa1c86d90aad8abe422614a78077515ef39d8c96 -r2899024e0e552929460b0eb71dbf86852dd40f58
--- src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs	(.../DeltaShellApplication.cs)	(revision fa1c86d90aad8abe422614a78077515ef39d8c96)
+++ src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs	(.../DeltaShellApplication.cs)	(revision 2899024e0e552929460b0eb71dbf86852dd40f58)
@@ -84,8 +84,6 @@
             }
             AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainAssemblyResolve;
 
-            InitializeSettingsHelper();
-
             Settings = ConfigurationManager.AppSettings;
             UserSettings = Properties.Settings.Default;
         }
@@ -617,15 +615,6 @@
             }
         }
 
-        private void InitializeSettingsHelper()
-        {
-            //read settings from app.config and update the settings helper.
-            if (Settings.AllKeys.Contains("applicationName"))
-            {
-                SettingsHelper.ApplicationName = Settings["applicationName"];
-            }
-        }
-
         private void SaveTemporaryProjectThread()
         {
             ProjectService.SaveProjectInTemporaryFolder(projectBeingCreated);
Index: src/DeltaShell/DeltaShell.Core/DeltaShellUserDataFolderConverter.cs
===================================================================
diff -u -rfa1c86d90aad8abe422614a78077515ef39d8c96 -r2899024e0e552929460b0eb71dbf86852dd40f58
--- src/DeltaShell/DeltaShell.Core/DeltaShellUserDataFolderConverter.cs	(.../DeltaShellUserDataFolderConverter.cs)	(revision fa1c86d90aad8abe422614a78077515ef39d8c96)
+++ src/DeltaShell/DeltaShell.Core/DeltaShellUserDataFolderConverter.cs	(.../DeltaShellUserDataFolderConverter.cs)	(revision 2899024e0e552929460b0eb71dbf86852dd40f58)
@@ -17,7 +17,6 @@
     {
         protected override void Convert(TextWriter writer, object state)
         {
-            // makes sure that the application log file is saved in a correct folder, settings it in DeltaShellApplication is not enough
             var settingsDirectory = SettingsHelper.GetApplicationLocalUserSettingsDirectory();
 
             DeleteOldLogFiles(settingsDirectory);
Index: src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs
===================================================================
diff -u -rfa1c86d90aad8abe422614a78077515ef39d8c96 -r2899024e0e552929460b0eb71dbf86852dd40f58
--- src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs	(.../DeltaShellGui.cs)	(revision fa1c86d90aad8abe422614a78077515ef39d8c96)
+++ src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs	(.../DeltaShellGui.cs)	(revision 2899024e0e552929460b0eb71dbf86852dd40f58)
@@ -764,13 +764,12 @@
 
         private void ShowSplashScreen()
         {
-            // plugin assemblies loaded - count steps required to start application
             splashScreen = new SplashScreen(Application)
             {
                 LabelVersionVersion = SettingsHelper.ApplicationVersion,
                 SplashScreenCopyright = Application.Settings["copyright"],
                 LabelLicense = Application.Settings["license"],
-                LabelCompany = Application.Settings["company"]
+                LabelCompany = SettingsHelper.ApplicationCompany
             };
 
             splashScreen.IsVisibleChanged += delegate
Index: src/DeltaShell/DeltaShell.Gui/app.config
===================================================================
diff -u -rfa1c86d90aad8abe422614a78077515ef39d8c96 -r2899024e0e552929460b0eb71dbf86852dd40f58
--- src/DeltaShell/DeltaShell.Gui/app.config	(.../app.config)	(revision fa1c86d90aad8abe422614a78077515ef39d8c96)
+++ src/DeltaShell/DeltaShell.Gui/app.config	(.../app.config)	(revision 2899024e0e552929460b0eb71dbf86852dd40f58)
@@ -14,15 +14,13 @@
     </sectionGroup>
   </configSections>
   <appSettings>
-    <add key="applicationName" value="Delta Shell"  />
     <add key="toolboxPath" value="" />
     <add key="startPageUrl" value="http://www.helpdeskwater.nl" />
     <add key="IsProjectExplorerSorted" value="false" />
     <add key="supportEmail" value="delta-shell-support@deltares.nl" />
     <add key="supportPhone" value="+31 (0)88 335 8100" />
     <add key="copyright" value="© Deltares 2015" />
     <add key="license" value="Free" />
-    <add key="company" value="Deltares" />
     <add key="applicationIcon" value="" />
     <add key="mainWindowTitle" value="Delta Shell" />
     <add key="licensePageName" value="License Agreement" />