diff --git a/VECTO3GUI2020/App.config b/VECTO3GUI2020/App.config
deleted file mode 100644
index 42539f8d635f40d4574f7993d787fcbf3fabdd07..0000000000000000000000000000000000000000
--- a/VECTO3GUI2020/App.config
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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="VECTO3GUI2020.Properties.Application" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-            <section name="VECTO3GUI2020.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
-    <userSettings>
-        <VECTO3GUI2020.Properties.Application>
-            <setting name="Path" serializeAs="String">
-                <value />
-            </setting>
-        </VECTO3GUI2020.Properties.Application>
-        <VECTO3GUI2020.Properties.Settings>
-            <setting name="EngineeringMode" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="DefaultFilePath" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="WriteModalResults" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ModalResults1Hz" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="Validate" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ActualModalData" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="SerializeVectoRunData" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="DefaultOutputPath" serializeAs="String">
-                <value />
-            </setting>
-        </VECTO3GUI2020.Properties.Settings>
-    </userSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.6000.0" newVersion="3.0.6000.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.6000.0" newVersion="3.0.6000.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git "a/VECTO3GUI2020/Documentation - Verkn\303\274pfung.lnk" "b/VECTO3GUI2020/Documentation - Verkn\303\274pfung.lnk"
deleted file mode 100644
index b67320f9a2eebaf55c4c984c8cf03b0f110586ae..0000000000000000000000000000000000000000
Binary files "a/VECTO3GUI2020/Documentation - Verkn\303\274pfung.lnk" and /dev/null differ
diff --git a/VECTO3GUI2020/Properties/Application.Designer.cs b/VECTO3GUI2020/Properties/Application.Designer.cs
index 6dc9f161ce435740fe6c6509ef8c1f718445e508..2bd83de8b115b65e032f32a8f4f4603dd85870a2 100644
--- a/VECTO3GUI2020/Properties/Application.Designer.cs
+++ b/VECTO3GUI2020/Properties/Application.Designer.cs
@@ -12,7 +12,7 @@ namespace VECTO3GUI2020.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Application : global::System.Configuration.ApplicationSettingsBase {
         
         private static Application defaultInstance = ((Application)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Application())));
