From 88978764622948a512f3fea484d7b284d9f5c6eb Mon Sep 17 00:00:00 2001
From: martaf <marta.fullen@iosb-ina.fraunhofer.de>
Date: Wed, 22 Nov 2023 16:37:25 +0100
Subject: [PATCH] eol renormalized

---
 .gitattributes                                |   2 +-
 .gitignore                                    |  10 +-
 .../AasxPackageExplorer.csproj                |   4 +-
 .../Properties/launchSettings.json            |  14 +-
 .../Model/AASRestClient.cs                    | 380 ++++-----
 .../Model/BomSubmodel.cs                      |  64 +-
 src/AasxPluginSmdExporter/Model/EClass.cs     | 240 +++---
 src/AasxPluginSmdExporter/Model/Mapping.cs    |  74 +-
 .../Model/RelationshipElement.cs              | 344 ++++----
 .../Model/SemanticPort.cs                     | 112 +--
 .../Properties/AssemblyInfo.cs                |  72 +-
 .../Properties/Resources.resx                 | 200 ++---
 .../Resources/IdTables.cs                     | 220 +++---
 .../View/PhysicalDialog.xaml                  | 154 ++--
 src/AasxPluginSmdExporter/View/TextUI.cs      | 648 +++++++--------
 .../View/Themes/Generic.xaml                  | 480 +++++------
 .../Properties/launchSettings.json            |  14 +-
 src/BlazorExplorer/BlazorExplorer.csproj      |   4 +-
 src/BlazorExplorer/options.json               | 746 +++++++++---------
 19 files changed, 1891 insertions(+), 1891 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 9664cbf8..06aad29c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 *   text=auto
-*   autocrlf=true
+*   core.autocrlf=true
 
 *.cs text eol=crlf
 .xaml diff
diff --git a/.gitignore b/.gitignore
index 931ac6ba..05e40ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,8 @@ sample-aasx/
 /src/BlazorUI/09_SchneiderElectric.aasx
 /.vs/aasx-package-explorer/v16/.suo
 /.vs/slnx.sqlite
-/.vs/aasx-package-explorer/v17/.suo
-/src/WpfXamlTool/Properties/AssemblyInfo.cs
-/src/WpfMtpVisuViewer/Properties/AssemblyInfo.cs
-/src/WpfMtpControl/Properties/AssemblyInfo.cs
-/src/MsaglWpfControl/Properties/AssemblyInfo.cs
+/.vs/aasx-package-explorer/v17/.suo
+/src/WpfXamlTool/Properties/AssemblyInfo.cs
+/src/WpfMtpVisuViewer/Properties/AssemblyInfo.cs
+/src/WpfMtpControl/Properties/AssemblyInfo.cs
+/src/MsaglWpfControl/Properties/AssemblyInfo.cs
diff --git a/src/AasxPackageExplorer/AasxPackageExplorer.csproj b/src/AasxPackageExplorer/AasxPackageExplorer.csproj
index 9b672f7e..071692fd 100644
--- a/src/AasxPackageExplorer/AasxPackageExplorer.csproj
+++ b/src/AasxPackageExplorer/AasxPackageExplorer.csproj
@@ -90,8 +90,8 @@
     <None Update="IDTA_and_PI40_t.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="options-debug.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="options-debug.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="options-debug.MIHO.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/AasxPackageExplorer/Properties/launchSettings.json b/src/AasxPackageExplorer/Properties/launchSettings.json
index d0738d85..efd8b2ba 100644
--- a/src/AasxPackageExplorer/Properties/launchSettings.json
+++ b/src/AasxPackageExplorer/Properties/launchSettings.json
@@ -1,8 +1,8 @@
-{
-  "profiles": {
-    "AasxPackageExplorer": {
-      "commandName": "Project",
-      "commandLineArgs": "-read-json options-debug.json -script debug.MIHO.script"
-    }
-  }
+{
+  "profiles": {
+    "AasxPackageExplorer": {
+      "commandName": "Project",
+      "commandLineArgs": "-read-json options-debug.json -script debug.MIHO.script"
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/AasxPluginSmdExporter/Model/AASRestClient.cs b/src/AasxPluginSmdExporter/Model/AASRestClient.cs
index 67dd1b45..f84308f7 100644
--- a/src/AasxPluginSmdExporter/Model/AASRestClient.cs
+++ b/src/AasxPluginSmdExporter/Model/AASRestClient.cs
@@ -1,190 +1,190 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-
-namespace AasxPluginSmdExporter
-{
-    public static class AASRestClient
-    {
-        static readonly HttpClient httpClient;
-
-        private static bool used;
-
-
-        static AASRestClient()
-        {
-            httpClient = new HttpClient();
-            used = false;
-        }
-
-        /// <summary>
-        /// Starts the HttpClient and sets its Baseaadress to the given Adress
-        /// </summary>
-        /// <param name="baseAddress"></param>
-        public static void Start(string baseAddress)
-        {
-            if (!used)
-            {
-                httpClient.BaseAddress = new Uri(baseAddress);
-                httpClient.DefaultRequestHeaders.Accept.Clear();
-                httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                used = true;
-            }
-
-
-        }
-
-        /// <summary>
-        /// Returns the Json version of the aas with the given name.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public static async Task<JObject> GetJson(string path)
-        {
-            try
-            {
-
-                HttpResponseMessage response = httpClient.GetAsync(path).Result;
-
-                if (response.IsSuccessStatusCode)
-                {
-
-                    string respstr = await response.Content.ReadAsStringAsync();
-                    JObject json = JObject.Parse(respstr);
-
-                    return json;
-                }
-
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-                throw;
-            }
-            return null;
-        }
-
-        public static async Task<JArray> GetJArray(string path)
-        {
-            HttpResponseMessage response = httpClient.GetAsync(path).Result;
-            if (response.IsSuccessStatusCode)
-            {
-                string respstr = await response.Content.ReadAsStringAsync();
-
-                JArray jarray = JArray.Parse(respstr);
-
-                return jarray;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a  BillOfMaterial with the currently necessary information
-        /// </summary>
-        /// <param name="aasID"></param>
-        /// <returns></returns>
-        public static BillOfMaterial GetBillofmaterialWithRelationshipElements(string aasID)
-        {
-
-
-            JObject json = GetJson($"aas/{aasID}/submodels/billofmaterial/complete").Result;
-
-            if (json == null || json.SelectToken("hasDataSpecification") == null)
-            {
-                return null;
-            }
-
-            BillOfMaterial billOfMaterial = BillOfMaterial.Parse(json);
-            billOfMaterial.BomName = aasID;
-            return billOfMaterial;
-
-        }
-
-        /// <summary>
-        /// Returns the SimulationModel of the given Submodel
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public static SimulationModel GetSimulationModel(string name)
-        {
-
-            JObject simulationModelJson
-                = AASRestClient.GetJson($"aas/{name}/submodels/SimulationModels/complete").Result;
-            SimulationModel ret = SimulationModel.Parse(simulationModelJson, name);
-            return ret;
-        }
-
-        /// <summary>
-        /// Puts an AAS to the server.
-        /// </summary>
-        /// <param name="aas"></param>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public static bool PutAAS(string aas, string name)
-        {
-            HttpResponseMessage response = httpClient.PutAsync($"aas",
-                new StringContent(aas, Encoding.UTF8, "application/json")).Result;
-
-            return response.IsSuccessStatusCode;
-        }
-
-        /// <summary>
-        /// Puts an Submodel with Path: aas/{aasId}/submodels to the server.
-        /// </summary>
-        /// <param name="submodel"></param>
-        /// <param name="name"></param>
-        /// <param name="aasId"></param>
-        /// <returns></returns>
-        public static bool PutSubmodel(string submodel, string name, string aasId)
-        {
-            HttpResponseMessage response = httpClient.PutAsync($"aas/{aasId}/submodels",
-                new StringContent(submodel, Encoding.UTF8, "application/json")).Result;
-
-            return response.IsSuccessStatusCode;
-        }
-
-
-        public static bool PutEntity(string submodel_json, string aasId, string nameSub, string nameEntity)
-        {
-            HttpResponseMessage response = httpClient.PutAsync($"aas/{aasId}/submodels/{nameSub}/elements/{nameEntity}",
-                new StringContent(submodel_json, Encoding.UTF8, "application/json")).Result;
-
-            return response.IsSuccessStatusCode;
-        }
-
-        public static string GetAASNameForAssetId(string assetId)
-        {
-            try
-            {
-                assetId = WebUtility.UrlEncode(assetId);
-                var path = $"assets/@qs?qs=IRI,{assetId}";
-
-                JArray jObject = AASRestClient.GetJArray(path).Result;
-
-                return (string)jObject[0]["idShort"];
-            }
-            catch (Exception)
-            {
-                // Could not get asset with assetId
-                return "";
-            }
-        }
-
-    }
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace AasxPluginSmdExporter
+{
+    public static class AASRestClient
+    {
+        static readonly HttpClient httpClient;
+
+        private static bool used;
+
+
+        static AASRestClient()
+        {
+            httpClient = new HttpClient();
+            used = false;
+        }
+
+        /// <summary>
+        /// Starts the HttpClient and sets its Baseaadress to the given Adress
+        /// </summary>
+        /// <param name="baseAddress"></param>
+        public static void Start(string baseAddress)
+        {
+            if (!used)
+            {
+                httpClient.BaseAddress = new Uri(baseAddress);
+                httpClient.DefaultRequestHeaders.Accept.Clear();
+                httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                used = true;
+            }
+
+
+        }
+
+        /// <summary>
+        /// Returns the Json version of the aas with the given name.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static async Task<JObject> GetJson(string path)
+        {
+            try
+            {
+
+                HttpResponseMessage response = httpClient.GetAsync(path).Result;
+
+                if (response.IsSuccessStatusCode)
+                {
+
+                    string respstr = await response.Content.ReadAsStringAsync();
+                    JObject json = JObject.Parse(respstr);
+
+                    return json;
+                }
+
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+                throw;
+            }
+            return null;
+        }
+
+        public static async Task<JArray> GetJArray(string path)
+        {
+            HttpResponseMessage response = httpClient.GetAsync(path).Result;
+            if (response.IsSuccessStatusCode)
+            {
+                string respstr = await response.Content.ReadAsStringAsync();
+
+                JArray jarray = JArray.Parse(respstr);
+
+                return jarray;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a  BillOfMaterial with the currently necessary information
+        /// </summary>
+        /// <param name="aasID"></param>
+        /// <returns></returns>
+        public static BillOfMaterial GetBillofmaterialWithRelationshipElements(string aasID)
+        {
+
+
+            JObject json = GetJson($"aas/{aasID}/submodels/billofmaterial/complete").Result;
+
+            if (json == null || json.SelectToken("hasDataSpecification") == null)
+            {
+                return null;
+            }
+
+            BillOfMaterial billOfMaterial = BillOfMaterial.Parse(json);
+            billOfMaterial.BomName = aasID;
+            return billOfMaterial;
+
+        }
+
+        /// <summary>
+        /// Returns the SimulationModel of the given Submodel
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public static SimulationModel GetSimulationModel(string name)
+        {
+
+            JObject simulationModelJson
+                = AASRestClient.GetJson($"aas/{name}/submodels/SimulationModels/complete").Result;
+            SimulationModel ret = SimulationModel.Parse(simulationModelJson, name);
+            return ret;
+        }
+
+        /// <summary>
+        /// Puts an AAS to the server.
+        /// </summary>
+        /// <param name="aas"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public static bool PutAAS(string aas, string name)
+        {
+            HttpResponseMessage response = httpClient.PutAsync($"aas",
+                new StringContent(aas, Encoding.UTF8, "application/json")).Result;
+
+            return response.IsSuccessStatusCode;
+        }
+
+        /// <summary>
+        /// Puts an Submodel with Path: aas/{aasId}/submodels to the server.
+        /// </summary>
+        /// <param name="submodel"></param>
+        /// <param name="name"></param>
+        /// <param name="aasId"></param>
+        /// <returns></returns>
+        public static bool PutSubmodel(string submodel, string name, string aasId)
+        {
+            HttpResponseMessage response = httpClient.PutAsync($"aas/{aasId}/submodels",
+                new StringContent(submodel, Encoding.UTF8, "application/json")).Result;
+
+            return response.IsSuccessStatusCode;
+        }
+
+
+        public static bool PutEntity(string submodel_json, string aasId, string nameSub, string nameEntity)
+        {
+            HttpResponseMessage response = httpClient.PutAsync($"aas/{aasId}/submodels/{nameSub}/elements/{nameEntity}",
+                new StringContent(submodel_json, Encoding.UTF8, "application/json")).Result;
+
+            return response.IsSuccessStatusCode;
+        }
+
+        public static string GetAASNameForAssetId(string assetId)
+        {
+            try
+            {
+                assetId = WebUtility.UrlEncode(assetId);
+                var path = $"assets/@qs?qs=IRI,{assetId}";
+
+                JArray jObject = AASRestClient.GetJArray(path).Result;
+
+                return (string)jObject[0]["idShort"];
+            }
+            catch (Exception)
+            {
+                // Could not get asset with assetId
+                return "";
+            }
+        }
+
+    }
+}
diff --git a/src/AasxPluginSmdExporter/Model/BomSubmodel.cs b/src/AasxPluginSmdExporter/Model/BomSubmodel.cs
index 713ebe02..2e2aac53 100644
--- a/src/AasxPluginSmdExporter/Model/BomSubmodel.cs
+++ b/src/AasxPluginSmdExporter/Model/BomSubmodel.cs
@@ -1,32 +1,32 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AasxPluginSmdExporter.Model
-{
-    public abstract class BomSubmodel
-    {
-
-        public List<string> PropertyBoms { get; set; }
-
-        public string name { get; set; }
-        protected BomSubmodel()
-        {
-            PropertyBoms = new List<string>();
-        }
-    }
-
-
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AasxPluginSmdExporter.Model
+{
+    public abstract class BomSubmodel
+    {
+
+        public List<string> PropertyBoms { get; set; }
+
+        public string name { get; set; }
+        protected BomSubmodel()
+        {
+            PropertyBoms = new List<string>();
+        }
+    }
+
+
+}
diff --git a/src/AasxPluginSmdExporter/Model/EClass.cs b/src/AasxPluginSmdExporter/Model/EClass.cs
index 36328a49..a0ed4609 100644
--- a/src/AasxPluginSmdExporter/Model/EClass.cs
+++ b/src/AasxPluginSmdExporter/Model/EClass.cs
@@ -1,120 +1,120 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using CsvHelper;
-
-namespace AasxPluginSmdExporter
-{
-    public class EClass
-    {
-        public static Dictionary<string, EClass> InputEclassIds { get; set; }
-
-        public static Dictionary<string, EClass> OutputEclassIds { get; set; }
-        public static Dictionary<string, EClass> PortEclassIds { get; set; }
-
-        public string Id { get; set; }
-
-        public string Unit { get; set; }
-
-        /// <summary>
-        /// Initializes all necessary dictionaries and in case of success returns true.
-        /// </summary>
-        /// <returns></returns>
-        public static bool InitEclass(Queue<string> log)
-        {
-            InputEclassIds = new Dictionary<string, EClass>();
-            OutputEclassIds = new Dictionary<string, EClass>();
-            PortEclassIds = new Dictionary<string, EClass>();
-
-            foreach (var pair in IdTables.InputEclassUnits)
-            {
-                EClass eClassIn = new EClass();
-                eClassIn.Id = pair.Key;
-                eClassIn.Unit = pair.Value;
-
-                InputEclassIds.Add(eClassIn.Id, eClassIn);
-
-                if (!PortEclassIds.ContainsKey(eClassIn.Id))
-                    PortEclassIds.Add(eClassIn.Id.Trim(), eClassIn);
-            }
-
-            foreach (var pair in IdTables.OutputEclassUnits)
-            {
-                EClass eClassOut = new EClass();
-                eClassOut.Id = pair.Key;
-                if (!eClassOut.Id.Equals("") && !eClassOut.Id.Equals("?"))
-                {
-                    eClassOut.Unit = pair.Value;
-                    OutputEclassIds.Add(eClassOut.Id, eClassOut);
-
-                    if (!PortEclassIds.ContainsKey(eClassOut.Id))
-                        PortEclassIds.Add(eClassOut.Id.Trim(), eClassOut);
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Checks whether or not the two given strings are compatible eclass ids according to the csv data.
-        /// </summary>
-        /// <param name="inputId"></param>
-        /// <param name="outputId"></param>
-        /// <returns></returns>
-        public static bool CheckEClassConnection(string inputId, string outputId)
-        {
-
-            inputId = inputId.Trim();
-            outputId = outputId.Trim();
-
-            if (inputId.Equals(outputId))
-            {
-                return true;
-            }
-
-            if (IdTables.CompatibleEclassIds.ContainsKey(inputId))
-            {
-                return IdTables.CompatibleEclassIds[inputId].Equals(outputId);
-            }
-            else
-            {
-                return false;
-            }
-
-        }
-
-        /// <summary>
-        /// In case the given string is an eclass id and it is in the list the unit is returned
-        /// </summary>
-        /// <param name="eclassId"></param>
-        /// <returns></returns>
-        public static string GetUnitForEclassId(string eclassId)
-        {
-            eclassId = eclassId.Trim();
-            if (PortEclassIds == null)
-            {
-                return "";
-            }
-            if (PortEclassIds.ContainsKey(eclassId))
-            {
-                return PortEclassIds[eclassId].Unit;
-            }
-            return "";
-        }
-
-    }
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using CsvHelper;
+
+namespace AasxPluginSmdExporter
+{
+    public class EClass
+    {
+        public static Dictionary<string, EClass> InputEclassIds { get; set; }
+
+        public static Dictionary<string, EClass> OutputEclassIds { get; set; }
+        public static Dictionary<string, EClass> PortEclassIds { get; set; }
+
+        public string Id { get; set; }
+
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// Initializes all necessary dictionaries and in case of success returns true.
+        /// </summary>
+        /// <returns></returns>
+        public static bool InitEclass(Queue<string> log)
+        {
+            InputEclassIds = new Dictionary<string, EClass>();
+            OutputEclassIds = new Dictionary<string, EClass>();
+            PortEclassIds = new Dictionary<string, EClass>();
+
+            foreach (var pair in IdTables.InputEclassUnits)
+            {
+                EClass eClassIn = new EClass();
+                eClassIn.Id = pair.Key;
+                eClassIn.Unit = pair.Value;
+
+                InputEclassIds.Add(eClassIn.Id, eClassIn);
+
+                if (!PortEclassIds.ContainsKey(eClassIn.Id))
+                    PortEclassIds.Add(eClassIn.Id.Trim(), eClassIn);
+            }
+
+            foreach (var pair in IdTables.OutputEclassUnits)
+            {
+                EClass eClassOut = new EClass();
+                eClassOut.Id = pair.Key;
+                if (!eClassOut.Id.Equals("") && !eClassOut.Id.Equals("?"))
+                {
+                    eClassOut.Unit = pair.Value;
+                    OutputEclassIds.Add(eClassOut.Id, eClassOut);
+
+                    if (!PortEclassIds.ContainsKey(eClassOut.Id))
+                        PortEclassIds.Add(eClassOut.Id.Trim(), eClassOut);
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Checks whether or not the two given strings are compatible eclass ids according to the csv data.
+        /// </summary>
+        /// <param name="inputId"></param>
+        /// <param name="outputId"></param>
+        /// <returns></returns>
+        public static bool CheckEClassConnection(string inputId, string outputId)
+        {
+
+            inputId = inputId.Trim();
+            outputId = outputId.Trim();
+
+            if (inputId.Equals(outputId))
+            {
+                return true;
+            }
+
+            if (IdTables.CompatibleEclassIds.ContainsKey(inputId))
+            {
+                return IdTables.CompatibleEclassIds[inputId].Equals(outputId);
+            }
+            else
+            {
+                return false;
+            }
+
+        }
+
+        /// <summary>
+        /// In case the given string is an eclass id and it is in the list the unit is returned
+        /// </summary>
+        /// <param name="eclassId"></param>
+        /// <returns></returns>
+        public static string GetUnitForEclassId(string eclassId)
+        {
+            eclassId = eclassId.Trim();
+            if (PortEclassIds == null)
+            {
+                return "";
+            }
+            if (PortEclassIds.ContainsKey(eclassId))
+            {
+                return PortEclassIds[eclassId].Unit;
+            }
+            return "";
+        }
+
+    }
+}
diff --git a/src/AasxPluginSmdExporter/Model/Mapping.cs b/src/AasxPluginSmdExporter/Model/Mapping.cs
index 330c13a3..358a0000 100644
--- a/src/AasxPluginSmdExporter/Model/Mapping.cs
+++ b/src/AasxPluginSmdExporter/Model/Mapping.cs
@@ -1,38 +1,38 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace AasxPluginSmdExporter
-{
-    public class Mapping
-    {
-        public string IdShort { get; set; }
-
-        public string UnknownId { get; set; }
-
-        public string BasicId { get; set; }
-
-        public double Value { get; set; }
-
-        public Mapping(string idShort, string unknownId, string basicId, double value)
-        {
-            this.IdShort = idShort;
-            this.UnknownId = unknownId;
-            this.BasicId = basicId;
-            this.Value = value;
-        }
-
-    }
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace AasxPluginSmdExporter
+{
+    public class Mapping
+    {
+        public string IdShort { get; set; }
+
+        public string UnknownId { get; set; }
+
+        public string BasicId { get; set; }
+
+        public double Value { get; set; }
+
+        public Mapping(string idShort, string unknownId, string basicId, double value)
+        {
+            this.IdShort = idShort;
+            this.UnknownId = unknownId;
+            this.BasicId = basicId;
+            this.Value = value;
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/src/AasxPluginSmdExporter/Model/RelationshipElement.cs b/src/AasxPluginSmdExporter/Model/RelationshipElement.cs
index 2ccb3d42..5add3ba5 100644
--- a/src/AasxPluginSmdExporter/Model/RelationshipElement.cs
+++ b/src/AasxPluginSmdExporter/Model/RelationshipElement.cs
@@ -1,172 +1,172 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-
-namespace AasxPluginSmdExporter
-{
-    public class RelationshipElement
-    {
-        #region properties
-
-        public String ValueFirst { get; set; }
-
-        public string FirstAssetId { get; set; }
-
-        public string FirstInterface { get; set; }
-
-        public String ValueSecond { get; set; }
-
-        public string SecondAssetId { get; set; }
-
-        public string SecondInterface { get; set; }
-
-        public String IdShort { get; set; }
-
-
-        public bool IsCertainConnection { get; set; }
-
-
-
-        #endregion
-
-        public RelationshipElement()
-        {
-            IsCertainConnection = true;
-        }
-
-        public RelationshipElement(string valueFirst, string valueSecond, string idShort, bool isCertainConnection)
-        {
-            ValueFirst = valueFirst.Trim();
-            ValueSecond = valueSecond.Trim();
-            IdShort = idShort.Trim();
-            IsCertainConnection = isCertainConnection;
-        }
-
-        /// <summary>
-        /// Sets the values according to the asset ids
-        /// </summary>
-        public void SetValuesAccordingToAsset()
-        {
-            if (this.FirstAssetId != null && this.FirstAssetId != "")
-                this.ValueFirst = getValuesAccordingToAssetHelper(this.FirstAssetId, this.ValueFirst);
-            if (this.SecondAssetId != null && this.SecondAssetId != "")
-            {
-                this.ValueSecond = getValuesAccordingToAssetHelper(this.SecondAssetId, this.ValueSecond);
-            }
-
-        }
-
-        /// <summary>
-        /// Gets the right value for the assetId
-        /// </summary>
-        /// <param name="assetId"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        private static string getValuesAccordingToAssetHelper(string assetId, string value)
-        {
-            try
-            {
-                assetId = WebUtility.UrlEncode(assetId);
-                var path = $"assets/@qs?qs=IRI,{assetId}";
-
-                JArray jObject = AASRestClient.GetJArray(path).Result;
-
-                return (string)jObject[0]["idShort"];
-            }
-            catch (Exception)
-            {
-                // Could not get asset with assetId
-                return value;
-            }
-
-        }
-
-
-
-        /// <summary>
-        /// Parses the JToken into a RelationshipElement and returns the new created RelationshipElement
-        /// </summary>
-        /// <param name="valueFirst"></param>
-        /// <param name="valueSecond"></param>
-        /// <param name="idShort"></param>
-        /// <param name="ReferenceToAsset"></param>
-        /// <param name="interfaceFirst"></param>
-        /// <param name="interfaceSecond"></param>
-        /// <returns></returns>
-        public static RelationshipElement Parse(string valueFirst,
-            string valueSecond,
-            string idShort,
-            Dictionary<string, string> ReferenceToAsset,
-            string interfaceFirst = null,
-            string interfaceSecond = null)
-        {
-
-
-            RelationshipElement relationship = new RelationshipElement();
-
-
-            relationship.ValueFirst = valueFirst;
-            relationship.ValueSecond = valueSecond;
-
-            if (ReferenceToAsset.ContainsKey(relationship.ValueFirst))
-                relationship.FirstAssetId = ReferenceToAsset[relationship.ValueFirst];
-            if (ReferenceToAsset.ContainsKey(relationship.ValueSecond))
-                relationship.SecondAssetId = ReferenceToAsset[relationship.ValueSecond];
-
-
-
-            relationship.SetValuesAccordingToAsset();
-
-            relationship.IdShort = idShort;
-
-            relationship.FirstInterface = interfaceFirst;
-            relationship.SecondInterface = interfaceSecond;
-
-            return relationship;
-
-        }
-
-        public static RelationshipElement Parse(JToken statement)
-        {
-            RelationshipElement relationshipElement = new RelationshipElement();
-            relationshipElement.IsCertainConnection = true;
-            JToken locTokenFirst = statement.SelectToken("first.keys(0).value");
-            if (locTokenFirst != null)
-            {
-                relationshipElement.FirstAssetId = locTokenFirst.ToString();
-            }
-            JToken locTokenSecond = statement.SelectToken("second.keys(0).value");
-            if (locTokenSecond != null)
-            {
-                relationshipElement.SecondAssetId = locTokenSecond.ToString();
-            }
-            relationshipElement.SetValuesAccordingToAsset();
-            relationshipElement.FirstInterface = relationshipElement.ValueFirst +
-                ((string)statement.SelectToken("first.keys(2).value"));
-            relationshipElement.SecondInterface = relationshipElement.ValueSecond +
-                ((string)statement.SelectToken("second.keys(2).value"));
-            relationshipElement.IdShort = (string)statement.SelectToken("idShort");
-
-            if (relationshipElement.ValueFirst == null || relationshipElement.ValueSecond == null)
-            {
-                return null;
-            }
-
-            return relationshipElement;
-        }
-    }
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace AasxPluginSmdExporter
+{
+    public class RelationshipElement
+    {
+        #region properties
+
+        public String ValueFirst { get; set; }
+
+        public string FirstAssetId { get; set; }
+
+        public string FirstInterface { get; set; }
+
+        public String ValueSecond { get; set; }
+
+        public string SecondAssetId { get; set; }
+
+        public string SecondInterface { get; set; }
+
+        public String IdShort { get; set; }
+
+
+        public bool IsCertainConnection { get; set; }
+
+
+
+        #endregion
+
+        public RelationshipElement()
+        {
+            IsCertainConnection = true;
+        }
+
+        public RelationshipElement(string valueFirst, string valueSecond, string idShort, bool isCertainConnection)
+        {
+            ValueFirst = valueFirst.Trim();
+            ValueSecond = valueSecond.Trim();
+            IdShort = idShort.Trim();
+            IsCertainConnection = isCertainConnection;
+        }
+
+        /// <summary>
+        /// Sets the values according to the asset ids
+        /// </summary>
+        public void SetValuesAccordingToAsset()
+        {
+            if (this.FirstAssetId != null && this.FirstAssetId != "")
+                this.ValueFirst = getValuesAccordingToAssetHelper(this.FirstAssetId, this.ValueFirst);
+            if (this.SecondAssetId != null && this.SecondAssetId != "")
+            {
+                this.ValueSecond = getValuesAccordingToAssetHelper(this.SecondAssetId, this.ValueSecond);
+            }
+
+        }
+
+        /// <summary>
+        /// Gets the right value for the assetId
+        /// </summary>
+        /// <param name="assetId"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private static string getValuesAccordingToAssetHelper(string assetId, string value)
+        {
+            try
+            {
+                assetId = WebUtility.UrlEncode(assetId);
+                var path = $"assets/@qs?qs=IRI,{assetId}";
+
+                JArray jObject = AASRestClient.GetJArray(path).Result;
+
+                return (string)jObject[0]["idShort"];
+            }
+            catch (Exception)
+            {
+                // Could not get asset with assetId
+                return value;
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// Parses the JToken into a RelationshipElement and returns the new created RelationshipElement
+        /// </summary>
+        /// <param name="valueFirst"></param>
+        /// <param name="valueSecond"></param>
+        /// <param name="idShort"></param>
+        /// <param name="ReferenceToAsset"></param>
+        /// <param name="interfaceFirst"></param>
+        /// <param name="interfaceSecond"></param>
+        /// <returns></returns>
+        public static RelationshipElement Parse(string valueFirst,
+            string valueSecond,
+            string idShort,
+            Dictionary<string, string> ReferenceToAsset,
+            string interfaceFirst = null,
+            string interfaceSecond = null)
+        {
+
+
+            RelationshipElement relationship = new RelationshipElement();
+
+
+            relationship.ValueFirst = valueFirst;
+            relationship.ValueSecond = valueSecond;
+
+            if (ReferenceToAsset.ContainsKey(relationship.ValueFirst))
+                relationship.FirstAssetId = ReferenceToAsset[relationship.ValueFirst];
+            if (ReferenceToAsset.ContainsKey(relationship.ValueSecond))
+                relationship.SecondAssetId = ReferenceToAsset[relationship.ValueSecond];
+
+
+
+            relationship.SetValuesAccordingToAsset();
+
+            relationship.IdShort = idShort;
+
+            relationship.FirstInterface = interfaceFirst;
+            relationship.SecondInterface = interfaceSecond;
+
+            return relationship;
+
+        }
+
+        public static RelationshipElement Parse(JToken statement)
+        {
+            RelationshipElement relationshipElement = new RelationshipElement();
+            relationshipElement.IsCertainConnection = true;
+            JToken locTokenFirst = statement.SelectToken("first.keys(0).value");
+            if (locTokenFirst != null)
+            {
+                relationshipElement.FirstAssetId = locTokenFirst.ToString();
+            }
+            JToken locTokenSecond = statement.SelectToken("second.keys(0).value");
+            if (locTokenSecond != null)
+            {
+                relationshipElement.SecondAssetId = locTokenSecond.ToString();
+            }
+            relationshipElement.SetValuesAccordingToAsset();
+            relationshipElement.FirstInterface = relationshipElement.ValueFirst +
+                ((string)statement.SelectToken("first.keys(2).value"));
+            relationshipElement.SecondInterface = relationshipElement.ValueSecond +
+                ((string)statement.SelectToken("second.keys(2).value"));
+            relationshipElement.IdShort = (string)statement.SelectToken("idShort");
+
+            if (relationshipElement.ValueFirst == null || relationshipElement.ValueSecond == null)
+            {
+                return null;
+            }
+
+            return relationshipElement;
+        }
+    }
+}
diff --git a/src/AasxPluginSmdExporter/Model/SemanticPort.cs b/src/AasxPluginSmdExporter/Model/SemanticPort.cs
index bcb2a499..c4e03bb2 100644
--- a/src/AasxPluginSmdExporter/Model/SemanticPort.cs
+++ b/src/AasxPluginSmdExporter/Model/SemanticPort.cs
@@ -1,56 +1,56 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AasxPluginSmdExporter.Model
-{
-    public class SemanticPort
-    {
-
-        static SemanticPort semanticPort;
-
-        /// <summary>
-        /// Returns a Instance of a class which implements
-        /// </summary>
-        /// <returns></returns>
-        public static SemanticPort GetInstance()
-        {
-            if (semanticPort == null)
-            {
-                semanticPort = new SemanticPort();
-            }
-            return semanticPort;
-        }
-
-        /// <summary>
-        /// Returns the semanticID  for the given domain
-        /// </summary>
-        /// <param name="domain"></param>
-        /// <returns></returns>
-        public string GetSemanticForPort(string domain)
-        {
-            if (IdTables.SemanticPortsDomain.ContainsKey(domain))
-            {
-                return IdTables.SemanticPortsDomain[domain];
-            }
-            return "";
-        }
-
-        protected SemanticPort()
-        {
-
-        }
-    }
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AasxPluginSmdExporter.Model
+{
+    public class SemanticPort
+    {
+
+        static SemanticPort semanticPort;
+
+        /// <summary>
+        /// Returns a Instance of a class which implements
+        /// </summary>
+        /// <returns></returns>
+        public static SemanticPort GetInstance()
+        {
+            if (semanticPort == null)
+            {
+                semanticPort = new SemanticPort();
+            }
+            return semanticPort;
+        }
+
+        /// <summary>
+        /// Returns the semanticID  for the given domain
+        /// </summary>
+        /// <param name="domain"></param>
+        /// <returns></returns>
+        public string GetSemanticForPort(string domain)
+        {
+            if (IdTables.SemanticPortsDomain.ContainsKey(domain))
+            {
+                return IdTables.SemanticPortsDomain[domain];
+            }
+            return "";
+        }
+
+        protected SemanticPort()
+        {
+
+        }
+    }
+}
diff --git a/src/AasxPluginSmdExporter/Properties/AssemblyInfo.cs b/src/AasxPluginSmdExporter/Properties/AssemblyInfo.cs
index c9751398..9898ee0f 100644
--- a/src/AasxPluginSmdExporter/Properties/AssemblyInfo.cs
+++ b/src/AasxPluginSmdExporter/Properties/AssemblyInfo.cs
@@ -1,36 +1,36 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 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("AasxPluginSmdExporter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AasxPluginSmdExporter")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 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)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("02c78dbd-7c1e-4e61-9a30-e44a5736339a")]
-
-// 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")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("AasxPluginSmdExporter")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("AasxPluginSmdExporter")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("02c78dbd-7c1e-4e61-9a30-e44a5736339a")]
+
+// 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/src/AasxPluginSmdExporter/Properties/Resources.resx b/src/AasxPluginSmdExporter/Properties/Resources.resx
index 85c90909..4fdb1b6a 100644
--- a/src/AasxPluginSmdExporter/Properties/Resources.resx
+++ b/src/AasxPluginSmdExporter/Properties/Resources.resx
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-	<!-- 
-		Microsoft ResX Schema
-
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
-	
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
 </root>
\ No newline at end of file
diff --git a/src/AasxPluginSmdExporter/Resources/IdTables.cs b/src/AasxPluginSmdExporter/Resources/IdTables.cs
index 01fcac48..6d919dac 100644
--- a/src/AasxPluginSmdExporter/Resources/IdTables.cs
+++ b/src/AasxPluginSmdExporter/Resources/IdTables.cs
@@ -1,110 +1,110 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-
-namespace AasxPluginSmdExporter
-{
-    public static class IdTables
-    {
-        /// <summary>
-        /// To define simulation model ports, a domain is added to every port 
-        /// Only ports with matching domain will be connected from the SMD exporter
-        /// </summary>
-        public static Dictionary<string, string> SemanticPortsDomain = new Dictionary<string, string>()
-        {
-            { "Domain", "SemanticId" },
-            { "elecDC", "Dies ist elecDC" },
-            { "SmdComp_SignalFlow", "www.tedz.itsowl.com/ids/cd/7565_0191_6002_1240" },
-            { "SmdComp_PhysicalElectric", "www.tedz.itsowl.com/ids/cd/7565_0191_6002_2222" },
-            { "SmdComp_PhysicalMechanic", "placeholder" },
-            { "SmdComp_SimModelType", "www.tedz.itsowl.com/ids/cd/3191_3132_1102_6456" },
-            { "BoM_SmdComp_Fmu", "www.tedz.itsowl.com/ids/cd/5593_7040_8002_2422" },
-            { "BoM_SmdComp_Sum", "www.tedz.itsowl.com/ids/cd/8364_7040_8002_5528" },
-            { "BoM_SmdComp_Mult", "www.tedz.itsowl.com/ids/cd/9301_8040_8002_5424" },
-            { "BoM_SmdComp_Div", "www.tedz.itsowl.com/ids/cd/6321_8040_8002_3964" },
-            { "BoM_Comp_Interface", "www.tedz.itsowl.com/ids/cd/7221_0191_0102_0108" },
-            { "BoM_SmdComp_PhyNode", "placeholder" }
-        };
-        /// <summary>
-        /// The SMD Exporters draws connections between simulations models based on EClass IDs.
-        /// This dictionary includes all supported connections between simulation model ports
-        /// </summary>
-        public static Dictionary<string, string> CompatibleEclassIds = new Dictionary<string, string>()
-        {
-            { "eclassIn", "eclassOut" },
-            { "0173-1#02-AAU445#002", "0173-1#02-BAB975#006" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649",
-                "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869",
-                "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869" },
-            { "0173-1#02-BAC200#007", "0173-1#02-AAB427#007" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607",
-                "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718",
-                "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718" },
-            { "0173-1#02-AAG870#003", "0173-1#02-AAG870#003" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355",
-                "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355" },
-            { "0173-1#02-BAA977#005", "0173-1#02-BAA977#005" },
-            { "0173-1#02-AAJ701#002", "0173-1#02-AAC967#006" },
-            { "0173-1#02-BAI019#003", "0173-1#02-BAI019#003" },
-            { "0173-1#02-AAI902#001", "0173-1#02-AAI902#001" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349",
-                "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721",
-                "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721" }
-        };
-        /// <summary>
-        /// Supported simulation model input ports with affiliated units
-        /// </summary>
-        public static Dictionary<string, string> InputEclassUnits = new Dictionary<string, string>()
-        {
-            { "eclassInId", "eclassInUnit" },
-            { "0173-1#02-AAU445#002", "A (Ampere)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649", "A (Ampere)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869", "A (Ampere)" },
-            { "0173-1#02-BAC200#007", "V (Volt)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607", "V (Volt)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718", "V (Volt)" },
-            { "0173-1#02-AAG870#003", "1/min (Umdrehungen pro Minute)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355", "1/min (Umdrehungen pro Minute)" },
-            { "0173-1#02-BAA977#005", "N*m (Newtonmeter)" },
-            { "0173-1#02-AAJ701#002", "V*A (Voltampere)" },
-            { "0173-1#02-BAI019#003", "m/s (Meter pro Sekunde)" },
-            { "0173-1#02-AAI902#001", "N (Newton)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349", "-" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721", "-" }
-        };
-        /// <summary>
-        /// Supported simulation model output ports with affiliated units
-        /// </summary>
-        public static Dictionary<string, string> OutputEclassUnits = new Dictionary<string, string>()
-        {
-            { "eclassOutId", "eclassOutUnit" },
-            { "0173-1#02-BAB975#006", "A (Ampere)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649", "A (Ampere)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869", "A (Ampere)" },
-            { "0173-1#02-AAB427#007", "V (Volt)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607", "V (Volt)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718", "V (Volt)" },
-            { "0173-1#02-AAG870#003", "1/min (Umdrehungen pro Minute)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355", "1/min (Umdrehungen pro Minute)" },
-            { "0173-1#02-BAA977#005", "N*m (Newtonmeter)" },
-            { "0173-1#02-AAC967#006", "V*A (Voltampere)" },
-            { "0173-1#02-BAI019#003", "m/s (Meter pro Sekunde)" },
-            { "0173-1#02-AAI902#001", "Schubkraft (In)" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349", "-" },
-            { "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721", "-" }
-        };
-
-    }
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+
+namespace AasxPluginSmdExporter
+{
+    public static class IdTables
+    {
+        /// <summary>
+        /// To define simulation model ports, a domain is added to every port 
+        /// Only ports with matching domain will be connected from the SMD exporter
+        /// </summary>
+        public static Dictionary<string, string> SemanticPortsDomain = new Dictionary<string, string>()
+        {
+            { "Domain", "SemanticId" },
+            { "elecDC", "Dies ist elecDC" },
+            { "SmdComp_SignalFlow", "www.tedz.itsowl.com/ids/cd/7565_0191_6002_1240" },
+            { "SmdComp_PhysicalElectric", "www.tedz.itsowl.com/ids/cd/7565_0191_6002_2222" },
+            { "SmdComp_PhysicalMechanic", "placeholder" },
+            { "SmdComp_SimModelType", "www.tedz.itsowl.com/ids/cd/3191_3132_1102_6456" },
+            { "BoM_SmdComp_Fmu", "www.tedz.itsowl.com/ids/cd/5593_7040_8002_2422" },
+            { "BoM_SmdComp_Sum", "www.tedz.itsowl.com/ids/cd/8364_7040_8002_5528" },
+            { "BoM_SmdComp_Mult", "www.tedz.itsowl.com/ids/cd/9301_8040_8002_5424" },
+            { "BoM_SmdComp_Div", "www.tedz.itsowl.com/ids/cd/6321_8040_8002_3964" },
+            { "BoM_Comp_Interface", "www.tedz.itsowl.com/ids/cd/7221_0191_0102_0108" },
+            { "BoM_SmdComp_PhyNode", "placeholder" }
+        };
+        /// <summary>
+        /// The SMD Exporters draws connections between simulations models based on EClass IDs.
+        /// This dictionary includes all supported connections between simulation model ports
+        /// </summary>
+        public static Dictionary<string, string> CompatibleEclassIds = new Dictionary<string, string>()
+        {
+            { "eclassIn", "eclassOut" },
+            { "0173-1#02-AAU445#002", "0173-1#02-BAB975#006" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649",
+                "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869",
+                "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869" },
+            { "0173-1#02-BAC200#007", "0173-1#02-AAB427#007" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607",
+                "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718",
+                "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718" },
+            { "0173-1#02-AAG870#003", "0173-1#02-AAG870#003" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355",
+                "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355" },
+            { "0173-1#02-BAA977#005", "0173-1#02-BAA977#005" },
+            { "0173-1#02-AAJ701#002", "0173-1#02-AAC967#006" },
+            { "0173-1#02-BAI019#003", "0173-1#02-BAI019#003" },
+            { "0173-1#02-AAI902#001", "0173-1#02-AAI902#001" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349",
+                "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721",
+                "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721" }
+        };
+        /// <summary>
+        /// Supported simulation model input ports with affiliated units
+        /// </summary>
+        public static Dictionary<string, string> InputEclassUnits = new Dictionary<string, string>()
+        {
+            { "eclassInId", "eclassInUnit" },
+            { "0173-1#02-AAU445#002", "A (Ampere)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649", "A (Ampere)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869", "A (Ampere)" },
+            { "0173-1#02-BAC200#007", "V (Volt)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607", "V (Volt)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718", "V (Volt)" },
+            { "0173-1#02-AAG870#003", "1/min (Umdrehungen pro Minute)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355", "1/min (Umdrehungen pro Minute)" },
+            { "0173-1#02-BAA977#005", "N*m (Newtonmeter)" },
+            { "0173-1#02-AAJ701#002", "V*A (Voltampere)" },
+            { "0173-1#02-BAI019#003", "m/s (Meter pro Sekunde)" },
+            { "0173-1#02-AAI902#001", "N (Newton)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349", "-" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721", "-" }
+        };
+        /// <summary>
+        /// Supported simulation model output ports with affiliated units
+        /// </summary>
+        public static Dictionary<string, string> OutputEclassUnits = new Dictionary<string, string>()
+        {
+            { "eclassOutId", "eclassOutUnit" },
+            { "0173-1#02-BAB975#006", "A (Ampere)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1213_2122_7002_4649", "A (Ampere)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1053_2122_7002_4869", "A (Ampere)" },
+            { "0173-1#02-AAB427#007", "V (Volt)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6522_2122_7002_4607", "V (Volt)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/0082_2122_7002_4718", "V (Volt)" },
+            { "0173-1#02-AAG870#003", "1/min (Umdrehungen pro Minute)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6130_2122_7002_4355", "1/min (Umdrehungen pro Minute)" },
+            { "0173-1#02-BAA977#005", "N*m (Newtonmeter)" },
+            { "0173-1#02-AAC967#006", "V*A (Voltampere)" },
+            { "0173-1#02-BAI019#003", "m/s (Meter pro Sekunde)" },
+            { "0173-1#02-AAI902#001", "Schubkraft (In)" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/6484_9013_7002_8349", "-" },
+            { "http://tedz.itsowl.com/demo/cd/1/1/1102_2171_1102_8721", "-" }
+        };
+
+    }
+}
diff --git a/src/AasxPluginSmdExporter/View/PhysicalDialog.xaml b/src/AasxPluginSmdExporter/View/PhysicalDialog.xaml
index 175ad604..8bc6548d 100644
--- a/src/AasxPluginSmdExporter/View/PhysicalDialog.xaml
+++ b/src/AasxPluginSmdExporter/View/PhysicalDialog.xaml
@@ -1,77 +1,77 @@
-<UserControl x:Class="AasxPluginSmdExporter.View.PhysicalDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AasxPluginSmdExporter.View"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-			 
-	<!--
-	Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>, 2021 Lenze SE <https://www.lenze.com/en-de/>, author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-	This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-	This source code may use other Open Source software components (see LICENSE.txt).
-	-->
-
-    <UserControl.Resources> 
-        <ResourceDictionary Source="Themes/Generic.xaml"/>
-    </UserControl.Resources>
-
-    <Viewbox>
-        <Grid Margin="10">
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="30"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="6*"/>
-            <RowDefinition Height="36"/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.3*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="10*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="0.3*"/>
-        </Grid.ColumnDefinitions>
-
-        <Viewbox Grid.Row="0" Grid.Column="3" Margin="2" HorizontalAlignment="Right">
-            <Button x:Name="ButtonClose" Style="{DynamicResource TranspRoundCorner}" Height="20" Width="20" Foreground="White" Click="ButtonClose_Click">X</Button>
-        </Viewbox>
-
-        <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="4" FontSize="24" Foreground="White" HorizontalAlignment="Center" TextWrapping="Wrap"><Run Text="Export AAS elements as Table"/></TextBlock>
-
-            <Grid Grid.Row="2" Grid.Column="2">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="6*"/>
-                    <RowDefinition Height="36"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.3*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="10*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.3*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock Grid.Row="1" Grid.Column="2" FontSize="36" TextWrapping="Wrap" Foreground="White">Choose preferred simulation model type</TextBlock>
-                <Grid Grid.Column="2" Grid.Row="2">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="3*"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Button Margin="40" Grid.Row="0" Grid.Column="0" Click="PhysicalClick" Style="{DynamicResource TranspRoundCorner}" Foreground="White">Physical model</Button>
-                    <Button Margin="40" Grid.Row="0" Grid.Column="1" Click="SignalClick" Style="{DynamicResource TranspRoundCorner}" Foreground="White">Signal flow oriented model</Button>
-                </Grid>
-            </Grid>
-        </Grid>
-    </Viewbox>
-</UserControl>
+<UserControl x:Class="AasxPluginSmdExporter.View.PhysicalDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:AasxPluginSmdExporter.View"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+			 
+	<!--
+	Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>, 2021 Lenze SE <https://www.lenze.com/en-de/>, author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+	This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+	This source code may use other Open Source software components (see LICENSE.txt).
+	-->
+
+    <UserControl.Resources> 
+        <ResourceDictionary Source="Themes/Generic.xaml"/>
+    </UserControl.Resources>
+
+    <Viewbox>
+        <Grid Margin="10">
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="6*"/>
+            <RowDefinition Height="36"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.3*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="0.3*"/>
+        </Grid.ColumnDefinitions>
+
+        <Viewbox Grid.Row="0" Grid.Column="3" Margin="2" HorizontalAlignment="Right">
+            <Button x:Name="ButtonClose" Style="{DynamicResource TranspRoundCorner}" Height="20" Width="20" Foreground="White" Click="ButtonClose_Click">X</Button>
+        </Viewbox>
+
+        <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="2" Margin="4" FontSize="24" Foreground="White" HorizontalAlignment="Center" TextWrapping="Wrap"><Run Text="Export AAS elements as Table"/></TextBlock>
+
+            <Grid Grid.Row="2" Grid.Column="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="6*"/>
+                    <RowDefinition Height="36"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.3*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="10*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.3*"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Grid.Row="1" Grid.Column="2" FontSize="36" TextWrapping="Wrap" Foreground="White">Choose preferred simulation model type</TextBlock>
+                <Grid Grid.Column="2" Grid.Row="2">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="3*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Button Margin="40" Grid.Row="0" Grid.Column="0" Click="PhysicalClick" Style="{DynamicResource TranspRoundCorner}" Foreground="White">Physical model</Button>
+                    <Button Margin="40" Grid.Row="0" Grid.Column="1" Click="SignalClick" Style="{DynamicResource TranspRoundCorner}" Foreground="White">Signal flow oriented model</Button>
+                </Grid>
+            </Grid>
+        </Grid>
+    </Viewbox>
+</UserControl>
diff --git a/src/AasxPluginSmdExporter/View/TextUI.cs b/src/AasxPluginSmdExporter/View/TextUI.cs
index 974180b9..485ad2fd 100644
--- a/src/AasxPluginSmdExporter/View/TextUI.cs
+++ b/src/AasxPluginSmdExporter/View/TextUI.cs
@@ -1,324 +1,324 @@
-/*
-Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
-Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
-author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-This source code may use other Open Source software components (see LICENSE.txt).
-*/
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AasxPluginSmdExporter.Model;
-
-namespace AasxPluginSmdExporter
-{
-    public class TextUI
-    {
-        private Exporter exporter;
-
-        private Queue<string> logs;
-
-        public TextUI()
-        {
-            logs = new Queue<string>();
-        }
-
-        public TextUI(Queue<string> logs)
-        {
-            this.logs = logs;
-        }
-        public Queue<string> Start(string host, string machine)
-        {
-            string locstring = "Physical";
-            return this.Start(host, machine, locstring);
-        }
-
-
-        public Queue<string> Start(string host, string machine, string modeltype)
-        {
-            bool usePhysical = modeltype.Equals("Physical");
-            exporter = new Exporter(usePhysical);
-            Console.WriteLine($"--- {machine} ---");
-            Console.WriteLine();
-            logs.Enqueue($"---{machine}---");
-            logs.Enqueue("");
-            if (CreateSMD(host, machine))
-            {
-                CreateConnections();
-                PutSmd();
-
-
-                CreateSummingPoints();
-                CreateMultPoints();
-                CreatePhysicalNodes();
-                logs.Enqueue("--- Warnings ---");
-                ToManyInputThrough();
-                ToManyOutputAcross();
-                logs.Enqueue("----------------");
-                logs.Enqueue("");
-                Console.WriteLine();
-                PutSmd();
-            }
-            return logs;
-        }
-
-        public bool CreateSMD(string host, string machine)
-        {
-            if (SemanticPort.GetInstance() == null)
-            {
-                logs.Enqueue("Missing semantic ID csv");
-                Console.WriteLine("Missing semantic ID csv");
-            }
-            else
-            {
-                if (EClass.InitEclass(logs) && SemanticPort.GetInstance() != null)
-                {
-
-                    try
-                    {
-                        if (exporter.CreateSMD(host, machine))
-                        {
-                            List<SimulationModel> noFmu = exporter.GetSimulationModelsWithoutFMU();
-                            foreach (var sim in noFmu)
-                            {
-                                Console.WriteLine($"SimulationModel {sim.Name} has no Fmu");
-                                Console.WriteLine();
-                                logs.Enqueue($"SimulationModel {sim.Name} has no Fmu");
-                                logs.Enqueue("");
-                            }
-
-                            foreach (var warning in SimulationModel.Warnings)
-                            {
-                                Console.WriteLine(warning);
-                                logs.Enqueue(warning);
-                            }
-                        }
-                        else
-                        {
-                            Console.WriteLine($"Could not find or read {machine}." +
-                                $" Please check the name of the AAS and structure of the aasx");
-                            logs.Enqueue($"Could not find or read {machine}." +
-                                $" Please check the name of the AAS and structure of the aasx");
-                            return false;
-                        }
-                    }
-                    catch (AggregateException e)
-                    {
-                        print("No Connection:" + e.Message);
-                        Console.WriteLine();
-                        logs.Enqueue("No Connection:" + e.Message);
-                        logs.Enqueue("");
-                        return false;
-                    }
-
-                    return true;
-                }
-                else
-                {
-                    Console.WriteLine("No mappings.csv found or does not contain all rows");
-                    logs.Enqueue("No mappings.csv found or does not contain all rows");
-                    return false;
-                }
-            }
-            return false;
-
-
-
-
-
-        }
-
-        public void CreateConnections()
-        {
-
-            foreach (var relationshipElement in exporter.RelationshipElements)
-            {
-
-
-                Console.WriteLine();
-                Console.WriteLine();
-                Console.WriteLine("---------------------------------------------------------------------------");
-                Console.WriteLine($"--- Checking connections for {relationshipElement.ValueFirst} " +
-                    $"and {relationshipElement.ValueSecond} ---");
-                Console.WriteLine();
-                logs.Enqueue("");
-                logs.Enqueue("");
-                logs.Enqueue("--------------------------------------------------------------------------------");
-                logs.Enqueue($"--- Checking connections for {relationshipElement.ValueFirst}" +
-                    $" and {relationshipElement.ValueSecond} ---");
-                logs.Enqueue("");
-                bool noError = true;
-
-                if (!exporter.CheckCompatibleDomainsAndConnect(relationshipElement,
-                    relationshipElement.ValueFirst,
-                    relationshipElement.ValueSecond,
-                    relationshipElement.FirstInterface,
-                    relationshipElement.SecondInterface))
-                {
-
-                }
-
-                List<string> difDatatype = exporter.ReturnListWithMessageForDifferentDatatypes(relationshipElement,
-                    relationshipElement.ValueFirst,
-                    relationshipElement.ValueSecond);
-                if (difDatatype.Count != 0)
-                {
-                    foreach (var dif in difDatatype)
-                    {
-                        print("-" + dif);
-                        logs.Enqueue("-" + dif);
-                        noError = false;
-                    }
-                }
-
-                List<string> difEclass = exporter.CheckeClassConnectionAndRemoveIncompatible(relationshipElement,
-                    relationshipElement.ValueFirst,
-                    relationshipElement.ValueSecond);
-                if (difEclass.Count != 0)
-                {
-                    foreach (var dif in difEclass)
-                    {
-                        print("-" + dif);
-                        logs.Enqueue("-" + dif);
-                        noError = false;
-                    }
-                }
-
-                if (!exporter.RelationHasConnection(relationshipElement))
-                {
-                    print($"{relationshipElement.ValueFirst} and" +
-                        $"{relationshipElement.ValueSecond} have no connection!");
-                    logs.Enqueue($"{relationshipElement.ValueFirst} and" +
-                        $"{relationshipElement.ValueSecond} have no connection!");
-                    noError = false;
-                }
-
-
-                if (noError)
-                {
-                    print("-No error", ConsoleColor.DarkGreen);
-                    Console.WriteLine("");
-                    logs.Enqueue("-No error");
-                    logs.Enqueue("");
-                }
-
-
-                logs.Enqueue("------------------------------------------------------------------------------");
-                Console.WriteLine("------------------------------------------------------------------------------");
-            }
-
-        }
-
-        public void CreateSummingPoints()
-        {
-            if (exporter.CreateSummingPoints())
-            {
-                Console.WriteLine("-SummingPoints successfully created");
-                logs.Enqueue("-SummingPoints successfully created");
-                logs.Enqueue("");
-            }
-        }
-
-        public void CreateMultPoints()
-        {
-            if (exporter.CreateMultPoints())
-            {
-                Console.WriteLine("");
-                Console.WriteLine("-MultPoints successfully created");
-                logs.Enqueue("-MultPoints successfully created");
-                logs.Enqueue("");
-            }
-        }
-
-        public void CreatePhysicalNodes()
-        {
-            exporter.CreateNodesForPhysicalPorts();
-        }
-
-        private void outputConnections()
-        {
-            foreach (var sim in exporter.SimulationsModels.Values)
-            {
-                Console.WriteLine();
-                logs.Enqueue("");
-                logs.Enqueue("");
-                Console.WriteLine(sim.Name);
-                logs.Enqueue(sim.Name);
-                logs.Enqueue("");
-                foreach (var port in sim.Inputs)
-                {
-                    foreach (var output in port.ConnectedTo)
-                    {
-                        Console.WriteLine(port.IdShort + " connected to " + output.IdShort);
-                        logs.Enqueue(port.IdShort + " connected to " + output.IdShort);
-                        logs.Enqueue("");
-                    }
-                }
-                foreach (var port in sim.Outputs)
-                {
-                    foreach (var output in port.ConnectedTo)
-                    {
-                        Console.WriteLine(port.IdShort + " connected to " + output.IdShort);
-                        logs.Enqueue(port.IdShort + " connected to " + output.IdShort);
-                        logs.Enqueue("");
-                    }
-                }
-            }
-        }
-
-        public void PutSmd()
-        {
-            if (exporter.PutSMD())
-            {
-                print("-Successfully put Submodel", ConsoleColor.DarkGreen);
-                logs.Enqueue("-Successfully put Submodel");
-                logs.Enqueue("");
-            }
-            else
-            {
-                print("-Error while putting Submodel", ConsoleColor.Red);
-                logs.Enqueue("-Error while putting Submodel");
-                logs.Enqueue("");
-            }
-        }
-
-        public void ToManyOutputAcross()
-        {
-
-            foreach (var warning in exporter.ToManyOutputsAcross())
-            {
-                print(warning, ConsoleColor.Blue);
-                logs.Enqueue(warning);
-            }
-        }
-
-        public void ToManyInputThrough()
-        {
-            foreach (var warning in exporter.ToManyOutputThrough())
-            {
-                print(warning, ConsoleColor.Blue);
-                logs.Enqueue(warning);
-            }
-        }
-        public static void print(string str)
-        {
-
-            Console.BackgroundColor = ConsoleColor.Red;
-            Console.WriteLine(str);
-            Console.ResetColor();
-        }
-        public static void print(string str, ConsoleColor color)
-        {
-            Console.BackgroundColor = color;
-            Console.WriteLine(str);
-            Console.ResetColor();
-        }
-
-    }
-}
+/*
+Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>,
+Copyright (c) 2021 Lenze SE <https://www.lenze.com/en-de/>,
+author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AasxPluginSmdExporter.Model;
+
+namespace AasxPluginSmdExporter
+{
+    public class TextUI
+    {
+        private Exporter exporter;
+
+        private Queue<string> logs;
+
+        public TextUI()
+        {
+            logs = new Queue<string>();
+        }
+
+        public TextUI(Queue<string> logs)
+        {
+            this.logs = logs;
+        }
+        public Queue<string> Start(string host, string machine)
+        {
+            string locstring = "Physical";
+            return this.Start(host, machine, locstring);
+        }
+
+
+        public Queue<string> Start(string host, string machine, string modeltype)
+        {
+            bool usePhysical = modeltype.Equals("Physical");
+            exporter = new Exporter(usePhysical);
+            Console.WriteLine($"--- {machine} ---");
+            Console.WriteLine();
+            logs.Enqueue($"---{machine}---");
+            logs.Enqueue("");
+            if (CreateSMD(host, machine))
+            {
+                CreateConnections();
+                PutSmd();
+
+
+                CreateSummingPoints();
+                CreateMultPoints();
+                CreatePhysicalNodes();
+                logs.Enqueue("--- Warnings ---");
+                ToManyInputThrough();
+                ToManyOutputAcross();
+                logs.Enqueue("----------------");
+                logs.Enqueue("");
+                Console.WriteLine();
+                PutSmd();
+            }
+            return logs;
+        }
+
+        public bool CreateSMD(string host, string machine)
+        {
+            if (SemanticPort.GetInstance() == null)
+            {
+                logs.Enqueue("Missing semantic ID csv");
+                Console.WriteLine("Missing semantic ID csv");
+            }
+            else
+            {
+                if (EClass.InitEclass(logs) && SemanticPort.GetInstance() != null)
+                {
+
+                    try
+                    {
+                        if (exporter.CreateSMD(host, machine))
+                        {
+                            List<SimulationModel> noFmu = exporter.GetSimulationModelsWithoutFMU();
+                            foreach (var sim in noFmu)
+                            {
+                                Console.WriteLine($"SimulationModel {sim.Name} has no Fmu");
+                                Console.WriteLine();
+                                logs.Enqueue($"SimulationModel {sim.Name} has no Fmu");
+                                logs.Enqueue("");
+                            }
+
+                            foreach (var warning in SimulationModel.Warnings)
+                            {
+                                Console.WriteLine(warning);
+                                logs.Enqueue(warning);
+                            }
+                        }
+                        else
+                        {
+                            Console.WriteLine($"Could not find or read {machine}." +
+                                $" Please check the name of the AAS and structure of the aasx");
+                            logs.Enqueue($"Could not find or read {machine}." +
+                                $" Please check the name of the AAS and structure of the aasx");
+                            return false;
+                        }
+                    }
+                    catch (AggregateException e)
+                    {
+                        print("No Connection:" + e.Message);
+                        Console.WriteLine();
+                        logs.Enqueue("No Connection:" + e.Message);
+                        logs.Enqueue("");
+                        return false;
+                    }
+
+                    return true;
+                }
+                else
+                {
+                    Console.WriteLine("No mappings.csv found or does not contain all rows");
+                    logs.Enqueue("No mappings.csv found or does not contain all rows");
+                    return false;
+                }
+            }
+            return false;
+
+
+
+
+
+        }
+
+        public void CreateConnections()
+        {
+
+            foreach (var relationshipElement in exporter.RelationshipElements)
+            {
+
+
+                Console.WriteLine();
+                Console.WriteLine();
+                Console.WriteLine("---------------------------------------------------------------------------");
+                Console.WriteLine($"--- Checking connections for {relationshipElement.ValueFirst} " +
+                    $"and {relationshipElement.ValueSecond} ---");
+                Console.WriteLine();
+                logs.Enqueue("");
+                logs.Enqueue("");
+                logs.Enqueue("--------------------------------------------------------------------------------");
+                logs.Enqueue($"--- Checking connections for {relationshipElement.ValueFirst}" +
+                    $" and {relationshipElement.ValueSecond} ---");
+                logs.Enqueue("");
+                bool noError = true;
+
+                if (!exporter.CheckCompatibleDomainsAndConnect(relationshipElement,
+                    relationshipElement.ValueFirst,
+                    relationshipElement.ValueSecond,
+                    relationshipElement.FirstInterface,
+                    relationshipElement.SecondInterface))
+                {
+
+                }
+
+                List<string> difDatatype = exporter.ReturnListWithMessageForDifferentDatatypes(relationshipElement,
+                    relationshipElement.ValueFirst,
+                    relationshipElement.ValueSecond);
+                if (difDatatype.Count != 0)
+                {
+                    foreach (var dif in difDatatype)
+                    {
+                        print("-" + dif);
+                        logs.Enqueue("-" + dif);
+                        noError = false;
+                    }
+                }
+
+                List<string> difEclass = exporter.CheckeClassConnectionAndRemoveIncompatible(relationshipElement,
+                    relationshipElement.ValueFirst,
+                    relationshipElement.ValueSecond);
+                if (difEclass.Count != 0)
+                {
+                    foreach (var dif in difEclass)
+                    {
+                        print("-" + dif);
+                        logs.Enqueue("-" + dif);
+                        noError = false;
+                    }
+                }
+
+                if (!exporter.RelationHasConnection(relationshipElement))
+                {
+                    print($"{relationshipElement.ValueFirst} and" +
+                        $"{relationshipElement.ValueSecond} have no connection!");
+                    logs.Enqueue($"{relationshipElement.ValueFirst} and" +
+                        $"{relationshipElement.ValueSecond} have no connection!");
+                    noError = false;
+                }
+
+
+                if (noError)
+                {
+                    print("-No error", ConsoleColor.DarkGreen);
+                    Console.WriteLine("");
+                    logs.Enqueue("-No error");
+                    logs.Enqueue("");
+                }
+
+
+                logs.Enqueue("------------------------------------------------------------------------------");
+                Console.WriteLine("------------------------------------------------------------------------------");
+            }
+
+        }
+
+        public void CreateSummingPoints()
+        {
+            if (exporter.CreateSummingPoints())
+            {
+                Console.WriteLine("-SummingPoints successfully created");
+                logs.Enqueue("-SummingPoints successfully created");
+                logs.Enqueue("");
+            }
+        }
+
+        public void CreateMultPoints()
+        {
+            if (exporter.CreateMultPoints())
+            {
+                Console.WriteLine("");
+                Console.WriteLine("-MultPoints successfully created");
+                logs.Enqueue("-MultPoints successfully created");
+                logs.Enqueue("");
+            }
+        }
+
+        public void CreatePhysicalNodes()
+        {
+            exporter.CreateNodesForPhysicalPorts();
+        }
+
+        private void outputConnections()
+        {
+            foreach (var sim in exporter.SimulationsModels.Values)
+            {
+                Console.WriteLine();
+                logs.Enqueue("");
+                logs.Enqueue("");
+                Console.WriteLine(sim.Name);
+                logs.Enqueue(sim.Name);
+                logs.Enqueue("");
+                foreach (var port in sim.Inputs)
+                {
+                    foreach (var output in port.ConnectedTo)
+                    {
+                        Console.WriteLine(port.IdShort + " connected to " + output.IdShort);
+                        logs.Enqueue(port.IdShort + " connected to " + output.IdShort);
+                        logs.Enqueue("");
+                    }
+                }
+                foreach (var port in sim.Outputs)
+                {
+                    foreach (var output in port.ConnectedTo)
+                    {
+                        Console.WriteLine(port.IdShort + " connected to " + output.IdShort);
+                        logs.Enqueue(port.IdShort + " connected to " + output.IdShort);
+                        logs.Enqueue("");
+                    }
+                }
+            }
+        }
+
+        public void PutSmd()
+        {
+            if (exporter.PutSMD())
+            {
+                print("-Successfully put Submodel", ConsoleColor.DarkGreen);
+                logs.Enqueue("-Successfully put Submodel");
+                logs.Enqueue("");
+            }
+            else
+            {
+                print("-Error while putting Submodel", ConsoleColor.Red);
+                logs.Enqueue("-Error while putting Submodel");
+                logs.Enqueue("");
+            }
+        }
+
+        public void ToManyOutputAcross()
+        {
+
+            foreach (var warning in exporter.ToManyOutputsAcross())
+            {
+                print(warning, ConsoleColor.Blue);
+                logs.Enqueue(warning);
+            }
+        }
+
+        public void ToManyInputThrough()
+        {
+            foreach (var warning in exporter.ToManyOutputThrough())
+            {
+                print(warning, ConsoleColor.Blue);
+                logs.Enqueue(warning);
+            }
+        }
+        public static void print(string str)
+        {
+
+            Console.BackgroundColor = ConsoleColor.Red;
+            Console.WriteLine(str);
+            Console.ResetColor();
+        }
+        public static void print(string str, ConsoleColor color)
+        {
+            Console.BackgroundColor = color;
+            Console.WriteLine(str);
+            Console.ResetColor();
+        }
+
+    }
+}
diff --git a/src/AasxPluginSmdExporter/View/Themes/Generic.xaml b/src/AasxPluginSmdExporter/View/Themes/Generic.xaml
index 0791d3bb..912f3e16 100644
--- a/src/AasxPluginSmdExporter/View/Themes/Generic.xaml
+++ b/src/AasxPluginSmdExporter/View/Themes/Generic.xaml
@@ -1,241 +1,241 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:AasxPluginSmdExporter">
-
-    <!--
-	Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>, 2021 Lenze SE <https://www.lenze.com/en-de/>, author: Jonas Grote, Denis Göllner, Sebastian Bischof
-
-	This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
-
-	This source code may use other Open Source software components (see LICENSE.txt).
-	-->
-
-    <Style x:Key="TranspRoundCorner" TargetType="{x:Type Button}">
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="grid">
-                        <Border x:Name="border" CornerRadius="4" BorderBrush="White" BorderThickness="1" Padding="2,0,2,0">
-                            <Border.Background>
-                                <SolidColorBrush Color="White" Opacity="0.05"/>
-                            </Border.Background>
-                            <ContentPresenter HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"                                          
-                                          TextElement.FontWeight="Bold">
-                            </ContentPresenter>
-                        </Border>
-
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="border">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="#8888ff" Opacity="0.20"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="border">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="#8888ff" Opacity="0.50"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="grid" Value="0.25"/>
-                        </Trigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="myLBStyle" TargetType="{x:Type ListBoxItem}">
-        <Style.Resources>
-            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}"
-                             Color="Transparent"/>
-        </Style.Resources>
-    </Style>
-
-    <!--
-    <ControlTemplate x:Key="ComboBoxControlTemplate1" TargetType="{x:Type ComboBox}">
-        <Grid x:Name="templateRoot" SnapsToDevicePixels="True">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
-            </Grid.ColumnDefinitions>
-            <Popup x:Name="PART_Popup" AllowsTransparency="True" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Themes:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}">
-                    <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                        <ScrollViewer x:Name="DropDownScrollViewer">
-                            <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
-                                <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                    <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
-                                </Canvas>
-                                <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </Grid>
-                        </ScrollViewer>
-                    </Border>
-                </Themes:SystemDropShadowChrome>
-            </Popup>
-            <ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-                <ToggleButton.Style>
-                    <Style TargetType="{x:Type ToggleButton}">
-                        <Setter Property="OverridesDefaultStyle" Value="True"/>
-                        <Setter Property="IsTabStop" Value="False"/>
-                        <Setter Property="Focusable" Value="False"/>
-                        <Setter Property="ClickMode" Value="Press"/>
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                                    <Border x:Name="templateRoot" BorderBrush="Red" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-                                        <Border.Background>
-                                            <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                                <GradientStop Color="#FFF0F0F0" Offset="0"/>
-                                                <GradientStop Color="#FFE5E5E5" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.Background>
-                                        <Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="True" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                                            <Path x:Name="Arrow" Data="F1M0,0L2.667,2.66665 5.3334,0 5.3334,-1.78168 2.6667,0.88501 0,-1.78168 0,0z" Fill="#FF606060" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/>
-                                        </Border>
-                                    </Border>
-                                    <ControlTemplate.Triggers>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
-                                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FFABADB3"/>
-                                            <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
-                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="Transparent"/>
-                                        </MultiDataTrigger>
-                                        <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter Property="Fill" TargetName="Arrow" Value="Black"/>
-                                        </Trigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot">
-                                                <Setter.Value>
-                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                                        <GradientStop Color="#FFECF4FC" Offset="0"/>
-                                                        <GradientStop Color="#FFDCECFC" Offset="1"/>
-                                                    </LinearGradientBrush>
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF7EB4EA"/>
-                                        </MultiDataTrigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF7EB4EA"/>
-                                            <Setter Property="Background" TargetName="splitBorder">
-                                                <Setter.Value>
-                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                                        <GradientStop Color="#FFEBF4FC" Offset="0"/>
-                                                        <GradientStop Color="#FFDCECFC" Offset="1"/>
-                                                    </LinearGradientBrush>
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="#FF7EB4EA"/>
-                                        </MultiDataTrigger>
-                                        <Trigger Property="IsPressed" Value="True">
-                                            <Setter Property="Fill" TargetName="Arrow" Value="Black"/>
-                                        </Trigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot">
-                                                <Setter.Value>
-                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                                        <GradientStop Color="#FFDAECFC" Offset="0"/>
-                                                        <GradientStop Color="#FFC4E0FC" Offset="1"/>
-                                                    </LinearGradientBrush>
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF569DE5"/>
-                                        </MultiDataTrigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF569DE5"/>
-                                            <Setter Property="Background" TargetName="splitBorder">
-                                                <Setter.Value>
-                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                                        <GradientStop Color="#FFDAEBFC" Offset="0"/>
-                                                        <GradientStop Color="#FFC4E0FC" Offset="1"/>
-                                                    </LinearGradientBrush>
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="#FF569DE5"/>
-                                        </MultiDataTrigger>
-                                        <Trigger Property="IsEnabled" Value="False">
-                                            <Setter Property="Fill" TargetName="Arrow" Value="#FFBFBFBF"/>
-                                        </Trigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot" Value="#FFF0F0F0"/>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FFD9D9D9"/>
-                                        </MultiDataTrigger>
-                                        <MultiDataTrigger>
-                                            <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
-                                            </MultiDataTrigger.Conditions>
-                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
-                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FFBFBFBF"/>
-                                            <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
-                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="Transparent"/>
-                                        </MultiDataTrigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </ToggleButton.Style>
-            </ToggleButton>
-            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="False" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="True">
-                <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
-                <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
-            </Trigger>
-            <Trigger Property="HasItems" Value="False">
-                <Setter Property="Height" TargetName="DropDownBorder" Value="95"/>
-            </Trigger>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsGrouping" Value="True"/>
-                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="False"/>
-                </MultiTrigger.Conditions>
-                <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
-            </MultiTrigger>
-            <Trigger Property="CanContentScroll" SourceName="DropDownScrollViewer" Value="False">
-                <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
-                <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-    -->
-
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:AasxPluginSmdExporter">
+
+    <!--
+	Copyright (c) 2021 KEB Automation KG <https://www.keb.de/>, 2021 Lenze SE <https://www.lenze.com/en-de/>, author: Jonas Grote, Denis Göllner, Sebastian Bischof
+
+	This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+	This source code may use other Open Source software components (see LICENSE.txt).
+	-->
+
+    <Style x:Key="TranspRoundCorner" TargetType="{x:Type Button}">
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid x:Name="grid">
+                        <Border x:Name="border" CornerRadius="4" BorderBrush="White" BorderThickness="1" Padding="2,0,2,0">
+                            <Border.Background>
+                                <SolidColorBrush Color="White" Opacity="0.05"/>
+                            </Border.Background>
+                            <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"                                          
+                                          TextElement.FontWeight="Bold">
+                            </ContentPresenter>
+                        </Border>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="border">
+                                <Setter.Value>
+                                    <SolidColorBrush Color="#8888ff" Opacity="0.20"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="border">
+                                <Setter.Value>
+                                    <SolidColorBrush Color="#8888ff" Opacity="0.50"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" TargetName="grid" Value="0.25"/>
+                        </Trigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="myLBStyle" TargetType="{x:Type ListBoxItem}">
+        <Style.Resources>
+            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}"
+                             Color="Transparent"/>
+        </Style.Resources>
+    </Style>
+
+    <!--
+    <ControlTemplate x:Key="ComboBoxControlTemplate1" TargetType="{x:Type ComboBox}">
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="True">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+            </Grid.ColumnDefinitions>
+            <Popup x:Name="PART_Popup" AllowsTransparency="True" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Themes:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}">
+                    <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                        <ScrollViewer x:Name="DropDownScrollViewer">
+                            <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                                <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+                                </Canvas>
+                                <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </Themes:SystemDropShadowChrome>
+            </Popup>
+            <ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+                <ToggleButton.Style>
+                    <Style TargetType="{x:Type ToggleButton}">
+                        <Setter Property="OverridesDefaultStyle" Value="True"/>
+                        <Setter Property="IsTabStop" Value="False"/>
+                        <Setter Property="Focusable" Value="False"/>
+                        <Setter Property="ClickMode" Value="Press"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                    <Border x:Name="templateRoot" BorderBrush="Red" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                                        <Border.Background>
+                                            <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                                <GradientStop Color="#FFF0F0F0" Offset="0"/>
+                                                <GradientStop Color="#FFE5E5E5" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Border.Background>
+                                        <Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="True" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                                            <Path x:Name="Arrow" Data="F1M0,0L2.667,2.66665 5.3334,0 5.3334,-1.78168 2.6667,0.88501 0,-1.78168 0,0z" Fill="#FF606060" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/>
+                                        </Border>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FFABADB3"/>
+                                            <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
+                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="Transparent"/>
+                                        </MultiDataTrigger>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter Property="Fill" TargetName="Arrow" Value="Black"/>
+                                        </Trigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot">
+                                                <Setter.Value>
+                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                                        <GradientStop Color="#FFECF4FC" Offset="0"/>
+                                                        <GradientStop Color="#FFDCECFC" Offset="1"/>
+                                                    </LinearGradientBrush>
+                                                </Setter.Value>
+                                            </Setter>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF7EB4EA"/>
+                                        </MultiDataTrigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF7EB4EA"/>
+                                            <Setter Property="Background" TargetName="splitBorder">
+                                                <Setter.Value>
+                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                                        <GradientStop Color="#FFEBF4FC" Offset="0"/>
+                                                        <GradientStop Color="#FFDCECFC" Offset="1"/>
+                                                    </LinearGradientBrush>
+                                                </Setter.Value>
+                                            </Setter>
+                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="#FF7EB4EA"/>
+                                        </MultiDataTrigger>
+                                        <Trigger Property="IsPressed" Value="True">
+                                            <Setter Property="Fill" TargetName="Arrow" Value="Black"/>
+                                        </Trigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot">
+                                                <Setter.Value>
+                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                                        <GradientStop Color="#FFDAECFC" Offset="0"/>
+                                                        <GradientStop Color="#FFC4E0FC" Offset="1"/>
+                                                    </LinearGradientBrush>
+                                                </Setter.Value>
+                                            </Setter>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF569DE5"/>
+                                        </MultiDataTrigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FF569DE5"/>
+                                            <Setter Property="Background" TargetName="splitBorder">
+                                                <Setter.Value>
+                                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                                        <GradientStop Color="#FFDAEBFC" Offset="0"/>
+                                                        <GradientStop Color="#FFC4E0FC" Offset="1"/>
+                                                    </LinearGradientBrush>
+                                                </Setter.Value>
+                                            </Setter>
+                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="#FF569DE5"/>
+                                        </MultiDataTrigger>
+                                        <Trigger Property="IsEnabled" Value="False">
+                                            <Setter Property="Fill" TargetName="Arrow" Value="#FFBFBFBF"/>
+                                        </Trigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot" Value="#FFF0F0F0"/>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FFD9D9D9"/>
+                                        </MultiDataTrigger>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="templateRoot" Value="White"/>
+                                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="#FFBFBFBF"/>
+                                            <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
+                                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="Transparent"/>
+                                        </MultiDataTrigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ToggleButton.Style>
+            </ToggleButton>
+            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="False" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="True">
+                <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
+                <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
+            </Trigger>
+            <Trigger Property="HasItems" Value="False">
+                <Setter Property="Height" TargetName="DropDownBorder" Value="95"/>
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="True"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="False"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+            </MultiTrigger>
+            <Trigger Property="CanContentScroll" SourceName="DropDownScrollViewer" Value="False">
+                <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    -->
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/AasxUaNetConsoleServer/Properties/launchSettings.json b/src/AasxUaNetConsoleServer/Properties/launchSettings.json
index 353ff464..7393c712 100644
--- a/src/AasxUaNetConsoleServer/Properties/launchSettings.json
+++ b/src/AasxUaNetConsoleServer/Properties/launchSettings.json
@@ -1,8 +1,8 @@
-{
-  "profiles": {
-    "AasxUaNetConsoleServer": {
-      "commandName": "Project",
-      "commandLineArgs": "D:\\Code\\aasx-server\\src\\AasxServerBlazor\\erich-repo.aasx"
-    }
-  }
+{
+  "profiles": {
+    "AasxUaNetConsoleServer": {
+      "commandName": "Project",
+      "commandLineArgs": "D:\\Code\\aasx-server\\src\\AasxServerBlazor\\erich-repo.aasx"
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/BlazorExplorer/BlazorExplorer.csproj b/src/BlazorExplorer/BlazorExplorer.csproj
index 4d78b9b5..a7aedbcc 100644
--- a/src/BlazorExplorer/BlazorExplorer.csproj
+++ b/src/BlazorExplorer/BlazorExplorer.csproj
@@ -96,8 +96,8 @@
     <None Update="start-server.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="startup.bat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="startup.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="StylePile.txt">
       <DesignTime>True</DesignTime>
diff --git a/src/BlazorExplorer/options.json b/src/BlazorExplorer/options.json
index a84ee024..cee91f9f 100644
--- a/src/BlazorExplorer/options.json
+++ b/src/BlazorExplorer/options.json
@@ -1,373 +1,373 @@
-{
-  /* "AasxToLoad" :  "sample-techdata.aasx", */
-  /* "AasxToLoad": "..\\..\\..\\..\\AasxToolkit\\bin\\Debug\\sample.aasx", */
-  /* "AasxToLoad": "sample-hsu.aasx", */
-  /* "AasxToLoad": "MTPsample.aasx", */
-  /* "AasxToLoad": "sample-generated-modified.aasx", */
-  /* "AasxToLoad": "..\\..\\..\\..\\..\\..\\aasx-sample-data\\Develop_AAS\\Sample-Fluiddraw.aasx", */
-  /* "AasxRepositoryFn": "..\\..\\..\\..\\..\\Sample_AAS\\aasxrepo-new.json", */
-  /* "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\201112_Festo_AAS_Demo_Koffer\\repo\\FestoDemoBox-RepositoryViaHTTP.json", */
-  // "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\201112_Festo_AAS_Demo_Koffer\\repo3\\Festo-DemoBox-repo-local.json",
-  /* "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\201112_Festo_AAS_Demo_Koffer\\Festo_Demo_Box\\Festo-DemoBox-repo-CPX_E.json", */
-  /* "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\new-aasx-repo.json", */
-  // "AasxRepositoryFn": "C:\\HOMI\\Develop\\Aasx\\repo_demo_case\\Festo-DemoCase-repo-local.json",
-  /* "AasxToLoad": "C:\\Users\\miho\\Desktop\\200806_Sample_Repo_with_Fluidic_Plan\\MTPsample.aasx", */
-  /* "AasxToLoad": "http://localhost:51310/server/getaasx/0", */
-  /* "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\AasxFesto\\AasxFesto\\AasxFctTool\\bin\\Debug\\net472\\test.aasx", */
-  /* "AasxToLoad": "C:\\Users\\miho\\Desktop\\Festo_SPAU_VR3_UA.aasx", */
-  /* "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\Festo_SPAU_VR3.aasx", */
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_forV3-spiel.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\00_FestoDemoBox-Module-2-Kopie2.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\IDTA 02003-1-2_Template_TechnicalData.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SMT_Sample_B.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\IDTA 02006-2-1_Template_Digital Nameplate_V3_lang.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_DPPV2.aasx",
-  // "AuxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SMT_Sample_A.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_V3new_spiel1.aasx",
-  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_DPPV2.aasx",
-  "WindowLeft": 100,
-  "WindowTop": -1,
-  "WindowWidth": 900,
-  "WindowHeight": 600,
-  "WindowMaximized": false,
-  "TemplateIdAas": "www.example.com/ids/aas/DDDD_DDDD_DDDD_DDDD",
-  "TemplateIdAsset": "www.example.com/ids/asset/DDDD_DDDD_DDDD_DDDD",
-  "TemplateIdSubmodelInstance": "www.example.com/ids/sm/DDDD_DDDD_DDDD_DDDD",
-  "TemplateIdSubmodelTemplate": "www.example.com/ids/sm/DDDD_DDDD_DDDD_DDDD",
-  "TemplateIdConceptDescription": "www.example.com/ids/cd/DDDD_DDDD_DDDD_DDDD",
-  "EclassDir": ".\\eclass\\",
-  /* "LogoFile": "SpecPI40_t.png", */
-  "LogoFile": "PI40_and_IDTA.png",
-  "QualifiersFile": "qualifier-presets.json",
-  "ExtensionsPresetFile": "extension-presets.json",
-  "IdentifierKeyValuePairsFile": "local-identifier-presets.json",
-  "ContentHome": "https://github.com/admin-shell/io/blob/master/README.md",
-  "UseFlyovers": true,
-  "SplashTime": 0,
-  "InternalBrowser": false,
-  "EclassTwoPass": true,
-  "BackupDir": ".\\backup",
-  "BackupFiles": 10,
-  "RestServerHost": "localhost",
-  "RestServerPort": "1111",
-  "WriteDefaultOptionsFN": null /* "options-written.json" */,
-  "IndirectLoadSave": true,
-  "AccentColors": {},
-  "LoadWithoutPrompt": true,
-  "ShowIdAsIri": false,
-  "VerboseConnect": true,
-  "DefaultStayConnected": true,
-  "DefaultUpdatePeriod": 1000,
-  "StayConnectOptions": "REST-QUEUE", // SIM
-  /* "DefaultConnectRepositoryLocation": "http://localhost:51310", */
-  /* "DefaultConnectRepositoryLocation": "http://admin-shell-io.com:51510", */
-  /* "DefaultConnectRepositoryLocation": "https://admin-shell-io.com:51711", */
-  "DefaultConnectRepositoryLocation": "https://admin-shell-io.com/51711",
-  "MqttPublisherOptions": {
-    "BrokerUrl": "192.168.178.97:1883",
-    "MqttRetain": false,
-    "EnableFirstPublish": true,
-    "FirstTopicAAS": "AAS",
-    "FirstTopicSubmodel": "{aas}/Submodel_{sm}",
-    "EnableEventPublish": true,
-    "EventTopic": "Events/aas/{aas}/sm/{sm}/{path}",
-    "SingleValuePublish": true,
-    "SingleValueFirstTime": true,
-    "SingleValueTopic": "Values/aas/{aas}/sm/{sm}/{path}"
-  },
-  "UserDir": ".\\userdata",
-  "UserName": "miho",
-  "Remarks": [
-    "This JSON file might contain special settings for debugging purposes of Michael Hoffmeisters setup."
-  ],
-  "PluginPrefer": "ANYUI",
-  "PluginDll": [
-    /*
-    {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginUaNetServer\\bin\\Debug\\net472\\AasxPluginUaNetServer.dll",
-      "Args": [
-        "-single-nodeids",
-        "-single-keys",
-        "-ns",
-        "2",
-        "-ns",
-        "3"
-      ],
-      "Options": null
-    },
-    {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginUaNetClient\\bin\\Debug\\net472\\AasxPluginUaNetClient.dll",
-      "Args": [],
-      "Options": null
-    }, 
-    {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginBomStructure\\bin\\Debug\\net472\\AasxPluginBomStructure.dll",
-      "Args": []
-    },
-    {
-      "Path": "..\\AasxPluginBomStructure\\bin\\Debug\\net6.0-windows\\AasxPluginBomStructure.dll",
-      "Args": []
-    },
-    {
-      "Path": "..\\AasxPluginMtpViewer\\bin\\Debug\\net6.0-windows\\AasxPluginMtpViewer.dll",
-      "Args": []
-    },
-    */
-    {
-      "Path": ".\\plugins\\AasxPluginKnownSubmodels\\AasxPluginKnownSubmodels.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginDigitalNameplate\\AasxPluginDigitalNameplate.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginDocumentShelf\\AasxPluginDocumentShelf.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginContactInformation\\AasxPluginContactInformation.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginGenericForms\\AasxPluginGenericForms.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginTechnicalData\\AasxPluginTechnicalData.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginPlotting\\AasxPluginPlotting.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginImageMap\\AasxPluginImageMap.dll",
-      "Args": []
-    },
-    {
-      "Path": ".\\plugins\\AasxPluginExportTable\\AasxPluginExportTable.dll",
-      "Args": []
-    }
-    // Festo specific from here on
-    /* ,    
-    {
-      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawViewer\\bin\\Debug\\net6.0-windows\\AasxPluginFluiddrawViewer.dll",
-      "Args": []
-    },
-    {
-      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawBom\\bin\\Debug\\net6.0-windows\\AasxPluginFluiddrawBom.dll",
-      "Args": []
-    },
-    {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginWebBrowser\\bin\\x64\\Debug\\net6.0-windows\\AasxPluginWebBrowser.dll",
-      "Args": []
-    }
-    // Festo specific from here on
-    {
-      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawViewer\\bin\\Debug\\AasxPluginFluiddrawViewer.dll",
-      "Args": []
-    },
-    {
-      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawBom\\bin\\Debug\\AasxPluginFluiddrawBom.dll",
-      "Args": [] 
-    }
-    */
-  ],
-  "SecureConnectPresets": [
-    {
-      "Name": "Internet Demo",
-      "Protocol": {
-        "Value": "Azure",
-        "Choices": [
-          "Unprotected",
-          "OpenID Connect",
-          "Azure"
-        ]
-      },
-      "AuthorizationServer": {
-        "Value": "http://auth1.phoenix.com",
-        "Choices": [
-          "http://auth2.phoenix.com",
-          "http://auth1.phoenix.com",
-          "http://auth3.phoenix.com"
-        ]
-      },
-      "AasServer": {
-        "Value": "http://aas2.phoenix.com",
-        "Choices": [
-          "http://aas3.phoenix.com",
-          "http://aas2.phoenix.com",
-          "http://aas1.phoenix.com"
-        ]
-      },
-      "CertificateFile": {
-        "Value": "wieso.txt",
-        "Choices": [
-          "C:\\FILE1.TXT",
-          "C:\\FILE2.TXT",
-          "C:\\FILE3_dsnchdsbcjbdsjhcbdsjhcbjdsbcjhdsbhjcbdshjcjdshjhcbjhdsbcjhcdsjhbcdsbhjcshjdbcjhdsbjcbdshjcbhsjdbcdsbchjdscbhjdsbhcjhdsb.TXT"
-        ]
-      },
-      "Password": {
-        "Value": "sescret",
-        "Choices": [
-          "geheim",
-          "hidden",
-          "Pand0ra"
-        ]
-      }
-    },
-    {
-      "Name": "Only Intranet",
-      "Protocol": {
-        "Value": "Unprotected",
-        "Choices": [
-          "Unprotected",
-          "OpenID Connect",
-          "Azure"
-        ]
-      },
-      "AuthorizationServer": {
-        "Value": "http://auth3.phoenix.com",
-        "Choices": [
-          "http://auth2.phoenix.com",
-          "http://auth1.phoenix.com",
-          "http://auth3.phoenix.com"
-        ]
-      },
-      "AasServer": {
-        "Value": "http://aas1.phoenix.com",
-        "Choices": [
-          "http://aas3.phoenix.com",
-          "http://aas2.phoenix.com",
-          "http://aas1.phoenix.com"
-        ]
-      },
-      "CertificateFile": {
-        "Value": "wieso22.txt",
-        "Choices": [
-          "C:\\FILE1.TXT",
-          "C:\\FILE2.TXT",
-          "C:\\FILE3_dsnchdsbcjbdsjhcbdsjhcbjdsbcjhdsbhjcbdshjcjdshjhcbjhdsbcjhcdsjhbcdsbhjcshjdbcjhdsbjcbdshjcbhsjdbcdsbchjdscbhjdsbhcjhdsb.TXT"
-        ]
-      }
-    }
-  ],
-  "IntegratedConnectPresets": [
-    {
-      "Name": "Empty",
-      "Location": "",
-      "Username": "",
-      "Password": ""
-    },
-    {
-      "Name": "First of admin-shell-io.com",
-      "Location": "http://admin-shell-io.com:51310/server/getaasx/0",
-      "Username": "",
-      "Password": "",
-      "StayConnected": true
-    },
-    {
-      "Name": "DEMO",
-      "Location": "http://demo/",
-      "Username": "Foo",
-      "Password": "Bar",
-      "AutoClose": false
-    },
-    {
-      "Name": "Long loading of admin-shell-io.com",
-      "Location": "http://admin-shell-io.com:51410/server/getaasx/3",
-      "Username": "",
-      "Password": "",
-      "StayConnected": true,
-      "AutoClose": false
-    },
-    {
-      "Name": "Latest testing",
-      "Location": "http://admin-shell-io.com:52001/server/getaasx/0",
-      "Username": "",
-      "Password": "",
-      "StayConnected": true,
-      "AutoClose": false
-    }
-  ],
-  "FontSizePreset": 16,
-  "ScriptPresets": [
-    {
-      "Name": "Test1",
-      "Lines": [
-        "Select(\"AAS\", \"First\");",
-        "Sleep(1000);",
-        "Location(\"Push\");",
-        "Sleep(1000);",
-        "Select(\"Submodel\", \"First\");",
-        "Sleep(1000);",
-        "while (true) {",
-        "  rf = Select(\"This\");",
-        "  WriteLine(\"Approaching Referable \" + rf);",
-        "  if (Select(\"Submodel\", \"Next\") == null) break;",
-        "}"
-      ]
-    },
-    {
-      "Name": "Test2",
-      "Lines": [
-        "Select(\"Submodel\", \"First\");",
-        "Sleep(1000);",
-        "Tool(\"ImportTimeSeries\", ",
-        "  \"Format\", \"Excel\", \"File\", \"Test.xlsx\", ",
-        "  \"ColData\", \"3\" );",
-        "Sleep(1000);",
-        "WriteLine(\"Done\");"
-      ]
-    },
-    {
-      "Name": "Select Test 3",
-      "Lines": [
-        "Select(\"AAS\", \"Next\");"
-      ]
-    },
-    {
-      "Name": "Select Test 4",
-      "Lines": [
-        "Select(\"AAS\", \"Prev\");"
-      ]
-    },
-    {
-      "Name": "Test 5",
-      "Lines": [
-        "Tool(\"EditMenu\", \"Mode\", true);",
-        "res = Tool(\"ToolsFindText\", \"FindText\", \"DE\"); ",
-        "num = 0;",
-        "while (res) {",
-        "    x = Select(\"This\"); ",
-        "    WriteLine(num, \":\", x.idShort);",
-        "    num = num + 1;",
-        "    if (num > 18)",
-        "        break;",
-        "    res = Tool(\"ToolsFindForward\");",
-        "    Sleep(200);",
-        "}"
-      ]
-    },
-    {
-      "Name": "Test 6",
-      "Lines": [
-        "Tool(\"EditMenu\", \"Mode\", true);",
-        "res = Tool(\"ToolsReplaceText\", \"FindText\", \"DE\", \"ReplaceText\", \"GDR\", \"Do\", \"All\"); "
-      ]
-    },
-    {
-      "Name": "Test 7",
-      "Lines": [
-        "Tool(\"aas-elem-delete\");"
-      ]
-    }
-  ],
-  "ScriptLoglevel": 2,
-  "ScriptLaunchWithoutPrompt": true,
-  "ScriptExecuteSystem": true
-  // "ScriptCmd":  "WriteLine(\"Hallo\");"
-  // "ScriptFn" :  "test-script.txt"
-}
+{
+  /* "AasxToLoad" :  "sample-techdata.aasx", */
+  /* "AasxToLoad": "..\\..\\..\\..\\AasxToolkit\\bin\\Debug\\sample.aasx", */
+  /* "AasxToLoad": "sample-hsu.aasx", */
+  /* "AasxToLoad": "MTPsample.aasx", */
+  /* "AasxToLoad": "sample-generated-modified.aasx", */
+  /* "AasxToLoad": "..\\..\\..\\..\\..\\..\\aasx-sample-data\\Develop_AAS\\Sample-Fluiddraw.aasx", */
+  /* "AasxRepositoryFn": "..\\..\\..\\..\\..\\Sample_AAS\\aasxrepo-new.json", */
+  /* "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\201112_Festo_AAS_Demo_Koffer\\repo\\FestoDemoBox-RepositoryViaHTTP.json", */
+  // "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\201112_Festo_AAS_Demo_Koffer\\repo3\\Festo-DemoBox-repo-local.json",
+  /* "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\201112_Festo_AAS_Demo_Koffer\\Festo_Demo_Box\\Festo-DemoBox-repo-CPX_E.json", */
+  /* "AasxRepositoryFn": "C:\\Users\\miho\\Desktop\\new-aasx-repo.json", */
+  // "AasxRepositoryFn": "C:\\HOMI\\Develop\\Aasx\\repo_demo_case\\Festo-DemoCase-repo-local.json",
+  /* "AasxToLoad": "C:\\Users\\miho\\Desktop\\200806_Sample_Repo_with_Fluidic_Plan\\MTPsample.aasx", */
+  /* "AasxToLoad": "http://localhost:51310/server/getaasx/0", */
+  /* "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\AasxFesto\\AasxFesto\\AasxFctTool\\bin\\Debug\\net472\\test.aasx", */
+  /* "AasxToLoad": "C:\\Users\\miho\\Desktop\\Festo_SPAU_VR3_UA.aasx", */
+  /* "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\Festo_SPAU_VR3.aasx", */
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_forV3-spiel.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\00_FestoDemoBox-Module-2-Kopie2.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\IDTA 02003-1-2_Template_TechnicalData.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SMT_Sample_B.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\IDTA 02006-2-1_Template_Digital Nameplate_V3_lang.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_DPPV2.aasx",
+  // "AuxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\SMT_Sample_A.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_V3new_spiel1.aasx",
+  // "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\01_Festo_SPAU_VR3_DPPV2.aasx",
+  "WindowLeft": 100,
+  "WindowTop": -1,
+  "WindowWidth": 900,
+  "WindowHeight": 600,
+  "WindowMaximized": false,
+  "TemplateIdAas": "www.example.com/ids/aas/DDDD_DDDD_DDDD_DDDD",
+  "TemplateIdAsset": "www.example.com/ids/asset/DDDD_DDDD_DDDD_DDDD",
+  "TemplateIdSubmodelInstance": "www.example.com/ids/sm/DDDD_DDDD_DDDD_DDDD",
+  "TemplateIdSubmodelTemplate": "www.example.com/ids/sm/DDDD_DDDD_DDDD_DDDD",
+  "TemplateIdConceptDescription": "www.example.com/ids/cd/DDDD_DDDD_DDDD_DDDD",
+  "EclassDir": ".\\eclass\\",
+  /* "LogoFile": "SpecPI40_t.png", */
+  "LogoFile": "PI40_and_IDTA.png",
+  "QualifiersFile": "qualifier-presets.json",
+  "ExtensionsPresetFile": "extension-presets.json",
+  "IdentifierKeyValuePairsFile": "local-identifier-presets.json",
+  "ContentHome": "https://github.com/admin-shell/io/blob/master/README.md",
+  "UseFlyovers": true,
+  "SplashTime": 0,
+  "InternalBrowser": false,
+  "EclassTwoPass": true,
+  "BackupDir": ".\\backup",
+  "BackupFiles": 10,
+  "RestServerHost": "localhost",
+  "RestServerPort": "1111",
+  "WriteDefaultOptionsFN": null /* "options-written.json" */,
+  "IndirectLoadSave": true,
+  "AccentColors": {},
+  "LoadWithoutPrompt": true,
+  "ShowIdAsIri": false,
+  "VerboseConnect": true,
+  "DefaultStayConnected": true,
+  "DefaultUpdatePeriod": 1000,
+  "StayConnectOptions": "REST-QUEUE", // SIM
+  /* "DefaultConnectRepositoryLocation": "http://localhost:51310", */
+  /* "DefaultConnectRepositoryLocation": "http://admin-shell-io.com:51510", */
+  /* "DefaultConnectRepositoryLocation": "https://admin-shell-io.com:51711", */
+  "DefaultConnectRepositoryLocation": "https://admin-shell-io.com/51711",
+  "MqttPublisherOptions": {
+    "BrokerUrl": "192.168.178.97:1883",
+    "MqttRetain": false,
+    "EnableFirstPublish": true,
+    "FirstTopicAAS": "AAS",
+    "FirstTopicSubmodel": "{aas}/Submodel_{sm}",
+    "EnableEventPublish": true,
+    "EventTopic": "Events/aas/{aas}/sm/{sm}/{path}",
+    "SingleValuePublish": true,
+    "SingleValueFirstTime": true,
+    "SingleValueTopic": "Values/aas/{aas}/sm/{sm}/{path}"
+  },
+  "UserDir": ".\\userdata",
+  "UserName": "miho",
+  "Remarks": [
+    "This JSON file might contain special settings for debugging purposes of Michael Hoffmeisters setup."
+  ],
+  "PluginPrefer": "ANYUI",
+  "PluginDll": [
+    /*
+    {
+      "Path": "..\\..\\..\\..\\..\\AasxPluginUaNetServer\\bin\\Debug\\net472\\AasxPluginUaNetServer.dll",
+      "Args": [
+        "-single-nodeids",
+        "-single-keys",
+        "-ns",
+        "2",
+        "-ns",
+        "3"
+      ],
+      "Options": null
+    },
+    {
+      "Path": "..\\..\\..\\..\\..\\AasxPluginUaNetClient\\bin\\Debug\\net472\\AasxPluginUaNetClient.dll",
+      "Args": [],
+      "Options": null
+    }, 
+    {
+      "Path": "..\\..\\..\\..\\..\\AasxPluginBomStructure\\bin\\Debug\\net472\\AasxPluginBomStructure.dll",
+      "Args": []
+    },
+    {
+      "Path": "..\\AasxPluginBomStructure\\bin\\Debug\\net6.0-windows\\AasxPluginBomStructure.dll",
+      "Args": []
+    },
+    {
+      "Path": "..\\AasxPluginMtpViewer\\bin\\Debug\\net6.0-windows\\AasxPluginMtpViewer.dll",
+      "Args": []
+    },
+    */
+    {
+      "Path": ".\\plugins\\AasxPluginKnownSubmodels\\AasxPluginKnownSubmodels.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginDigitalNameplate\\AasxPluginDigitalNameplate.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginDocumentShelf\\AasxPluginDocumentShelf.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginContactInformation\\AasxPluginContactInformation.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginGenericForms\\AasxPluginGenericForms.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginTechnicalData\\AasxPluginTechnicalData.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginPlotting\\AasxPluginPlotting.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginImageMap\\AasxPluginImageMap.dll",
+      "Args": []
+    },
+    {
+      "Path": ".\\plugins\\AasxPluginExportTable\\AasxPluginExportTable.dll",
+      "Args": []
+    }
+    // Festo specific from here on
+    /* ,    
+    {
+      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawViewer\\bin\\Debug\\net6.0-windows\\AasxPluginFluiddrawViewer.dll",
+      "Args": []
+    },
+    {
+      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawBom\\bin\\Debug\\net6.0-windows\\AasxPluginFluiddrawBom.dll",
+      "Args": []
+    },
+    {
+      "Path": "..\\..\\..\\..\\..\\AasxPluginWebBrowser\\bin\\x64\\Debug\\net6.0-windows\\AasxPluginWebBrowser.dll",
+      "Args": []
+    }
+    // Festo specific from here on
+    {
+      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawViewer\\bin\\Debug\\AasxPluginFluiddrawViewer.dll",
+      "Args": []
+    },
+    {
+      "Path": "..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawBom\\bin\\Debug\\AasxPluginFluiddrawBom.dll",
+      "Args": [] 
+    }
+    */
+  ],
+  "SecureConnectPresets": [
+    {
+      "Name": "Internet Demo",
+      "Protocol": {
+        "Value": "Azure",
+        "Choices": [
+          "Unprotected",
+          "OpenID Connect",
+          "Azure"
+        ]
+      },
+      "AuthorizationServer": {
+        "Value": "http://auth1.phoenix.com",
+        "Choices": [
+          "http://auth2.phoenix.com",
+          "http://auth1.phoenix.com",
+          "http://auth3.phoenix.com"
+        ]
+      },
+      "AasServer": {
+        "Value": "http://aas2.phoenix.com",
+        "Choices": [
+          "http://aas3.phoenix.com",
+          "http://aas2.phoenix.com",
+          "http://aas1.phoenix.com"
+        ]
+      },
+      "CertificateFile": {
+        "Value": "wieso.txt",
+        "Choices": [
+          "C:\\FILE1.TXT",
+          "C:\\FILE2.TXT",
+          "C:\\FILE3_dsnchdsbcjbdsjhcbdsjhcbjdsbcjhdsbhjcbdshjcjdshjhcbjhdsbcjhcdsjhbcdsbhjcshjdbcjhdsbjcbdshjcbhsjdbcdsbchjdscbhjdsbhcjhdsb.TXT"
+        ]
+      },
+      "Password": {
+        "Value": "sescret",
+        "Choices": [
+          "geheim",
+          "hidden",
+          "Pand0ra"
+        ]
+      }
+    },
+    {
+      "Name": "Only Intranet",
+      "Protocol": {
+        "Value": "Unprotected",
+        "Choices": [
+          "Unprotected",
+          "OpenID Connect",
+          "Azure"
+        ]
+      },
+      "AuthorizationServer": {
+        "Value": "http://auth3.phoenix.com",
+        "Choices": [
+          "http://auth2.phoenix.com",
+          "http://auth1.phoenix.com",
+          "http://auth3.phoenix.com"
+        ]
+      },
+      "AasServer": {
+        "Value": "http://aas1.phoenix.com",
+        "Choices": [
+          "http://aas3.phoenix.com",
+          "http://aas2.phoenix.com",
+          "http://aas1.phoenix.com"
+        ]
+      },
+      "CertificateFile": {
+        "Value": "wieso22.txt",
+        "Choices": [
+          "C:\\FILE1.TXT",
+          "C:\\FILE2.TXT",
+          "C:\\FILE3_dsnchdsbcjbdsjhcbdsjhcbjdsbcjhdsbhjcbdshjcjdshjhcbjhdsbcjhcdsjhbcdsbhjcshjdbcjhdsbjcbdshjcbhsjdbcdsbchjdscbhjdsbhcjhdsb.TXT"
+        ]
+      }
+    }
+  ],
+  "IntegratedConnectPresets": [
+    {
+      "Name": "Empty",
+      "Location": "",
+      "Username": "",
+      "Password": ""
+    },
+    {
+      "Name": "First of admin-shell-io.com",
+      "Location": "http://admin-shell-io.com:51310/server/getaasx/0",
+      "Username": "",
+      "Password": "",
+      "StayConnected": true
+    },
+    {
+      "Name": "DEMO",
+      "Location": "http://demo/",
+      "Username": "Foo",
+      "Password": "Bar",
+      "AutoClose": false
+    },
+    {
+      "Name": "Long loading of admin-shell-io.com",
+      "Location": "http://admin-shell-io.com:51410/server/getaasx/3",
+      "Username": "",
+      "Password": "",
+      "StayConnected": true,
+      "AutoClose": false
+    },
+    {
+      "Name": "Latest testing",
+      "Location": "http://admin-shell-io.com:52001/server/getaasx/0",
+      "Username": "",
+      "Password": "",
+      "StayConnected": true,
+      "AutoClose": false
+    }
+  ],
+  "FontSizePreset": 16,
+  "ScriptPresets": [
+    {
+      "Name": "Test1",
+      "Lines": [
+        "Select(\"AAS\", \"First\");",
+        "Sleep(1000);",
+        "Location(\"Push\");",
+        "Sleep(1000);",
+        "Select(\"Submodel\", \"First\");",
+        "Sleep(1000);",
+        "while (true) {",
+        "  rf = Select(\"This\");",
+        "  WriteLine(\"Approaching Referable \" + rf);",
+        "  if (Select(\"Submodel\", \"Next\") == null) break;",
+        "}"
+      ]
+    },
+    {
+      "Name": "Test2",
+      "Lines": [
+        "Select(\"Submodel\", \"First\");",
+        "Sleep(1000);",
+        "Tool(\"ImportTimeSeries\", ",
+        "  \"Format\", \"Excel\", \"File\", \"Test.xlsx\", ",
+        "  \"ColData\", \"3\" );",
+        "Sleep(1000);",
+        "WriteLine(\"Done\");"
+      ]
+    },
+    {
+      "Name": "Select Test 3",
+      "Lines": [
+        "Select(\"AAS\", \"Next\");"
+      ]
+    },
+    {
+      "Name": "Select Test 4",
+      "Lines": [
+        "Select(\"AAS\", \"Prev\");"
+      ]
+    },
+    {
+      "Name": "Test 5",
+      "Lines": [
+        "Tool(\"EditMenu\", \"Mode\", true);",
+        "res = Tool(\"ToolsFindText\", \"FindText\", \"DE\"); ",
+        "num = 0;",
+        "while (res) {",
+        "    x = Select(\"This\"); ",
+        "    WriteLine(num, \":\", x.idShort);",
+        "    num = num + 1;",
+        "    if (num > 18)",
+        "        break;",
+        "    res = Tool(\"ToolsFindForward\");",
+        "    Sleep(200);",
+        "}"
+      ]
+    },
+    {
+      "Name": "Test 6",
+      "Lines": [
+        "Tool(\"EditMenu\", \"Mode\", true);",
+        "res = Tool(\"ToolsReplaceText\", \"FindText\", \"DE\", \"ReplaceText\", \"GDR\", \"Do\", \"All\"); "
+      ]
+    },
+    {
+      "Name": "Test 7",
+      "Lines": [
+        "Tool(\"aas-elem-delete\");"
+      ]
+    }
+  ],
+  "ScriptLoglevel": 2,
+  "ScriptLaunchWithoutPrompt": true,
+  "ScriptExecuteSystem": true
+  // "ScriptCmd":  "WriteLine(\"Hallo\");"
+  // "ScriptFn" :  "test-script.txt"
+}