diff --git a/VECTO3GUI2020/Properties/AssemblyInfo.cs b/VECTO3GUI2020/Properties/AssemblyInfo.cs
deleted file mode 100644
index faea5cd03a3ab66fe948819a62fb6f77ce0a3ead..0000000000000000000000000000000000000000
--- a/VECTO3GUI2020/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("VECTO3GUI2020")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VECTO3GUI2020")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: InternalsVisibleTo("Vecto3GUI2020Test")]
-
-// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
-// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-//Um mit dem Erstellen lokalisierbarer Anwendungen zu beginnen, legen Sie
-//<UICulture>ImCodeVerwendeteKultur</UICulture> in der .csproj-Datei
-//in einer <PropertyGroup> fest.  Wenn Sie in den Quelldateien beispielsweise Deutsch
-//(Deutschland) verwenden, legen Sie <UICulture> auf \"de-DE\" fest.  Heben Sie dann die Auskommentierung
-//des nachstehenden NeutralResourceLanguage-Attributs auf.  Aktualisieren Sie "en-US" in der nachstehenden Zeile,
-//sodass es mit der UICulture-Einstellung in der Projektdatei übereinstimmt.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher
-                                     //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird,
-                                     // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.)
-    ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs
-                                              //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird,
-                                              // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.)
-)]
-
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-// indem Sie "*" wie unten gezeigt eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyVersion("1.0.0.0")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/VECTO3GUI2020/Properties/BusStrings.Designer.cs b/VECTO3GUI2020/Properties/BusStrings.Designer.cs
index 769c403097691b962e9a7647a4b4e72c2bee84f3..97550ca49819430bdd1125fb3630dfb2ecbd4886 100644
--- a/VECTO3GUI2020/Properties/BusStrings.Designer.cs
+++ b/VECTO3GUI2020/Properties/BusStrings.Designer.cs
@@ -22,7 +22,7 @@ namespace VECTO3GUI2020.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class BusStrings {
+    internal class BusStrings {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ namespace VECTO3GUI2020.Properties {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VECTO3GUI2020.Properties.BusStrings", typeof(BusStrings).Assembly);
@@ -51,7 +51,7 @@ namespace VECTO3GUI2020.Properties {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Airdrag Area 0.
         /// </summary>
-        public static string AirdragArea0 {
+        internal static string AirdragArea0 {
             get {
                 return ResourceManager.GetString("AirdragArea0", resourceCulture);
             }
@@ -72,7 +72,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Airdrag Modified.
         /// </summary>
-        public static string AirdragModifiedEnum {
+        internal static string AirdragModifiedEnum {
             get {
                 return ResourceManager.GetString("AirdragModifiedEnum", resourceCulture);
             }
@@ -81,7 +81,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to APT Eco Roll Release Lockup Clutch.
         /// </summary>
-        public static string ATEcoRollReleaseLockupClutch {
+        internal static string ATEcoRollReleaseLockupClutch {
             get {
                 return ResourceManager.GetString("ATEcoRollReleaseLockupClutch", resourceCulture);
             }
@@ -90,7 +90,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Compressor Drive.
         /// </summary>
-        public static string CompressorDrive {
+        internal static string CompressorDrive {
             get {
                 return ResourceManager.GetString("CompressorDrive", resourceCulture);
             }
@@ -99,7 +99,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Corrected Actual Mass.
         /// </summary>
-        public static string CurbMassChassis {
+        internal static string CurbMassChassis {
             get {
                 return ResourceManager.GetString("CurbMassChassis", resourceCulture);
             }
@@ -108,7 +108,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Eco Roll Type.
         /// </summary>
-        public static string EcoRollTypeNullable {
+        internal static string EcoRollTypeNullable {
             get {
                 return ResourceManager.GetString("EcoRollTypeNullable", resourceCulture);
             }
@@ -117,7 +117,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Engine Stop Start.
         /// </summary>
-        public static string EngineStopStartNullable {
+        internal static string EngineStopStartNullable {
             get {
                 return ResourceManager.GetString("EngineStopStartNullable", resourceCulture);
             }
@@ -126,7 +126,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Entrance Height.
         /// </summary>
-        public static string EntranceHeightInMm {
+        internal static string EntranceHeightInMm {
             get {
                 return ResourceManager.GetString("EntranceHeightInMm", resourceCulture);
             }
@@ -135,7 +135,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Tech. Perm. Max. Laden Mass.
         /// </summary>
-        public static string GrossVehicleMassRating {
+        internal static string GrossVehicleMassRating {
             get {
                 return ResourceManager.GetString("GrossVehicleMassRating", resourceCulture);
             }
@@ -144,7 +144,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Cooling.
         /// </summary>
-        public static string HeatPumpTypeCoolingDriverCompartment {
+        internal static string HeatPumpTypeCoolingDriverCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpTypeCoolingDriverCompartment", resourceCulture);
             }
@@ -153,7 +153,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Cooling.
         /// </summary>
-        public static string HeatPumpTypeCoolingPassengerCompartment {
+        internal static string HeatPumpTypeCoolingPassengerCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpTypeCoolingPassengerCompartment", resourceCulture);
             }
@@ -162,7 +162,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heating.
         /// </summary>
-        public static string HeatPumpTypeHeatingDriverCompartment {
+        internal static string HeatPumpTypeHeatingDriverCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpTypeHeatingDriverCompartment", resourceCulture);
             }
@@ -171,7 +171,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heating.
         /// </summary>
-        public static string HeatPumpTypeHeatingPassengerCompartment {
+        internal static string HeatPumpTypeHeatingPassengerCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpTypeHeatingPassengerCompartment", resourceCulture);
             }
@@ -180,7 +180,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Height Integrated Body.
         /// </summary>
-        public static string HeightInMm {
+        internal static string HeightInMm {
             get {
                 return ResourceManager.GetString("HeightInMm", resourceCulture);
             }
@@ -189,7 +189,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Legislative Category.
         /// </summary>
-        public static string LegislativeClass {
+        internal static string LegislativeClass {
             get {
                 return ResourceManager.GetString("LegislativeClass", resourceCulture);
             }
@@ -198,7 +198,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Length.
         /// </summary>
-        public static string LengthInMm {
+        internal static string LengthInMm {
             get {
                 return ResourceManager.GetString("LengthInMm", resourceCulture);
             }
@@ -207,7 +207,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Manufacturer.
         /// </summary>
-        public static string Manufacturer {
+        internal static string Manufacturer {
             get {
                 return ResourceManager.GetString("Manufacturer", resourceCulture);
             }
@@ -216,7 +216,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Seats Lower Deck.
         /// </summary>
-        public static string NumberPassengerSeatsLowerDeck {
+        internal static string NumberPassengerSeatsLowerDeck {
             get {
                 return ResourceManager.GetString("NumberPassengerSeatsLowerDeck", resourceCulture);
             }
@@ -225,7 +225,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Seats Upper Deck.
         /// </summary>
-        public static string NumberPassengerSeatsUpperDeck {
+        internal static string NumberPassengerSeatsUpperDeck {
             get {
                 return ResourceManager.GetString("NumberPassengerSeatsUpperDeck", resourceCulture);
             }
@@ -234,7 +234,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Standing Lower Deck.
         /// </summary>
-        public static string NumberPassengersStandingLowerDeck {
+        internal static string NumberPassengersStandingLowerDeck {
             get {
                 return ResourceManager.GetString("NumberPassengersStandingLowerDeck", resourceCulture);
             }
@@ -243,7 +243,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Standing Upper Deck.
         /// </summary>
-        public static string NumberPassengersStandingUpperDeck {
+        internal static string NumberPassengersStandingUpperDeck {
             get {
                 return ResourceManager.GetString("NumberPassengersStandingUpperDeck", resourceCulture);
             }
@@ -252,7 +252,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Predictive Cruise Control.
         /// </summary>
-        public static string PredictiveCruiseControlNullable {
+        internal static string PredictiveCruiseControlNullable {
             get {
                 return ResourceManager.GetString("PredictiveCruiseControlNullable", resourceCulture);
             }
@@ -261,7 +261,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Class Bus.
         /// </summary>
-        public static string RegisteredClass {
+        internal static string RegisteredClass {
             get {
                 return ResourceManager.GetString("RegisteredClass", resourceCulture);
             }
@@ -270,7 +270,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Ng Tank System.
         /// </summary>
-        public static string TankSystem {
+        internal static string TankSystem {
             get {
                 return ResourceManager.GetString("TankSystem", resourceCulture);
             }
@@ -279,7 +279,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Transferred Airdrag Area.
         /// </summary>
-        public static string TransferredAirDragArea {
+        internal static string TransferredAirDragArea {
             get {
                 return ResourceManager.GetString("TransferredAirDragArea", resourceCulture);
             }
@@ -288,7 +288,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Bodywork Code.
         /// </summary>
-        public static string VehicleCode {
+        internal static string VehicleCode {
             get {
                 return ResourceManager.GetString("VehicleCode", resourceCulture);
             }
@@ -297,7 +297,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Width.
         /// </summary>
-        public static string WidthInMm {
+        internal static string WidthInMm {
             get {
                 return ResourceManager.GetString("WidthInMm", resourceCulture);
             }
diff --git a/VECTO3GUI2020/Properties/GUILabels.Designer.cs b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
index 0e03d5db72536c8f0709c46d9bd792448c02dc07..b42eaaa102007f45f9d76928468b62ee3bbf5b55 100644
--- a/VECTO3GUI2020/Properties/GUILabels.Designer.cs
+++ b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
@@ -22,7 +22,7 @@ namespace VECTO3GUI2020.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class GUILabels {
+    internal class GUILabels {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ namespace VECTO3GUI2020.Properties {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VECTO3GUI2020.Properties.GUILabels", typeof(GUILabels).Assembly);
@@ -51,7 +51,7 @@ namespace VECTO3GUI2020.Properties {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Airdrag Data.
         /// </summary>
-        public static string _consolidateAirdragData {
+        internal static string _consolidateAirdragData {
             get {
                 return ResourceManager.GetString("_consolidateAirdragData", resourceCulture);
             }
@@ -72,7 +72,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Bus Auxiliaries Data.
         /// </summary>
-        public static string _consolidateBusAuxiliariesData {
+        internal static string _consolidateBusAuxiliariesData {
             get {
                 return ResourceManager.GetString("_consolidateBusAuxiliariesData", resourceCulture);
             }
@@ -81,7 +81,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to ADAS.
         /// </summary>
-        public static string _consolidatedADAS {
+        internal static string _consolidatedADAS {
             get {
                 return ResourceManager.GetString("_consolidatedADAS", resourceCulture);
             }
@@ -90,7 +90,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Components.
         /// </summary>
-        public static string _consolidatedComponents {
+        internal static string _consolidatedComponents {
             get {
                 return ResourceManager.GetString("_consolidatedComponents", resourceCulture);
             }
@@ -99,7 +99,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to HVAC Data.
         /// </summary>
-        public static string _consolidatedHVACBusAuxiliariesData {
+        internal static string _consolidatedHVACBusAuxiliariesData {
             get {
                 return ResourceManager.GetString("_consolidatedHVACBusAuxiliariesData", resourceCulture);
             }
@@ -108,7 +108,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Electric Consumer Data.
         /// </summary>
-        public static string _consolidateElectricConsumerData {
+        internal static string _consolidateElectricConsumerData {
             get {
                 return ResourceManager.GetString("_consolidateElectricConsumerData", resourceCulture);
             }
@@ -117,7 +117,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Components_Conventional_CompletedBusType.
         /// </summary>
-        public static string Components_Conventional_CompletedBusType {
+        internal static string Components_Conventional_CompletedBusType {
             get {
                 return ResourceManager.GetString("Components_Conventional_CompletedBusType", resourceCulture);
             }
@@ -126,7 +126,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Create Exempted Interim/Completed Input.
         /// </summary>
-        public static string CreateExemptedInterimCompletedInput {
+        internal static string CreateExemptedInterimCompletedInput {
             get {
                 return ResourceManager.GetString("CreateExemptedInterimCompletedInput", resourceCulture);
             }
@@ -135,7 +135,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Create Exempted Interim/Completed Input.
         /// </summary>
-        public static string CreateExemptedInterimCompletedInputToolTip {
+        internal static string CreateExemptedInterimCompletedInputToolTip {
             get {
                 return ResourceManager.GetString("CreateExemptedInterimCompletedInputToolTip", resourceCulture);
             }
@@ -144,7 +144,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Create Interim/Completed Input.
         /// </summary>
-        public static string CreateInterimCompletedInput {
+        internal static string CreateInterimCompletedInput {
             get {
                 return ResourceManager.GetString("CreateInterimCompletedInput", resourceCulture);
             }
@@ -153,7 +153,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to .
         /// </summary>
-        public static string CreateInterimCompletedInputToolTip {
+        internal static string CreateInterimCompletedInputToolTip {
             get {
                 return ResourceManager.GetString("CreateInterimCompletedInputToolTip", resourceCulture);
             }
@@ -162,7 +162,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to VECTO.
         /// </summary>
-        public static string DefaultTitle {
+        internal static string DefaultTitle {
             get {
                 return ResourceManager.GetString("DefaultTitle", resourceCulture);
             }
@@ -171,7 +171,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Edit Multistep Job.
         /// </summary>
-        public static string Edit_Multistep_Job {
+        internal static string Edit_Multistep_Job {
             get {
                 return ResourceManager.GetString("Edit_Multistep_Job", resourceCulture);
             }
@@ -180,7 +180,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Edit step input.
         /// </summary>
-        public static string Edit_step_input {
+        internal static string Edit_step_input {
             get {
                 return ResourceManager.GetString("Edit_step_input", resourceCulture);
             }
@@ -189,7 +189,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Invalid Airdrag Entries.
         /// </summary>
-        public static string IsAirdragEntriesValid {
+        internal static string IsAirdragEntriesValid {
             get {
                 return ResourceManager.GetString("IsAirdragEntriesValid", resourceCulture);
             }
@@ -198,7 +198,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Invalid Tank System.
         /// </summary>
-        public static string IsTankSystemValid {
+        internal static string IsTankSystemValid {
             get {
                 return ResourceManager.GetString("IsTankSystemValid", resourceCulture);
             }
@@ -207,7 +207,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Manufacturing Step.
         /// </summary>
-        public static string ManufacturingSteps {
+        internal static string ManufacturingSteps {
             get {
                 return ResourceManager.GetString("ManufacturingSteps", resourceCulture);
             }
@@ -216,7 +216,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to New Multistep File.
         /// </summary>
-        public static string New_Multistep_File {
+        internal static string New_Multistep_File {
             get {
                 return ResourceManager.GetString("New_Multistep_File", resourceCulture);
             }
@@ -225,7 +225,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to New Complete Job.
         /// </summary>
-        public static string NewCompleteJob {
+        internal static string NewCompleteJob {
             get {
                 return ResourceManager.GetString("NewCompleteJob", resourceCulture);
             }
@@ -234,7 +234,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Special Case 2: Provide primary input XML and all parameters of completed vehicle to create a VECTO job..
         /// </summary>
-        public static string NewCompleteJobToolTip {
+        internal static string NewCompleteJobToolTip {
             get {
                 return ResourceManager.GetString("NewCompleteJobToolTip", resourceCulture);
             }
@@ -243,7 +243,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to New Interim/Completed Job.
         /// </summary>
-        public static string NewInterimOrCompletedJob {
+        internal static string NewInterimOrCompletedJob {
             get {
                 return ResourceManager.GetString("NewInterimOrCompletedJob", resourceCulture);
             }
@@ -252,7 +252,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to General case: Provide VIF and completed model parameters to create a VECTO job..
         /// </summary>
-        public static string NewInterimOrCompletedJobToolTip {
+        internal static string NewInterimOrCompletedJobToolTip {
             get {
                 return ResourceManager.GetString("NewInterimOrCompletedJobToolTip", resourceCulture);
             }
@@ -261,7 +261,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to New Primary Job with Interim Input.
         /// </summary>
-        public static string NewPrimaryAndInterimJob {
+        internal static string NewPrimaryAndInterimJob {
             get {
                 return ResourceManager.GetString("NewPrimaryAndInterimJob", resourceCulture);
             }
@@ -270,7 +270,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Special Case 1: Provide primary input XML and some parameters of completed vehicle (interim XML) to create a VECTO job..
         /// </summary>
-        public static string NewPrimaryAndInterimJobToolTip {
+        internal static string NewPrimaryAndInterimJobToolTip {
             get {
                 return ResourceManager.GetString("NewPrimaryAndInterimJobToolTip", resourceCulture);
             }
@@ -279,7 +279,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to No Manufacturing Steps.
         /// </summary>
-        public static string no_manufacturing_stages {
+        internal static string no_manufacturing_stages {
             get {
                 return ResourceManager.GetString("no manufacturing stages", resourceCulture);
             }
diff --git a/VECTO3GUI2020/Properties/Resources.Designer.cs b/VECTO3GUI2020/Properties/Resources.Designer.cs
index 3b10976644a9ab1b1bafce21574716b2d4ba2e71..ccb456556c30ed361e4a20f89a3756fb1e9d1cef 100644
--- a/VECTO3GUI2020/Properties/Resources.Designer.cs
+++ b/VECTO3GUI2020/Properties/Resources.Designer.cs
@@ -1,69 +1,61 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion: 4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace VECTO3GUI2020.Properties
-{
-
-
+namespace VECTO3GUI2020.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse
-    // über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VECTO3GUI2020.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        ///   Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden.
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/VECTO3GUI2020/Properties/Settings.Designer.cs b/VECTO3GUI2020/Properties/Settings.Designer.cs
index 78e0471711f38b352703436909e712ed7d3f3dd8..640ca742950e36e0105cf2a441b746a3c4497c78 100644
--- a/VECTO3GUI2020/Properties/Settings.Designer.cs
+++ b/VECTO3GUI2020/Properties/Settings.Designer.cs
@@ -12,8 +12,8 @@ namespace VECTO3GUI2020.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
-    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
diff --git a/VECTO3GUI2020/Properties/Strings.Designer.cs b/VECTO3GUI2020/Properties/Strings.Designer.cs
index 8ab0b64d91b1dab1f514b75cd977bdfe05f6b2b1..e6967966cb4c087dabbb6a1317bf49effda540db 100644
--- a/VECTO3GUI2020/Properties/Strings.Designer.cs
+++ b/VECTO3GUI2020/Properties/Strings.Designer.cs
@@ -22,7 +22,7 @@ namespace VECTO3GUI2020.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Strings {
+    internal class Strings {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ namespace VECTO3GUI2020.Properties {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VECTO3GUI2020.Properties.Strings", typeof(Strings).Assembly);
@@ -51,7 +51,7 @@ namespace VECTO3GUI2020.Properties {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Adjustable Auxiliary Heater.
         /// </summary>
-        public static string AdjustableAuxiliaryHeater {
+        internal static string AdjustableAuxiliaryHeater {
             get {
                 return ResourceManager.GetString("AdjustableAuxiliaryHeater", resourceCulture);
             }
@@ -72,7 +72,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Airdrag Area.
         /// </summary>
-        public static string AirDragArea {
+        internal static string AirDragArea {
             get {
                 return ResourceManager.GetString("AirDragArea", resourceCulture);
             }
@@ -81,7 +81,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Airdrag Area 0.
         /// </summary>
-        public static string AirdragArea0 {
+        internal static string AirdragArea0 {
             get {
                 return ResourceManager.GetString("AirdragArea0", resourceCulture);
             }
@@ -90,7 +90,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Air Electric Heater.
         /// </summary>
-        public static string AirElectricHeater {
+        internal static string AirElectricHeater {
             get {
                 return ResourceManager.GetString("AirElectricHeater", resourceCulture);
             }
@@ -99,7 +99,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Angledrive Type.
         /// </summary>
-        public static string AngledriveType {
+        internal static string AngledriveType {
             get {
                 return ResourceManager.GetString("AngledriveType", resourceCulture);
             }
@@ -108,7 +108,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Auxiliary Heater Power.
         /// </summary>
-        public static string AuxHeaterPower {
+        internal static string AuxHeaterPower {
             get {
                 return ResourceManager.GetString("AuxHeaterPower", resourceCulture);
             }
@@ -117,7 +117,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Axle Configuration.
         /// </summary>
-        public static string AxleConfiguration {
+        internal static string AxleConfiguration {
             get {
                 return ResourceManager.GetString("AxleConfiguration", resourceCulture);
             }
@@ -126,7 +126,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Axlegear Ratio.
         /// </summary>
-        public static string AxleGearRatio {
+        internal static string AxleGearRatio {
             get {
                 return ResourceManager.GetString("AxleGearRatio", resourceCulture);
             }
@@ -135,7 +135,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Brake Lights LED.
         /// </summary>
-        public static string BrakelightsLED {
+        internal static string BrakelightsLED {
             get {
                 return ResourceManager.GetString("BrakelightsLED", resourceCulture);
             }
@@ -144,7 +144,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Certification Number.
         /// </summary>
-        public static string Certification_Number {
+        internal static string Certification_Number {
             get {
                 return ResourceManager.GetString("Certification Number", resourceCulture);
             }
@@ -153,7 +153,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Certification Method.
         /// </summary>
-        public static string CertificationMethod {
+        internal static string CertificationMethod {
             get {
                 return ResourceManager.GetString("CertificationMethod", resourceCulture);
             }
@@ -162,7 +162,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Certification Number.
         /// </summary>
-        public static string CertificationNumber {
+        internal static string CertificationNumber {
             get {
                 return ResourceManager.GetString("CertificationNumber", resourceCulture);
             }
@@ -171,7 +171,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Curb Mass Chassis.
         /// </summary>
-        public static string CurbMassChassis {
+        internal static string CurbMassChassis {
             get {
                 return ResourceManager.GetString("CurbMassChassis", resourceCulture);
             }
@@ -180,7 +180,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Dayrunning Lights LED.
         /// </summary>
-        public static string DayrunninglightsLED {
+        internal static string DayrunninglightsLED {
             get {
                 return ResourceManager.GetString("DayrunninglightsLED", resourceCulture);
             }
@@ -189,7 +189,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Dimension.
         /// </summary>
-        public static string Dimension {
+        internal static string Dimension {
             get {
                 return ResourceManager.GetString("Dimension", resourceCulture);
             }
@@ -198,7 +198,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Displacement.
         /// </summary>
-        public static string Displacement {
+        internal static string Displacement {
             get {
                 return ResourceManager.GetString("Displacement", resourceCulture);
             }
@@ -207,7 +207,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Doordrive Technology.
         /// </summary>
-        public static string DoorDriveTechnology {
+        internal static string DoorDriveTechnology {
             get {
                 return ResourceManager.GetString("DoorDriveTechnology", resourceCulture);
             }
@@ -216,7 +216,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Double Glazing.
         /// </summary>
-        public static string DoubleGlazing {
+        internal static string DoubleGlazing {
             get {
                 return ResourceManager.GetString("DoubleGlazing", resourceCulture);
             }
@@ -225,7 +225,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Efficiency.
         /// </summary>
-        public static string Efficiency {
+        internal static string Efficiency {
             get {
                 return ResourceManager.GetString("Efficiency", resourceCulture);
             }
@@ -234,7 +234,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Engine Idle Speed.
         /// </summary>
-        public static string EngineIdleSpeed {
+        internal static string EngineIdleSpeed {
             get {
                 return ResourceManager.GetString("EngineIdleSpeed", resourceCulture);
             }
@@ -243,7 +243,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Entrance Height.
         /// </summary>
-        public static string EntranceHeight {
+        internal static string EntranceHeight {
             get {
                 return ResourceManager.GetString("EntranceHeight", resourceCulture);
             }
@@ -252,7 +252,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Gross Vehicle Mass.
         /// </summary>
-        public static string GrossVehicleMass {
+        internal static string GrossVehicleMass {
             get {
                 return ResourceManager.GetString("GrossVehicleMass", resourceCulture);
             }
@@ -261,7 +261,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Gross Vehicle Mass Rating.
         /// </summary>
-        public static string GrossVehicleMassRating {
+        internal static string GrossVehicleMassRating {
             get {
                 return ResourceManager.GetString("GrossVehicleMassRating", resourceCulture);
             }
@@ -270,7 +270,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Head Lights LED.
         /// </summary>
-        public static string HeadlightsLED {
+        internal static string HeadlightsLED {
             get {
                 return ResourceManager.GetString("HeadlightsLED", resourceCulture);
             }
@@ -279,7 +279,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Mode.
         /// </summary>
-        public static string HeatPumpMode {
+        internal static string HeatPumpMode {
             get {
                 return ResourceManager.GetString("HeatPumpMode", resourceCulture);
             }
@@ -288,7 +288,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Mode Driver.
         /// </summary>
-        public static string HeatPumpModeDriverCompartment {
+        internal static string HeatPumpModeDriverCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpModeDriverCompartment", resourceCulture);
             }
@@ -297,7 +297,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Mode Passenger.
         /// </summary>
-        public static string HeatPumpModePassengerCompartment {
+        internal static string HeatPumpModePassengerCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpModePassengerCompartment", resourceCulture);
             }
@@ -306,7 +306,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Type.
         /// </summary>
-        public static string HeatPumpType {
+        internal static string HeatPumpType {
             get {
                 return ResourceManager.GetString("HeatPumpType", resourceCulture);
             }
@@ -315,7 +315,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Type Driver.
         /// </summary>
-        public static string HeatPumpTypeDriverCompartment {
+        internal static string HeatPumpTypeDriverCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpTypeDriverCompartment", resourceCulture);
             }
@@ -324,7 +324,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Heat Pump Type Passenger.
         /// </summary>
-        public static string HeatPumpTypePassengerCompartment {
+        internal static string HeatPumpTypePassengerCompartment {
             get {
                 return ResourceManager.GetString("HeatPumpTypePassengerCompartment", resourceCulture);
             }
@@ -333,7 +333,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Height.
         /// </summary>
-        public static string Height {
+        internal static string Height {
             get {
                 return ResourceManager.GetString("Height", resourceCulture);
             }
@@ -342,7 +342,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Idling Speed.
         /// </summary>
-        public static string IdlingSpeed {
+        internal static string IdlingSpeed {
             get {
                 return ResourceManager.GetString("IdlingSpeed", resourceCulture);
             }
@@ -351,7 +351,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Interior Lights LED.
         /// </summary>
-        public static string InteriorLightsLED {
+        internal static string InteriorLightsLED {
             get {
                 return ResourceManager.GetString("InteriorLightsLED", resourceCulture);
             }
@@ -360,7 +360,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Legislative Class.
         /// </summary>
-        public static string LegislativeClass {
+        internal static string LegislativeClass {
             get {
                 return ResourceManager.GetString("LegislativeClass", resourceCulture);
             }
@@ -369,7 +369,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Length.
         /// </summary>
-        public static string Length {
+        internal static string Length {
             get {
                 return ResourceManager.GetString("Length", resourceCulture);
             }
@@ -378,7 +378,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Low Entry.
         /// </summary>
-        public static string LowEntry {
+        internal static string LowEntry {
             get {
                 return ResourceManager.GetString("LowEntry", resourceCulture);
             }
@@ -387,7 +387,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Manufacturer.
         /// </summary>
-        public static string Manufacturer {
+        internal static string Manufacturer {
             get {
                 return ResourceManager.GetString("Manufacturer", resourceCulture);
             }
@@ -396,7 +396,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Manufacturer Address.
         /// </summary>
-        public static string ManufacturerAddress {
+        internal static string ManufacturerAddress {
             get {
                 return ResourceManager.GetString("ManufacturerAddress", resourceCulture);
             }
@@ -405,7 +405,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Manufacturer Adress.
         /// </summary>
-        public static string ManufacturerAdress {
+        internal static string ManufacturerAdress {
             get {
                 return ResourceManager.GetString("ManufacturerAdress", resourceCulture);
             }
@@ -414,7 +414,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Max. Torque Declared.
         /// </summary>
-        public static string MaxTorqueDeclared {
+        internal static string MaxTorqueDeclared {
             get {
                 return ResourceManager.GetString("MaxTorqueDeclared", resourceCulture);
             }
@@ -423,7 +423,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Model.
         /// </summary>
-        public static string Model {
+        internal static string Model {
             get {
                 return ResourceManager.GetString("Model", resourceCulture);
             }
@@ -432,7 +432,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Passengers Lower Deck.
         /// </summary>
-        public static string NumberOfPassengersLowerDeck {
+        internal static string NumberOfPassengersLowerDeck {
             get {
                 return ResourceManager.GetString("NumberOfPassengersLowerDeck", resourceCulture);
             }
@@ -441,7 +441,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Passengers Upper Deck.
         /// </summary>
-        public static string NumberOfPassengersUpperDeck {
+        internal static string NumberOfPassengersUpperDeck {
             get {
                 return ResourceManager.GetString("NumberOfPassengersUpperDeck", resourceCulture);
             }
@@ -450,7 +450,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Other Heating Technology.
         /// </summary>
-        public static string OtherHeatingTechnology {
+        internal static string OtherHeatingTechnology {
             get {
                 return ResourceManager.GetString("OtherHeatingTechnology", resourceCulture);
             }
@@ -459,7 +459,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Position Lights LED.
         /// </summary>
-        public static string PositionlightsLED {
+        internal static string PositionlightsLED {
             get {
                 return ResourceManager.GetString("PositionlightsLED", resourceCulture);
             }
@@ -468,7 +468,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Predictive Cruise Control.
         /// </summary>
-        public static string PredictiveCruiseControl {
+        internal static string PredictiveCruiseControl {
             get {
                 return ResourceManager.GetString("PredictiveCruiseControl", resourceCulture);
             }
@@ -477,7 +477,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Transmission Type.
         /// </summary>
-        public static string PTOTransmissionType {
+        internal static string PTOTransmissionType {
             get {
                 return ResourceManager.GetString("PTOTransmissionType", resourceCulture);
             }
@@ -486,7 +486,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Rated Power.
         /// </summary>
-        public static string RatedPowerDeclared {
+        internal static string RatedPowerDeclared {
             get {
                 return ResourceManager.GetString("RatedPowerDeclared", resourceCulture);
             }
@@ -495,7 +495,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Rated Speed Declared.
         /// </summary>
-        public static string RatedSpeedDeclared {
+        internal static string RatedSpeedDeclared {
             get {
                 return ResourceManager.GetString("RatedSpeedDeclared", resourceCulture);
             }
@@ -504,7 +504,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Ratio.
         /// </summary>
-        public static string Ratio {
+        internal static string Ratio {
             get {
                 return ResourceManager.GetString("Ratio", resourceCulture);
             }
@@ -513,7 +513,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Registered Class.
         /// </summary>
-        public static string RegisteredClass {
+        internal static string RegisteredClass {
             get {
                 return ResourceManager.GetString("RegisteredClass", resourceCulture);
             }
@@ -522,7 +522,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Retarder Ratio.
         /// </summary>
-        public static string RetarderRatio {
+        internal static string RetarderRatio {
             get {
                 return ResourceManager.GetString("RetarderRatio", resourceCulture);
             }
@@ -531,7 +531,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Retarder Type.
         /// </summary>
-        public static string RetarderType {
+        internal static string RetarderType {
             get {
                 return ResourceManager.GetString("RetarderType", resourceCulture);
             }
@@ -540,7 +540,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Roll Resistance Coefficient.
         /// </summary>
-        public static string RRC {
+        internal static string RRC {
             get {
                 return ResourceManager.GetString("RRC", resourceCulture);
             }
@@ -550,7 +550,7 @@ namespace VECTO3GUI2020.Properties {
         ///   Looks up a localized string similar to Do you want to overwrite 
         /// .
         /// </summary>
-        public static string SaveExecute_Do_you_want_to_overwrite {
+        internal static string SaveExecute_Do_you_want_to_overwrite {
             get {
                 return ResourceManager.GetString("SaveExecute_Do_you_want_to_overwrite", resourceCulture);
             }
@@ -559,7 +559,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Seperate Air Distribution Ducts.
         /// </summary>
-        public static string SeparateAirDistributionDucts {
+        internal static string SeparateAirDistributionDucts {
             get {
                 return ResourceManager.GetString("SeparateAirDistributionDucts", resourceCulture);
             }
@@ -568,7 +568,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to System Configuration.
         /// </summary>
-        public static string SystemConfiguration {
+        internal static string SystemConfiguration {
             get {
                 return ResourceManager.GetString("SystemConfiguration", resourceCulture);
             }
@@ -577,7 +577,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Tank System.
         /// </summary>
-        public static string TankSystem {
+        internal static string TankSystem {
             get {
                 return ResourceManager.GetString("TankSystem", resourceCulture);
             }
@@ -586,7 +586,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Transferred Airdrag Area.
         /// </summary>
-        public static string TransferredAirDragArea {
+        internal static string TransferredAirDragArea {
             get {
                 return ResourceManager.GetString("TransferredAirDragArea", resourceCulture);
             }
@@ -595,7 +595,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Transmission Type.
         /// </summary>
-        public static string TransmissionType {
+        internal static string TransmissionType {
             get {
                 return ResourceManager.GetString("TransmissionType", resourceCulture);
             }
@@ -604,7 +604,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Twin Tyres.
         /// </summary>
-        public static string TwinTyres {
+        internal static string TwinTyres {
             get {
                 return ResourceManager.GetString("TwinTyres", resourceCulture);
             }
@@ -613,7 +613,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Category.
         /// </summary>
-        public static string VehicleCategory {
+        internal static string VehicleCategory {
             get {
                 return ResourceManager.GetString("VehicleCategory", resourceCulture);
             }
@@ -622,7 +622,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Code.
         /// </summary>
-        public static string VehicleCode {
+        internal static string VehicleCode {
             get {
                 return ResourceManager.GetString("VehicleCode", resourceCulture);
             }
@@ -631,7 +631,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Declaration Type.
         /// </summary>
-        public static string VehicleDeclarationType {
+        internal static string VehicleDeclarationType {
             get {
                 return ResourceManager.GetString("VehicleDeclarationType", resourceCulture);
             }
@@ -640,7 +640,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Type Approval Number.
         /// </summary>
-        public static string VehicleTypeApprovalNumber {
+        internal static string VehicleTypeApprovalNumber {
             get {
                 return ResourceManager.GetString("VehicleTypeApprovalNumber", resourceCulture);
             }
@@ -649,7 +649,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Identification Number.
         /// </summary>
-        public static string VehicleViewModel_v1_0_VIN {
+        internal static string VehicleViewModel_v1_0_VIN {
             get {
                 return ResourceManager.GetString("VehicleViewModel_v1_0_VIN", resourceCulture);
             }
@@ -658,7 +658,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Vehicle Identification Number.
         /// </summary>
-        public static string VIN {
+        internal static string VIN {
             get {
                 return ResourceManager.GetString("VIN", resourceCulture);
             }
@@ -667,7 +667,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Water Electric Heater.
         /// </summary>
-        public static string WaterElectricHeater {
+        internal static string WaterElectricHeater {
             get {
                 return ResourceManager.GetString("WaterElectricHeater", resourceCulture);
             }
@@ -676,7 +676,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Waste Heat Recovery.
         /// </summary>
-        public static string WHRType {
+        internal static string WHRType {
             get {
                 return ResourceManager.GetString("WHRType", resourceCulture);
             }
@@ -685,7 +685,7 @@ namespace VECTO3GUI2020.Properties {
         /// <summary>
         ///   Looks up a localized string similar to Width.
         /// </summary>
-        public static string Width {
+        internal static string Width {
             get {
                 return ResourceManager.GetString("Width", resourceCulture);
             }
diff --git a/VECTO3GUI2020/Properties/Version.cs b/VECTO3GUI2020/Properties/Version.cs
deleted file mode 100644
index 9cd97f5647a38119802a0e213c68a58a4d4853e5..0000000000000000000000000000000000000000
--- a/VECTO3GUI2020/Properties/Version.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2017 European Union
-*
-* Developed by Graz University of Technology,
-*              Institute of Internal Combustion Engines and Thermodynamics,
-*              Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*	
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.2436")]
-[assembly: AssemblyFileVersion("0.2.0.2436")]
diff --git a/VECTO3GUI2020/Properties/Version.tt b/VECTO3GUI2020/Properties/Version.tt
deleted file mode 100644
index 1808397053a9fb36fc00fbe0ed7bb5529131dc02..0000000000000000000000000000000000000000
--- a/VECTO3GUI2020/Properties/Version.tt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2017 European Union
-*
-* Developed by Graz University of Technology,
-*              Institute of Internal Combustion Engines and Thermodynamics,
-*              Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*	
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-<#@ template language="C#" #>
-<#@ output extension=".cs"#>
-<#@ include file="../../VectoCore/VectoCore/VersionNumber.t4" once="true" #>
-using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.<#= GetBuildNumber() #>")]
-[assembly: AssemblyFileVersion("0.2.0.<#=  GetBuildNumber() #>")]
-<#+ 
-	int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2017, 1, 1)).TotalDays; 
-#>
\ No newline at end of file
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index 8c711606fea4fe8f8c0665580e69bb300787567d..99913e0b0668e8a7d18cbb9d624994fbf8a8d2a7 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -1,63 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <!-- Version Information (only needed if it differs from Global VECTO Version)-->
+    <MainProductVersion>0.2.0</MainProductVersion>
+    <VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix>
+
     <ProjectGuid>{7E9172D4-07E3-4077-814E-7117AB2B3E22}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>VECTO3GUI2020</RootNamespace>
     <AssemblyName>VECTOMultistage</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
     <ApplicationIcon>Resources\Icons\Icon2.ico</ApplicationIcon>
+    <UseWPF>true</UseWPF>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Vecto3GUI2020Test" />
+  </ItemGroup>
+    
+  <ItemGroup>
+    <Compile Remove="Util\Component.cs" />
+    <Compile Remove="Util\InheritingConstructorParameterInstanceProvider.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -65,18 +29,17 @@
     <Reference Include="InteractiveDataDisplay.WPF, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\InteractiveDataDisplay.WPF.1.0.0\lib\net452\InteractiveDataDisplay.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Maps.MapControl.WPF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Maps.MapControl.WPF.1.0.0.3\lib\net40-Client\Microsoft.Maps.MapControl.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Toolkit.Mvvm, Version=7.1.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Toolkit.Mvvm.7.1.2\lib\netstandard2.0\Microsoft.Toolkit.Mvvm.dll</HintPath>
+    <Reference Include="Microsoft.Toolkit.Mvvm, Version=7.0.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Toolkit.Mvvm.7.0.2\lib\netstandard2.0\Microsoft.Toolkit.Mvvm.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
     </Reference>
@@ -84,10 +47,7 @@
       <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.31\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
     <Reference Include="Ninject">
       <HintPath>..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
@@ -95,9 +55,6 @@
     <Reference Include="Ninject.Extensions.Factory">
       <HintPath>..\packages\Ninject.Extensions.Factory.3.3.3\lib\net45\Ninject.Extensions.Factory.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.13\lib\net45\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -127,8 +84,8 @@
     <Reference Include="System.Reactive.Linq, Version=3.0.6000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Reactive.Linq.5.0.0\lib\net472\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -152,755 +109,90 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
   </ItemGroup>
+
   <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="Behaviours\AutoScrollDataGridBehaviour.cs" />
-    <Compile Include="Behaviours\PopUpHorizontalAlignmentBehavior.cs" />
-    <Compile Include="Helper\ConvertedSIDummyCreator.cs" />
-    <Compile Include="Helper\Converter\AlwaysVisibleConverter.cs" />
-    <Compile Include="Helper\Converter\BoolToVisibilityConverter.cs" />
-    <Compile Include="Helper\Converter\EnumConverter.cs" />
-    <Compile Include="Helper\Converter\InvertBoolConverter.cs" />
-    <Compile Include="Helper\Converter\JobTypeStringConverter.cs" />
-    <Compile Include="Helper\Converter\LabledTextBoxLabelConverter.cs" />
-    <Compile Include="Helper\Converter\MultipleBoolConverter.cs" />
-    <Compile Include="Helper\Converter\MultistageParameterModeToVisibilityConverter.cs" />
-    <Compile Include="Helper\Converter\BoolToIntConverter.cs" />
-    <Compile Include="Helper\Converter\NullToUnsetValueConverter.cs" />
-    <Compile Include="Helper\Converter\NullToVisibilityConverter.cs" />
-    <Compile Include="Helper\Converter\LabledTextBoxConverter.cs" />
-    <Compile Include="Helper\Converter\PropertyNameToLabelTextConverter.cs" />
-    <Compile Include="Helper\Converter\SIToUnitString.cs" />
-    <Compile Include="Helper\Converter\SIValueToStringConverter.cs" />
-    <Compile Include="Helper\Converter\VehicleCategoryToStringConverter.cs" />
-    <Compile Include="Helper\Converter\XToBoolConverter.cs" />
-    <Compile Include="Helper\DoubleValidation.cs" />
-    <Compile Include="Helper\ExceptionExtension.cs" />
-    <Compile Include="Helper\Exceptions.cs" />
-    <Compile Include="Helper\EnumHelper.cs" />
-    <Compile Include="Helper\FileHelper.cs" />
-    <Compile Include="Helper\IWindowHelper.cs" />
-    <Compile Include="Helper\DialogHelper.cs" />
-    <Compile Include="Helper\ObservableDictionary.cs" />
-    <Compile Include="Helper\ProcessHelper.cs" />
-    <Compile Include="Helper\VisualTreeHelperExtensions.cs" />
-    <Compile Include="Helper\TemplateSelector\MultistageParameterDataTemplateSelector.cs" />
-    <Compile Include="Model\Multistage\JSONJob.cs" />
-    <Compile Include="Properties\GUILabels.Designer.cs">
+    <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
+    <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Resource Include="Resources\Icons\Icon2.ico" />
+    <Resource Include="Resources\Icons\folderpicker.ico" />
+    <Resource Include="Resources\Icons\Trash_16x.ico" />
+    <Resource Include="Resources\Images\JRC-About.png" />
+    <Resource Include="Resources\Images\VECTO-About.png" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <Compile Update="Properties\Application.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>GUILabels.resx</DependentUpon>
+      <DependentUpon>Application.settings</DependentUpon>
     </Compile>
-    <Compile Include="ViewModel\Implementation\Common\AdditionalJobInfoViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\Common\BackingStorage.cs" />
-    <Compile Include="ViewModel\Implementation\Common\ObservableObject.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\MultistageParameterViewModel.cs" />
-    <Compile Include="Helper\NameResolver.cs" />
-    <Compile Include="Helper\TemplateSelector\MultistageVehicleDataTemplateSelector.cs" />
-    <Compile Include="Helper\WindowHelper.cs" />
-    <Compile Include="Helper\XMLExtension.cs" />
-    <Compile Include="Helper\XmlHelper.cs" />
-    <Compile Include="Ninject\FactoryModule.cs" />
-    <Compile Include="Ninject\IMultistageDependencies.cs" />
-    <Compile Include="Ninject\MultiStageViewModelFactory.cs" />
-    <Compile Include="Ninject\MultistageLazyDependencies.cs" />
-    <Compile Include="Ninject\MultistageModule.cs" />
-    <Compile Include="Ninject\Vecto3GUI2020Module.cs" />
-    <Compile Include="Properties\Annotations.cs" />
-    <Compile Include="Properties\BusStrings.Designer.cs">
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>BusStrings.resx</DependentUpon>
+      <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Version.cs">
-      <DependentUpon>Version.tt</DependentUpon>
-      <AutoGen>True</AutoGen>
+    <Compile Update="Properties\Strings.Designer.cs">
       <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Test.xaml.cs">
-      <DependentUpon>Test.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="TestViewModel.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLBusAuxiliariesWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLPTOWriter.cs" />
-    <Compile Include="ViewModel\Implementation\AboutViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\CreateVifViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\Document\DeclarationJobViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\Document\DeclarationTrailerJobDocumentViewModel.cs" />
-    <Compile Include="Model\Interfaces\IAuxiliaryModelFactory.cs" />
-    <Compile Include="ViewModel\Implementation\Document\SimulationOnlyDeclarationJob.cs" />
-    <Compile Include="ViewModel\Implementation\MessageEntry.cs" />
-    <Compile Include="ViewModel\Interfaces\Document\IDocumentViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\Document\IDocumentViewModelFactory.cs" />
-    <Compile Include="ViewModel\Interfaces\Document\IJobViewModel.cs" />
-    <Compile Include="Model\Interfaces\ISettingsModel.cs" />
-    <Compile Include="Model\Implementation\SettingsModel.cs" />
-    <Compile Include="Ninject\DocumentModule.cs" />
-    <Compile Include="Ninject\JobEditModule.cs" />
-    <Compile Include="Ninject\Vehicle\ComponentModule.cs" />
-    <Compile Include="Ninject\XMLWriterFactoryModule.cs" />
-    <Compile Include="Properties\Application.Designer.cs">
       <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Application.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Settings.cs" />
-    <Compile Include="Util\AllowedEntry.cs" />
-    <Compile Include="Util\RelayCommand.cs" />
-    <Compile Include="Util\SIUtils.cs" />
-    <Compile Include="Ninject\Util\UseFirstArgumentAsNameInstanceProvider.cs" />
-    <Compile Include="Ninject\Util\UseFirstArgumentTypeAsNameInstanceProvider.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLAirDragWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLAuxiliariesWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLAxleGearWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLAxleWheelsWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLAxleWheelWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLEngineWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLComponentsWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLGearboxWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLRetarderWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLTyreWriter.cs" />
-    <Compile Include="Util\XML\Implementation\ComponentWriter\XMLVehicleWriter.cs" />
-    <Compile Include="Util\XML\Implementation\DocumentWriter\XMLDeclarationJobWriter.cs" />
-    <Compile Include="Util\XML\Interfaces\IXMLComponentsWriter.cs" />
-    <Compile Include="Util\XML\Interfaces\IXMLDeclarationJobWriter.cs" />
-    <Compile Include="Util\XML\Interfaces\IXMLComponentWriter.cs" />
-    <Compile Include="Util\XML\Interfaces\IXMLVehicleWriter.cs" />
-    <Compile Include="Util\XML\Interfaces\IXMLWriterFactory.cs" />
-    <Compile Include="Util\XML\XMLNamespaces.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\EngineFuelViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\EngineModeViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\TorqueConverterViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IEngineFuelViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IEngineModeViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\Common\IViewModelBase.cs" />
-    <Compile Include="ViewModel\Implementation\Common\ViewModelBase.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\DeclarationJobEditViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\ComponentsViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Trailer\ITrailerViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\ADASViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AirDragViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AngleDriveViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AuxiliariesViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AuxiliaryViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AxleGearViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AxleViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\AxleWheelsViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\CommonComponentViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\EngineViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\GearboxViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\GearViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\PTOViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\RetarderViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\Components\TyreViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobEdit\Vehicle\VehicleViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\JobListViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\MainWindowViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\MessageViewModel.cs" />
-    <Compile Include="ViewModel\Implementation\SettingsViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\IEditViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAdasViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAirDragViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAuxiliariesViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAuxiliaryViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAxleGearViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAxleViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAxleWheelsViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\ICommonComponentViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IComponentsViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IComponentViewModelFactory.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\IJobEditViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\ISettingsViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\IJobListViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\IMainViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\IMainWindowViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\IMessageViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\IJobEditViewModelFactory.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IComponentViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IEngineViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IGearBoxViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IGearViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IAngleDriveViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IRetarderViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\IPTOViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\ITorqueConverterViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\Components\ITyreViewModel.cs" />
-    <Compile Include="ViewModel\Interfaces\JobEdit\Vehicle\IVehicleViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\InterimStageBusVehicleViewModel_v2_8.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\ManufacturingStageViewModel_v0_1.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\MultistageAirdragViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\MultistageAuxiliariesViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\NewMultiStageJobViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\MultistageJobViewModel_v0_1.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\StageInputViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Implementation\StageViewModelBase.cs" />
-    <Compile Include="ViewModel\MultiStage\Interfaces\IMultistageAirdragViewModel.cs" />
-    <Compile Include="ViewModel\MultiStage\Interfaces\IMultiStageViewModelFactory.cs" />
-    <Compile Include="ViewModel\Implementation\OutputViewModel.cs" />
-    <Compile Include="Views\AboutView.xaml.cs">
-      <DependentUpon>AboutView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\ComboParameter.xaml.cs">
-      <DependentUpon>ComboParameter.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\CustomControlExtensionMethods.cs" />
-    <Compile Include="Views\CustomControls\DateTimePicker.xaml.cs">
-      <DependentUpon>DateTimePicker.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\LabledCheckBoxAutomatic.xaml.cs">
-      <DependentUpon>LabledCheckBoxAutomatic.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\LabledTextBox.xaml.cs">
-      <DependentUpon>LabledTextBox.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\LabledTextBoxAutomatic.xaml.cs">
-      <DependentUpon>LabledTextBoxAutomatic.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\LabledTextBoxUnit.xaml.cs">
-      <DependentUpon>LabledTextBoxUnit.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\ScatterPlot.xaml.cs">
-      <DependentUpon>ScatterPlot.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomControls\Viewer.xaml.cs">
-      <DependentUpon>Viewer.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\DeclarationJobEditView.xaml.cs">
-      <DependentUpon>DeclarationJobEditView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\ADASView_v2_3.xaml.cs">
-      <DependentUpon>ADASView_v2_3.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AirDragView_v2_0.xaml.cs">
-      <DependentUpon>AirDragView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AngleDriveView_v2_0.xaml.cs">
-      <DependentUpon>AngleDriveView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AuxiliariesView_v2_0.xaml.cs">
-      <DependentUpon>AuxiliariesView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AuxiliaryView_v2_0.xaml.cs">
-      <DependentUpon>AuxiliaryView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AxleGearView_v2_0.xaml.cs">
-      <DependentUpon>AxleGearView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AxleView_v2_0.xaml.cs">
-      <DependentUpon>AxleView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\AxleWheelsView_v2_0.xaml.cs">
-      <DependentUpon>AxleWheelsView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\CommonComponentView.xaml.cs">
-      <DependentUpon>CommonComponentView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\EngineFuelView.xaml.cs">
-      <DependentUpon>EngineFuelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\EngineModeViewSingleFuel.xaml.cs">
-      <DependentUpon>EngineModeViewSingleFuel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\EngineView_v2_0.xaml.cs">
-      <DependentUpon>EngineView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\GearboxView_v2_0.xaml.cs">
-      <DependentUpon>GearboxView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\GearView_v2_0.xaml.cs">
-      <DependentUpon>GearView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\PTOView_v2_0.xaml.cs">
-      <DependentUpon>PTOView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\RetarderView_v2_0.xaml.cs">
-      <DependentUpon>RetarderView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\TyreView_v2_3.xaml.cs">
-      <DependentUpon>TyreView_v2_3.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\Components\TyreView_v2_0.xaml.cs">
-      <DependentUpon>TyreView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobEditViews\Vehicle\VehicleView_v2_0.xaml.cs">
-      <DependentUpon>VehicleView_v2_0.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\JobListView.xaml.cs">
-      <DependentUpon>JobListView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MessageView.xaml.cs">
-      <DependentUpon>MessageView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\AdditionalJobInfoViews\AdditionalJobInfoStageInput.xaml.cs">
-      <DependentUpon>AdditionalJobInfoStageInput.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\AdditionalJobInfoViews\AdditionalJobInfoViewMultiStage.xaml.cs">
-      <DependentUpon>AdditionalJobInfoViewMultiStage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\AdditionalJobInfoViews\AdditionalJobInfoViewNewVIF.xaml.cs">
-      <DependentUpon>AdditionalJobInfoViewNewVIF.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\AirDragView_v2_8.xaml.cs">
-      <DependentUpon>AirDragView_v2_8.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CreateVifView.xaml.cs">
-      <DependentUpon>CreateVifView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\FilePicker.xaml.cs">
-      <DependentUpon>FilePicker.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\InputStageView.xaml.cs">
-      <DependentUpon>InputStageView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\LabledTextBoxMultistage.xaml.cs">
-      <DependentUpon>LabledTextBoxMultistage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\MultiStageParameter.xaml.cs">
-      <DependentUpon>MultiStageParameter.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\MultistageParameterCheckBoxView.xaml.cs">
-      <DependentUpon>MultistageParameterCheckBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\MultistageParameterComboBoxView.xaml.cs">
-      <DependentUpon>MultistageParameterComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\CustomControls\MultistageParameterTextView.xaml.cs">
-      <DependentUpon>MultistageParameterTextView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\ManufacturingStageAuxiliariesView.xaml.cs">
-      <DependentUpon>ManufacturingStageAuxiliariesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\MultistageAirDragView.xaml.cs">
-      <DependentUpon>MultistageAirDragView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\MultiStageView.xaml.cs">
-      <DependentUpon>MultiStageView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\NewMultistageFileView.xaml.cs">
-      <DependentUpon>NewMultistageFileView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\ManufacturingStageView.xaml.cs">
-      <DependentUpon>ManufacturingStageView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\VehicleView_v2_8.xaml.cs">
-      <DependentUpon>VehicleView_v2_8.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Multistage\VehicleView_v2_8_exempted.xaml.cs">
-      <DependentUpon>VehicleView_v2_8_exempted.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OutputView.xaml.cs">
-      <DependentUpon>OutputView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SettingsView.xaml.cs">
-      <DependentUpon>SettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\XMLViewer.xaml.cs">
-      <DependentUpon>XMLViewer.xaml</DependentUpon>
-    </Compile>
-    <Page Include="Resources\Icons\StatusInformationOutline_nohalo_16x.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\Sizes.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Styles\DataGridStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\DataTemplateSelectors.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Icons\AddDocument_16x.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\Icons\Add_16x.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\Icons\drawables.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Icons\FolderClosed_16x.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\Icons\Trash_16x.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Resources\MultistageParameterDataTemplates.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\ObjectProvider.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Styles\ButtonStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Styles\Colors.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Resources\Converter.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Styles\GlobalStyles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Templates\ButtonTemplates.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Templates\ErrorTemplates.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\ViewModelBindings.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Test.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\AboutView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\ComboParameter.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\DateTimePicker.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\LabledCheckBoxAutomatic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\LabledTextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\LabledTextBoxAutomatic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\LabledTextBoxUnit.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\ScatterPlot.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomControls\Viewer.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\DeclarationJobEditView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\ADASView_v2_3.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AirDragView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AngleDriveView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AuxiliariesView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AuxiliaryView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AxleGearView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AxleView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\AxleWheelsView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\CommonComponentView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\EngineFuelView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\EngineModeViewSingleFuel.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\EngineView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\GearboxView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\GearView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\PTOView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\RetarderView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\TyreView_v2_3.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\Components\TyreView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobEditViews\Vehicle\VehicleView_v2_0.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\JobListView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MessageView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\AdditionalJobInfoViews\AdditionalJobInfoStageInput.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\AdditionalJobInfoViews\AdditionalJobInfoViewMultiStage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\AdditionalJobInfoViews\AdditionalJobInfoViewNewVIF.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\AirDragView_v2_8.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CreateVifView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\FilePicker.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\InputStageView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\LabledTextBoxMultistage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\MultiStageParameter.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\MultistageParameterCheckBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\MultistageParameterComboBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\CustomControls\MultistageParameterTextView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\ManufacturingStageAuxiliariesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\MultistageAirDragView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\MultiStageView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\NewMultistageFileView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\ManufacturingStageView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\VehicleView_v2_8.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Multistage\VehicleView_v2_8_exempted.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\OutputView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\XMLViewer.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <EmbeddedResource Update="Properties\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
+    <Compile Update="Properties\GUILabels.Designer.cs">
       <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>GUILabels.resx</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="Properties\BusStrings.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>BusStrings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\GUILabels.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
+    <EmbeddedResource Update="Properties\GUILabels.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>GUILabels.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Strings.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <Compile Update="Properties\BusStrings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>BusStrings.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Update="Properties\BusStrings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>BusStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <AdditionalFiles Include="..\DependencyValidation1\DependencyValidation1.layerdiagram">
-      <Link>DependencyValidation1.layerdiagram</Link>
-      <Visible>False</Visible>
-    </AdditionalFiles>
-    <None Include="app.manifest" />
-    <None Include="Documentation\InputData.cd" />
-    <None Include="Properties\Application.settings">
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Properties\Application.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Application.Designer.cs</LastGenOutput>
     </None>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>PublicSettingsSingleFileGenerator</Generator>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="ViewModel\ClassDiagram1.cd" />
-    <None Include="ViewModel\Implementation\JobEdit\ClassDiagram1.cd" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Icons\Icon2.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Icons\folderpicker.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj">
-      <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
-      <Name>VectoCommon</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj">
-      <Project>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</Project>
-      <Name>VectoCore</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Icons\Trash_16x.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Properties\Version.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Version.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Images\JRC-About.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Images\VECTO-About.png" />
   </ItemGroup>
-  <!-- ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.11.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
-  </-ItemGroup -->
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
+
 </Project>
\ No newline at end of file
diff --git a/VECTO3GUI2020/packages.config b/VECTO3GUI2020/packages.config
deleted file mode 100644
index b110f785273bda3d0d06df3db12bd7e83c5b6845..0000000000000000000000000000000000000000
--- a/VECTO3GUI2020/packages.config
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Castle.Core" version="4.4.1" targetFramework="net48" />
-  <package id="InteractiveDataDisplay.WPF" version="1.0.0" targetFramework="net48" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net48" />
-  <package id="Microsoft.Maps.MapControl.WPF" version="1.0.0.3" targetFramework="net48" />
-  <package id="Microsoft.Toolkit.Mvvm" version="7.1.2" targetFramework="net48" />
-  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-  <package id="Ninject" version="3.3.4" targetFramework="net48" />
-  <package id="Ninject.Extensions.ChildKernel" version="3.3.0" targetFramework="net48" />
-  <package id="Ninject.Extensions.Factory" version="3.3.3" targetFramework="net48" />
-  <package id="NLog" version="4.7.13" targetFramework="net48" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
-  <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
-  <package id="System.Reactive" version="5.0.0" targetFramework="net48" />
-  <package id="System.Reactive.Core" version="5.0.0" targetFramework="net48" />
-  <package id="System.Reactive.Linq" version="5.0.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
-  <package id="System.Windows.Controls.DataVisualization.Toolkit" version="4.0.0.0" targetFramework="net48" />
-  <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net48" />
-  <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net48" />
-</packages>
\ No newline at end of file