Lädt nur noch aktuelle GKV Abrechnung -> Verbesserungfähig

Muss mit aktueller DB getestet werden
Logikfehler + wird nicht mehr benutzt (vorher umgebaut)
2025-11-24 10:28:48 +01:00 · 2025-11-21 15:39:52 +01:00 · 2025-11-21 12:22:57 +01:00 · 2025-11-21 11:51:02 +01:00 · 2025-11-21 10:10:24 +01:00 · 2025-11-19 09:36:58 +01:00
14168 changed files with 4536001 additions and 914623 deletions
--- a/.cr/server/Editor/Code
+++ b/.cr/server/Editor/Code
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeAnalysis.CodeCleanUp.CodeCleanUpOptions">
+  <Options Language="C#">
+    <Providers>
+      <Item Id="{53ccb10f-f7af-40a6-9472-d05054672052}" />
+      <Item Id="{bb96a982-bed0-4d8f-93a7-1e1ce7493e96}" />
+      <Item Id="{12f6d456-d2ec-407e-aa44-2b74d7c56e9c}" />
+      <Item Id="{ffa114f4-9122-46e4-96c8-655d54c904e6}" />
+      <Item Id="{0e6b7b2c-84e6-4eee-83d1-6149282c8501}">
+        <ApplyOnSave>True</ApplyOnSave>
+      </Item>
+      <Item Id="{03781427-dea7-45b0-9eef-81abe2961a61}" />
+      <Item Id="{ab07124b-0893-4a2d-b6f5-39bfa9f10148}" />
+      <Item Id="{5d712912-91ed-4728-ba16-ac1821b702ca}">
+        <ApplyOnSave>True</ApplyOnSave>
+      </Item>
+      <Item Id="{c47b114f-eeae-46fc-9562-454e8f9196c0}" />
+      <Item Id="{4216ef39-52bd-4e7f-92a7-673406f92bc8}" />
+      <Item Id="{f410df1e-6e44-4854-a3f0-14bb756113f9}">
+        <ApplyOnSave>True</ApplyOnSave>
+      </Item>
+      <Item Id="{d2f76d4e-97a9-4031-a7a2-23f192201426}" />
+      <Item Id="{3824f6f0-fee1-4847-94ff-1efa133ba199}" />
+      <Item Id="{d24bd9c7-7686-4101-9ec1-f61c19af8d2e}" />
+      <Item Id="{f804e36e-414f-409c-9b90-63b7727745a7}">
+        <ApplyOnSave>True</ApplyOnSave>
+      </Item>
+      <Item Id="{163af547-186c-4fa1-9a3e-b9b0a1ceec32}" />
+      <Item Id="{00bb41b3-3de9-458a-93c1-1f126253eab0}" />
+      <Item Id="{8e24f031-d25c-4ddb-86a5-c28f8fc354eb}" />
+      <Item Id="{e950f01e-2b15-4da5-8176-cafe3cc883d9}" />
+      <Item Id="{37bde68f-a39d-4791-adba-8ad7b2952ab0}" />
+      <Item Id="{ef51c8cb-e48a-498f-98b2-eadda592c4c7}" />
+      <Item Id="{20943A7B-2B32-4727-8E9D-61CB5B5F2A0D}" />
+      <Item Id="{528bdd86-5882-4b4c-b717-e0ec33958bd7}" />
+      <Item Id="{40c971cf-ebeb-419d-a559-6183d8d0d6a4}" />
+      <Item Id="{4B42E272-EE39-4E83-924C-B2458D827DE3}" />
+      <Item Id="{73a73e0e-5575-4c34-a97b-a942c6da1f90}" />
+      <Item Id="{f7752b2b-7ba5-43ec-b0f7-7f45c21c1c23}" />
+      <Item Id="{9dab2827-57cc-40e9-a330-a0626261453e}" />
+      <Item Id="{6bf7cfc1-1332-4bec-982e-c2d0968237cd}" />
+      <Item Id="{7e640eab-b585-47a5-afdc-0f110357cebb}" />
+      <Item Id="{44ac74a7-dba7-45aa-b2ca-8094b85cb9c9}" />
+      <Item Id="{2cd1441b-9e0f-4e39-bd8c-8aaa6e2a1728}" />
+      <Item Id="{41388575-074b-49f2-b3bc-9d28b212bd1a}" />
+      <Item Id="{4fa0bfa3-0a7e-471b-9933-3a379bdd5bd7}" />
+      <Item Id="{1f88209e-45e2-40b9-a235-1df251df05dd}" />
+      <Item Id="{086b0e70-893d-4b97-a6cf-d366ddbae573}" />
+      <Item Id="{4771fd98-4357-4780-b479-a7a875fec011}" />
+      <Item Id="{174C98E6-48C4-42D0-BC30-35EDE6377C9B}" />
+    </Providers>
+    <IsNewVersion>True</IsNewVersion>
+  </Options>
+</Root>
--- a/.cr/server/Editor/Formatting/Other.CSharp.xml
+++ b/.cr/server/Editor/Formatting/Other.CSharp.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.Formatting.UI.Options.OtherOptionsContainer">
+  <Options Language="C#">
+    <Options>
+      <Item Id="{7b13bb67-6fc9-44dd-87a1-ea1dc649d561}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.PlaceOnNewLineOtherOption">
+        <ElseOnNewLine>True</ElseOnNewLine>
+        <WhileOnNewLine>True</WhileOnNewLine>
+        <CatchOnNewLine>True</CatchOnNewLine>
+        <FinallyOnNewLine>True</FinallyOnNewLine>
+      </Item>
+      <Item Id="{84e7d791-613d-4018-bf31-9a9f43264480}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.XmlDocCommentsOtherOption" />
+      <Item Id="{8921dd1e-bb6c-4fa8-b4d5-58e6edcea04f}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.OtherIndentOption" />
+    </Options>
+  </Options>
+</Root>
--- a/.cr/server/Editor/Formatting/Wrapping.CSharp.xml
+++ b/.cr/server/Editor/Formatting/Wrapping.CSharp.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.Formatting.UI.Options.WrappingOptionsContainer">
+  <Options Language="C#">
+    <Options>
+      <Item Id="{48f3f6c0-b3c2-4567-b071-33af7480c9a3}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.QueryExpressionFormattingOption" />
+      <Item Id="{a2c75ad7-ba6a-49ca-8070-6d9e3c52e3c6}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.BinaryExpressionFormattingOption" />
+      <Item Id="{0e2d0391-24ba-4ed8-aeb4-1b3e9f26be55}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.RelationalExpressionFormattingOption" />
+      <Item Id="{fea50ebc-99c9-4599-9b55-bf2961b9cc95}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.BitwiseExpressionFormattingOption" />
+      <Item Id="{4246b900-cbb3-44f4-b59e-b3055fb4f7bc}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.LogicalExpressionFormattingOption" />
+      <Item Id="{cd721fc1-23fb-4d88-a9f0-42d6b318a32b}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.TernaryExpressionFormattingOption" />
+      <Item Id="{10e904ea-f51d-4c32-9320-1b93fa557564}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.AssignmentExpressionFormattingOption">
+        <WrapAssignment>
+          <Kind>WrapBefore</Kind>
+        </WrapAssignment>
+      </Item>
+      <Item Id="{25746bdc-0a43-4741-a740-20784691314b}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.InvocationArgumentListFormattingOption" />
+      <Item Id="{D5EE2ECB-9FA6-47F7-A11F-007FC45E872D}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.AttributeArgumentsFormattingOption" />
+      <Item Id="{5A186AB9-03A5-4BFE-83B1-B99B3B8408BC}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.DeclarationParameterListFormattingOption" />
+      <Item Id="{8739877d-3674-40ae-90c4-38b2b160e92b}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.ArrayInitializerFormattingOption" />
+      <Item Id="{a940ae15-f98a-4b7d-8357-2214eb421250}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.CollectionInitializerFormattingOption" />
+      <Item Id="{0414181a-3915-4d0c-81d3-3bc7718da90f}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.ObjectInitializerFormattingOption" />
+      <Item Id="{ea60e2ab-d67a-45e8-ab42-36d747c494c}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.ChainedMethodCallsFormattingOption" />
+      <Item Id="{5f4ed422-88b9-4e95-8401-cef404d645d6}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.LambdaExpressionFormattingOption" />
+      <Item Id="{0531de5e-ff20-4043-a67c-eeef76a8f3c3}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.ArrowExpressionFormattingOption" />
+      <Item Id="{08fa5953-cc71-4ded-bd41-ef5d5b690585}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.TypeParameterListFormattingOption" />
+      <Item Id="{dc060d33-cfc0-411e-9508-8d27b84934e8}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.CoalesceExpressionFormattingOption" />
+      <Item Id="{b25d25a0-dd92-45ed-88ef-51953e28222c}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.BaseListWrappingFormattingOption" />
+      <Item Id="{4db5e14f-8f4c-416f-9b59-7e9239f2150e}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.CtorInitWrappingFormattingOption" />
+      <Item Id="{be0c2117-5732-40fd-9b4a-0fe749356e87}" Type="DevExpress.CodeRush.Formatting.UI.Options.Conversion.SwitchExpressionWrappingFormattingOption" />
+    </Options>
+  </Options>
+</Root>
--- a/.cr/server/Editor/NamingSuggestions.xml
+++ b/.cr/server/Editor/NamingSuggestions.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.CodeCompletion.NamingSuggestions.Options.NamingSuggestionsOptions">
+  <Options Language="C#">
+    <Enabled>True</Enabled>
+  </Options>
+</Root>
--- a/.cr/server/Editor/Organize
+++ b/.cr/server/Editor/Organize
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersOptions">
+  <Options Language="Neutral">
+    <Schemes>
+      <Item Id="{537ce5d1-771a-4e99-9f4a-c409ebd5e213}">
+        <IsActive>False</IsActive>
+        <Rules>
+          <Item Id="{a1310165-0385-4fbf-92d3-71402b646318}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <GroupRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.AndRule">
+              <Rules>
+                <Item Id="{2ebbe39b-ad28-42e6-b6fe-58cbbe1366ea}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.GroupByParentTypeAttributesRule">
+                  <AttributeName>InterfaceType</AttributeName>
+                </Item>
+                <Item Id="{e7428898-429e-46c7-84f8-a4eeffbf1bc7}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.GroupByKindRule" />
+              </Rules>
+            </GroupRule>
+            <RuleName>Members in type with InterfaceType</RuleName>
+          </Item>
+          <Item Id="{ebd30c1d-59b5-4a03-9f33-8813a996b952}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{02fdb982-e0dd-4b47-84c3-f44926013188}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{f5649b7d-32eb-4a64-88b4-5de14ed335e4}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{b72b1c09-252f-4d4f-881c-1a4832911d5f}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{eae9a2ed-5135-45c6-9cd1-e75ee9e9ac68}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{7e2e2ef2-8ef3-4f28-825d-ce10da1931e6}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{0430f49d-5690-49a2-b2ef-154bfbf64cd7}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{907fc4a7-efee-4337-af73-d71b996b3923}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{724ebc08-3b98-4c52-91c5-158b7a759d95}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{bcbd84af-ad2b-4353-a834-ece7b6e41d92}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{c49c00d2-9626-428d-8818-e71e68bf07f9}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{335094b6-641c-4832-bfdc-84087f8c7b24}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{1136a603-d516-4f42-a80b-c2bc7baf163b}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{89215376-ecad-435a-a6bf-137f09a41f0d}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{380049a0-9dbf-4d84-9612-20fc0c34dca2}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{36cc0c47-d29c-4e7a-a29b-d73ec1b3910b}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{c87a250e-ef05-4000-9e2c-e5c078ce51ae}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{0fcd1a59-0fc8-4bde-9db7-2d73508b918d}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{050f50d0-7ec6-4610-a820-08f54f1d4c3c}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{6b6953c9-dcb7-4d34-a123-7f390fd24e1e}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{b8f8c881-e919-48b1-8655-602c75ddbfec}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{f591aeca-b50c-47e2-ab24-84fb3a7327c2}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{c9b4252f-60a9-48d3-869e-2c3c23c20aae}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{d6d0a5a4-c770-47f3-8cda-c699e76101d1}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{9b31a53f-4bae-4b97-8356-39a48bd91e9c}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{45e128f7-55bf-4186-b09c-760d2a6477cb}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{1c54e8e0-33dd-4a95-8899-42ba94669156}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{b76710ac-780e-4cad-bd0c-02f7f676db0f}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{48b47296-0fd0-4056-bdc1-b09ae6266d06}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{9d6898f1-002e-4c71-a281-1ec6e78a3003}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{f1959e1c-1062-4a5f-a26d-b66a530b56dc}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{4651e354-b408-4df4-bb8c-0490daddccaa}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{6653a3b6-576e-4f5e-9c6a-a440ee257399}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{dc81be48-841a-48c0-bb6a-e70cb3c26341}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{b8475833-a96e-4e5a-825c-bf3266fcf330}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <DeletedItem Id="{1eb07ab2-16f0-4bf2-a2a6-33b899b861b8}" />
+        </Rules>
+      </Item>
+      <Item Id="{fb41924a-35f9-47ee-8f8c-74cc34c4bf63}">
+        <IsActive>True</IsActive>
+        <Rules>
+          <Item Id="{b98b9ab7-3a4c-4b50-8c32-771f758e4507}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{175afa49-1b02-4335-8697-426564eb966b}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{793c3efa-da34-4af7-9338-b079461a74c8}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{2a66d808-4878-480c-b9b8-8ae03700c1e8}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{3f3676c5-45dd-45df-888a-0f07b1b3707d}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{1b549ff5-3ce2-43ff-93bc-f4da46903b6a}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{761299d1-70d4-44bf-b06b-ccd7c409e448}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{b0120844-0819-42f0-a49b-62c4c7497a99}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{00b09b98-ac03-48d2-b2a0-9c6e1b7ba907}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{612527cd-1b3e-41be-8a3c-fce9731c5798}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{9766d442-e0fb-427f-99b0-405fc57f6d4f}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{f82b02cb-b317-44af-ab65-2a3c90761afe}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{f2379393-c0e5-4bee-a551-6383d0c1f843}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{7c815ce6-5ac8-4c71-a1a9-b7fc8adea37c}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{300ff320-0e96-446c-8de9-3f808dafce55}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{78216f10-5d1c-41eb-a048-bd50ff4224fd}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{f0d58f97-1bb4-4762-95e4-fb7f7b1e184f}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{c17095aa-afa2-4136-8771-c2a7ac591d15}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{b1d169c2-df12-4479-8c61-2af5bbee8a06}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule">
+            <SortingRule Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.MultipleSortingsRule">
+              <Sortings>
+                <Item Id="{c2c647e5-108d-4154-ad61-de7692259d35}" />
+              </Sortings>
+            </SortingRule>
+          </Item>
+          <Item Id="{b02e42bb-4a64-4196-8d23-aca15029a893}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{096ce198-34f5-4265-8a4a-4a4b00c711ac}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{eddf6fb8-a51b-4632-b8fd-20965a20efe2}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{0aa19952-807c-40eb-ab92-6c7a5f3f79b2}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+          <Item Id="{e7160382-ae65-4f07-aaac-72e124360b1d}" Type="DevExpress.CodeAnalysis.CodeCleanUp.OrganizeMembers.OrganizeMembersGroupAndSortRule" />
+        </Rules>
+      </Item>
+    </Schemes>
+    <UseMemberSections>False</UseMemberSections>
+  </Options>
+</Root>
--- a/.gitignore
+++ b/.gitignore
@@ -1,419 +1,417 @@
-/BeWoOhneReports.v12.suo
-/BeWo/bin
-/BeWo/obj
-/BeWoChatServer/bin
-/BeWoChatServer/obj
-/BeWoPlanerAndroid/bin
-/BeWoPlanerAndroid/obj
-/BeWoPlanerMobil/bin
-/BeWoPlanerMobil/obj
-/BeWoPlanerMobil/node_modules
-/Host/bin
-/Host/obj
-/Controls/bin
-/Controls/obj
-/Data/bin
-/Data/obj
-/Report/bin
-/Report/obj
-/ReportImp/AachenerVereinReports/obj
-/ReportImp/ABCBetreuungenReports/obj
-/ReportImp/AdikKleve/obj
-/ReportImp/AidshilfeDortmund/obj
-/ReportImp/AidsHilfeGiessen/obj
-/ReportImp/AidshilfeKassel/obj
-/ReportImp/AidsInitiativeBonn/bin
-/ReportImp/AidsInitiativeBonn/obj
-/ReportImp/AidsUndDrogenberatung/obj
-/ReportImp/ASBBergischGladbachReports/bin
-/ReportImp/ASBBergischGladbachReports/obj
-/ReportImp/ASBHammReports/obj
-/ReportImp/AssistenzaReports/obj
-/ReportImp/BetreutesWohnenAmRheinReports/obj
-/ReportImp/BetreutesWohnenStelzel/obj
-/ReportImp/BetreutesWohnenStLudgerus/obj
-/ReportImp/BetreutesWohnenWoellReports/obj
-/ReportImp/BetreuungsbueroBaak/bin
-/ReportImp/BetreuungsbueroBaak/obj
-/ReportImp/BetreuWoReports/obj
-/ReportImp/BeWoAlsdorf/obj
-/ReportImp/BeWoAmrath/obj
-/ReportImp/BeWoAuxilio/obj
-/ReportImp/BeWoBiallas/obj
-/ReportImp/BeWoColonia5Reports/obj
-/ReportImp/BeWoColoniaKalayci/obj
-/ReportImp/BeWoColoniaMitarbeiter/obj
-/ReportImp/BeWoDellbrueck/obj
-/ReportImp/BeWoDirekt/obj
-/ReportImp/BeWoHeinsberg/obj
-/ReportImp/BeWoKerpen/obj
-/ReportImp/BeWoMarinReports/obj
-/ReportImp/BeWoMobilReports/obj
-/ReportImp/BeWoNeuss/obj
-/ReportImp/BeWoPlusReports/obj
-/ReportImp/BeWoRichartz/obj
-/ReportImp/BeWoRueckenwind/obj
-/ReportImp/BeWoSchillingReports/obj
-/ReportImp/BleibImLeben/obj
-/ReportImp/BloemelingUndTeckhaus/obj
-/ReportImp/BrueckeABW/obj
-/ReportImp/BUGeVReports/obj
-/ReportImp/BWKGbR/obj
-/ReportImp/CaritasAachen/obj
-/ReportImp/CaritasBottrop/obj
-/ReportImp/CaritasFrankfurt2Reports/obj
-/ReportImp/CaritasFrankfurtReports/obj
-/ReportImp/CaritasLeverkusen/bin
-/ReportImp/CaritasLeverkusen/obj
-/ReportImp/CaritasUnna/obj
-/ReportImp/CaritasUnnaWohnungslosenhilfe/bin
-/ReportImp/CaritasUnnaWohnungslosenhilfe/obj
-/ReportImp/CaritasWuppertalSolingen/obj
-/ReportImp/ChristopherusHaus/obj
-/ReportImp/Club74/obj
-/ReportImp/Convoi/obj
-/ReportImp/demo_reports/obj
-/ReportImp/DerKarren/obj
-/ReportImp/DiakonieKKKleve/obj
-/ReportImp/DiakonieLennepReports/obj
-/ReportImp/DieDueneReports/obj
-/ReportImp/DieWohnhelferReports/obj
-/ReportImp/FaerberReports/obj
-/ReportImp/FeidPartnerReports/obj
-/ReportImp/FibMarburg/obj
-/ReportImp/FizHof/obj
-/ReportImp/FlingernMobilReports/obj
-/ReportImp/Fortis/obj
-/ReportImp/GenderBeWoReports/obj
-/ReportImp/GerdasPflegedienst/obj
-/ReportImp/GpzBiberachReports/obj
-/ReportImp/HausschoppReports/obj
-/ReportImp/HausTheresia/obj
-/ReportImp/HolsingerReports/obj
-/ReportImp/HPHBersenbrueck/obj
-/ReportImp/IBPReports/obj
-/ReportImp/IndroABW/obj
-/ReportImp/IntegraHeinsbergReports/obj
-/ReportImp/IntegraReports/obj
-/ReportImp/IntegroReports/obj
-/ReportImp/KetteReports/obj
-/ReportImp/KocksReports/obj
-/ReportImp/KoelnRingReports/obj
-/ReportImp/KomMitBewo/obj
-/ReportImp/KOMO/obj
-/ReportImp/KontaktUndKrisenhilfeReports/obj
-/ReportImp/LebenshilfeBorkenReports/obj
-/ReportImp/LebenshilfeCoburg/obj
-/ReportImp/LebenshilfeDuisburgReports/obj
-/ReportImp/LebenshilfeDuisburgServicePlus/bin
-/ReportImp/LebenshilfeDuisburgServicePlus/obj
-/ReportImp/LebenshilfeEssenReports/obj
-/ReportImp/LebenshilfeHannoverReports/obj
-/ReportImp/LebenshilfeRemscheid/obj
-/ReportImp/LebenshilfeRheinSiegReports/obj
-/ReportImp/LebenshilfeRodenkirchenReports/obj
-/ReportImp/LebenshilfeStade/obj
-/ReportImp/LebenshilfeWarendorf/obj
-/ReportImp/LebenshilfeWuerzburgReports/obj
-/ReportImp/LebensweltGabrielReports/obj
-/ReportImp/LeiendeckerReports/obj
-/ReportImp/LoslebenReports/obj
-/ReportImp/LWVEingliederungshilfe/obj
-/ReportImp/Marienhospital/obj
-/ReportImp/MeinBetreutesWohnen/obj
-/ReportImp/MezMenzelReports/obj
-/ReportImp/Mittendrin/obj
-/ReportImp/MuellestumpeReports/obj
-/ReportImp/PouginReports/obj
-/ReportImp/Praesentation/obj
-/ReportImp/PsychosozialerTraegervereinReports/bin
-/ReportImp/PsychosozialerTraegervereinReports/obj
-/ReportImp/PURReports/bin
-/ReportImp/PURReports/obj
-/ReportImp/SBBMainzReports/obj
-/ReportImp/SchillingerReports/obj
-/ReportImp/SchoengeistReports/obj
-/ReportImp/SelwoReports/obj
-/ReportImp/SeverinReports/obj
-/ReportImp/SeWo/obj
-/ReportImp/SHGSchwerte/obj
-/ReportImp/SigncomReports/obj
-/ReportImp/SKFAlsdorf/obj
-/ReportImp/SkmMenden/obj
-/ReportImp/skmRheydt/obj
-/ReportImp/SozialeDiensteKathrinSchmidt/obj
-/ReportImp/SozialeDiensteNiederrhein/obj
-/ReportImp/SozialeDienstleistungenBeckerReports/obj
-/ReportImp/SozialeDienstleistungenGessnerReports/obj
-/ReportImp/SozialeDienstleistungenSchoenberg/obj
-/ReportImp/SozialwirkstattSchmitz/obj
-/ReportImp/SpektrumGmbH/obj
-/ReportImp/SpektrumReports/obj
-/ReportImp/SprungbrettReports/obj
-/ReportImp/SprungbrettTheresia/obj
-/ReportImp/SPZLeverkusen/obj
-/ReportImp/SPZRatingen/obj
-/ReportImp/SynpraxReports/obj
-/ReportImp/TagwerkReports/obj
-/ReportImp/TeamGSReports/obj
-/ReportImp/TranskulturellesBBBasaran/obj
-/ReportImp/TranskulturellesBBPastor/obj
-/ReportImp/TranskulturellesBetreuungsbuero/obj
-/ReportImp/TrialogReports/obj
-/ReportImp/TRIAS Ambulante Sozialarbeit/obj
-/ReportImp/VereinDuerenerChristenReports/obj
-/ReportImp/VereinLebensgestaltung/obj
-/ReportImp/VibbEssenReports/obj
-/ReportImp/VisionReports/obj
-/ReportImp/VivaAVidaReports/obj
-/ReportImp/VivatgGmbHReports/obj
-/ReportImp/VKMAachen/obj
-/ReportImp/VkmHamm/obj
-/ReportImp/VSDHammReports/obj
-/ReportImp/WegeReports/obj
-/ReportImp/WegweiserBetreuungsdienstReports/obj
-/ReportImp/Weitblick-ambulantBeWo/obj
-/ReportImp/WigonetzReports/obj
-/ReportImp/WMB/bin
-/ReportImp/WMB/obj
-/ReportImp/WohnassistenzMuensterReports/obj
-/ReportImp/WohnhelferRemscheidReports/obj
-/ReportImp/ZMDLengerichReports/obj
-/ReportImp/ZukunftWohnenReports/bin
-/ReportImp/ZukunftWohnenReports/obj
-/ReportService/bin
-/ReportService/obj
-/Service/bin
-/Service/obj
-/Shared/bin
-/Shared/obj
-/ReportImp/ABWElsebrock/bin
-/ReportImp/ABWElsebrock/obj
-/ReportImp/FortschritteEV/bin
-/ReportImp/FortschritteEV/obj
-/ReportImp/LebenshilfeWetterau/bin
-/ReportImp/LebenshilfeWetterau/obj
-/ReportImp/Socia/bin
-/ReportImp/Socia/obj
-/ReportImp/EigentstaendigHennef/bin
-/ReportImp/EigentstaendigHennef/obj
-/ReportImp/RessourceEV/bin
-/ReportImp/RessourceEV/obj
-/ReportImp/ProfEggersStiftung/bin
-/ReportImp/ProfEggersStiftung/obj
-/ReportImp/PraunheimerWerkstaettenGmbh/obj
-/ReportImp/PraunheimerWerkstaettenGmbh/bin
-/ReportImp/LebenshilfeAhrweiler/obj
-/ReportImp/HphBersenbrueckAtz/obj
-/ReportImp/HphBersenbrueckAtz/bin
-/ReportImp/BetreuungsBueroScholzReport/bin
-/ReportImp/BetreuungsBueroScholzReport/obj
-/ReportImp/BAPBielefelderAmbulantePflege/bin
-/ReportImp/BAPBielefelderAmbulantePflege/obj
-/ReportImp/LebenshilfeMannheimEV/bin
-/Host/Multitenancy/demo.config
-/ReportImp/LebenshilfeMannheimEV/obj
-/ReportImp/BeWoLeverkusen/bin
-/ReportImp/BeWoLeverkusen/obj
-/ReportImp/SultanSahinReports/obj
-/ReportImp/SultanSahinReports/bin
-/ReportImp/ApiBerlin/obj
-/ReportImp/BeWoGuen/obj/Debug
-/ReportImp/BeWoGuen/obj/Release
-/ReportImp/BeWoViersen/obj/Debug
-/ReportImp/BeWoViersen/obj/Release
-/ReportImp/BetreuwoWesel/obj/Debug
-/ReportImp/BetreuwoWesel/obj/Release
-/ReportImp/BundBBetreutesWohnen/obj/Debug
-/.vs/BeWo/v14
-/.vs/BeWoGit/v14
-/ReportImp/BundBBetreutesWohnen/obj/Release
-/ReportImp/DiakonieNeustadtAisch/obj/Debug
-/ReportImp/DiakonieNeustadtAisch/obj/Release
-/ReportImp/Findus/obj/Debug
-/ReportImp/Findus/obj/Release
-/ReportImp/HilfeDaheim2/obj/Debug
-/ReportImp/HphBersenbrueckAph/obj/Debug
-/ReportImp/HphBersenbrueckAph/obj/Release
-/ReportImp/HphBersenbrueckFreizeitUndReisen/obj/Debug
-/ReportImp/HphBersenbrueckFreizeitUndReisen/obj/Release
-/ReportImp/IbpEingliederungshilfe/obj/Debug
-/ReportImp/IbpEingliederungshilfe/obj/Release
-/ReportImp/LebenshilfeKoblenz/obj/Debug
-/ReportImp/LebenshilfeKoblenz/obj/Release
-/ReportImp/Monvita/obj/Debug
-/ReportImp/Monvita/obj/Release
-/ReportImp/Salem/obj/Debug
-/ReportImp/Salem/obj/Release
-/ReportImp/VkmAachenSbd/bin/Debug
-/ReportImp/VkmAachenSbd/obj/Debug
-/ReportImp/VkmAachenSbd/obj/Release
-/ReportImp/HilfeDaheim2/obj/Release
-/Model/Changes_2017_06_01.txt
-/ReportImp/Wetterleuchten/bin/Debug
-/ReportImp/Taubblindendienst/obj/Release
-/ReportImp/Wetterleuchten/obj/Release
-/ReportImp/Wetterleuchten/obj/Debug
-/ReportImp/Taubblindendienst/obj/Debug
-/BeWoPlanerMobil/logs
-/Host/logs
-/.vs/BeWoGit/v15
-/ReportImp/DerKarrenSbd/obj/Debug
-/ReportImp/DerKarrenSbd/obj/Release
-/.vs
-/BeWo/.vs/BeWo/v14/*.suo
-/BeWoChatServer/BeWoChatServer.csproj.user
-/*.suo
-/ReportImp/Nous/bin/Debug
-/ReportImp/Nous/obj/Debug
-/ReportImp/Nous/obj/Release
-/ReportImp/PraxisPusteblume/obj/Debug
-/ReportImp/PraxisPusteblume/obj/Release
-/ReportImp/TwgJonathan/obj/Debug
-/ReportImp/TwgJonathan/obj/Release
-/Host/demo/temp
-/ReportImp/SawoReports/bin/Debug
-/ReportImp/SawoReports/bin/Release
-/ReportImp/SawoReports/obj/Debug
-/ReportImp/SawoReports/obj/Release
-/ReportImp/AlphaEv/obj/Debug
-/ReportImp/AlphaEv/obj/Release
-/ReportImp/AwoDortmund/bin/Release
-/ReportImp/AwoDortmund/obj/Debug
-/ReportImp/AwoDortmund/obj/Release
-/ReportImp/CaritasAhlen/obj/Debug
-/ReportImp/CaritasAhlen/obj/Release
-/ReportImp/CaritasKleve/obj/Debug
-/ReportImp/CaritasKleve/obj/Release
-/ReportImp/FreundeskreisSuchthilfe/obj/Debug
-/ReportImp/FreundeskreisSuchthilfe/obj/Release
-/ReportImp/PaSMoenchengladbach/obj/Debug
-/ReportImp/PaSMoenchengladbach/obj/Release
-/ReportImp/ProBeWoDueren/obj/Debug
-/ReportImp/ProBeWoDueren/obj/Release
-/ReportImp/BeWoFuerDich/obj/Debug
-/ReportImp/BeWoFuerDich/obj/Release
-/ReportImp/Hiba/obj/Debug
-/ReportImp/Hiba/obj/Release
-/ReportImp/Humanitas/bin/Release
-/ReportImp/Humanitas/obj/Debug
-/ReportImp/Humanitas/obj/Release
-/ReportImp/LeWoAachen/bin/Release
-/ReportImp/LeWoAachen/obj/Debug
-/ReportImp/LeWoAachen/obj/Release
-/ReportImp/LebenshilfeKusel/obj/Debug
-/ReportImp/LebenshilfeKusel/obj/Release
-/ReportImp/Lori/obj/Debug
-/ReportImp/Lori/obj/Release
-/ReportImp/SkmLeverkusen/obj/Debug
-/ReportImp/SkmLeverkusen/obj/Release
-/ReportImp/CaritasGuenzburgNeuUlm/obj/Debug
-/ReportImp/CaritasGuenzburgNeuUlm/obj/Release
-/ReportImp/CaritasOsnabrueck/obj/Debug
-/ReportImp/CaritasOsnabrueck/obj/Release
-/ReportImp/BeWoColoniaMitarbeiter2/obj/Debug
-/ReportImp/BeWoColoniaMitarbeiter2/obj/Release
-/ReportImp/BeWoWalzPaiva/obj/Debug
-/ReportImp/BeWoWalzPaiva/obj/Release
-/ReportImp/MitMenschenWuppertal/obj/Debug
-/ReportImp/MitMenschenWuppertal/obj/Release
-/ReportImp/Triathlon/obj/Debug
-/ReportImp/Triathlon/obj/Release
-/ReportImp/AbwWeeger/obj/Debug
-/ReportImp/BeWoImFlow/obj/Debug
-/ReportImp/DiakonieLandshut/obj/Debug
-/ReportImp/DiakonieLandshut/obj/Release
-/ReportImp/BeWoImFlow/obj/Release
-/ReportImp/AbwWeeger/obj/Release
-/ReportImp/LebenshilfeMoenchengladbach/obj/Debug
-/ReportImp/LebenshilfeMoenchengladbach/obj/Release
-/ReportImp/AufEigenenFuessenStehen/obj/Debug
-/ReportImp/AufEigenenFuessenStehen/obj/Release
-/ReportImp/BeWoKoelnSued/obj/Debug
-/ReportImp/BeWoKoelnSued/obj/Release
-/ReportImp/ChristianWilke/obj/Debug
-/ReportImp/ChristianWilke/obj/Release
-/ReportImp/HshNetzwerk/obj/Debug
-/ReportImp/HshNetzwerk/obj/Release
-/ReportImp/JohannesDiakonieMosbach/obj/Debug
-/ReportImp/JohannesDiakonieMosbach/obj/Release/*.dll
-/ReportImp/JohannesDiakonieMosbach/obj/Release
-/ReportImp/PflegedienstWessel/obj/Debug
-/ReportImp/SozialbueroBorggreve/obj/Debug
-/ReportImp/SozialbueroBorggreve/obj/Release
-/ReportImp/WahlEv/obj/Debug
-/ReportImp/WahlEv/obj/Release
-/ReportImp/PflegedienstWessel/obj/Release
-/ReportImp/AwoWesel/obj/Debug
-/ReportImp/AwoWesel/obj/Release
-/BeWoCB.sln
-/BeWoCB.sln.DotSettings.user
-/BeWoPlanerMobil/.vs/BeWoPlanerMobil/v15/.suo
-/BeWoPlanerMobil/.vs/config/applicationhost.config
-/ReportImp/DiakonieMuelheim/obj/Debug
-/ReportImp/DiakonieMuelheim/obj/Release
-/ReportImp/VkmMenden/obj/Debug
-/ReportImp/VkmMenden/obj/Release
-/ReportImp/DiakonieMuelheim/bin/Debug
-/ReportImp/AbwDziallasMuhrin/obj/Debug
-/ReportImp/AbwDziallasMuhrin/obj/Release
-/ReportImp/AidsHilfeDuisburg/obj/Debug
-/ReportImp/AidsHilfeDuisburg/obj/Release
-/ReportImp/NahDran/bin/Debug
-/ReportImp/NahDran/obj/Debug
-/ReportImp/NahDran/obj/Release
-/ReportImp/WohnstaettenEssen/obj/Debug
-/ReportImp/WohnstaettenEssen/obj/Release
-/ReportImp/AsbRheinErftDueren/obj/Debug
-/ReportImp/AsbRheinErftDueren/obj/Release
-/ReportImp/BeWoKleefeld/obj/Debug
-/ReportImp/BeWoKleefeld/obj/Release
-/ReportImp/FortisNova/obj/Debug
-/ReportImp/FortisNova/obj/Release
-/ReportImp/LandshuterNetzwerk/obj/Debug
-/ReportImp/LebenshilfeTrier/obj/Debug
-/ReportImp/LandshuterNetzwerk/obj/Release
-/ReportImp/LebenshilfeTrier/obj/Release
-/ReportImp/TabulaRasa/obj/Debug
-/ReportImp/TabulaRasa/obj/Release
-/ReportImp/KirschbaumManz/obj/Debug
-/ReportImp/KirschbaumManz/obj/Release
-/ReportImp/VkmRietberg/obj/Debug
-/ReportImp/VkmRietberg/obj/Release
-/ReportImp/Bussmannshof/bin/Release
-/ReportImp/Bussmannshof/obj/Debug
-/ReportImp/Bussmannshof/obj/Release
-/ReportImp/KollegiumEv/bin/Debug
-/ReportImp/KollegiumEv/obj/Debug
-/ReportImp/KollegiumEv/obj/Release
-/ReportImp/AsbMoenchengladbach/obj/Debug
-/ReportImp/AsbMoenchengladbach/obj/Release
-/ReportImp/BeWoTrio/obj/Debug
-/ReportImp/BeWoTrio/obj/Release
-/ReportImp/BhsSolingen/bin/Release
-/ReportImp/BhsSolingen/obj/Debug
-/ReportImp/BhsSolingen/obj/Release
-/ReportImp/ChristianLuft/bin/Debug
-/ReportImp/ChristianLuft/bin/Release
-/ReportImp/ChristianLuft/obj/Debug
-/ReportImp/ChristianLuft/obj/Release
-/ReportImp/SehtMuenster/obj/Debug
-/ReportImp/SehtMuenster/obj/Release
-/ReportImp/SehtMuenster/bin/Release
-/ReportImp/FabEv/bin/Debug
-/ReportImp/FabEv/obj/Debug
-/ReportImp/FabEv/obj/Release
-/ReportImp/ProBalance/bin/Debug
-/ReportImp/ProBalance/obj/Debug
-/ReportImp/ProBalance/obj/Release
-/ReportImp/BeWoNordeifel/obj/Debug
-/ReportImp/BeWoNordeifel/obj/Release
-/ReportImp/HshCologne/obj/Debug
-/ReportImp/HshCologne/obj/Release
-/ReportImp/IWohl/obj/Debug
-/ReportImp/IWohl/obj/Release
-/ReportImp/KuhringBetreuung/obj/Debug
-/ReportImp/KuhringBetreuung/obj/Release
-/ReportImp/LebenshilfeFrankfurtOder/obj/Debug
-/ReportImp/LebenshilfeFrankfurtOder/obj/Release
-/BeWoPlanerMobil/delete_and_ignore_file.txt
+########## ownSoft extra stuff
+# Files
+.editorconfig
+DebugConfig.txt
+Host/Multitenancy/demo.config
+*.log.txt
+*temp.txt
+*.Secrets.config
+
+# Folder
+bin[Rr]elease/
+CustomerDlls/
+Host/demo/temp/
+
+
+########## https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
+/ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs
--- a/BeWo.Styles/BeWo.Styles.csproj
+++ b/BeWo.Styles/BeWo.Styles.csproj
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9BAB16DE-E284-4B57-BD09-763FC5CE521A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BeWo.Styles</RootNamespace>
+    <AssemblyName>BeWo.Styles</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Xpf.Core.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpf.Core.v23.2.Extensions, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="PresentationFramework.Aero" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Converters\EnumTranslationConverter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Colors\Colors.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\ButtonStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\CheckBoxStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\ComboBoxStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\CustomControlsStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\DateEditStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\GroupBoxStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\LabelStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\ListBoxStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\NullItemComboBoxStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\RadioButtonStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\TextBoxStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\TextEditStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ControlStyles\ToggleButtonStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="DataTemplates\ControlTemplates.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="DataTemplates\DataTemplates.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ModernOrangeBlack.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Controls\Controls.csproj">
+      <Project>{d5e53b0f-bf5a-41e8-93e2-0f32845fc729}</Project>
+      <Name>Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Shared\Shared.csproj">
+      <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/BeWo.Styles/Colors/Colors.xaml
+++ b/BeWo.Styles/Colors/Colors.xaml
@@ -0,0 +1,16 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TextBoxBorderBrush" Color="#FF86878F" />
+
+
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFFDC784" />
+    <SolidColorBrush x:Key="ControlSelectedBackgroundBrush" Color="#FFFFD86C" />
+    <SolidColorBrush x:Key="ControlMouseOverBackgroundBrush" Color="#FFDCA158" />
+
+    <SolidColorBrush x:Key="TabItemHotTextBrush" Color="#FFAB4A07" />
+
+    <LinearGradientBrush x:Key="ApplicationBackground" StartPoint="0.5,0" EndPoint="0.5,1">
+        <GradientStop Offset="0.38" Color="#FFDADADB" />
+        <GradientStop Offset="0.725" Color="#FFA9B8C2" />
+        <GradientStop Offset="0.91" Color="#FF4E565A" />
+    </LinearGradientBrush>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/ButtonStyles.xaml
+++ b/BeWo.Styles/ControlStyles/ButtonStyles.xaml
@@ -0,0 +1,153 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Base  -->
+    <Style x:Key="BaseButton" TargetType="{x:Type Button}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Foreground" Value="#FFFFFFFF" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+
+    <Style
+        x:Key="PrimaryButton"
+        BasedOn="{StaticResource BaseButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Timeline1">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                        <Storyboard x:Key="Timeline2">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border
+                        x:Name="border"
+                        Padding="0,0,0,0"
+                        BorderBrush="#FF000000"
+                        BorderThickness="1,1,1,1"
+                        CornerRadius="4,4,4,4">
+                        <Border.Background>
+                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="#FF000000" />
+                                <GradientStop Offset="1" Color="#FF262626" />
+                            </LinearGradientBrush>
+                        </Border.Background>
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="0.5*" />
+                                <RowDefinition Height="0.5*" />
+                            </Grid.RowDefinitions>
+                            <Border
+                                x:Name="glow"
+                                Grid.RowSpan="2"
+                                Width="Auto"
+                                HorizontalAlignment="Stretch"
+                                CornerRadius="4,4,4,4"
+                                Opacity="0">
+                                <Border.Background>
+                                    <RadialGradientBrush>
+                                        <RadialGradientBrush.RelativeTransform>
+                                            <TransformGroup>
+                                                <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
+                                                <SkewTransform AngleX="0" AngleY="0" />
+                                                <RotateTransform Angle="0" />
+                                                <TranslateTransform X="-0.368" Y="-0.152" />
+                                            </TransformGroup>
+                                        </RadialGradientBrush.RelativeTransform>
+                                        <GradientStop Offset="0" Color="#B28DBDFF" />
+                                        <GradientStop Offset="1" Color="#008DBDFF" />
+                                    </RadialGradientBrush>
+                                </Border.Background>
+                            </Border>
+                            <Border
+                                x:Name="shine"
+                                Grid.Row="0"
+                                Width="Auto"
+                                Margin="0,0,0,0"
+                                HorizontalAlignment="Stretch"
+                                CornerRadius="4,4,0,0">
+                                <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                        <GradientStop Offset="0" Color="#99FFFFFF" />
+                                        <GradientStop Offset="1" Color="#33FFFFFF" />
+                                    </LinearGradientBrush>
+                                </Border.Background>
+                            </Border>
+                            <Border
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Margin="0,0,0,0">
+                                <ContentPresenter
+                                    Width="Auto"
+                                    Margin="3,0,3,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center" />
+                            </Border>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
+                            <Setter TargetName="border" Property="Background" Value="#998DBDFF" />
+                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="border" Property="Background" Value="#FF808080" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="HideDisabledButton"
+        BasedOn="{StaticResource PrimaryButton}"
+        TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="HideDisabledButtonSmall"
+        BasedOn="{StaticResource HideDisabledButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Height" Value="21" />
+    </Style>
+
+    <Style
+        x:Key="PrimaryButtonSmall"
+        BasedOn="{StaticResource PrimaryButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Height" Value="21" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/CheckBoxStyles.xaml
+++ b/BeWo.Styles/ControlStyles/CheckBoxStyles.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="CheckBoxBase" TargetType="{x:Type CheckBox}">
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/ComboBoxStyles.xaml
+++ b/BeWo.Styles/ControlStyles/ComboBoxStyles.xaml
@@ -0,0 +1,161 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+    xmlns:conv="clr-namespace:BeWo.Styles.Converters">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="..\DataTemplates\ControlTemplates.xaml" />
+        <ResourceDictionary Source="..\ControlStyles\ToggleButtonStyles.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+
+    <!--  ComboBox  -->
+    <Style x:Key="BaseComboBox" TargetType="ComboBox">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+    <Style
+        x:Key="PrimaryComboBox"
+        BasedOn="{StaticResource BaseComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid Grid.IsSharedSizeScope="true">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    x:Name="SelectedItemBorder"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2,1,20,1">
+                                    <ContentPresenter
+                                        Margin="3,0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Border>
+                                <ToggleButton
+                                    Grid.ColumnSpan="3"
+                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="true"
+                            Focusable="false"
+                            IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Placement="Bottom"
+                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Microsoft_Windows_Themes:SystemDropShadowChrome
+                                x:Name="Shdw"
+                                MinWidth="{TemplateBinding ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Color="Transparent">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                    BorderThickness="1">
+                                    <ScrollViewer>
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Border>
+                            </Microsoft_Windows_Themes:SystemDropShadowChrome>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelectionBoxHighlighted" Value="true" />
+                                <Condition Property="IsDropDownOpen" Value="false" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="#FF000000" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelectionBoxHighlighted" Value="true">
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource ControlSelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="0,1" />
+                <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="NoWrapComboBox"
+        BasedOn="{StaticResource PrimaryComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Path=.}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
+    <DataTemplate x:Key="ListItemView">
+        <TextBlock
+            x:Name="textblock"
+            MaxWidth="362"
+            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+            Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
+            TextTrimming="CharacterEllipsis"
+            TextWrapping="NoWrap"
+            ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
+    </DataTemplate>
+    <Style
+        x:Key="EnumTranslationComboBox"
+        BasedOn="{StaticResource PrimaryComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="MaxWidth" Value="400" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/CustomControlsStyles.xaml
+++ b/BeWo.Styles/ControlStyles/CustomControlsStyles.xaml
@@ -0,0 +1 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" />
--- a/BeWo.Styles/ControlStyles/DateEditStyles.xaml
+++ b/BeWo.Styles/ControlStyles/DateEditStyles.xaml
@@ -0,0 +1,74 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxei="http://schemas.devexpress.com/winfx/2008/xaml/editors/internal"
+    xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys">
+    <Style
+        x:Key="BaseDateEdit"
+        BasedOn="{StaticResource {x:Type dxe:DateEdit}}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+    </Style>
+    <Style
+        x:Key="PrimaryDateEdit"
+        BasedOn="{StaticResource BaseDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Style.Resources>
+            <DataTemplate x:Key="{dxet:ButtonsThemeKey ResourceKey=ToggleButtonInfoTemplate, IsThemeIndependent=True}">
+                <dx:ToggleStateButton
+                    x:Name="PART_Item"
+                    Margin="2"
+                    dxei:SetIsCheckedToButtonInfoBehavior.IsEnabled="True"
+                    IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
+                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
+                <DataTemplate.Triggers>
+                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="True">
+                        <Setter TargetName="PART_Item" Property="IsChecked" Value="{Binding Path=(dxe:BaseEdit.OwnerEdit).IsPopupOpen, RelativeSource={RelativeSource Self}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
+                        <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
+                    </DataTrigger>
+                </DataTemplate.Triggers>
+            </DataTemplate>
+        </Style.Resources>
+    </Style>
+    <Style
+        x:Key="DateEditDateOnly"
+        BasedOn="{StaticResource PrimaryDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="MaskType" Value="DateOnlyAdvancingCaret" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="true" />
+    </Style>
+    <Style
+        x:Key="DateEditDateOnlyShort"
+        BasedOn="{StaticResource DateEditDateOnly}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Mask" Value="d" />
+    </Style>
+    <Style
+        x:Key="DateEditDateOnlyLong"
+        BasedOn="{StaticResource DateEditDateOnly}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Mask" Value="D" />
+    </Style>
+    <Style
+        x:Key="DateEditDateTime"
+        BasedOn="{StaticResource PrimaryDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="MaskType" Value="DateTimeAdvancingCaret" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="true" />
+    </Style>
+    <Style
+        x:Key="DateEditDateTimeShort"
+        BasedOn="{StaticResource DateEditDateTime}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Mask" Value="F" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/GroupBoxStyles.xaml
+++ b/BeWo.Styles/ControlStyles/GroupBoxStyles.xaml
@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseGroupBox" TargetType="{x:Type GroupBox}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="3" />
+    </Style>
+    <Style
+        x:Key="ObjectEditGroupBox"
+        BasedOn="{StaticResource BaseGroupBox}"
+        TargetType="{x:Type GroupBox}">
+        <!-- <Setter Property="BorderBrush" Value="#D5DFE5" />-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GroupBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Border
+                            x:Name="Header"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            MinHeight="20"
+                            Padding="3,0,3,0"
+                            TextElement.FontFamily="Microsoft Sans Serif"
+                            TextElement.FontSize="16"
+                            TextElement.Foreground="{StaticResource TabItemHotTextBrush}">
+                            <ContentPresenter
+                                ContentSource="Header"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <Border
+                            Grid.Row="1"
+                            BorderBrush="#FF86878F"
+                            BorderThickness="0,0,0,1" />
+                        <ContentPresenter
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/LabelStyles.xaml
+++ b/BeWo.Styles/ControlStyles/LabelStyles.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseLabel" TargetType="Label">
+        <Setter Property="IsEnabled" Value="True" />
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="TextElement.Foreground" Value="#FF000000" />
+    </Style>
+
+    <Style x:Key="Header1" TargetType="Label">
+        <Setter Property="TextElement.FontSize" Value="16" />
+        <Setter Property="TextElement.Foreground" Value="{StaticResource TabItemHotTextBrush}" />
+        <Setter Property="TextElement.FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="Padding" Value="3,0,3,0" />
+        <Setter Property="MinHeight" Value="20" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Margin" Value="3,-6,3,6" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/ListBoxStyles.xaml
+++ b/BeWo.Styles/ControlStyles/ListBoxStyles.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  ListBoxItems  -->
+    <Style x:Key="PhotoListBoxItem" TargetType="ListBoxItem">
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Style.Resources>
+            <SolidColorBrush
+                x:Key="{x:Static SystemColors.HighlightBrushKey}"
+                Opacity="0.4"
+                Color="AliceBlue" />
+            <SolidColorBrush
+                x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}"
+                Opacity="0.4"
+                Color="AliceBlue" />
+        </Style.Resources>
+    </Style>
+
+    <!--  ListBox  -->
+    <Style x:Key="PhotoListBox" TargetType="{x:Type ListBox}">
+        <Setter Property="Foreground" Value="Black" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="MinHeight" Value="100" />
+        <Setter Property="MaxHeight" Value="800" />
+        <Setter Property="IsSynchronizedWithCurrentItem" Value="True" />
+        <Setter Property="SelectionMode" Value="Single" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource PhotoListBoxItem}" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/NullItemComboBoxStyles.xaml
+++ b/BeWo.Styles/ControlStyles/NullItemComboBoxStyles.xaml
@@ -0,0 +1,148 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
+
+    <!--  NullItemComboBox  -->
+    <Style x:Key="PrimaryNullItemComboBox" TargetType="uc:NullItemComboBox">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Path=.}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type uc:NullItemComboBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid Grid.IsSharedSizeScope="true">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    x:Name="SelectedItemBorder"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2,1,20,1">
+                                    <ContentPresenter
+                                        Margin="3,0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Border>
+                                <ToggleButton
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                                <Label
+                                    x:Name="label_nullText"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Margin="5,3,20,3"
+                                    Padding="0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding NullText}"
+                                    IsHitTestVisible="False"
+                                    Visibility="Hidden" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="true"
+                            Focusable="false"
+                            IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Placement="Bottom"
+                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Microsoft_Windows_Themes:SystemDropShadowChrome
+                                x:Name="Shdw"
+                                MinWidth="{TemplateBinding ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Color="Transparent">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                    BorderThickness="1">
+                                    <ScrollViewer>
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Border>
+                            </Microsoft_Windows_Themes:SystemDropShadowChrome>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelectionBoxHighlighted" Value="true" />
+                                <Condition Property="IsDropDownOpen" Value="false" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="#FF000000" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelectionBoxHighlighted" Value="true">
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource ControlSelectedBackgroundBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                        </Trigger>
+                        <Trigger Property="SelectedItem" Value="{x:Null}">
+                            <Setter TargetName="label_nullText" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="0,1" />
+                <Setter Property="Template" Value="{DynamicResource ComboBoxEditableTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="EnumTranslationNullItemComboBox"
+        BasedOn="{StaticResource PrimaryNullItemComboBox}"
+        TargetType="{x:Type uc:NullItemComboBox}">
+        <Setter Property="ItemTemplate" Value="{DynamicResource ListItemView}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="MaxWidth" Value="400" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/RadioButtonStyles.xaml
+++ b/BeWo.Styles/ControlStyles/RadioButtonStyles.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Base  -->
+    <Style x:Key="BaseRadioButton" TargetType="RadioButton">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/TextBoxStyles.xaml
+++ b/BeWo.Styles/ControlStyles/TextBoxStyles.xaml
@@ -0,0 +1,71 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="TextBoxBase" TargetType="{x:Type TextBox}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+    </Style>
+
+    <Style
+        x:Key="TextBoxNoticeBase"
+        BasedOn="{StaticResource TextBoxBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="23" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="AcceptsReturn" Value="True" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    </Style>
+    <Style
+        x:Key="TextBoxNotice"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MaxHeight" Value="150" />
+        <Setter Property="Height" Value="auto" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeLarge"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="58" />
+        <Setter Property="Height" Value="auto" />
+        <Setter Property="MaxHeight" Value="300" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeExtended"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="150" />
+        <Setter Property="Height" Value="150" />
+        <Setter Property="MaxHeight" Value="150" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeSmallExtended"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="75" />
+        <Setter Property="MaxHeight" Value="75" />
+    </Style>
+
+    <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ScrollViewer
+                        x:Name="PART_ContentHost"
+                        Background="Transparent"
+                        Focusable="false"
+                        HorizontalScrollBarVisibility="Hidden"
+                        VerticalScrollBarVisibility="Hidden" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo.Styles/ControlStyles/TextEditStyles.xaml
@@ -0,0 +1,76 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
+
+    <!--  Base  -->
+    <Style x:Key="BaseTextEdit" TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+    </Style>
+    <Style
+        x:Key="BaseNumberMaskTextEdit"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+    </Style>
+
+    <!--  Special  -->
+    <Style
+        x:Key="TextEditNumber"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="N0" />
+    </Style>
+    <Style
+        x:Key="TextEditYear"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="0000" />
+    </Style>
+    <Style
+        x:Key="TextEditQm"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="######0.00 qm" />
+    </Style>
+    <Style
+        x:Key="TextEditCurrency"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="######0.## $" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+    <Style
+        x:Key="TextEditHours"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="########0.## Std" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+    <Style
+        x:Key="TextEditDays"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="########0.## Tage" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+
+    <!--  Numbers  -->
+    <Style
+        x:Key="TextEditNumberDecimal"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="########0.##" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+    <Style
+        x:Key="TextEditNumberDecimalNullable"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="#########.##" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/ControlStyles/ToggleButtonStyles.xaml
+++ b/BeWo.Styles/ControlStyles/ToggleButtonStyles.xaml
@@ -0,0 +1,149 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="ComboBoxTransparentButtonStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="Width" Value="Auto" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="ClickMode" Value="Press" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Timeline1">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                To="1.3"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="1.3"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="Timeline2">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            x:Name="border"
+                            Grid.Column="1"
+                            Width="{DynamicResource {x:Static SystemParameters.ScrollWidthKey}}"
+                            Margin="0,0,0,0"
+                            Padding="0,0,0,0"
+                            BorderBrush="#FF000000"
+                            BorderThickness="1,1,1,1"
+                            CornerRadius="4,4,4,4">
+                            <Border.Background>
+                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Offset="0" Color="#FF000000" />
+                                    <GradientStop Offset="1" Color="#FF262626" />
+                                </LinearGradientBrush>
+                            </Border.Background>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="0.5*" />
+                                    <RowDefinition Height="0.5*" />
+                                </Grid.RowDefinitions>
+                                <Border
+                                    x:Name="glow"
+                                    Grid.RowSpan="2"
+                                    Width="Auto"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="3,3,3,3"
+                                    Opacity="0">
+                                    <Border.Background>
+                                        <RadialGradientBrush>
+                                            <RadialGradientBrush.RelativeTransform>
+                                                <TransformGroup>
+                                                    <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
+                                                    <SkewTransform AngleX="0" AngleY="0" />
+                                                    <RotateTransform Angle="0" />
+                                                    <TranslateTransform X="-0.368" Y="-0.152" />
+                                                </TransformGroup>
+                                            </RadialGradientBrush.RelativeTransform>
+                                            <GradientStop Offset="0" Color="#B28DBDFF" />
+                                            <GradientStop Offset="1" Color="#008DBDFF" />
+                                        </RadialGradientBrush>
+                                    </Border.Background>
+                                </Border>
+                                <Border
+                                    x:Name="shine"
+                                    Grid.Row="0"
+                                    Width="Auto"
+                                    Margin="0,0,0,0"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="3,3,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                            <GradientStop Offset="0" Color="#99FFFFFF" />
+                                            <GradientStop Offset="1" Color="#33FFFFFF" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                </Border>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontFamily="Webdings"
+                                    FontSize="9"
+                                    Text="6"
+                                    TextWrapping="Wrap">
+                                    <TextBlock.Foreground>
+                                        <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
+                                    </TextBlock.Foreground>
+                                </TextBlock>
+                            </Grid>
+                        </Border>
+
+                        <!-- <ToggleButton x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Style="{StaticResource ComboBoxReadonlyToggleButton}" Grid.ColumnSpan="2" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>-->
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
+                            <Setter TargetName="border" Property="Background" Value="#99FFA500" />
+                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
--- a/BeWo.Styles/Converters/EnumTranslationConverter.cs
+++ b/BeWo.Styles/Converters/EnumTranslationConverter.cs
@@ -0,0 +1,37 @@
+using BS.Shared.Core;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace BeWo.Styles.Converters
+{
+    public class EnumTranslationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is Enum e)
+            {
+                if (EnumTranslations.Wohnhilfe2Translation.TryGetValue(e, out string v))
+                {
+                    return v;
+                }
+                // RE:
+                // EnumTranslationConverter, aber betrachtet nicht alle?
+                // Brauche hier eig nur EnumTranslations.Gkv2Translation
+                if (EnumTranslations.AllTranslations.TryGetValue(e, out string vv))
+                {
+                    return vv;
+                }
+
+                return e;
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo.Styles/DataTemplates/ControlTemplates.xaml
+++ b/BeWo.Styles/DataTemplates/ControlTemplates.xaml
@@ -0,0 +1,92 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+    <Style x:Key="ComboBoxFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle
+                        Margin="4,4,21,4"
+                        SnapsToDevicePixels="true"
+                        Stroke="Black"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  Control Templates  -->
+    <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
+        <Grid SnapsToDevicePixels="true">
+            <Border
+                x:Name="Bd"
+                Padding="1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+                <Grid Grid.IsSharedSizeScope="true">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox
+                        x:Name="PART_EditableTextBox"
+                        Grid.Column="1"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{DynamicResource ComboBoxEditableTextBox}" />
+                    <ToggleButton
+                        Grid.Column="0"
+                        Grid.ColumnSpan="3"
+                        Background="{x:Null}"
+                        IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                </Grid>
+            </Border>
+            <Popup
+                x:Name="PART_Popup"
+                AllowsTransparency="true"
+                Focusable="false"
+                IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                Placement="Bottom"
+                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <Microsoft_Windows_Themes:SystemDropShadowChrome
+                    x:Name="Shdw"
+                    MinWidth="{TemplateBinding ActualWidth}"
+                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                    Color="Transparent">
+                    <Border
+                        x:Name="DropDownBorder"
+                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                        BorderThickness="1">
+                        <ScrollViewer>
+                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </Microsoft_Windows_Themes:SystemDropShadowChrome>
+            </Popup>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+            </Trigger>
+            <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+</ResourceDictionary>
--- a/BeWo.Styles/DataTemplates/DataTemplates.xaml
+++ b/BeWo.Styles/DataTemplates/DataTemplates.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:BeWo.Styles.Converters" />
--- a/BeWo.Styles/ModernOrangeBlack.xaml
+++ b/BeWo.Styles/ModernOrangeBlack.xaml
@@ -0,0 +1,41 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="Colors\Colors.xaml" />
+
+        <ResourceDictionary Source="DataTemplates\ControlTemplates.xaml" />
+        <ResourceDictionary Source="DataTemplates\DataTemplates.xaml" />
+
+        <ResourceDictionary Source="ControlStyles\ButtonStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\CheckBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ComboBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\CustomControlsStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\DateEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\GroupBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\LabelStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ListBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\RadioButtonStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\TextBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\TextEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ToggleButtonStyles.xaml" />
+
+        <!--  Benötigt TextBoxStyles + ToggleButtonStyles  -->
+        <ResourceDictionary Source="ControlStyles\NullItemComboBoxStyles.xaml" />
+
+    </ResourceDictionary.MergedDictionaries>
+
+    <!--  Default Styles  -->
+    <Style BasedOn="{StaticResource HideDisabledButton}" TargetType="Button" />
+    <Style BasedOn="{StaticResource CheckBoxBase}" TargetType="CheckBox" />
+    <Style BasedOn="{StaticResource NoWrapComboBox}" TargetType="ComboBox" />
+    <Style BasedOn="{StaticResource PrimaryDateEdit}" TargetType="dxe:DateEdit" />
+    <Style BasedOn="{StaticResource BaseLabel}" TargetType="Label" />
+    <Style BasedOn="{StaticResource PrimaryNullItemComboBox}" TargetType="controls:NullItemComboBox" />
+    <Style BasedOn="{StaticResource BaseRadioButton}" TargetType="RadioButton" />
+    <Style BasedOn="{StaticResource TextBoxBase}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource BaseTextEdit}" TargetType="dxe:TextEdit" />
+</ResourceDictionary>
--- a/BeWo.Styles/Properties/AssemblyInfo.cs
+++ b/BeWo.Styles/Properties/AssemblyInfo.cs
@@ -0,0 +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("BeWo.Styles")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("BeWo.Styles")]
+[assembly: AssemblyCopyright("Copyright ©  2025")]
+[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("9bab16de-e284-4b57-bd09-763fc5ce521a")]
+
+// 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")]
--- a/BeWo.sln
+++ b/BeWo.sln
--- a/BeWo/AI/AiChatController.cs
+++ b/BeWo/AI/AiChatController.cs
@@ -0,0 +1,46 @@
+using BeWo.AI.View;
+using BeWo.View;
+using BeWo.View.Windows;
+using BS.Shared;
+using BS.Shared.Translation;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.AI
+{
+    class AiChatController
+    {
+        private static void CreateAiChatWindow(AiChatView view, double height, double width)
+        {
+            var beWoWindow = BeWoWindowBuilder.GetBeWoWindow(Translator.Translate("Frage unsere KI"), view, height, width);
+
+            view.CloseButtonClicked += () => beWoWindow.Close();
+
+            beWoWindow.ShowDialog();
+        }
+
+        public static void ShowAiChatViewForServiceRecords(long c2sOid, DateTime start, DateTime end, double height, double width)
+        {
+            var ctrl = new AiChatView();
+            ctrl.InitServiceRecordQuery(c2sOid, start, end);
+            CreateAiChatWindow(ctrl, height, width);
+        }
+
+        public static void ShowAiChatViewForSingleCustomer(long customerOid, double height, double width)
+        {
+            var ctrl = new AiChatView();
+            ctrl.InitSingleCustomerQuery(customerOid);
+            CreateAiChatWindow(ctrl, height, width);
+        }
+
+        public static void ShowAiChatViewForObjects(TableID tableId, double height, double width)
+        {
+            var ctrl = new AiChatView();
+            ctrl.InitObjectQuery(tableId);
+            CreateAiChatWindow(ctrl, height, width);
+        }
+    }
+}
--- a/BeWo/AI/View/AiChatView.xaml
+++ b/BeWo/AI/View/AiChatView.xaml
@@ -0,0 +1,149 @@
+<view:BeWoView
+    x:Class="BeWo.AI.View.AiChatView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:validation="clr-namespace:BeWo.Validation"
+    xmlns:view="clr-namespace:BeWo.View"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    Focusable="True"
+    mc:Ignorable="d">
+    <view:BeWoView.Resources>
+        <!--<Expander x:Name="ExpanderTemplate" IsExpanded="True">
+            <Expander.Header>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Label HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="14" Margin="0" />
+                </Grid>
+            </Expander.Header>
+        </Expander>-->
+    </view:BeWoView.Resources>
+    <Grid Margin="0" Background="{DynamicResource ObjectEditBackgroundBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <dxlc:LayoutControl Padding="0" Orientation="Vertical">
+            <dxlc:LayoutGroup Height="200" dxlc:LayoutControl.AllowVerticalSizing="True">
+
+                <Grid Margin="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Button
+                        Grid.Row="0"
+                        HorizontalAlignment="Left"
+                        Click="btnSettings_Click"
+                        Content="Einstellungen" />
+                    <Popup
+                        x:Name="PopupTemplate"
+                        Grid.Row="0"
+                        Grid.RowSpan="3"
+                        Width="400"
+                        Height="300"
+                        Placement="MousePoint"
+                        StaysOpen="True">
+                        <Grid Margin="2,2,2,2" Background="{DynamicResource ObjectEditBackgroundBrush}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Label Grid.Row="0" Content="{t:Translate Datensatz Template}" />
+                            <TextBox
+                                x:Name="TextBoxTemplate"
+                                Grid.Row="1"
+                                MinHeight="60"
+                                AcceptsReturn="True"
+                                AcceptsTab="True"
+                                HorizontalScrollBarVisibility="Auto"
+                                VerticalScrollBarVisibility="Auto" />
+                            <StackPanel
+                                Grid.Row="2"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Grid.Row="2"
+                                    Margin="3"
+                                    Click="btnSaveSettings_Click"
+                                    Content="Übernehmen" />
+                                <Button
+                                    Grid.Row="2"
+                                    Margin="3"
+                                    Click="btnCancelSettings_Click"
+                                    Content="Abbrechen" />
+                            </StackPanel>
+
+                        </Grid>
+                    </Popup>
+                    <Label Grid.Row="1" Content="{t:Translate Formulieren Sie hier Ihre Anfrage}" />
+                    <TextBox
+                        x:Name="TextBoxAnfrage"
+                        Grid.Row="2"
+                        MinHeight="60"
+                        AcceptsReturn="True"
+                        AcceptsTab="True"
+                        HorizontalScrollBarVisibility="Auto"
+                        VerticalScrollBarVisibility="Auto" />
+                </Grid>
+            </dxlc:LayoutGroup>
+            <dxlc:LayoutGroup dxlc:LayoutControl.AllowVerticalSizing="True">
+
+                <Grid Margin="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Label Content="{t:Translate Ergebnis}" />
+                    <TextBox
+                        x:Name="TextBoxErgebnis"
+                        Grid.Row="1"
+                        MinHeight="60"
+                        AcceptsReturn="True"
+                        AcceptsTab="True"
+                        HorizontalScrollBarVisibility="Disabled"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
+                </Grid>
+            </dxlc:LayoutGroup>
+        </dxlc:LayoutControl>
+
+        <StackPanel
+            Grid.Row="1"
+            Height="Auto"
+            Margin="5,10,10,10"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSend"
+                Height="25"
+                Margin="0,0,3,0"
+                Click="btnSend_Click"
+                Content="{t:Translate Absenden}" />
+            <Button
+                x:Name="btnClose"
+                Height="25"
+                Margin="0,0,3,0"
+                Click="btnClose_Click"
+                Content="  Schließen  " />
+        </StackPanel>
+    </Grid>
+</view:BeWoView>
--- a/BeWo/AI/View/AiChatView.xaml.cs
+++ b/BeWo/AI/View/AiChatView.xaml.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Forms;
+using System.Windows.Input;
+
+using BeWo.Annotations;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.View;
+using BeWo.View.Controls;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Translation;
+using DevExpress.Utils;
+using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
+using MessageBox = System.Windows.MessageBox;
+
+namespace BeWo.AI.View
+{
+    public partial class AiChatView : BeWoView
+    {
+        public event Action CloseButtonClicked;
+
+        int type = 0; //0 = ServiceRecordQuery, 1 = SingleCustomerQuery, 2 = AllCustomerQuery
+
+        private long cb2scOid;
+        private long customerOid;
+        private TableID tableID;
+        private DateTime startDate;
+        private DateTime endDate;
+        private AiSettingsDC aiSettings;
+
+        public AiChatView()
+        {
+            InitializeComponent();
+            
+        }
+        
+        public void InitServiceRecordQuery(long c2sOid, DateTime start, DateTime end)
+        {
+            type = 0;
+            this.cb2scOid = c2sOid;
+            this.startDate = start;
+            this.endDate = end;
+
+            LoadAiSettings(1);
+        }
+
+
+        public void InitSingleCustomerQuery(long customerOid)
+        {
+            type = 1;
+            this.customerOid = customerOid;
+        }
+
+        public void InitObjectQuery(TableID tableId)
+        {
+            type = 2;
+            tableID = tableId;
+        }
+
+        private void LoadAiSettings(int settingsType)
+        {
+            aiSettings = ServiceFacade.DoOperationsServiceSync(s => s.GetAiSettings(settingsType));
+        }
+
+        private void ReloadViewModel(AiChatDC dc)
+        {
+            TextBoxErgebnis.Text = dc.Result;
+        }
+
+        private void btnSend_Click(object sender, RoutedEventArgs e)
+        {
+            var acdc = new AiChatDC();
+            acdc.Prompt = TextBoxAnfrage.Text;
+
+            if (type == 1)
+            {
+                ServiceFacade.DoOperationsServiceAsync(s => s.CreateAiQueryForSingleCustomer(acdc, customerOid),
+                               dc =>
+                               {
+                                   this.Dispatch(delegate
+                                   {
+                                       ReloadViewModel(dc);
+                                   });
+                               });
+            }
+            else if (type == 2)
+            {
+                ServiceFacade.DoOperationsServiceAsync(s => s.CreateAiQueryForObjects(acdc, (int)tableID),
+                               dc =>
+                               {
+                                   this.Dispatch(delegate
+                                   {
+                                       ReloadViewModel(dc);
+                                   });
+                               });
+            }
+            else
+            {
+                ServiceFacade.DoOperationsServiceAsync(s => s.CreateAiQueryForServiceRecords(acdc, cb2scOid, startDate, endDate),
+                               dc =>
+                               {
+                                   this.Dispatch(delegate
+                                   {
+                                       ReloadViewModel(dc);
+                                   });
+                               });
+            }
+        }
+        private void btnClose_Click(object sender, RoutedEventArgs e)
+        {
+            CloseButtonClicked?.Invoke();
+        }
+
+        private void btnSettings_Click(object sender, RoutedEventArgs e)
+        {
+            if (aiSettings != null)
+            {
+                TextBoxTemplate.Text = aiSettings.Settings;
+            }
+            PopupTemplate.IsOpen = true;
+        }
+
+
+        private void btnSaveSettings_Click(object sender, RoutedEventArgs e)
+        {
+            PopupTemplate.IsOpen = false;
+            if (aiSettings != null)
+            {
+                aiSettings.Settings = TextBoxTemplate.Text;
+
+                ServiceFacade.DoOperationsServiceAsync(s => s.UpdateAiSettings(aiSettings),
+                                   dc =>
+                                   {
+                                       this.Dispatch(delegate
+                                       {
+                                           aiSettings = dc;
+                                       });
+                                   });
+            }
+        }
+
+        private void btnCancelSettings_Click(object sender, RoutedEventArgs e)
+        {
+            PopupTemplate.IsOpen = false;
+        }
+    }
+}
--- a/BeWo/BSLogoControl.xaml
+++ b/BeWo/BSLogoControl.xaml
@@ -1,92 +1,133 @@
-<UserControl 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" x:Class="BeWo.BSLogoControl" x:Name="UserControl" Foreground="AliceBlue" Width="800" Height="800">
-	<UserControl.Resources>
-		<SolidColorBrush x:Key="FillBrush" Color="#FFF18A00" />
+<UserControl
+    x:Class="BeWo.BSLogoControl"
+    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"
+    x:Name="UserControl"
+    Width="800"
+    Height="800"
+    Foreground="AliceBlue">
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="FillBrush" Color="#FFF18A00" />

-		<Style TargetType="{x:Type Ellipse}">
-			<Setter Property="Fill" Value="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" />
-			<Setter Property="Width" Value="20" />
-			<Setter Property="Height" Value="20" />
-		</Style>
-	</UserControl.Resources>
+        <Style TargetType="{x:Type Ellipse}">
+            <Setter Property="Fill" Value="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" />
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Height" Value="20" />
+        </Style>
+    </UserControl.Resources>

-	<Grid>
-		<Viewbox StretchDirection="Both" Stretch="Fill" MaxWidth="{Binding Path=Width, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" MaxHeight="{Binding Path=Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
-			<Canvas Width="800" Height="800">
-				<Canvas Width="100" Height="100" Canvas.Left="350" Canvas.Top="350">
-					<Ellipse Canvas.Left="40" Canvas.Top="6" />
-					<Ellipse Canvas.Left="10" Canvas.Top="56" />
-					<Ellipse Canvas.Left="70" Canvas.Top="56" />
-				</Canvas>
-				<Canvas Width="100" Height="100" Canvas.Left="350" Canvas.Top="350" RenderTransformOrigin="0.5,0.5">
-					<Canvas.RenderTransform>
-						<TransformGroup>
-							<ScaleTransform ScaleX="1.6" ScaleY="1.6" />
-							<SkewTransform AngleX="0" AngleY="0" />
-							<RotateTransform Angle="-20" />
-							<TranslateTransform X="0" Y="0" />
-						</TransformGroup>
-					</Canvas.RenderTransform>
-					<Ellipse Canvas.Left="40" Canvas.Top="6" />
-					<Ellipse Canvas.Left="10" Canvas.Top="56" />
-					<Ellipse Canvas.Left="70" Canvas.Top="56" />
-				</Canvas>
-				<Canvas Width="100" Height="100" Canvas.Left="350" Canvas.Top="350" RenderTransformOrigin="0.5,0.5">
-					<Canvas.RenderTransform>
-						<TransformGroup>
-							<ScaleTransform ScaleX="2.5" ScaleY="2.5" />
-							<SkewTransform AngleX="0" AngleY="0" />
-							<RotateTransform Angle="-42" />
-							<TranslateTransform X="0" Y="0" />
-						</TransformGroup>
-					</Canvas.RenderTransform>
-					<Ellipse Canvas.Left="40" Canvas.Top="6" />
-					<Ellipse Canvas.Left="10" Canvas.Top="56" />
-					<Ellipse Canvas.Left="70" Canvas.Top="56" />
-				</Canvas>
-				<Canvas Width="100" Height="100" Canvas.Left="350" Canvas.Top="350" RenderTransformOrigin="0.5,0.5">
-					<Canvas.RenderTransform>
-						<TransformGroup>
-							<ScaleTransform ScaleX="3.8" ScaleY="3.8" />
-							<SkewTransform AngleX="0" AngleY="0" />
-							<RotateTransform Angle="-65" />
-							<TranslateTransform X="0" Y="0" />
-						</TransformGroup>
-					</Canvas.RenderTransform>
-					<Ellipse Canvas.Left="40" Canvas.Top="6" />
-					<Ellipse Canvas.Left="10" Canvas.Top="56" />
-					<Ellipse Canvas.Left="70" Canvas.Top="56" />
-				</Canvas>
+    <Grid>
+        <Viewbox
+            MaxWidth="{Binding Path=Width, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+            MaxHeight="{Binding Path=Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+            Stretch="Fill"
+            StretchDirection="Both">
+            <Canvas Width="800" Height="800">
+                <Canvas
+                    Canvas.Left="350"
+                    Canvas.Top="350"
+                    Width="100"
+                    Height="100">
+                    <Ellipse Canvas.Left="40" Canvas.Top="6" />
+                    <Ellipse Canvas.Left="10" Canvas.Top="56" />
+                    <Ellipse Canvas.Left="70" Canvas.Top="56" />
+                </Canvas>
+                <Canvas
+                    Canvas.Left="350"
+                    Canvas.Top="350"
+                    Width="100"
+                    Height="100"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Canvas.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform ScaleX="1.6" ScaleY="1.6" />
+                            <SkewTransform AngleX="0" AngleY="0" />
+                            <RotateTransform Angle="-20" />
+                            <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                    </Canvas.RenderTransform>
+                    <Ellipse Canvas.Left="40" Canvas.Top="6" />
+                    <Ellipse Canvas.Left="10" Canvas.Top="56" />
+                    <Ellipse Canvas.Left="70" Canvas.Top="56" />
+                </Canvas>
+                <Canvas
+                    Canvas.Left="350"
+                    Canvas.Top="350"
+                    Width="100"
+                    Height="100"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Canvas.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform ScaleX="2.5" ScaleY="2.5" />
+                            <SkewTransform AngleX="0" AngleY="0" />
+                            <RotateTransform Angle="-42" />
+                            <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                    </Canvas.RenderTransform>
+                    <Ellipse Canvas.Left="40" Canvas.Top="6" />
+                    <Ellipse Canvas.Left="10" Canvas.Top="56" />
+                    <Ellipse Canvas.Left="70" Canvas.Top="56" />
+                </Canvas>
+                <Canvas
+                    Canvas.Left="350"
+                    Canvas.Top="350"
+                    Width="100"
+                    Height="100"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Canvas.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform ScaleX="3.8" ScaleY="3.8" />
+                            <SkewTransform AngleX="0" AngleY="0" />
+                            <RotateTransform Angle="-65" />
+                            <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                    </Canvas.RenderTransform>
+                    <Ellipse Canvas.Left="40" Canvas.Top="6" />
+                    <Ellipse Canvas.Left="10" Canvas.Top="56" />
+                    <Ellipse Canvas.Left="70" Canvas.Top="56" />
+                </Canvas>

-				<Canvas Width="100" Height="100" Canvas.Left="350" Canvas.Top="350" RenderTransformOrigin="0.5,0.5">
-					<Canvas.RenderTransform>
-						<TransformGroup>
-							<ScaleTransform ScaleX="5.8" ScaleY="5.8" />
-							<SkewTransform AngleX="0" AngleY="0" />
-							<RotateTransform Angle="-88" />
-							<TranslateTransform X="0" Y="0" />
-						</TransformGroup>
-					</Canvas.RenderTransform>
-					<Ellipse Canvas.Left="40" Canvas.Top="6" />
-					<Ellipse Canvas.Left="10" Canvas.Top="56" />
-					<Ellipse Canvas.Left="70" Canvas.Top="56" />
-				</Canvas>
-				<Canvas Width="100" Height="100" Canvas.Left="350" Canvas.Top="350" RenderTransformOrigin="0.5,0.5">
-					<Canvas.RenderTransform>
-						<TransformGroup>
-							<ScaleTransform ScaleX="9" ScaleY="9" />
-							<SkewTransform AngleX="0" AngleY="0" />
-							<RotateTransform Angle="-110" />
-							<TranslateTransform X="0" Y="0" />
-						</TransformGroup>
-					</Canvas.RenderTransform>
-					<Ellipse Canvas.Left="40" Canvas.Top="6" />
-					<Ellipse Canvas.Left="10" Canvas.Top="56" />
-					<Ellipse Canvas.Left="70" Canvas.Top="56" />
-				</Canvas>
+                <Canvas
+                    Canvas.Left="350"
+                    Canvas.Top="350"
+                    Width="100"
+                    Height="100"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Canvas.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform ScaleX="5.8" ScaleY="5.8" />
+                            <SkewTransform AngleX="0" AngleY="0" />
+                            <RotateTransform Angle="-88" />
+                            <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                    </Canvas.RenderTransform>
+                    <Ellipse Canvas.Left="40" Canvas.Top="6" />
+                    <Ellipse Canvas.Left="10" Canvas.Top="56" />
+                    <Ellipse Canvas.Left="70" Canvas.Top="56" />
+                </Canvas>
+                <Canvas
+                    Canvas.Left="350"
+                    Canvas.Top="350"
+                    Width="100"
+                    Height="100"
+                    RenderTransformOrigin="0.5,0.5">
+                    <Canvas.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform ScaleX="9" ScaleY="9" />
+                            <SkewTransform AngleX="0" AngleY="0" />
+                            <RotateTransform Angle="-110" />
+                            <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                    </Canvas.RenderTransform>
+                    <Ellipse Canvas.Left="40" Canvas.Top="6" />
+                    <Ellipse Canvas.Left="10" Canvas.Top="56" />
+                    <Ellipse Canvas.Left="70" Canvas.Top="56" />
+                </Canvas>

-			</Canvas>
-		</Viewbox>
-	</Grid>
+            </Canvas>
+        </Viewbox>
+    </Grid>


 </UserControl>
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrlHistory>
-    <InstallUrlHistory>http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/</InstallUrlHistory>
+    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
+    <InstallUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/</InstallUrlHistory>
    <SupportUrlHistory />
-    <UpdateUrlHistory />
+    <UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
    <BootstrapperUrlHistory />
    <ErrorReportUrlHistory />
    <FallbackCulture>de-DE</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
  <PropertyGroup>
    <EnableSecurityDebugging>false</EnableSecurityDebugging>
--- a/BeWo/BeWoApp.xaml
+++ b/BeWo/BeWoApp.xaml
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
--- a/BeWo/ConfirmDemoDialog.xaml
+++ b/BeWo/ConfirmDemoDialog.xaml
@@ -1,10 +1,20 @@
-<Window x:Class="BeWo.ConfirmDemoDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="BeWoPlaner" Height="240" Width="360" WindowStartupLocation="CenterScreen" WindowStyle="None" ResizeMode="NoResize" >
-    
-    <Grid Background="{x:Null}"  Margin="0,0,0,0">
-        <Border BorderThickness="1" Padding="5,5,5,5" BorderBrush="Black" Background="{DynamicResource LoginBackgroundColor}">
+<Window
+    x:Class="BeWo.ConfirmDemoDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="BeWoPlaner"
+    Width="360"
+    Height="240"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None">
+
+    <Grid Margin="0,0,0,0" Background="{x:Null}">
+        <Border
+            Padding="5,5,5,5"
+            Background="{DynamicResource LoginBackgroundColor}"
+            BorderBrush="Black"
+            BorderThickness="1">
            <Grid Opacity="1">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="*" />
@@ -17,26 +27,63 @@
                    <RowDefinition Height="Auto" />
                    <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
-                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                <Image
+                    Grid.Row="0"
+                    Height="45"
+                    Margin="7,7,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Source="Ressources\Icons\bewoplaner_logo_small.png" />
                <Grid Grid.Row="1" Margin="0,10,0,0">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="*" />
                    </Grid.ColumnDefinitions>
                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" ></RowDefinition>
-                        <RowDefinition Height="Auto" ></RowDefinition>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
-                    <TextBlock TextWrapping="Wrap" Margin="3" FontSize="14">WICHTIG! Bitte tragen Sie keine echten Daten bei Ihren Tests ein, da es sich um einen öffentlichen Testzugang handelt, auf den jeder Zugriff hat!</TextBlock>
-                    <Button x:Name="CountButton" Grid.Row="2" Grid.Column ="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
+
+                    <TextBlock
+                        Margin="3"
+                        FontSize="14"
+                        TextWrapping="Wrap">
+                        WICHTIG! Bitte tragen Sie keine echten Daten bei Ihren Tests ein, da es sich um einen öffentlichen Testzugang handelt, auf den jeder Zugriff hat!
+                    </TextBlock>
+                    <Button
+                        x:Name="CountButton"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="120"
+                        Margin="3,25,3,3"
+                        HorizontalAlignment="Right"
+                        Click="ButtonBase_OnClick"
+                        IsDefault="True">
+                        OK
+                    </Button>
                    <!--<Button Grid.Row="2" Grid.Column ="2" Width="100" Margin="3" IsCancel="True" IsEnabled="False" HorizontalAlignment="Right">Abbrechen</Button>-->
                </Grid>
            </Grid>
        </Border>
-        <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
-        <Line x:Name="linkLine" Stroke="#FFADADAD" X1="14" Y1="340" X2="585" Y2="340" StrokeThickness="1" Margin="0,30,0,-30"></Line>

+        <Line
+            Grid.ColumnSpan="4"
+            Stroke="#FFADADAD"
+            StrokeThickness="1"
+            X1="14"
+            X2="585"
+            Y1="70"
+            Y2="70" />
+        <Line
+            x:Name="linkLine"
+            Margin="0,30,0,-30"
+            Stroke="#FFADADAD"
+            StrokeThickness="1"
+            X1="14"
+            X2="585"
+            Y1="340"
+            Y2="340" />
    </Grid>
-            
-        
-    
+
+
+
 </Window>
--- a/BeWo/ConfirmDemoDialog.xaml.cs
+++ b/BeWo/ConfirmDemoDialog.xaml.cs
@@ -12,10 +12,20 @@ namespace BeWo
 		public ConfirmDemoDialog()
        {
            InitializeComponent();
-			CountButton.Content = "Bitte warten (10 sek.)";
-			CountButton.IsEnabled = false;
+			
+			if (BeWoApp.Tenant == "7514581436")
+			{
+				CountButton.Content = "OK";
+				CountButton.IsEnabled = true;
+			}
+			else
+            {
+				CountButton.Content = "Bitte warten (10 sek.)";
+				CountButton.IsEnabled = false;

-			this.Loaded += new RoutedEventHandler(ConfirmDemoDialog_Loaded);
+				this.Loaded += new RoutedEventHandler(ConfirmDemoDialog_Loaded);
+			}
+			
 			
        }

@@ -23,7 +33,7 @@ namespace BeWo
 		{

 			int count = 9;
-
+			
 			new DispatcherTimer(
 				TimeSpan.FromMilliseconds(1000),
 				DispatcherPriority.Background,
--- a/BeWo/Converter/AddressToStringConverter.cs
+++ b/BeWo/Converter/AddressToStringConverter.cs
@@ -0,0 +1,29 @@
+using BeWo.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class AddressToStringConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			var vm = value as AddressVM;
+
+			if (vm is null)
+				return null;
+
+			return vm.ToSingleLine();
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/ArchiveRight2VisibilityConverter.cs
+++ b/BeWo/Converter/ArchiveRight2VisibilityConverter.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using BS.Shared;
+
+namespace BeWo.Converter
+{
+	public class ArchiveRight2VisibilityConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (parameter == null)
+			{
+				return Visibility.Collapsed;
+			}
+
+			var hasRight = false;
+
+			switch (parameter.ToString())
+			{
+				case "Person":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Person_AllowArchiving);
+					break;
+				case "Organisation":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Organisation_AllowArchiving);
+					break;
+				case "SupportConcept":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving);
+					break;
+				case "Customer":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_AllowArchiving);
+					break;
+				case "Employee":
+				    hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_AllowArchiving);
+				    break;
+			}
+
+			return (bool)value && hasRight ? Visibility.Visible : Visibility.Collapsed;
+		}
+
+		public object ConvertBack(object value, Type targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/BoolEnabledToTabitemBackgroundConverter.cs
+++ b/BeWo/Converter/BoolEnabledToTabitemBackgroundConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolEnabledToTabitemBackgroundConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Application.Current.Resources["TabItemTextBrush"];
+            }
+
+            return (bool)value ? Application.Current.Resources["TabItemTextBrush"] : Application.Current.Resources["TabItemTextBrushDisabled"];
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/BoolReverseConverter.cs
+++ b/BeWo/Converter/BoolReverseConverter.cs
@@ -8,9 +8,9 @@ namespace BeWo.Converter
    {
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            if (value is bool)
+            if (value is bool buhl)
            {
-                return !(bool) value;
+                return !buhl;
            }

            return false;
--- a/BeWo/Converter/BoolScaleTransformConverter.cs
+++ b/BeWo/Converter/BoolScaleTransformConverter.cs
@@ -4,9 +4,6 @@ using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 using System.Windows.Media;
-
-using BeWo.View;
-
 using BS.Shared;
 using BS.Shared.Core;

@@ -29,11 +26,15 @@ namespace BeWo.Converter
    {
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            var i = (value as IEnumerable<UserRightType>).ToList();
+            if(!(value is IEnumerable<UserRightType> iEnumerable))
+            {
+                return value;
+            }

-            i.Remove(UserRightType.None);
+            var userRights = iEnumerable.ToList();
+            userRights.Remove(UserRightType.None);

-            return (i != null) ? i.Select(r => EnumTranslations.UserRightType2Translations.Single(f => f.Key == r)).OrderBy(l => l.Value).ToDictionary(t => t.Key, t => t.Value) : value;
+            return userRights.Select(right => EnumTranslations.UserRightType2Translations.Single(right2Translation => right2Translation.Key == right)).OrderBy(right2Translation => right2Translation.Value).ToDictionary(right2Translation => right2Translation.Key, right2Translation => right2Translation.Value);
        }

        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
--- a/BeWo/Converter/BoolToParameterReturnConverter.cs
+++ b/BeWo/Converter/BoolToParameterReturnConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolToParameterReturnConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return null;
+            }
+
+            return (bool)value ? parameter : null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/BoolVisibilityCollapsedConverter.cs
+++ b/BeWo/Converter/BoolVisibilityCollapsedConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolVisibilityCollapsedConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Visibility.Visible;
+            }
+
+            if(value is bool b)
+            {
+                return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/BoolVisibilityConverter.cs
+++ b/BeWo/Converter/BoolVisibilityConverter.cs
@@ -14,18 +14,24 @@ namespace BeWo.Converter
                return Visibility.Visible;
            }

-            var lMode = true;
-            if (parameter is string s)
-	        {
-		        bool.TryParse(s, out lMode);
-	        }
-
-            if (lMode)
+            if(value is bool b)
            {
-                return !(bool)value ? Visibility.Collapsed : Visibility.Visible;
+                var lMode = true;
+                if (parameter is string s)
+                {
+                    bool.TryParse(s, out lMode);
+                }
+
+                if (lMode)
+                {
+                    return !(bool)value ? Visibility.Collapsed : Visibility.Visible;
+                }
+
+                return (bool)value ? Visibility.Collapsed : Visibility.Visible;
            }

-            return (bool)value ? Visibility.Collapsed : Visibility.Visible;
+            // Fange Fälle ab, wo noch nicht mit Command gearbeitet wird
+            return Visibility.Visible;
        }

        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
--- a/BeWo/Converter/BooleanAndVisibilityMultiConverter.cs
+++ b/BeWo/Converter/BooleanAndVisibilityMultiConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    /// <summary>
+    /// https://stackoverflow.com/a/19210037
+    /// </summary>
+    public class BooleanAndVisibilityMultiConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            foreach (object value in values)
+            {
+                if ((value is bool) && (bool)value == false)
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            return Visibility.Visible;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/BooleanOrVisibilityMultiConverter.cs
+++ b/BeWo/Converter/BooleanOrVisibilityMultiConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    /// <summary>
+    /// https://stackoverflow.com/a/19210037
+    /// </summary>
+    public class BooleanOrVisibilityMultiConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            foreach (object value in values)
+            {
+                if ((value is bool) && (bool)value == true)
+                {
+                    return Visibility.Visible;
+                }
+            }
+            return Visibility.Collapsed;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/CellColorConverter.cs
+++ b/BeWo/Converter/CellColorConverter.cs
@@ -5,7 +5,9 @@ using System.Linq;
 using System.Windows.Data;
 using System.Windows.Markup;
 using System.Windows.Media;
+using BeWo.View.Detail;
 using BeWo.ViewModel;
+using BS.Shared.DataContracts;
 using DevExpress.Xpf.Grid;

 namespace BeWo.Converter
@@ -23,9 +25,49 @@ namespace BeWo.Converter
            var viewTag = cellData.View.Tag as List<AdditionalServiceBookingVM>;
            var date = int.Parse(value[1].ToString().Split('.')[0], NumberStyles.Integer);

+            
+            if (viewTag != null && viewTag.Count > 0 && value.Length > 2 && value[2] is Teilnehmer)
+            {
+                var booking = viewTag[0];
+
+                if (date <= DateTime.DaysInMonth(booking.Date.Year, booking.Date.Month))
+                {
+
+                    var dt = new DateTime(booking.Date.Year, booking.Date.Month, date);
+
+                    if (dt.DayOfWeek == DayOfWeek.Saturday || dt.DayOfWeek == DayOfWeek.Sunday)
+                    {
+                        return Brushes.CornflowerBlue;
+                    }
+
+                    var t = (Teilnehmer) value[2];
+
+                    if (IsAbsence(dt, t.Customer.AbsenceTimes))
+                    {
+                        return Brushes.LightGray;
+                    }
+                }
+            }
            return viewTag.Any(v => v.Date.Day.Equals(date)) ? Brushes.White : b;
        }

+        private bool IsAbsence(DateTime dt, List<AbsenceTimeDC> absenceTimes)
+        {
+            if (absenceTimes == null)
+            {
+                return false;
+            }
+            foreach (var at in absenceTimes)
+            {
+                if ((!at.Start.HasValue || at.Start.Value <= dt) && (!at.End.HasValue || at.End.Value >= dt))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        
        public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); }

        public override object ProvideValue(IServiceProvider serviceProvider) { return this; }
--- a/BeWo/Converter/EnumTranslationConverter.cs
+++ b/BeWo/Converter/EnumTranslationConverter.cs
@@ -0,0 +1,41 @@
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class EnumTranslationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is Enum e)
+            {
+                if(EnumTranslations.Wohnhilfe2Translation.TryGetValue(e, out string v))
+                {
+                    return v;
+                }
+                // RE:
+                // EnumTranslationConverter, aber betrachtet nicht alle?
+                // Brauche hier eig nur EnumTranslations.Gkv2Translation
+                if (EnumTranslations.AllTranslations.TryGetValue(e, out string vv))
+                {
+                    return vv;
+                }
+
+                return e;
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/GkvState2StringConverter.cs
+++ b/BeWo/Converter/GkvState2StringConverter.cs
@@ -0,0 +1,41 @@
+using BS.Shared;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class GkvState2StringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+			var state = value as GkvState?;
+
+			if (state is null)
+				return null;
+
+			switch (state.Value)	
+			{
+				case GkvState.NoSend: return "Erstellt";
+				case GkvState.ErrorSoft: return "Fehler";
+				case GkvState.ErrorFatal: return "Fataler Fehler";
+				case GkvState.Paid: return "Bezahlt";
+				case GkvState.WaitingForDakota: return "Warte auf Übertragung";
+				case GkvState.WaitingForKrankenkasse: return "Warte auf Gkv";
+				case GkvState.WaitingForKrankenkasseTooLong: return "Keine Antwort von Gkv";
+				case GkvState.WaitingForUrbelege: return "Urbelege per Post senden";
+			}
+
+			return state.ToString();
+		}
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/NewlineConverter.cs
+++ b/BeWo/Converter/NewlineConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class NewlineConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value?.ToString()?
+				.Replace("\\r\\n", "\r\n")
+				.Replace("\\n", "\r\n")
+				.Replace("\\r", "\r\n");
+		}
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/Object2ToStringConverter.cs
+++ b/BeWo/Converter/Object2ToStringConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class Object2ToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is object)
+                return value.ToString();
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BeWo/Converter/RadioBoolToIntConverter.cs
+++ b/BeWo/Converter/RadioBoolToIntConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class RadioBoolToIntConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.Equals(int.Parse(parameter.ToString()));
+        }
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.Equals(true) == true ? int.Parse(parameter.ToString()) : Binding.DoNothing;
+        }
+	}
+}
--- a/BeWo/Converter/TestDebugConverter.cs
+++ b/BeWo/Converter/TestDebugConverter.cs
@@ -0,0 +1,23 @@
+using BeWo.ViewModel;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class TestDebugConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is null)
+                return null;
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}
--- a/BeWo/Converter/TooltipTextConverter.cs
+++ b/BeWo/Converter/TooltipTextConverter.cs
@@ -0,0 +1,67 @@
+using BeWo.ViewModel;
+using BeWo.ViewModel.Light;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class TooltipTextConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is bool val_bool)
+			{
+				return val_bool ? null : parameter;
+			}
+
+			if (value is GkvAbrechnungLightVM gkv)
+			{
+				if (parameter is string s)
+				{
+					if (s == "Send")
+					{
+						return gkv.SendTooltip;
+					}
+				}
+			}
+
+			if (value is GkvAbrechnungVM gkv2)
+			{
+				if (parameter is string s)
+				{
+					if (s == "Send")
+					{
+						return gkv2.SendTooltip;
+					}
+				}
+			}
+
+			if (value is InvoiceBaseLightVM invoice)
+			{
+				return invoice.IsGkvValidError;
+			}
+
+			if (value is InvoiceBaseVM invoice2)
+			{
+				return invoice2.IsGkvValidError;
+			}
+
+			if (value is MandatorVM mandator)
+			{
+				return mandator.CanEditIKLeistungserbringerTooltip;
+			}
+
+			return "xxx";
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/UserPermission2BoolConverter.cs
+++ b/BeWo/Converter/UserPermission2BoolConverter.cs
@@ -0,0 +1,55 @@
+using BS.Shared;
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class UserPermission2BoolConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			try
+			{
+				if (value is UserRightType type)
+				{
+					return BeWoApp.HasLoggedOnUserRight(type);
+				}
+
+				if (parameter is UserRightType type2)
+				{
+					return BeWoApp.HasLoggedOnUserRight(type2);
+				}
+
+				if (parameter is string setting && !string.IsNullOrWhiteSpace(setting))
+				{
+					if (setting == SettingsKeys.AllowGkvAbrechnung)
+						return BeWoApp.AppSettings.AllowGkvAbrechnung;
+
+					if (setting == SettingsKeys.ShowGkvBzEinzel)
+						return BeWoApp.Mandator.ShowGkvBzEinzel;
+
+					if (setting == SettingsKeys.ShowGkvBzUrbelege)
+						return BeWoApp.Mandator.ShowGkvBzUrbelege;
+				}
+			}
+			catch (Exception)
+			{
+				if (BeWoApp.IsInDesignMode)
+					return true;
+			}
+
+			return false;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/ValidationConverter.cs
+++ b/BeWo/Converter/ValidationConverter.cs
@@ -0,0 +1,32 @@
+using BeWo.ViewModel;
+using BS.Shared;
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BeWo.Converter
+{
+	public class ValidationConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if(value is string val_str && parameter is ValidationType val_type)
+			{
+				return GkvValidator.IsValid(val_type, val_str);
+			}
+
+			return null;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/ValidationToBrushConverter.cs
+++ b/BeWo/Converter/ValidationToBrushConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BeWo.Converter
+{
+	public class ValidationToBrushConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if(value is null)
+			{
+				return Brushes.Black;
+			}
+
+			if(value is bool val_bool)
+			{
+				return val_bool ? Brushes.Black : Brushes.Red;
+			}
+
+			return Brushes.Blue;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/ValidationToTooltipConverter.cs
+++ b/BeWo/Converter/ValidationToTooltipConverter.cs
@@ -0,0 +1,36 @@
+using BS.Shared;
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BeWo.Converter
+{
+	public class ValidationToTooltipConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is null)
+			{
+				return null;
+			}
+
+			if (value is bool val_bool && parameter is ValidationType val_type)
+			{
+				return val_bool ? null : GkvValidator.InvalidTooltipTxt(val_type);
+			}
+
+			return "xxx";
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
--- a/BeWo/Converter/ValueConverterGroup.cs
+++ b/BeWo/Converter/ValueConverterGroup.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class ValueConverterGroup : List<IValueConverter>, IValueConverter
+    {
+        #region IValueConverter Members
+
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return this.Aggregate(value, (current, converter) => converter.Convert(current, targetType, parameter, culture));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+}
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -45,9 +45,12 @@ using Image = System.Windows.Controls.Image;
 using MessageBox = System.Windows.MessageBox;
 using Panel = System.Windows.Controls.Panel;
 using System.Windows.Media;
+using System.Windows.Threading;
+using BeWo.Core.Service;
 using BeWo.ownChat;
 using BeWo.PasswortSecurity;
 using BeWo.Scheduler.Utils;
+using BeWo.ViewModel.ListViewModel;
 using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.DocumentViewer;
 using DevExpress.Xpf.Printing.PreviewControl.Bars;
@@ -55,6 +58,13 @@ using DevExpress.XtraScheduler;
 using RestSharp;
 using Control = System.Windows.Controls.Control;
 using Utils = BS.Shared.Core.Utils;
+using Brush = System.Windows.Media.Brush;
+using BeWo.View.Detail.Zeiterfassung;
+using DevExpress.Xpf.Scheduling;
+using CommandBarStyle = DevExpress.Xpf.DocumentViewer.CommandBarStyle;
+using ImageSource = System.Windows.Media.ImageSource;
+using BS.Shared.Translation;
+using BeWo.View.Windows;

 namespace BeWo.Core
 {
@@ -102,12 +112,22 @@ namespace BeWo.Core

 		public static void NavigateToReportUri(string navigateUriString, string title)
 		{
-			NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null);
+            NavigateToReportUri(navigateUriString, title, null);
 		}

-		public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp)
+        public static void NavigateToReportUri(string navigateUriString, string title, Action callback)
        {
-            var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
+            NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null, callback);
+        }
+
+        public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp, Action callback)
+        {
+            List<ReportTemplateDC> reportTemplates = null;
+            if (!navigateUriString.Contains("&template="))
+            {
+                reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
+            }
+            

            if (reportTemplates?.Count > 1)
            {
@@ -120,7 +140,7 @@ namespace BeWo.Core
                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
                    GroupBoxContent = control,
                    Owner = BeWoApp.CurrentBeWo.MainWindow,
-                    rootGroupBox = { Header = "Layout speichern" }
+                    rootGroupBox = { Header = "Bericht auswählen" }
                };

                control.CancelButtonClicked += () => beWoWindow.Close();
@@ -148,6 +168,10 @@ namespace BeWo.Core

                    StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainControl.Dispatch(delegate
                    {
+                        if (callback != null)
+                        {
+                            callback();
+                        }
                        ShowReportWindow(ms, title, dp);
                    }));
                };
@@ -160,6 +184,10 @@ namespace BeWo.Core

                StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
                {
+                    if (callback != null)
+                    {
+                        callback();
+                    }
                    ShowReportWindow(ms, title, dp);
                }));
            }
@@ -231,7 +259,7 @@ namespace BeWo.Core
 						}
 						catch (Exception e)
 						{
-							BeWoApp.ShowError(null, e, true);
+							BeWoApp.ShowErrorMessage(e);
 							BeWoApp.MainControl.EndWaiting();
 						}
 					},
@@ -258,7 +286,7 @@ namespace BeWo.Core
            return navigateUri.Split('?')[0] + "?" + uriValues;
        }

-        private static string RefreshNavigateUriString(string navigateUri)
+        public static string RefreshNavigateUriString(string navigateUri)
        {
            if (navigateUri.Contains("tenant"))
                navigateUri = RemoveAuthenticationInfoFromUri(navigateUri);
@@ -1305,7 +1333,7 @@ namespace BeWo.Core
                }

                var serv2 = serv as ServicesReportView;
-                if(serv != null)
+                if(serv2 != null)
                {
                    if(serv2.Customer != null)
                    {
@@ -1626,14 +1654,17 @@ namespace BeWo.Core
        //    }
        //}

-        public static void OpenMailClient(string mailAddress, string subject = "")
+        public static void OpenMailClient(string mailAddress, string subject = "", string body = "")
        {
-            var mailCmd = string.Format(@"mailto:{0}?subject={1}", mailAddress, subject);
+            //mailAddress = "cb@ownsoft.de";
+            //subject = "Betreff";
+            
+            var mailCmd = string.Format(@"mailto:{0}?subject={1}&body={2}", mailAddress, subject, body);

            System.Diagnostics.Process.Start(mailCmd);
        }
 		
-		public static bool ValidateServiceRecordVM(ServiceRecordVM vm, SupportConceptStatisticsDC statistics, FlatSupportConceptTreeNodeDC node, bool withoutClient, CompactEmployeeDC selectedEmployee, List<long> employeeOids, List<long> cb2ScOids)
+		public static bool ValidateServiceRecordVM(ServiceRecordVM vm, SupportConceptStatisticsDC statistics, FlatSupportConceptTreeNodeDC node, bool withoutClient, CompactEmployeeDC selectedEmployee, List<long> employeeOids, List<long> cb2ScOids, int groupIndex)
        {
            var lValid = true;

@@ -1642,12 +1673,35 @@ namespace BeWo.Core
 				MessageBox.Show("Bitte wählen Sie eine Leistung aus. Sollten keine Leistungen für die gewählte Kategorie verfügbar sein, müssen diese zunächst in der Verwaltung angelegt werden.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 				return false;
 			}
-			if(vm.GoalTree != null && vm.GoalTree.Count > 0 && (cb2ScOids == null || cb2ScOids.Count < 2))
+			if(vm.GoalTree != null && vm.GoalTree.Count > 0 && groupIndex == 1/* && (cb2ScOids == null || cb2ScOids.Count < 2)*/)
 			{
-				if(vm.SelectedGoals.Count == 0 && MessageBox.Show("Es wurde kein Ziel zugeordnet. Sind Sie sicher, dass Sie speichern möchten?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+                //Nur für abrechenbare Leistungen
+				if (vm.SelectedGoals.Count == 0)
 				{
-				    return false;
+                    if (BeWoApp.AppSettings.IsServiceRecordGoalMandatory && vm.ServiceDescription.ProzentAbrechnung.HasValue && vm.ServiceDescription.ProzentAbrechnung >= 100 && vm.ServiceDescription.Category.IsBillable)
+                    {
+                        MessageBox.Show(Translator.Translate("Sie müssen mindestens ein Ziel auswählen, bevor Sie speichern können."), "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                        return false;
+                    }
+                    else if (MessageBox.Show("Es wurde kein Ziel zugeordnet. Sind Sie sicher, dass Sie speichern möchten?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+                    {
+                        return false;
+                    }
 				}
+                else
+                {
+                    if (BeWoApp.AppSettings.IsServiceRecordRatingMandatory)
+                    {
+                        foreach (var goal in vm.SelectedGoals)
+                        {
+                            if (!goal.RatingTypeOid.HasValue)
+                            {
+                                MessageBox.Show(String.Format("Das Ziel '{0}' wurde nicht bewertet.\nSpeichern nicht möglich.", goal.DisplayName), "Speichern", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                                return false;
+                            }   
+                        }   
+                    }
+                }
 			}

 			CompactSupportConceptDC scDc = null;
@@ -1660,93 +1714,51 @@ namespace BeWo.Core
 				cbDc = node.SupportConceptTreeNodeDC.CostBearer;
 				relDc = node.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
 			}
-			

            var dc = vm.CommitToDataContract();
            dc.Employee = selectedEmployee ?? BeWoApp.LoggedOnUser.Employee;
            dc.SupportConcept = scDc;
 			dc.CostBearer = cbDc;
-
-            if(vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitMonatJahr && vm.Date.HasValue && vm.DateAndTime.HasValue && vm.StartDate.HasValue) {
-
-                dc.Start = new DateTime(vm.Date.Value.Year,
-                                        vm.Date.Value.Month,
-                                        vm.Date.Value.Day,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Hour : vm.StartDate.Value.Hour,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Minute : vm.StartDate.Value.Minute,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Second : vm.StartDate.Value.Second);
-                
-
-
-                if(vm.DurationInStunden == ZeiterfassungsDauer.Minuten)
-                {
-                    if (vm.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
-                    {
-                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.DurationSTD));
-                    }
-                    else
-                    {
-                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.Duration));
-                    }
-                }
-                else
-                {
-                    if (vm.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
-                    {
-                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.DurationSTD));
-                    }
-                    else 
-                    {
-                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.Duration));
-                    }
-                }
-
+            
+            if (relDc != null)
+            {
+                dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
            }
            else
            {
-                var dates = DateTime.Parse("1." + vm.OnlyMonth + vm.OnlyYear);
-
-                var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 0);
-         
-                dc.Start = StartDatetime;
-                dc.End = StartDatetime.AddHours((double)vm.DurationMonthYearGes);
+                dc.CostBearer2SupportConceptOid = null;
            }
-
-            
-            if (relDc != null)
-				dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
-
-            var r = new List<ServiceRecordValidationResultDC>();
+            var validationResults = new List<ServiceRecordValidationResultDC>();

            var maxdays = BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed;

            if (withoutClient && BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed <= 0)
+            {
                maxdays = -1;
+            }

            if (BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth))
+            {
                maxdays = -1;
+            }

-	        var test = dc.Start;
-	        var test2 = vm.DateAndTime;
+			ServiceFacade.DoOperationsServiceSync(o => validationResults = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));

-			ServiceFacade.DoOperationsServiceSync(o => r = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));
-
-
-            if (r.Count > 0)
+            if (validationResults.Count > 0)
            {
                var exitLoop = false;
                
-                foreach (var result in r)
+                foreach (var result in validationResults)
                {
                    switch (result.ResultType)
                    {
                        case ServiceRecordValidationResult.OutsideOfSupportConcept:
-                            MessageBox.Show("Das gewählte Datum '" + vm.DateAndTime.Value.ToShortDateString() + "' liegt außerhalb des Zeitraums des gewählten Hilfeplans (" + relDc.DateRangeString + ").\nDas Speichern ist nicht möglich.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+                            MessageBox.Show($"Das gewählte Datum '{vm.StartDate.ToShortDateString()}' liegt außerhalb des Zeitraums des gewählten Hilfeplans ({relDc.DateRangeString}).\nDas Speichern ist nicht möglich.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                            lValid = false;
                            exitLoop = true;
                            break;
                        case ServiceRecordValidationResult.OutOfEditLimit:
-                            MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da bereits der " + BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed + ". des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+                            MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da bereits der {BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed}. des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                            lValid = false;
                            exitLoop = true;
                            break;
@@ -1755,11 +1767,11 @@ namespace BeWo.Core
 							{
 								if (BeWoApp.AppSettings.AnzTageZeiterfassErfolgt == 1)
 								{
-									MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+									MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 								}
 								else
 								{
-									MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von " + BeWoApp.AppSettings.AnzTageZeiterfassErfolgt + " Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+									MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da die Zeiterfassung innerhalb von {BeWoApp.AppSettings.AnzTageZeiterfassErfolgt} Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 								}

 								lValid = false;
@@ -1775,10 +1787,10 @@ namespace BeWo.Core
                        case ServiceRecordValidationResult.ServiceRecordOverlapping:
 							if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS))
                            {
-                                MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+                                MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                lValid = false;
                            }
-							else if (MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                            {
                                lValid = false;
                                exitLoop = true;
@@ -1788,49 +1800,47 @@ namespace BeWo.Core
 		                   
                            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee))
                            {
-								MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+								MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag von {result.EmployeeName}\n({result.Message}).\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                lValid = false;
                            }
-							else if (MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\n\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag von {result.EmployeeName}\n({result.Message}).\n\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                            {
                                lValid = false;
                                exitLoop = true;
                            }
                            break;
                        case ServiceRecordValidationResult.ApprovedFLSOverspending:
-                            String klient = "diesen Hilfeplan";
-                            if (!String.IsNullOrEmpty(result.CustomerName))
+                            var klient = "diesen Hilfeplan";
+                            if (!string.IsNullOrEmpty(result.CustomerName))
                            {
-                                klient = "Klient/in " + result.CustomerName;
+                                klient = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                            }
-                            String msg =
-                                String.Format(
-                                    "Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).",
-                                    result.ApprovedHours, result.HoursNew, klient);
+
+                            var msg = string.Format("Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag ({1:N}) überschritten.", result.ApprovedHours, result.HoursNew, klient);

                            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved))
                            {
-								MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+								MessageBox.Show(msg + "\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                lValid = false;
                            }
-							else if (MessageBox.Show(msg + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show(msg + "\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                            {
                                lValid = false;
                                exitLoop = true;
                            }
                            break;
                        case ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting:
-                            String klient2 = "diesen Hilfeplan";
-                            if (!String.IsNullOrEmpty(result.CustomerName))
+                            var klient2 = "diesen Hilfeplan";
+                            if (!string.IsNullOrEmpty(result.CustomerName))
                            {
-                                klient2 = "Klient/in " + result.CustomerName;
+                                klient2 = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                            }
                            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
                            {
-                                MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+                                MessageBox.Show($"Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {klient2} erstellt wurde.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
                                lValid = false;
                            }
-							else if (MessageBox.Show(String.Format("Es existiert bereits eine Spitzabrechnung für {0}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", klient2), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+							else if (MessageBox.Show($"Es existiert bereits eine Spitzabrechnung für {klient2}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
                            {
                                lValid = false;
                                exitLoop = true;
@@ -1851,14 +1861,23 @@ namespace BeWo.Core
                                lValid = false;
                                exitLoop = true;
                            }
-							
 							break;
+                        case ServiceRecordValidationResult.SignatureExists:
+                            if(MessageBox.Show(result.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+                            {
+                                lValid = false;
+                                exitLoop = true;
+                            }
+                            break;
                    }

-                    if (exitLoop) break;
+                    if (exitLoop)
+                    {
+                        break;
+                    }
                }
            }
-            
+
            return lValid;
        }

@@ -1911,7 +1930,7 @@ namespace BeWo.Core
            else
            {
                var msg = vm.GroupOid != null
-                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne Klienten aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie dem gesamten Gruppeneintrag löschen möchten?"
+                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.Shared.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
                    : "Sind Sie sicher, dass Sie den gewählten Eintrag löschen möchten?";

                if (MessageBox.Show(msg, "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) !=
@@ -1940,8 +1959,18 @@ namespace BeWo.Core
 					var employeeOid        = Convert.ToInt64(variablen["employeeOid"]);
 					var serienTermine      = (List<SchedulerAppointmentDC>)variablen["serienTermine"];
 					var mehrtaegigeTermine = (List<SchedulerAppointmentDC>)variablen["mehrtaegigeTermine"];
+                    var nullableAbsenceTimeOids = (List<long?>) variablen["absenceTimeOids"] ?? new List<long?>();

-					ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReport(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, title)));
+                    var absenceTimeOids = new List<long>();
+                    foreach(var absenceTimeOid in nullableAbsenceTimeOids)
+                    {
+                        if(absenceTimeOid.HasValue)
+                        {
+                            absenceTimeOids.AddIfNotIn(absenceTimeOid.Value);
+                        }
+                    }
+
+					ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReportWithAbsenceTimes(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine, absenceTimeOids), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, title)));

 					break;
 				case ReportEnum.KassenbuchReportEnum:
@@ -1968,7 +1997,7 @@ namespace BeWo.Core

 	    public static void ShowReportWindow(MemoryStream ms, string title, DocumentPreviewControl documentPreviewControl = null)
 	    {
-			 var report = new XtraReport();
+	        var report = new XtraReport();

 			try
 			{
@@ -2070,25 +2099,26 @@ namespace BeWo.Core
            }
        }

-        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice, Appointment appointment, Action schedulerCallback)
+        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, string notice, Appointment appointment, Action<List<ServiceRecordDC>> schedulerCallback)
        {
            ChatDokumentationsView newView;

-            if (customer.Count == 0)
+            if(customer.Count == 0)
            {
                // Normale Buchung
-                newView = new ChatDokumentationsView(notice, null, start, end, schedulerCallback, appointment);
+                newView = new ChatDokumentationsView(notice, null, start, end, null, schedulerCallback, appointment);
            }
-            else if (customer.Count == 1 && employees.Count == 0)
+            else if(customer.Count == 1 && employees.Count < 2)
            {
                var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));

                // Normale Buchung
-                newView = new ChatDokumentationsView(notice, compactKlient, start, end, schedulerCallback, appointment);
+                
+                newView = new ChatDokumentationsView(notice, compactKlient, start, end, employees.Count == 1 ? employees[0] : null, schedulerCallback, appointment);
            }
            else
            {
-                if (employees.Count == 0)
+                if(employees.Count == 0)
                {
                    employees.Add(BeWoApp.CompactLoggedOnEmployee);
                }
@@ -2100,6 +2130,37 @@ namespace BeWo.Core
            newView.ShowDialog();
        }

+        // Zeiterfassungseintrag aus dem neuen Kalendermodul erstellen
+        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice, AppointmentItem appointment, Action schedulerCallback)
+        {
+            ChatDokumentationsView newView;
+
+            if(customer.Count == 0)
+            {
+                // Normale Buchung
+                newView = new ChatDokumentationsView(notice, null, null, start, end, schedulerCallback, appointment);
+            }
+            else if(customer.Count == 1 && employees.Count < 2)
+            {
+                var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));
+
+                // Normale Buchung
+                newView = new ChatDokumentationsView(notice, compactKlient, employees.Count == 1 ? employees[0] : null, start, end, schedulerCallback, appointment);
+            }
+            else
+            {
+                if(employees.Count == 0)
+                {
+                    employees.Add(BeWoApp.CompactLoggedOnEmployee);
+                }
+
+                // Gruppenbuchungen
+                newView = new ChatDokumentationsView(appointment, notice, start, end, customer, employees, schedulerCallback);
+            }
+
+            newView.ShowDialog();
+        }
+
        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice)
        {
            ChatDokumentationsView newView;
@@ -2107,14 +2168,14 @@ namespace BeWo.Core
            if(customer.Count == 0)
            {
                // Normale Buchung
-                newView = new ChatDokumentationsView(notice, null, start, end);
+                newView = new ChatDokumentationsView(notice, null, start, end, null);
            }
-            else if(customer.Count == 1 && employees.Count == 0)
+            else if(customer.Count == 1 && employees.Count < 2)
            {
                var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));

                // Normale Buchung
-                newView = new ChatDokumentationsView(notice, compactKlient, start, end);
+                newView = new ChatDokumentationsView(notice, compactKlient, start, end, employees.Count == 1 ? employees[0] : null);
            }
            else
            {
@@ -2131,7 +2192,7 @@ namespace BeWo.Core
        }

        public static void OwnChatSynchronisationVeranlassen()
-        {       
+        {
            if (!BeWoApp.Mandator.Apikey.IsNullOrEmpty())
            {
                try
@@ -2139,12 +2200,15 @@ namespace BeWo.Core
                    var tenant = BeWoApp.Tenant;

                    #if DEBUG
-                    tenant = "5473568546";
-                    #endif
+                    tenant = "2509786400";
+#endif

+                    
                    BeWoApp.GetChatServerUrlAsync(serverUrl =>
                    {
-                        var client = new RestClient($"{serverUrl}/api/ownchat/sync/schedule/{BeWoApp.Mandator.Apikey}/{tenant}");
+                        var url = $"{serverUrl}/api/ownchat/sync/schedule/{BeWoApp.Mandator.Apikey}/{tenant}";
+
+                        var client = new RestClient(url);
                        var request = new RestRequest();

                        client.ExecuteAsync(request, null);
@@ -2167,11 +2231,11 @@ namespace BeWo.Core
                        
 //                        response.Close();
 //                        response.Dispose();
-                    //}
+
                }
                catch (Exception exception)
                {
-                   // MessageBox.Show("Die Verbindung konnte nicht aufgebaut werden.", "ownChat Fehler ", MessageBoxButton.OK);
+                    // MessageBox.Show("Die Verbindung konnte nicht aufgebaut werden.", "ownChat Fehler ", MessageBoxButton.OK);

                }
            }
@@ -2187,11 +2251,169 @@ namespace BeWo.Core
            return BeWoApp.LoggedOnUser.HasRight(pUserRightType);
        }
        
-        public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType)
+        public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType, List<long> teamMemberCustomerOids, bool ignoreViewEditCreateAllRights)
        {
            var storage = pAppointment.GetCustomFieldStorage();

-            return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser);
+            return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser, teamMemberCustomerOids, ignoreViewEditCreateAllRights);
+        }
+
+        public static void EditServiceRecord(ServiceRecordDC dc, DispatcherObject p)
+        {
+            
+            var record = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordById(dc.ServiceRecordOid.Value));
+
+
+            //var allgoalsCopy = GoalService.CopyGoals(selectedRecord.AllGoals, false);
+
+            //var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+                //selectedRecord.AllGoalCategories, allgoalsCopy);
+
+            VMFactory.CreateServiceRecordVMAsync(
+                BeWoApp.LoggedOnUser.Employee.EmployeeOid,
+                vmList =>  p.Dispatch(
+                    delegate
+                    {
+                        vmList.DispatcherObject = p;
+
+                        if (record.Customer != null && record.SupportConcept != null)
+                        {
+                            vmList.InitPrototypeVM(record.Customer.CustomerOid, record.SupportConcept.SupportConceptOid, record.CostBearer2SupportConceptOid);
+                        }
+                        //var allgoalsCopy = GoalService.CopyGoals(selectedRecord.AllGoals, false);
+
+                        //var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+                        //    selectedRecord.AllGoalCategories, allgoalsCopy);
+                        
+                        var vm = new ServiceRecordVM(record, vmList.PrototypeVM.Category2Services, vmList.PrototypeVM.AllGoalCategories, vmList.PrototypeVM.AllGoals);
+
+                        EditServiceRecord(vmList, vm);
+                    }));
+        }
+        public static void EditServiceRecord(ServiceRecordListVM listvm, ServiceRecordVM vm)
+        {
+            if (vm == null)
+            {
+                return;
+            }
+
+            BeWoView serviceRecordEditView;
+
+            if (vm.GroupOid != null)
+            {
+                serviceRecordEditView = new ServiceRecordGroupEditView();
+            }
+            else
+            {
+                serviceRecordEditView = new ServiceRecordEditView();
+            }
+            double height = BeWoApp.MainControl.ActualHeight * 0.8;
+            double width = 710;
+
+            if (BeWoApp.AppSettings.ShowRtfTextfield)
+            {
+                height = BeWoApp.MainControl.ActualHeight - 120;
+                width = 1000;
+            }
+            if (BeWoApp.MainControl.ActualWidth < width)
+            {
+                width = BeWoApp.MainControl.ActualWidth;
+            }
+            if (height < 600)
+            {
+                height = 600;
+            }
+
+            var beWoWindow = new BeWoWindow
+            {
+                Height = height,
+                Width = width,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                GroupBoxContent = serviceRecordEditView,
+                Owner = BeWoApp.CurrentBeWo.MainWindow
+            };
+
+            beWoWindow.rootGroupBox.Style = null;
+            beWoWindow.rootGroupBox.Visibility = Visibility.Visible;
+            beWoWindow.rootGroupBox.Margin = new Thickness(-10);
+            beWoWindow.rootGroupBox.Padding = new Thickness(0);
+
+            if (serviceRecordEditView.CommandBindings.Count == 0)
+            {
+                serviceRecordEditView.CommandBindings.Add(
+                    new CommandBinding(
+                        ApplicationCommands.Close,
+                        (s, e) =>
+                        {
+                            var result = ServiceRecordDialogResult.ClosedWithoutSaving;
+
+                            if (vm.EditAllowed)
+                            {
+                                if (serviceRecordEditView is ServiceRecordEditView view)
+                                {
+                                    result = view.CloseAndDoSaveCheck();
+                                }
+                                else
+                                {
+                                    result = ((ServiceRecordGroupEditView)serviceRecordEditView).CloseAndDoSaveCheck();
+                                }
+                            }
+
+                            beWoWindow.Close();
+                        }));
+                serviceRecordEditView.CommandBindings.Add(
+                    new CommandBinding(
+                        ApplicationCommands.Save,
+                        (s, e) =>
+                        {
+                            if (vm.EditAllowed)
+                            {
+                                bool save;
+                                if (serviceRecordEditView is ServiceRecordEditView)
+                                {
+                                    save = ((ServiceRecordEditView)serviceRecordEditView).IsValid() &&
+                                           ((ServiceRecordEditView)serviceRecordEditView).IsCustomerChangeAllowed();
+                                }
+                                else
+                                {
+                                    save = ((ServiceRecordGroupEditView)serviceRecordEditView).IsValid() &&
+                                           ((ServiceRecordGroupEditView)serviceRecordEditView)
+                                           .IsCustomerChangeAllowed();
+                                }
+
+                                if (!save)
+                                {
+                                    return;
+                                }
+
+                                serviceRecordEditView.SaveData();
+                            }
+                            beWoWindow.Close();
+                        }));
+            }
+
+            if (serviceRecordEditView is ServiceRecordEditView)
+            {
+                ((ServiceRecordEditView)serviceRecordEditView).InitView(listvm, vm, vm.SupportConcept == null);
+                
+            }
+            else
+            {
+                var group = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordGroup(vm.GroupOid.Value));
+
+                ((ServiceRecordGroupEditView)serviceRecordEditView).InitView(listvm, vm, group);
+
+                beWoWindow.Width += 190;
+            }
+
+            beWoWindow.ShowDialog();
+        }
+
+        public static bool CheckForExistingSignatures(ServiceRecordDC serviceRecord)
+        {
+            var validationResult = ServiceFacade.DoOperationsServiceSync(s => s.CheckForExistingSignature(serviceRecord));
+
+            return validationResult != null && MessageBox.Show(validationResult.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.Yes) || validationResult == null;
        }
    }
 }
--- a/BeWo/Core/BeWoWpfUtils.cs
+++ b/BeWo/Core/BeWoWpfUtils.cs
@@ -293,5 +293,25 @@ namespace BeWo.Core

            return null;
        }
+
+        public static void ScrollToTop(ListBox listBox)
+        {
+			if (VisualTreeHelper.GetChildrenCount(listBox) > 0)
+			{
+				Border border = (Border)VisualTreeHelper.GetChild(listBox, 0);
+				ScrollViewer scrollViewer = (ScrollViewer)VisualTreeHelper.GetChild(border, 0);
+				scrollViewer.ScrollToTop();
+			}
+		}
+        
+        public static void ScrollToBottom(ListBox listBox)
+        {
+			if (VisualTreeHelper.GetChildrenCount(listBox) > 0)
+			{
+				Border border = (Border)VisualTreeHelper.GetChild(listBox, 0);
+				ScrollViewer scrollViewer = (ScrollViewer)VisualTreeHelper.GetChild(border, 0);
+				scrollViewer.ScrollToBottom();
+			}
+		}
    }
 }
--- a/BeWo/Core/Commands/CommandFactory.cs
+++ b/BeWo/Core/Commands/CommandFactory.cs
@@ -0,0 +1,52 @@
+using BS.Shared;
+using DevExpress.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static DevExpress.Mvvm.Native.Either;
+
+namespace BeWo.Core.Commands
+{
+	public static class CommandFactory
+	{
+		public static DelegateCommand GetAiViewCommand(Action openView, UserRightType userRightType, Func<bool> additionalCheckup = null)
+		{
+			bool canExecute() =>
+				(BeWoApp.AppSettings?.ModuleAiEnabled ?? false) &&
+				BeWoApp.HasLoggedOnUserRight(userRightType) &&
+				(additionalCheckup is null || additionalCheckup());
+
+			return GetTestClientCommand(openView, () => CheckupSafe(canExecute), null);
+		}
+
+		public static DelegateCommand GetTestClientCommand(Action action, Func<bool> canExecute = null, bool? useCommandManager = null)
+		{
+			bool canExecute2() => 
+				CheckupTestVersion() &&
+				(canExecute is null || canExecute());
+
+			return new DelegateCommand(action, () => CheckupSafe(canExecute2), useCommandManager);
+		}
+
+		private static bool CheckupSafe(Func<bool> predicate)
+		{
+			try
+			{
+				return predicate();
+			}
+			catch (Exception ex)
+			{
+				return false;
+			}
+		}
+
+		private static bool CheckupTestVersion()
+		{
+			var version = BeWoApp.Version.Split(' ');
+			var test_string = version[version.Length - 1].ToLower();
+			return test_string == "test";
+		}
+	}
+}
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -1,12 +1,18 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using BeWo.View.Navigation.Filter;
 using BS.Shared;
+using DevExpress.Xpf.Accordion;
+using DevExpress.Xpf.Scheduling;
+using DevExpress.XtraScheduler;

 namespace BeWo.Core.Config
 {
    public class AppSettings
    {
        private bool mIsServiceRecordNoticeMandatory = true;
+        private bool mIsServiceRecordGoalMandatory = false;
+        private bool mIsServiceRecordRatingMandatory = false;

        private bool mIsPasswordSecurityActiv = false;

@@ -16,21 +22,31 @@ namespace BeWo.Core.Config

        private bool misZeiterfassDateNormal = true;

-        private bool misZeiterfassungInStdMin = true;
+        private String einheitZeiterfassung = "0";

        private CustomerFilterEnum _CustomerFilterInZeiterfassung = CustomerFilterEnum.All;
        private CustomerFilterEnum _CustomerFilterSupportConcepts = CustomerFilterEnum.All;
        private CustomerFilterEnum _CustomerFilterCustomers = CustomerFilterEnum.All;

        private bool _showExpiredSupportConcepts = true;
-        private bool _showServiceRecordGridControl;
-        
+        private bool _showServiceRecordGridControl = true;
+        private bool _filterGroupServiceCategories = false;
+        private bool mOpenReportInNewWindow = false;
+
        private WindowStateType mWindowStateType = WindowStateType.Default;

        private ServiceRecordTimeInterval mLastSelectedServiceRecordTimeInterval = ServiceRecordTimeInterval.All;

        private int mLastSelectedServiceRecordTimeIntervalDays = 7;

+        private int mServiceRecordAllowChangeHours = 24;
+
+        private DateTime mLastSelectedServiceRecordMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+
+        private int mLastKassenSortOrder = 1;
+
+        private int mLastBewilligungSortOrder = 0;
+        
        private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;

        public enum WindowStateType
@@ -38,7 +54,13 @@ namespace BeWo.Core.Config
            Default,
            Maximised
        }
-        
+
+        public AppSettings()
+        {
+            DienstplanungStandardZeilenAnzahl = 1;
+        }
+
+        public int MoKSessionTimeout { get; set; } = 20;

        public bool IsServiceRecordNoticeMandatory
        {
@@ -47,6 +69,19 @@ namespace BeWo.Core.Config
            set { mIsServiceRecordNoticeMandatory = value; }
        }

+        public bool IsServiceRecordGoalMandatory
+        {
+            get { return mIsServiceRecordGoalMandatory; }
+
+            set { mIsServiceRecordGoalMandatory = value; }
+        }
+
+        public bool IsServiceRecordRatingMandatory
+        {
+            get { return mIsServiceRecordRatingMandatory; }
+
+            set { mIsServiceRecordRatingMandatory = value; }
+        }
        public bool IsPasswordSecurityActiv
        {
            get { return mIsPasswordSecurityActiv; }
@@ -74,10 +109,10 @@ namespace BeWo.Core.Config
            set { misZeiterfassDateNormal = value; }
        }

-        public bool IsZeiterfassungInStdMin
+        public String EinheitZeiterfassung
        {
-            get { return misZeiterfassungInStdMin; }
-            set { misZeiterfassungInStdMin = value; }
+            get { return einheitZeiterfassung; }
+            set { einheitZeiterfassung = value; }
        }

        public ZeiterfassungsDauer LetzteZeiterfassungsDauer
@@ -100,6 +135,7 @@ namespace BeWo.Core.Config
        public int LastSelectedStundenkontoIntervall { get; set; }

        public int AnzTageZeiterfassErfolgt { get; set; }
+        public int AnzTageUnterschriftErfolgt { get; set; }

        public int ZeiterfassungsSchwellwert { get; set; }

@@ -181,7 +217,6 @@ namespace BeWo.Core.Config

        public bool ShowLargeCustomerNotice { get; set; }

-        
        public bool ZeigeNurMeineTermine
        {
            get { return mZeigeNurMeineTermine; }
@@ -309,12 +344,74 @@ namespace BeWo.Core.Config
            }
        }

+        public DateTime LastSelectedServiceRecordMonth
+        {
+            get { return mLastSelectedServiceRecordMonth; }
+
+            set
+            {
+                if (mLastSelectedServiceRecordMonth != value)
+                {
+                    mLastSelectedServiceRecordMonth = value;
+                    IsDirty = true;
+                }
+            }
+
+            
+        }
+
+        public int LastKassenSortOrder
+        {
+            get { return mLastKassenSortOrder; }
+
+            set
+            {
+                if (mLastKassenSortOrder != value)
+                {
+                    mLastKassenSortOrder = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        public int LastBewilligungSortOrder
+        {
+            get { return mLastBewilligungSortOrder; }
+
+            set
+            {
+                if (mLastBewilligungSortOrder != value)
+                {
+                    mLastBewilligungSortOrder = value;
+                    IsDirty = true;
+                }
+            }
+
+
+        }
+
+        public int ServiceRecordAllowChangeHours
+        {
+            get { return mServiceRecordAllowChangeHours; }
+
+            set
+            {
+                if (mServiceRecordAllowChangeHours != value)
+                {
+                    mServiceRecordAllowChangeHours = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
        public bool IsDirty { get; set; }

        public string TimeRecordingMenuName { get; set; }

 		public bool ShowDistanceFields { get; set; }

+        public bool ShowBetrag { get; set; }
+
        public bool ShowHilfeplanBezeichnung { get; set; }

        public bool ShowArbeitszeiten { get; set; }
@@ -341,7 +438,9 @@ namespace BeWo.Core.Config

 		public bool IsWohnheimAllowed { get; set; }

-        public bool IsChatAllowed { get; set; }
+        public bool ShowOwnChat { get; set; }
+
+        public bool ShowOwnChatSettings { get; set; }

        public bool IsMedicationAllowed { get; set; }

@@ -351,8 +450,156 @@ namespace BeWo.Core.Config

 		public bool PrinterSettingsUseMargins { get; set; }

+        public bool ShowMultipleResourceColors { get; set; }
+
        public bool ShowPivotGrid { get; set; }

        public string ExpandedAdministrationItems { get; set; }
+        public string SelectedAdministrationItem { get; set; }
+
+        public bool ShowUrlaubsplanung { get; set; }
+        public bool DontShowSpitzabrechnung { get; set; }
+        public bool ShowDienstplanung { get; set; }
+
+        public bool ShowWorktime { get; set; }
+
+        public DateTime? StartStundenkonto { get; set; }
+        public bool EnableArbeitszeiterfassung { get; set; }
+        public bool EnableAutomaticPauses { get; set; }
+        public bool EnableRestTimeWarning { get; set; }
+        public int MaxWorkTimeHoursBeforeWarning { get; set; }
+
+        public int AnzTageArbeitszeiterfassungErfolgt { get; set; }
+
+        public int DienstplanungStandardZeilenAnzahl { get; set; }
+
+        public bool ShowInfoButtonInCalender{ get; set; }
+
+        public bool AllowStorno { get; set; }
+
+        public bool AllowXRechnung { get; set; }
+
+        public bool UseDistanceApi { get; set; }
+
+        public bool ShowEmployeeSignature { get; set; }
+
+        public bool SetStartTimeToEndTimeAfterSave { get; set; }
+
+        public bool ShowHilfeplanStatistikReport { get; set; }
+
+        public bool ShowAI { get; set; }
+
+        public bool ShowAIInternal { get; set; }
+
+        public bool AllowGkvAbrechnung { get; set; }
+
+        public bool ModuleAiEnabled { get; set; }
+        public bool ModuleAiSettingsEnabled { get; set; }
+
+        public bool ShowWohnhilfe { get; set; }
+
+        public bool ShowVorlagen { get; set; }
+        public bool ShowMitarbeiterSchwerbehindertenInfos { get; set; }
+        public bool ShowImportAbschlagszahlungen { get; set; }
+
+        public bool ShowPersehImport { get; set; }
+
+        public bool HidePrintQBPopup { get; set; }
+
+
+        public bool DontUpdateApprovalPeriodDates { get; set; }
+
+        private SchedulerViewType _SchedulerViewType;
+        public SchedulerViewType SchedulerViewType
+        {
+            get => _SchedulerViewType;
+            set
+            {
+                if(_SchedulerViewType != value)
+                {
+                    _SchedulerViewType = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private ViewType _SchedulingViewType;
+        public ViewType SchedulingViewType
+        {
+            get => _SchedulingViewType;
+            set
+            {
+                if(_SchedulingViewType != value)
+                {
+                    _SchedulingViewType = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private int _SchedulerTimelineViewDayCount;
+        public int SchedulerTimelineViewDayCount
+        {
+            get => _SchedulerTimelineViewDayCount == 0 ? 10 : _SchedulerTimelineViewDayCount;
+            set
+            {
+                if(_SchedulerTimelineViewDayCount != value)
+                {
+                    _SchedulerTimelineViewDayCount = value > 0 ? value : 10;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private int _SchedulerDayViewDayCount;
+        public int SchedulerDayViewDayCount
+        {
+            get => _SchedulerDayViewDayCount == 0 ? 5 : _SchedulerDayViewDayCount;
+            set
+            {
+                if(_SchedulerDayViewDayCount != value)
+                {
+                    _SchedulerDayViewDayCount = value > 0 ? value : 5;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        public bool ShowKlientenBetreuungszeiten { get; set; }
+
+        public bool FilterGroupServiceCategories
+        {
+            get { return _filterGroupServiceCategories; }
+
+            set { _filterGroupServiceCategories = value; }
+        }
+
+        private bool _ShowServicesOverviewHalfOrWholeMonth;
+        public bool ShowServicesOverviewHalfOrWholeMonth
+        {
+            get => _ShowServicesOverviewHalfOrWholeMonth;
+            set
+            {
+                if(_ShowServicesOverviewHalfOrWholeMonth != value)
+                {
+                    _ShowServicesOverviewHalfOrWholeMonth = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        public bool OpenReportInNewWindow
+        {
+            get { return mOpenReportInNewWindow; }
+
+            set
+            {
+                if (mOpenReportInNewWindow != value)
+                {
+                    mOpenReportInNewWindow = value;
+        IsDirty = true;
+                }
+            }
+        }
    }
 }
--- a/BeWo/Core/DocumentWatcher.cs
+++ b/BeWo/Core/DocumentWatcher.cs
@@ -54,7 +54,7 @@ namespace BeWo.Core
            try
            {
                if (!WirdDateiUeberwacht(dwi.FileName))
-                {
+                 {
                    ueberwachteDateien.Add(dwi);
                }
                if (watcher == null)
@@ -62,11 +62,20 @@ namespace BeWo.Core
                    FileInfo fi = new FileInfo(dwi.FileName);
                    watcher = new FileSystemWatcher(fi.DirectoryName);

-                    watcher.NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite
-                                           | NotifyFilters.FileName | NotifyFilters.DirectoryName | NotifyFilters.Attributes;
-                 
+                    watcher.NotifyFilter = NotifyFilters.Size | NotifyFilters.LastWrite | NotifyFilters.CreationTime;
+                    //watcher.NotifyFilter = NotifyFilters.Attributes
+                    //             | NotifyFilters.CreationTime
+                    //             | NotifyFilters.DirectoryName
+                    //             | NotifyFilters.FileName
+                    //             | NotifyFilters.LastAccess
+                    //             | NotifyFilters.LastWrite
+                    //             | NotifyFilters.Security
+                    //             | NotifyFilters.Size;
+
+
                    watcher.Changed += new FileSystemEventHandler(OnChanged);
                    watcher.EnableRaisingEvents = true;
+                    watcher.IncludeSubdirectories = false;
                   
                }

@@ -193,7 +202,7 @@ namespace BeWo.Core
        {
            try
            {
-                string file = "Möchten Sie das alte Dokument löschen?";
+                string file = "Möchten Sie das vorhandene Dokument überschreiben? Wenn Sie auf 'Behalten' klicken, wird eine neuer Datensatz für das aktuelle Dokument angelegt.";
                int i = 3;

                var dialog = new UploadDialog(file, i);
@@ -220,10 +229,10 @@ namespace BeWo.Core
            {
                if (dwi.FileAttachmentOid.HasValue)
                {
-                    if (System.Windows.MessageBox.Show("ACHTUNG: Das Löschen von Dateien kann nicht rückgängig gemacht werden!\nWollen Sie das Dokument '" + dwi.FileName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
-                    {
-                        return;
-                    }
+                    //if (System.Windows.MessageBox.Show("ACHTUNG: Das Löschen von Dateien kann nicht rückgängig gemacht werden!\nWollen Sie das Dokument '" + dwi.FileName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+                    //{
+                    //    return;
+                    //}
                    ServiceFacade.DoOperationsServiceAsync(s => s.DeleteFileAttachment(dwi.FileAttachmentOid.Value, dwi.FileAttachmentVersion.Value));
                }
            }
@@ -238,8 +247,16 @@ namespace BeWo.Core
        {
            foreach (var file in ueberwachteDateien)
            {
+
                LoescheTempDatei(file.FileName);
            }
+            ueberwachteDateien.Clear();
+            if (watcher != null)
+            {
+                watcher.EnableRaisingEvents = false;
+                watcher.Dispose();
+                watcher = null;
+            }
        }


--- a/BeWo/Core/Service/Cache.cs
+++ b/BeWo/Core/Service/Cache.cs
@@ -38,7 +38,9 @@ namespace BeWo.Core.Service

        private List<CompactEmployeeDC> mTeamMembers;

-		private Dictionary<ValueListEntryDC, List<ResourceDC>> mCats2ResInDic;
+        private List<RatingTypeDC> mRatingTypes;
+
+        private Dictionary<ValueListEntryDC, List<ResourceDC>> mCats2ResInDic;

        private Cache()
        {
@@ -63,6 +65,7 @@ namespace BeWo.Core.Service
 			this.ClearCustomers();
            this.ClearWohnheims();
 			ClearResources();
+            ClearRatingTypes();
        }

        public void ClearAllValueListEntries()
@@ -115,7 +118,12 @@ namespace BeWo.Core.Service
 		    mCats2ResInDic = null;
 	    }

-		public void GetActiveSupportConceptCostbearer(Action<List<CompactSupportConceptDC>> callback)
+        public void ClearRatingTypes()
+        {
+            mRatingTypes = null;
+        }
+
+        public void GetActiveSupportConceptCostbearer(Action<List<CompactSupportConceptDC>> callback)
        {
            if (this.mActiveSupportConceptCostbearerList == null)
            {
@@ -247,6 +255,16 @@ namespace BeWo.Core.Service
 			}
 		}

+        public List<RatingTypeDC> GetAllRatingTypeList()
+        {
+            if(mRatingTypes == null)
+            {
+                ServiceFacade.DoOperationsServiceSync(cs => mRatingTypes = cs.GetAllRatingTypes());
+            }
+
+            return mRatingTypes;
+        }
+
        public void GetServiceCategoryDescriptionDict(Action<Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>> callback)
        {
            if (this.mServiceCategoryDescriptionDict == null)
@@ -329,11 +347,34 @@ namespace BeWo.Core.Service
            }
            if (ve == null)
            {
-                return new ValueListEntryDC {TypeDescription = "<Gelöscht>"};
+                return new ValueListEntryDC {TypeDescription = "<Gelöscht>", ValueListEntryOid = oid };
+                //return new ValueListEntryDC { TypeDescription = "<Gelöscht>" };
            }
            return ve;
        }

+        public void AddGoalEntry(ValueListEntryDC newdc)
+        {
+            if (newdc.ValueListEntryOid.HasValue)
+            {
+                var ve = GetGoalEntry(newdc.ValueListEntryOid.Value);
+                if (ve == null || !ve.ValueListEntryOid.HasValue)
+                {
+                    if (mValueListEntryDict != null)
+                    {
+                        if (!mValueListEntryDict.ContainsKey(newdc.Type))
+                        {
+                            mValueListEntryDict[newdc.Type] = new List<ValueListEntryDC>();
+                        }
+                        mValueListEntryDict[newdc.Type].Add(newdc);
+                        
+                    }
+                }
+            }
+            
+            
+        }
+
        public ValueListEntryDC GetValueListEntry(ValueListEntryType type, long oid)
        {
            if (mValueListEntryDict == null || !mValueListEntryDict.ContainsKey(type))
@@ -511,5 +552,109 @@ namespace BeWo.Core.Service

 		    return mAllCompactCustomers;
 	    }
+
+        public void GetSchedulerObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
+        {
+            GetAllActiveEmployeesCompact(allEmployees =>
+            {
+                GetAllActiveCustomersCompact(allCustomers =>
+                {
+                    GetCategories2ResourcesDictionary(resourceDictionary =>
+                    {
+                        if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen))
+                        {
+                            allEmployees = new List<CompactEmployeeDC> { BeWoApp.CompactLoggedOnEmployee };
+                        }
+
+                        var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View);
+                        var darfTermineAllerKlientenSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen);
+
+                        if(darfKlientenAnsichtSehen)
+                        {
+                            if(!darfTermineAllerKlientenSehen || !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
+                            {
+                                allCustomers = allCustomers.Where(w => w.IsRelatedToEmployee).ToList();
+                            }
+                        }
+                        else
+                        {
+                            allCustomers.Clear();
+                        }
+
+                        if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen))
+                        {
+                            resourceDictionary.Clear();
+                        }
+
+                        callback(allCustomers, allEmployees, resourceDictionary);
+                    });
+                });
+            });
+        }
+
+
+        // Für neuen SchedulingView hinzugefügt
+        private List<CompactCustomerDC> _FilteredCustomers;
+        public void GetAllActiveCustomersCompactForEmployee(long employeeOid, bool forceReload, Action<List<CompactCustomerDC>> callback)
+        {
+            if(_FilteredCustomers is null || forceReload)
+            {
+                ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactCustomersForEmployee(employeeOid), customers =>
+                {
+                    customers.Sort((x, y) => $"{x.LastName}, {x.FirstName}".CompareTo($"{y.LastName}, {y.FirstName}"));
+                    _FilteredCustomers = customers;
+                    callback(customers);
+                });
+            }
+            else
+            {
+                callback(_FilteredCustomers);
+            }
+        }
+
+        private List<long> _TeamRelatedCustomerOids;
+
+        public void GetTeamRelatedCustomerOidsForEmployee(long employeeOid, bool forceReload, Action<List<long>> callback)
+        {
+            if(_TeamRelatedCustomerOids is null || forceReload)
+            {
+                ServiceFacade.DoEmployeeServiceAsync(s => s.LoadTeamsRelatedCustomerOids(employeeOid), customerOids =>
+                {
+                    _TeamRelatedCustomerOids = customerOids;
+                    callback?.Invoke(_TeamRelatedCustomerOids);
+                });
+            }
+            else
+            {
+                callback?.Invoke(_TeamRelatedCustomerOids);
+            }
+        }
+
+        public void ClearFilteredCustomers()
+        {
+            _FilteredCustomers = null;
+        }
+
+        private List<CompactEmployeeDC> _FilteredEmployees;
+        public void GetAllActiveCompactEmployeesForEmployee(long employeeOid, bool forceReload, Action<List<CompactEmployeeDC>> callback)
+        {
+            if(_FilteredEmployees is null || forceReload)
+            {
+                ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactEmployeesForEmployee(employeeOid), employees =>
+                {
+                    employees.Sort((x, y) => $"{x.LastName}, {x.FirstName}".CompareTo($"{y.LastName}, {y.FirstName}"));
+                    _FilteredEmployees = employees;
+                    callback(employees);
+                });
+            }
+            else
+            {
+                callback(_FilteredEmployees);
+            }
+        }
+        public void ClearFilteredEmployees()
+        {
+            _FilteredEmployees = null;
+        }
    }
 }
--- a/BeWo/Core/Service/GoalService.cs
+++ b/BeWo/Core/Service/GoalService.cs
@@ -41,8 +41,8 @@ namespace BeWo.Core.Service
 		        }
 	        }

-			var sortedCategories = allCategories.OrderBy(s => s.TypeDescription).ToList();
-            var sortedGoals      = pAllGoals.OrderBy(s => s.TypeDescription).ToList();
+			var sortedCategories = allCategories.OrderBy(s => s.DisplayName).ToList();
+            var sortedGoals      = pAllGoals.OrderBy(s => s.DisplayName).ToList();

            var allCatList      = new List<SupportConceptGoalDC>();
 			var allGoalList = new List<SupportConceptGoalDC>();
@@ -197,15 +197,23 @@ namespace BeWo.Core.Service
 			var goalCategoryDict = new Dictionary<long, SupportConceptGoalDC>();
 			var goalList         = new List<SupportConceptGoalDC>();

-		    foreach (var goalCategory in sortedCategories)
-		    {
+			foreach (var goalCategory in sortedCategories)
+			{
 				var treeItem = new SupportConceptGoalDC
 				{
 					GoalEntryDC = goalCategory.DataContract,
 					IsExpanded = true
 				};

-                goalCategoryDict.Add(goalCategory.DataContract.ValueListEntryOid.Value, treeItem);
+				if (!goalCategoryDict.ContainsKey(goalCategory.DataContract.ValueListEntryOid.Value))
+				{
+					goalCategoryDict.Add(goalCategory.DataContract.ValueListEntryOid.Value, treeItem);
+				}
+                else
+                {
+					int test = 0;
+                }
+

 				goalList.Add(treeItem);
 		    }
@@ -284,6 +292,7 @@ namespace BeWo.Core.Service
        public static void RecursiveSynchronousSCValueListEntrySave(SupportConceptGoalTreeItem treeItem)
        {
            var neuerDC = ServiceFacade.DoValueListServiceSync(s => s.InsertNewValueListEntry(treeItem.GoalEntryVM.CommitToDataContract()));
+            Cache.GetInstance().AddGoalEntry(neuerDC);
            InsertedGoals.Add(neuerDC);
            treeItem.GoalEntryVM = new ValueListEntryVM(neuerDC);
            treeItem.GoalEntryDC = neuerDC;
@@ -302,7 +311,7 @@ namespace BeWo.Core.Service
        {
            ValueListEntryDC copyVe = new ValueListEntryDC();
            copyVe.Abbreviation = ve.Abbreviation;
-            copyVe.Rating = copyRating ? ve.Rating : null;
+            copyVe.RatingTypeOid = copyRating ? ve.RatingTypeOid : null;
            copyVe.Notice = ve.Notice;
            copyVe.IsSystemEntry = ve.IsSystemEntry;
            copyVe.ParentOid = ve.ParentOid;
@@ -310,7 +319,9 @@ namespace BeWo.Core.Service
            copyVe.TypeDescription = ve.TypeDescription;
            copyVe.ValueListEntryOid = ve.ValueListEntryOid;
            copyVe.ValueListEntryVersion = ve.ValueListEntryVersion;
-            if (ve.Parent != null)
+			copyVe.CatalogOid = ve.CatalogOid;
+			copyVe.CatalogItem = ve.CatalogItem;
+			if (ve.Parent != null)
            {
                copyVe.Parent = ve.Parent;
            }
--- a/BeWo/Core/Service/SupportConceptService.cs
+++ b/BeWo/Core/Service/SupportConceptService.cs
@@ -17,8 +17,16 @@ namespace BeWo.Core.Service

            if (allGoalsAndCategories != null)
            {
-                var ziele            = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalCategoryType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType)).OrderBy(s => s.DisplayName).ToList();
-                var massnahmen       = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType)).OrderBy(s => s.DisplayName).ToList();
+                foreach (var goal in allGoalsAndCategories)
+                {
+                    if (goal.CatalogOid.HasValue)
+                    {
+                        var catalogItem = Cache.GetInstance().GetValueListEntry(ValueListEntryType.MassnahmenKatalog, goal.CatalogOid.Value);
+                        goal.CatalogItem = catalogItem;
+                    }
+                }
+                var ziele            = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalCategoryType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType)).OrderBy(s => s.OrderedDisplayName).ToList();
+                var massnahmen       = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType)).OrderBy(s => s.OrderedDisplayName).ToList();
                var goalCategoryDict = new Dictionary<long, SupportConceptGoalDC>();
                

@@ -26,6 +34,7 @@ namespace BeWo.Core.Service
                {
                    var treeItem = new SupportConceptGoalDC
                    {
+                        CheckRecursive = false,
                        GoalEntryDC = goalCat, 
                        IsExpanded  = allGoalsAndCategories.Count <= 30
                    };
@@ -57,16 +66,21 @@ namespace BeWo.Core.Service
 	                }
                }

-				var zieleOhneKinder = goalCategoryDict.Values.Where(w => w.Children.Count == 0).ToList();
-				foreach (var ziel in zieleOhneKinder)
-				{
-					CheckIfSelected(ziel, selectedGoals);
-				}
+                //var zieleOhneKinder = goalCategoryDict.Values.Where(w => w.Children.Count == 0).ToList();
+                //foreach (var ziel in zieleOhneKinder)
+                //{
+                //	CheckIfSelected(ziel, selectedGoals);
+                //}
+                var alleZiele = goalCategoryDict.Values.ToList();
+                foreach (var ziel in alleZiele)
+                {
+                    CheckIfSelected(ziel, selectedGoals);
+                }

                foreach (var goal in massnahmen)
                {
-                    var kind = new SupportConceptGoalDC { GoalEntryDC = goal };
-
+                    var kind = new SupportConceptGoalDC { GoalEntryDC = goal, CheckRecursive = false };
+                    
 	                CheckIfSelected(kind, selectedGoals);

                    if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
@@ -91,29 +105,38 @@ namespace BeWo.Core.Service
 					if (existingGoal.Equals(goal.GoalEntryDC))
 					{
 						goal.IsChecked = true;
-                        goal.GoalEntryDC.Rating = existingGoal.Rating;
+                        goal.GoalEntryDC.RatingTypeOid = existingGoal.RatingTypeOid;
+					    if (existingGoal.RatingTypeOid.HasValue)
+					    {
+					        var rdc = Cache.GetInstance().GetAllRatingTypeList()
+					            .FirstOrDefault(r => r.RatingTypeOid == existingGoal.RatingTypeOid);
+					        if (rdc != null)
+					        {
+					            goal.RatingName = rdc.DisplayName;
+					        }
+					    }
 					}
 				}

-				goal.PropertyChanged += (s, e) =>
-				{
-					var selectedGoal = s as SupportConceptGoalDC;
-					if (selectedGoal != null)
-					{
-						if (selectedGoal.IsChecked)
-						{
-						    if (!selectedGoals.Contains(selectedGoal.GoalEntryDC))
-						    {
-						        selectedGoals.Add(selectedGoal.GoalEntryDC);
-						    }
+				//goal.PropertyChanged += (s, e) =>
+				//{
+				//	var selectedGoal = s as SupportConceptGoalDC;
+				//	if (selectedGoal != null)
+				//	{
+				//		if (selectedGoal.IsChecked)
+				//		{
+				//		    if (!selectedGoals.Contains(selectedGoal.GoalEntryDC))
+				//		    {
+				//		        selectedGoals.Add(selectedGoal.GoalEntryDC);
+				//		    }
                            
-						}
-						else
-						{
-							selectedGoals.Remove(selectedGoal.GoalEntryDC);
-						}
-					}
-				};
+				//		}
+				//		else
+				//		{
+				//			selectedGoals.Remove(selectedGoal.GoalEntryDC);
+				//		}
+				//	}
+				//};
 			}
 		}

@@ -321,6 +344,7 @@ namespace BeWo.Core.Service

        public static CompactSupportConceptDC HoleHilfeplanAusListe(List<CompactSupportConceptDC> scList, CompactCustomerDC customerCompact, DateTime firstTime, DateTime lastTime)
        {
+            CompactSupportConceptDC result = null; 
            foreach (var sc in scList)
            {
                if (sc.Customer.Oid == customerCompact.Oid)
@@ -330,10 +354,14 @@ namespace BeWo.Core.Service
                    {
                        return sc;
                    }
+                    if (result == null || sc.EndDate.HasValue && sc.EndDate > result.EndDate)
+                    {
+                        result = sc;
+                    }
                }
            }

-            return null;
+            return result;
        }
    }
 }
--- a/BeWo/Core/SupportConceptGoalTreeItem.cs
+++ b/BeWo/Core/SupportConceptGoalTreeItem.cs
@@ -1,29 +1,82 @@
-using System.ComponentModel;
-
+using BeWo.ViewModel;
 using BS.Shared;
-
-using BeWo.ViewModel;
 using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
+using System.ComponentModel;
+using System.Diagnostics;

 namespace BeWo.Core
 {
+#pragma warning disable CS0108 // Rethrow to preserve stack details
+	[DebuggerDisplay("{GoalEntryVM.Abbreviation}: {GoalEntryVM.Description}")]
    public class SupportConceptGoalTreeItem : SupportConceptGoalDC
    {
        private ValueListEntryVM _GoalEntryVM;
        private BindingList<SupportConceptGoalTreeItem> _Children;
        private bool _ShowNotice;

+        public SupportConceptGoalTreeItem() { }
+
        public ValueListEntryVM GoalEntryVM
        {
            get => _GoalEntryVM;
            set => _GoalEntryVM = value;
        }

+        //CB Das ist doch genau falsch herum?
        public bool IsGoal => GoalEntryVM != null ?
                GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
                GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);

+        public bool IsZiel
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptGoalCategoryType);
+            }
+        }
+
+        public bool IsIndZiel
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptIndividualGoalCategoryType);
+            }
+        }
+
+        public bool IsMassnahme
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptGoalType);
+            }
+        }
+
+        public bool IsIndMassnahme
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType);
+            }
+        }
+
+        public bool IsOfType(ValueListEntryType t)
+        {
+
+            if (GoalEntryVM != null)
+            {
+                return GoalEntryVM.Type == t;
+            }
+            else if (GoalEntryDC != null)
+            {
+                return GoalEntryDC.Type == t;
+            }
+
+            return false;
+        }
+        //public bool IsGoal => GoalEntryVM != null ?
+        //        GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
+        //        GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
+


        public bool ShowNotice
@@ -36,6 +89,8 @@ namespace BeWo.Core
            }
        }

+        public bool IsHidden { get; set; }
+
        public BindingList<SupportConceptGoalTreeItem> Items
        {
            get => _Children ?? (_Children = new BindingList<SupportConceptGoalTreeItem>());
@@ -43,5 +98,6 @@ namespace BeWo.Core
        }

        public ValueListEntryType GoalType => GoalEntryDC?.Type ?? GoalEntryVM.Type;
-    }
+	}
+#pragma warning restore CS0108 // Rethrow to preserve stack details
 }
--- a/BeWo/CustomDXLocalizer.cs
+++ b/BeWo/CustomDXLocalizer.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
 using DevExpress.Xpf.Scheduler;

 namespace BeWo
@@ -17,6 +18,22 @@ namespace BeWo
        }
    }

+    //class CustomGridLocalizer : GridControlLocalizer
+    //{
+    //    protected override void PopulateStringTable()
+    //    {
+    //        base.PopulateStringTable();
+
+    //        for (int i = 0; i < 10000; i++)
+    //        {
+    //            var enumInt = (GridControlStringId)i;
+    //            AddString(enumInt, enumInt.ToString());
+    //        }
+    //        ;
+    //    }
+    //}
+
+
    //class CustomSchedulerResXLocalizer : SchedulerControlResXLocalizer
    //{
    //    public override string GetLocalizedString(SchedulerControlStringId id)
@@ -28,7 +45,7 @@ namespace BeWo
    //    {
    //        base.PopulateStringTable();

-            
+
    //    }
    //}

--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace BeWo
+{
+	public enum DebugConfigMode
+	{
+		SimpleAutoLogin,
+		FeatureCustomerWohnhilfe,
+		FeatureWohnheimWohneinheit,
+		FeatureAuswertungenQuittierungsbelege,
+		FeatureDakota,
+		FeatureXRechnung,
+		FeatureAiModule
+	}
+
+	public class DebugConfig
+	{
+		private static readonly string config_file_name = "DebugConfig.txt";
+
+		public static DebugConfig CurrentConfig { get; } = LoadCurrentDebugConfig();
+		
+		/// <summary>
+		/// Wird verwendet, wenn keine DebugConfig geladen wurde oder DefaultProfilename empty ist
+		/// </summary>
+		public static string ServerUrl { get; set; }
+		//= "https://app5.bewoplaner.de/service";
+		= "http://localhost:3777/Host";
+		//  = "http://178.63.79.124/service";
+
+		public DebugConfigMode DebugConfigMode { get; set; }
+
+		public string DefaultLoginUsername { get; set; }
+		public string DefaultLoginPassword { get; set; }
+		public string DefaultProfilename { get; set; }
+
+		public bool AutoLogin { get; set; }
+		public UIContext? SelectView { get; set; }
+		/// <summary>
+		/// Beschreibt den Index der jeweils gewählten View (UIContext)
+		/// 
+		/// Z.b.:
+		/// Customer:
+		/// - Details: 0
+		/// - ...: 1
+		/// - ...: 2
+		/// - ...: 3
+		/// - VermittlungArbeit: 4
+		/// - Wohnhilfe: 5
+		/// </summary>
+		public int? SelectIndex { get; set; }
+		public bool EnableAutoRemoteDebugging { get; set; }
+		public bool EnableAllUserRightsInDebug { get; set; } = false;
+
+        public static DebugConfig SimpleAutoLogin => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.SimpleAutoLogin,
+            AutoLogin = !Environment.MachineName.Equals("OWNSOFT-JETTEN")
+        };
+
+		private static DebugConfig LoadCurrentDebugConfig()
+		{
+#if DEBUG
+			try
+			{
+				var path = AppDomain.CurrentDomain.BaseDirectory;
+				var project_path = Directory.GetParent(path).Parent.Parent.FullName;
+				var config_path = Path.Combine(project_path, config_file_name);
+
+				if (!File.Exists(config_path))
+					return null;
+
+				var current_config = File.ReadAllText(config_path);
+
+				if (string.IsNullOrWhiteSpace(current_config))
+					return null;
+
+				var name2config = GetName2Config();
+
+				if (name2config.TryGetValue(current_config, out DebugConfig current))
+				{
+					return current;
+				}
+			}
+			catch (Exception)
+			{
+
+			}
+#endif
+			return null;
+
+		}
+
+#if DEBUG
+		private static Dictionary<string, DebugConfig> GetName2Config()
+		{
+			var name2config = new Dictionary<string, DebugConfig>();
+
+			name2config.Add("SimpleAutoLogin",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.SimpleAutoLogin,
+							AutoLogin = true
+						});
+
+			name2config.Add("FeatureCustomerWohnhilfe",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.FeatureCustomerWohnhilfe,
+							AutoLogin = true,
+							SelectView = UIContext.Customer,
+							SelectIndex = 5
+						});
+
+			name2config.Add("FeatureWohnheimWohneinheit",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.FeatureWohnheimWohneinheit,
+							AutoLogin = true,
+							SelectView = UIContext.Wohnheim
+						});
+
+			name2config.Add("FeatureAuswertungenQuittierungsbelege",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.FeatureAuswertungenQuittierungsbelege,
+							AutoLogin = true,
+							SelectView = UIContext.Report
+						});
+
+			name2config.Add("FeatureDakota",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.FeatureDakota,
+							AutoLogin = true,
+							//SelectView = UIContext.Organisation,
+							//SelectIndex = 8,
+							//DefaultLoginUsername = "admin",
+							//DefaultLoginPassword = "bewobewo",
+							//DefaultProfilename = "5000000000",
+							EnableAutoRemoteDebugging = true
+						});
+
+			name2config.Add("FeatureAiModule",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.FeatureAiModule,
+							AutoLogin = true,
+							SelectView = UIContext.Customer,
+							//SelectIndex = 8,
+							DefaultLoginUsername = "m1",
+							DefaultLoginPassword = "bewobewo",
+							DefaultProfilename = "5000000000",
+							EnableAutoRemoteDebugging = true
+						});
+
+			name2config.Add("FeatureXRechnung",
+						new DebugConfig()
+						{
+							DebugConfigMode = DebugConfigMode.FeatureXRechnung,
+							AutoLogin = true,
+							SelectView = UIContext.Finance,
+							SelectIndex = 7,
+							//DefaultLoginUsername = "m1",
+							//DefaultLoginPassword = "bewobewo",
+							//DefaultProfilename = "5000000000",
+							EnableAutoRemoteDebugging = true
+						});
+
+			return name2config;
+		}
+#endif
+	}
+}
--- a/BeWo/EmployeeServiceImp.cs
+++ b/BeWo/EmployeeServiceImp.cs
--- a/BeWo/EnterTenantDialog.xaml
+++ b/BeWo/EnterTenantDialog.xaml
@@ -1,10 +1,18 @@
-<Window x:Class="BeWo.EnterTenantDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="BeWoPlaner" Height="240" Width="320" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow">
-    
-    <Grid Background="{x:Null}"  Margin="0,0,0,0">
-        <Border BorderThickness="0" Padding="5,5,5,5" Background="{DynamicResource LoginBackgroundColor}">
+<Window
+    x:Class="BeWo.EnterTenantDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="BeWoPlaner"
+    Width="320"
+    Height="240"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="ToolWindow">
+
+    <Grid Margin="0,0,0,0" Background="{x:Null}">
+        <Border
+            Padding="5,5,5,5"
+            Background="{DynamicResource LoginBackgroundColor}"
+            BorderThickness="0">
            <Grid Opacity="1">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="*" />
@@ -17,7 +25,13 @@
                    <RowDefinition Height="Auto" />
                    <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
-                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                <Image
+                    Grid.Row="0"
+                    Height="45"
+                    Margin="7,7,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Source="Ressources\Icons\bewoplaner_logo_small.png" />
                <Grid Grid.Row="1">
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="*" />
@@ -25,24 +39,70 @@
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" ></RowDefinition>
-                        <RowDefinition Height="Auto" ></RowDefinition>
-                        <RowDefinition Height="Auto" ></RowDefinition>
-                        <RowDefinition Height="Auto" ></RowDefinition>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
-                    <TextBlock Grid.ColumnSpan="3" TextWrapping="Wrap" Margin="3">Bitte geben Sie Ihre 10-stellige Kundennummer ein:</TextBlock>
-                    <TextBox x:Name="txtTenant" Grid.ColumnSpan="3" Grid.Row="1" Margin="3"></TextBox>
-                    <Button Grid.Row="2" Grid.Column ="1" Width="100" Margin="3" IsDefault="True" Click="ButtonBase_OnClick">OK</Button>
-                    <Button Grid.Row="2" Grid.Column ="2" Width="100" Margin="3"  IsCancel="True" >Abbrechen</Button>
-                    <CheckBox Grid.ColumnSpan="3" Grid.Row="3" Margin="3" Checked="ToggleButton_OnChecked" Unchecked="ToggleButton_OnUnchecked">Demo Zugang nutzen</CheckBox>
+                    <TextBlock
+                        Grid.ColumnSpan="3"
+                        Margin="3"
+                        TextWrapping="Wrap">
+                        Bitte geben Sie Ihre 10-stellige Kundennummer ein:
+                    </TextBlock>
+                    <TextBox
+                        x:Name="txtTenant"
+                        Grid.Row="1"
+                        Grid.ColumnSpan="3"
+                        Margin="3" />
+                    <Button
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="100"
+                        Margin="3"
+                        Click="ButtonBase_OnClick"
+                        IsDefault="True">
+                        OK
+                    </Button>
+                    <Button
+                        Grid.Row="2"
+                        Grid.Column="2"
+                        Width="100"
+                        Margin="3"
+                        IsCancel="True">
+                        Abbrechen
+                    </Button>
+                    <CheckBox
+                        Grid.Row="3"
+                        Grid.ColumnSpan="3"
+                        Margin="3"
+                        Checked="ToggleButton_OnChecked"
+                        Unchecked="ToggleButton_OnUnchecked">
+                        Demo Zugang nutzen
+                    </CheckBox>
                </Grid>
            </Grid>
        </Border>
-        <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
-        <Line x:Name="linkLine" Stroke="#FFADADAD" X1="14" Y1="340" X2="585" Y2="340" StrokeThickness="1" Margin="0,30,0,-30"></Line>
+        <Line
+            Grid.ColumnSpan="4"
+            Stroke="#FFADADAD"
+            StrokeThickness="1"
+            X1="14"
+            X2="585"
+            Y1="70"
+            Y2="70" />
+        <Line
+            x:Name="linkLine"
+            Margin="0,30,0,-30"
+            Stroke="#FFADADAD"
+            StrokeThickness="1"
+            X1="14"
+            X2="585"
+            Y1="340"
+            Y2="340" />

    </Grid>
-            
-        
-    
+
+
+
 </Window>
--- a/BeWo/LockedPage.xaml
+++ b/BeWo/LockedPage.xaml
@@ -1,13 +1,22 @@
-<Page x:Class="BeWo.LockedPage"
-      Title="LockedPage"
-      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"
-      mc:Ignorable="d" Width="Auto" Background="{StaticResource LoginBackground}" SnapsToDevicePixels="False" Focusable="True">
+<Page
+    x:Class="BeWo.LockedPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="LockedPage"
+    Width="Auto"
+    Background="{StaticResource LoginBackground}"
+    Focusable="True"
+    SnapsToDevicePixels="False"
+    mc:Ignorable="d">
    <Page.Resources>
        <Storyboard x:Key="OnLoaded1">
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GridLogin" Storyboard.TargetProperty="(UIElement.Opacity)">
+            <DoubleAnimationUsingKeyFrames
+                BeginTime="00:00:00"
+                Storyboard.TargetName="GridLogin"
+                Storyboard.TargetProperty="(UIElement.Opacity)">
                <SplineDoubleKeyFrame KeyTime="00:00:00" Value="0" />
                <SplineDoubleKeyFrame KeyTime="00:00:01" Value="1" />
            </DoubleAnimationUsingKeyFrames>
@@ -20,7 +29,14 @@
    </Page.Triggers>
    <Grid>
        <StackPanel HorizontalAlignment="Center">
-            <Grid Background="{x:Null}" Height="400" Width="600" Visibility="Visible" x:Name="GridLogin" RenderTransformOrigin="0.5,0.5" Margin="0,0,0,0">
+            <Grid
+                x:Name="GridLogin"
+                Width="600"
+                Height="400"
+                Margin="0,0,0,0"
+                Background="{x:Null}"
+                RenderTransformOrigin="0.5,0.5"
+                Visibility="Visible">
                <Grid.RenderTransform>
                    <TransformGroup>
                        <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -29,7 +45,12 @@
                        <TranslateTransform X="0" Y="0" />
                    </TransformGroup>
                </Grid.RenderTransform>
-                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}">
+                <Border
+                    Padding="5,5,5,5"
+                    Background="{DynamicResource LoginBackgroundColor}"
+                    BorderBrush="#FF606060"
+                    BorderThickness="2,2,2,2"
+                    CornerRadius="7,7,7,7">
                    <Grid Opacity="1">
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="100" />
@@ -43,31 +64,142 @@
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
                        </Grid.RowDefinitions>
-                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
-                        <Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4" Grid.Column="0" FontSize="10" x:Name="LblVersion" />
-                        <StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,100,0,0" MaxWidth="330">
-                            <Label x:Name="lblGesperrt" Content="Gesperrt" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" HorizontalAlignment="Center" />
-                            <TextBlock Text="Bitte melden Sie sich an, um den BeWoPlaner zu entsperren." TextWrapping="Wrap" Foreground="#FF000000" FontSize="12" />
+                        <Image
+                            Grid.Row="0"
+                            Grid.ColumnSpan="4"
+                            Height="45"
+                            Margin="7,7,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Source="Ressources\Icons\bewoplaner_logo_small.png" />
+                        <Label
+                            x:Name="LblVersion"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="4"
+                            Margin="5,7,3,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Content="Version x.x.x"
+                            FontSize="10"
+                            Foreground="#FF818181" />
+                        <StackPanel
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            MaxWidth="330"
+                            Margin="0,100,0,0">
+                            <Label
+                                x:Name="lblGesperrt"
+                                Margin="0,30,0,0"
+                                HorizontalAlignment="Center"
+                                Content="Gesperrt"
+                                FontSize="12"
+                                FontWeight="Bold"
+                                Foreground="#FF000000" />
+                            <TextBlock
+                                FontSize="12"
+                                Foreground="#FF000000"
+                                Text="Bitte melden Sie sich an, um den BeWoPlaner zu entsperren."
+                                TextWrapping="Wrap" />
                        </StackPanel>
-                        <Label Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
-                        <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
-                        <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="1" Margin="10,10,20,10" Height="24" x:Name="TextBoxUsername" HorizontalAlignment="Stretch" Text="" />
-                        <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="2" x:Name="PasswordBoxPassword" Password="" HorizontalAlignment="Stretch" TabIndex="1" />
-                        <Button Margin="10,30,20,50" Height="30" x:Name="ButtonLogin" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch" Content="Anmelden" IsDefault="True" Foreground="White" TabIndex="2" />
-                        <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | beyondSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
-                        <TextBlock Grid.Row="3" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,0,12,10">
-							<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de">www.beyondsoft.de</Hyperlink>
+                        <Label
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Background="#00000000"
+                            Content="{markup:Translate Benutzername:}"
+                            Foreground="#FF000000" />
+                        <Label
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Background="#00000000"
+                            Content="Passwort:"
+                            Foreground="#FF000000" />
+                        <TextBox
+                            x:Name="TextBoxUsername"
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Height="24"
+                            Margin="10,10,20,10"
+                            HorizontalAlignment="Stretch"
+                            SnapsToDevicePixels="True"
+                            TabIndex="0"
+                            Text="" />
+                        <PasswordBox
+                            x:Name="PasswordBoxPassword"
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            Height="24"
+                            Margin="10,0,20,0"
+                            HorizontalAlignment="Stretch"
+                            Password=""
+                            TabIndex="1" />
+                        <Button
+                            x:Name="ButtonLogin"
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Height="30"
+                            Margin="10,30,20,50"
+                            HorizontalAlignment="Stretch"
+                            Content="Anmelden"
+                            Foreground="White"
+                            IsDefault="True"
+                            TabIndex="2" />
+                        <Label
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="5,0,0,3"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Bottom"
+                            Content="Copyright 2010 | ownSoft GmbH"
+                            FontSize="10"
+                            Foreground="#FF818181" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="3"
+                            Margin="0,0,12,10"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Bottom"
+                            FontSize="10">
+                            <Hyperlink
+                                Foreground="#FF818181"
+                                NavigateUri="https://www.ownsoft.de/"
+                                TargetName="newWindow">
+                                www.ownsoft.de
+                            </Hyperlink>
                        </TextBlock>
                    </Grid>
                </Border>
-                <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
-                <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="370" X2="585" Y2="370" StrokeThickness="1"></Line>
+                <Line
+                    Grid.ColumnSpan="4"
+                    Stroke="#FFADADAD"
+                    StrokeThickness="1"
+                    X1="14"
+                    X2="585"
+                    Y1="70"
+                    Y2="70" />
+                <Line
+                    Grid.ColumnSpan="4"
+                    Stroke="#FFADADAD"
+                    StrokeThickness="1"
+                    X1="14"
+                    X2="585"
+                    Y1="370"
+                    Y2="370" />
            </Grid>
-            <Rectangle Width="600" Height="400" RenderTransformOrigin="0.5,0.5">
+            <Rectangle
+                Width="600"
+                Height="400"
+                RenderTransformOrigin="0.5,0.5">
                <Rectangle.OpacityMask>
-                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0.418">
-                        <GradientStop Color="#00000000" Offset="0" />
-                        <GradientStop Color="#4CFFFFFF" Offset="1" />
+                    <LinearGradientBrush StartPoint="0.5,0.418" EndPoint="0.5,1">
+                        <GradientStop Offset="0" Color="#00000000" />
+                        <GradientStop Offset="1" Color="#4CFFFFFF" />
                    </LinearGradientBrush>
                </Rectangle.OpacityMask>
                <Rectangle.RenderTransform>
--- a/BeWo/LockedPage.xaml.cs
+++ b/BeWo/LockedPage.xaml.cs
@@ -10,7 +10,7 @@ namespace BeWo
            Loaded += LockedPage_Loaded;

            LblVersion.Content = BeWoApp.Version;
-            lblGesperrt.Content = $"Gesperrt von Benutzer {BeWoApp.LoggedOnUser.Employee.FirstName} {BeWoApp.LoggedOnUser.Employee.LastName}";
+            lblGesperrt.Content = $"Gesperrt von " + BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
        }

        private void LockedPage_Loaded(object sender, RoutedEventArgs e)
--- a/BeWo/LoginControl.xaml
+++ b/BeWo/LoginControl.xaml
@@ -1,14 +1,25 @@
-<UserControl x:Class="BeWo.LoginControl"
-             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"
-             mc:Ignorable="d"
-             Width="Auto" Background="{StaticResource LoginBackground}"
-             d:DesignHeight="600" d:DesignWidth="800">
-    <Grid Name="grid_root" >
+<UserControl
+    x:Class="BeWo.LoginControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Width="Auto"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    Background="{StaticResource LoginBackground}"
+    mc:Ignorable="d">
+    <Grid Name="grid_root">
        <StackPanel HorizontalAlignment="Center">
-            <Grid Background="{x:Null}" Height="400" Width="600" Visibility="Visible" x:Name="gridLogin" RenderTransformOrigin="0.5,0.5" Margin="0,0,0,0">
+            <Grid
+                x:Name="gridLogin"
+                Width="600"
+                Height="400"
+                Margin="0,0,0,0"
+                Background="{x:Null}"
+                RenderTransformOrigin="0.5,0.5"
+                Visibility="Visible">
                <Grid.RenderTransform>
                    <TransformGroup>
                        <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -17,7 +28,13 @@
                        <TranslateTransform X="0" Y="0" />
                    </TransformGroup>
                </Grid.RenderTransform>
-                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}">
+                <Border
+                    Padding="5,5,5,5"
+                    Background="{DynamicResource LoginBackgroundColor}"
+                    BorderBrush="#FF606060"
+                    BorderThickness="2,2,2,2"
+                    CornerRadius="7,7,7,7"
+                    KeyDown="UIElement_OnKeyDown">
                    <Grid Opacity="1">
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="100" />
@@ -33,152 +50,369 @@
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
                            <RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                        </Grid.RowDefinitions>
-                        
-                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
-                        <Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4"
-                               Grid.Column="0" FontSize="10" x:Name="lblVersion" />
-                        <StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,80,0,0">
-                            <Label Content="Herzlich willkommen beim BeWoPlaner!" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" />
-                            <Label Content="Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein." Foreground="#FF000000" FontSize="12" />
+
+                        <Image
+                            Grid.Row="0"
+                            Grid.ColumnSpan="4"
+                            Height="44"
+                            Margin="7,7,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Source="Ressources\Icons\bewoplaner_logo_small.png" />
+                        <Label
+                            x:Name="lblVersion"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="4"
+                            Margin="5,7,3,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Content="Version x.x.x"
+                            FontSize="10"
+                            Foreground="#FF818181" />
+                        <StackPanel
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Margin="0,80,0,0">
+                            <Label
+                                Margin="0,30,0,0"
+                                Content="Herzlich willkommen beim BeWoPlaner!"
+                                FontSize="12"
+                                FontWeight="Bold"
+                                Foreground="#FF000000" />
+                            <Label
+                                Content="{markup:Translate Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.}"
+                                FontSize="12"
+                                Foreground="#FF000000" />
                        </StackPanel>


-                        <Label Content="PIN:" Grid.Column="1" Grid.Row="1" Foreground="#FF000000" Background="#00000000" VerticalAlignment="Center" Visibility="{Binding Path=IsTechSupport, Converter={StaticResource BoolVisibilityConverter}}"/>
-                        <TextBox x:Name="PINTextBox" Grid.Column="2" Grid.Row="1" Margin="10,0,20,0" Height="24" SnapsToDevicePixels="True" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsTechSupport, Converter={StaticResource BoolVisibilityConverter}}"/>
+                        <Label
+                            x:Name="lblPin"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            VerticalAlignment="Center"
+                            Background="#00000000"
+                            Content="PIN:"
+                            Foreground="#FF000000"
+                            Visibility="Collapsed" />
+                        <TextBox
+                            x:Name="PINTextBox"
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Height="24"
+                            Margin="10,0,20,0"
+                            HorizontalAlignment="Stretch"
+                            SnapsToDevicePixels="True"
+                            Visibility="Collapsed" />

-                        <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
-                        <Label Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
+                        <Label
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Background="#00000000"
+                            Content="{markup:Translate Benutzername:}"
+                            Foreground="#FF000000" />
+                        <Label
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Background="#00000000"
+                            Content="Passwort:"
+                            Foreground="#FF000000" />

-                        <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="2" Margin="10,10,20,10" Height="24" x:Name="TextBox_Username" HorizontalAlignment="Stretch" Text="" GotFocus="TextBox_Username_OnGotFocus" />
+                        <TextBox
+                            x:Name="TextBox_Username"
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            Height="24"
+                            Margin="10,10,20,10"
+                            HorizontalAlignment="Stretch"
+                            GotFocus="TextBox_Username_OnGotFocus"
+                            SnapsToDevicePixels="True"
+                            TabIndex="0"
+                            Text="" />

-                        <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="3" x:Name="PasswordBox_Password" Password="" HorizontalAlignment="Stretch" GotFocus="PasswordBox_Password_OnGotFocus" TabIndex="1"/>
+                        <PasswordBox
+                            x:Name="PasswordBox_Password"
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Height="24"
+                            Margin="10,0,20,0"
+                            HorizontalAlignment="Stretch"
+                            GotFocus="PasswordBox_Password_OnGotFocus"
+                            Password=""
+                            TabIndex="1" />

-                        
-                        <Label x:Name="profileLabel" Grid.Column="1" Grid.Row="5" Content="Profil:" Foreground="#FF000000" FontSize="12" Visibility="Collapsed" VerticalAlignment="Center"/>

-                        <StackPanel x:Name="profileStackPanel" Grid.Row="5" Grid.Column="2" Orientation="Horizontal" Margin="0,10,20,0" Visibility="Collapsed" >
-                          <ComboBox HorizontalAlignment="Left" x:Name="profileSelectionComboBox" Width="175" Height="24" ItemsSource="{Binding Path=ProfileList}" SelectedIndex="0" Margin="10,0,0,0" />
-                          <Button Click="button_addProfile_Click" Content="@" FontFamily="Webdings" FontSize="14" Height="23" Width="23" Margin="3,0,0,0" ToolTip="Profile bearbeiten"/>
+                        <Label
+                            x:Name="profileLabel"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            VerticalAlignment="Center"
+                            Content="Profil:"
+                            FontSize="12"
+                            Foreground="#FF000000"
+                            Visibility="Collapsed" />
+
+                        <StackPanel
+                            x:Name="profileStackPanel"
+                            Grid.Row="5"
+                            Grid.Column="2"
+                            Margin="0,10,20,0"
+                            Orientation="Horizontal"
+                            Visibility="Collapsed">
+                            <ComboBox
+                                x:Name="profileSelectionComboBox"
+                                Width="175"
+                                Height="24"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="Left"
+                                ItemsSource="{Binding Path=ProfileList}"
+                                SelectedIndex="0" />
+                            <Button
+                                Width="23"
+                                Height="23"
+                                Margin="3,0,0,0"
+                                Click="button_addProfile_Click"
+                                Content="@"
+                                FontFamily="Webdings"
+                                FontSize="14"
+                                ToolTip="Profile bearbeiten" />
                        </StackPanel>
-						<Label x:Name="proxyLabel" Grid.Column="1" Grid.Row="6" Content="Proxy:" Foreground="#FF000000" FontSize="12" Visibility="Collapsed" VerticalAlignment="Center"/>
+                        <Label
+                            x:Name="proxyLabel"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            VerticalAlignment="Center"
+                            Content="Proxy:"
+                            FontSize="12"
+                            Foreground="#FF000000"
+                            Visibility="Collapsed" />

-                        <StackPanel x:Name="proxyStackPanel" Grid.Row="6" Grid.Column="2" Orientation="Horizontal" Margin="0,5,20,0" Visibility="Collapsed">
-                          <TextBox HorizontalAlignment="Left" x:Name="proxyTextBox" Width="175" Height="24" Margin="10,0,0,0" IsReadOnly="True"/>
-                          <Button Click="button_configureProxy_Click" Content="@" FontFamily="Webdings" FontSize="14" Height="23" Width="23" Margin="3,0,0,0" ToolTip="Proxy bearbeiten"/>
+                        <StackPanel
+                            x:Name="proxyStackPanel"
+                            Grid.Row="6"
+                            Grid.Column="2"
+                            Margin="0,5,20,0"
+                            Orientation="Horizontal"
+                            Visibility="Collapsed">
+                            <TextBox
+                                x:Name="proxyTextBox"
+                                Width="175"
+                                Height="24"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="Left"
+                                IsReadOnly="True" />
+                            <Button
+                                Width="23"
+                                Height="23"
+                                Margin="3,0,0,0"
+                                Click="button_configureProxy_Click"
+                                Content="@"
+                                FontFamily="Webdings"
+                                FontSize="14"
+                                ToolTip="Proxy bearbeiten" />
                        </StackPanel>
-                      
-                        
-                      <ToggleButton x:Name="showProfileSelectionBtn" Click="ShowProfileStackPanel" HorizontalAlignment="Right" Content="Erweitert" Grid.Row="4" Grid.Column="2" Margin="0,5,20,0" Foreground="#FF818181">
-                          <ToggleButton.Template>
-                              <ControlTemplate TargetType="{x:Type ToggleButton}">
-                                  <Grid >
-                                      <Grid.ColumnDefinitions>
-                                          <ColumnDefinition Width="*"/>
-                                          <ColumnDefinition Width="18"/>
-                                      </Grid.ColumnDefinitions>
-                                      <ContentPresenter x:Name="ButtonContent"/>
-                                      <Path Grid.Column="1"
-                                          x:Name="Down_Arrow"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Fill="{TemplateBinding Foreground}"
-                                          Data="M 0 0 L 4 4 L 8 0 L 4 2 Z" Margin="0,3,0,0"
-						/>
-                                      <Path Grid.Column="1"
-                                          x:Name="Down_Arrow2"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Fill="{TemplateBinding Foreground}"
-                                          Data="M 0 0 L 4 4 L 8 0 L 4 2 Z" Margin="0,-3,0,0"
-						/>
-
-                                      <Path Grid.Column="1"
-                                          x:Name="Up_Arrow"
-                                          Visibility="Collapsed"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Fill="{TemplateBinding Foreground}"
-                                          Data="M 0 4 L 4 0 L 8 4 L 4 2 Z" Margin="0,-3,0,0"
-						/>
-                                      <Path Grid.Column="1"
-                                          x:Name="Up_Arrow2"
-                                          Visibility="Collapsed"
-                                          HorizontalAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Fill="{TemplateBinding Foreground}"
-                                          Data="M 0 4 L 4 0 L 8 4 L 4 2 Z" Margin="0,3,0,0"
-						/>
-                                  </Grid>
-                                  <ControlTemplate.Triggers>
-                                      <Trigger Property="IsMouseOver" Value="true">
-                                          <Setter Property="Fill" Value="#FF333333" TargetName="Down_Arrow"/>
-                                          <Setter Property="Fill" Value="#FF333333" TargetName="Down_Arrow2"/>
-                                          <Setter Property="Fill" Value="#FF333333" TargetName="Up_Arrow"/>
-                                          <Setter Property="Fill" Value="#FF333333" TargetName="Up_Arrow2"/>
-                                          <Setter Property="TextBlock.Foreground" Value="#FF333333" TargetName="ButtonContent"/>
-                                      </Trigger>
-
-                                      <Trigger Property="IsChecked" Value="true">
-                                          <Setter Property="Visibility" Value="Collapsed" TargetName="Down_Arrow"/>
-                                          <Setter Property="Visibility" Value="Collapsed" TargetName="Down_Arrow2"/>
-                                          <Setter Property="Visibility" Value="Visible" TargetName="Up_Arrow"/>
-                                          <Setter Property="Visibility" Value="Visible" TargetName="Up_Arrow2"/>
-                                      </Trigger>
-                                  </ControlTemplate.Triggers>
-                              </ControlTemplate>
-                          </ToggleButton.Template>
-                          <ToggleButton.Triggers>
-                          <EventTrigger RoutedEvent="Button.Click">
-                            <BeginStoryboard>
-                              <Storyboard>
-                                <DoubleAnimation
-                                  Storyboard.TargetName="gridLogin"
-                                  Storyboard.TargetProperty="Height"
-                                  From="{Binding HeightFrom, UpdateSourceTrigger=PropertyChanged}" To="{Binding HeightTo, UpdateSourceTrigger=PropertyChanged}" Duration="0:0:0.1"
-                                  AutoReverse="False" Completed="AnimationComplete" />
-                                <DoubleAnimation
-                                  Storyboard.TargetName="linkLine"
-                                  Storyboard.TargetProperty="Y1"
-                                  From="{Binding LineYCoordFrom, UpdateSourceTrigger=PropertyChanged}" To="{Binding LineYCoordTo, UpdateSourceTrigger=PropertyChanged}" Duration="0:0:0.1"
-                                  AutoReverse="False" Completed="Animation2Complete" />
-                                <DoubleAnimation
-                                  Storyboard.TargetName="linkLine"
-                                  Storyboard.TargetProperty="Y2"
-                                  From="{Binding LineYCoordFrom, UpdateSourceTrigger=PropertyChanged}" To="{Binding LineYCoordTo, UpdateSourceTrigger=PropertyChanged}" Duration="0:0:0.1"
-                                  AutoReverse="False" />
-                              </Storyboard>
-                            </BeginStoryboard>
-                          </EventTrigger>
-                        </ToggleButton.Triggers>
-                      </ToggleButton>


-						<StackPanel Margin="10,30,20,50" Grid.Column="2" Grid.Row="7" Orientation="Vertical" HorizontalAlignment="Stretch">
-							<Button Height="30" x:Name="button_login" HorizontalAlignment="Stretch" Content="Anmelden" Click="button_login_Click" IsDefault="True" Foreground="White" Margin="3" />
-							<TextBlock VerticalAlignment="Center" Visibility="Collapsed" HorizontalAlignment="Center" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" Margin="3">
-								<Hyperlink RequestNavigate="PasswortVergessenLinkOnRequestNavigate" NavigateUri="#" >
-									<TextBlock Text="Passwort vergessen" HorizontalAlignment="Center" FontSize="10" VerticalAlignment="Center" />
-								</Hyperlink>
-							</TextBlock>
-						</StackPanel>
-                        <TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2017 | beyondSoft GmbH"  Foreground="#FF818181"/>
-                            
-                        <TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
-                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
+                        <ToggleButton
+                            x:Name="showProfileSelectionBtn"
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            Margin="0,5,20,0"
+                            HorizontalAlignment="Right"
+                            Click="ShowProfileStackPanel"
+                            Content="Erweitert"
+                            Foreground="#FF818181">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="18" />
+                                        </Grid.ColumnDefinitions>
+                                        <ContentPresenter x:Name="ButtonContent" />
+                                        <Path
+                                            x:Name="Down_Arrow"
+                                            Grid.Column="1"
+                                            Margin="0,3,0,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Data="M 0 0 L 4 4 L 8 0 L 4 2 Z"
+                                            Fill="{TemplateBinding Foreground}" />
+                                        <Path
+                                            x:Name="Down_Arrow2"
+                                            Grid.Column="1"
+                                            Margin="0,-3,0,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Data="M 0 0 L 4 4 L 8 0 L 4 2 Z"
+                                            Fill="{TemplateBinding Foreground}" />
+
+                                        <Path
+                                            x:Name="Up_Arrow"
+                                            Grid.Column="1"
+                                            Margin="0,-3,0,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Data="M 0 4 L 4 0 L 8 4 L 4 2 Z"
+                                            Fill="{TemplateBinding Foreground}"
+                                            Visibility="Collapsed" />
+                                        <Path
+                                            x:Name="Up_Arrow2"
+                                            Grid.Column="1"
+                                            Margin="0,3,0,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Data="M 0 4 L 4 0 L 8 4 L 4 2 Z"
+                                            Fill="{TemplateBinding Foreground}"
+                                            Visibility="Collapsed" />
+                                    </Grid>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="true">
+                                            <Setter TargetName="Down_Arrow" Property="Fill" Value="#FF333333" />
+                                            <Setter TargetName="Down_Arrow2" Property="Fill" Value="#FF333333" />
+                                            <Setter TargetName="Up_Arrow" Property="Fill" Value="#FF333333" />
+                                            <Setter TargetName="Up_Arrow2" Property="Fill" Value="#FF333333" />
+                                            <Setter TargetName="ButtonContent" Property="TextBlock.Foreground" Value="#FF333333" />
+                                        </Trigger>
+
+                                        <Trigger Property="IsChecked" Value="true">
+                                            <Setter TargetName="Down_Arrow" Property="Visibility" Value="Collapsed" />
+                                            <Setter TargetName="Down_Arrow2" Property="Visibility" Value="Collapsed" />
+                                            <Setter TargetName="Up_Arrow" Property="Visibility" Value="Visible" />
+                                            <Setter TargetName="Up_Arrow2" Property="Visibility" Value="Visible" />
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                            <ToggleButton.Triggers>
+                                <EventTrigger RoutedEvent="Button.Click">
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation
+                                                AutoReverse="False"
+                                                Completed="AnimationComplete"
+                                                Storyboard.TargetName="gridLogin"
+                                                Storyboard.TargetProperty="Height"
+                                                From="{Binding HeightFrom, UpdateSourceTrigger=PropertyChanged}"
+                                                To="{Binding HeightTo, UpdateSourceTrigger=PropertyChanged}"
+                                                Duration="0:0:0.1" />
+                                            <DoubleAnimation
+                                                AutoReverse="False"
+                                                Completed="Animation2Complete"
+                                                Storyboard.TargetName="linkLine"
+                                                Storyboard.TargetProperty="Y1"
+                                                From="{Binding LineYCoordFrom, UpdateSourceTrigger=PropertyChanged}"
+                                                To="{Binding LineYCoordTo, UpdateSourceTrigger=PropertyChanged}"
+                                                Duration="0:0:0.1" />
+                                            <DoubleAnimation
+                                                AutoReverse="False"
+                                                Storyboard.TargetName="linkLine"
+                                                Storyboard.TargetProperty="Y2"
+                                                From="{Binding LineYCoordFrom, UpdateSourceTrigger=PropertyChanged}"
+                                                To="{Binding LineYCoordTo, UpdateSourceTrigger=PropertyChanged}"
+                                                Duration="0:0:0.1" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </EventTrigger>
+                            </ToggleButton.Triggers>
+                        </ToggleButton>
+
+
+                        <StackPanel
+                            Grid.Row="7"
+                            Grid.Column="2"
+                            Margin="10,30,20,50"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical">
+                            <Button
+                                x:Name="button_login"
+                                Height="30"
+                                Margin="3"
+                                HorizontalAlignment="Stretch"
+                                Click="button_login_Click"
+                                Content="Anmelden"
+                                Foreground="White"
+                                IsDefault="True" />
+                            <TextBlock
+                                Margin="3"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
+                                Visibility="Collapsed">
+                                <Hyperlink NavigateUri="#" RequestNavigate="PasswortVergessenLinkOnRequestNavigate">
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        FontSize="10"
+                                        Text="Passwort vergessen" />
+                                </Hyperlink>
+                            </TextBlock>
+                        </StackPanel>
+                        <TextBlock
+                            x:Name="txtCopyright"
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="10,5,0,5"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Bottom"
+                            FontSize="10"
+                            Foreground="#FF818181"
+                            Text="Copyright 2022 | ownSoft GmbH" />
+
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="3"
+                            Margin="0,5,12,5"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Bottom"
+                            FontSize="10">
+                            <Hyperlink
+                                x:Name="hyperlink"
+                                Foreground="#FF818181"
+                                NavigateUri="https://www.ownsoft.de"
+                                RequestNavigate="Hyperlink_OnRequestNavigate"
+                                TargetName="newWindow">
+                                www.ownsoft.de
+                            </Hyperlink>
                        </TextBlock>
                    </Grid>
                </Border>
-                <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
-                <Line x:Name="linkLine" Stroke="#FFADADAD" X1="14" Y1="340" X2="585" Y2="340" StrokeThickness="1" Margin="0,30,0,-30"></Line>
+                <Line
+                    Grid.ColumnSpan="4"
+                    Stroke="#FFADADAD"
+                    StrokeThickness="1"
+                    X1="14"
+                    X2="585"
+                    Y1="70"
+                    Y2="70" />
+                <Line
+                    x:Name="linkLine"
+                    Margin="0,30,0,-30"
+                    Stroke="#FFADADAD"
+                    StrokeThickness="1"
+                    X1="14"
+                    X2="585"
+                    Y1="340"
+                    Y2="340" />

            </Grid>
-            <Rectangle Width="600" Height="400" RenderTransformOrigin="0.5,0.5">
+            <Rectangle
+                Width="600"
+                Height="400"
+                RenderTransformOrigin="0.5,0.5">
                <Rectangle.OpacityMask>
-                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0.418">
-                        <GradientStop Color="#00000000" Offset="0" />
-                        <GradientStop Color="#4CFFFFFF" Offset="1" />
+                    <LinearGradientBrush StartPoint="0.5,0.418" EndPoint="0.5,1">
+                        <GradientStop Offset="0" Color="#00000000" />
+                        <GradientStop Offset="1" Color="#4CFFFFFF" />
                    </LinearGradientBrush>
                </Rectangle.OpacityMask>
                <Rectangle.RenderTransform>
@@ -194,6 +428,6 @@
                </Rectangle.Fill>
            </Rectangle>
        </StackPanel>
-      <Border x:Name="profileEditPopUp" />
+        <Border x:Name="profileEditPopUp" />
    </Grid>
 </UserControl>
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
--- a/BeWo/LogoPage.xaml
+++ b/BeWo/LogoPage.xaml
@@ -1,6 +1,20 @@
-<Page xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="BeWo.LogoPage" x:Name="Page" WindowTitle="Page" FlowDirection="LeftToRight" Width="640" Height="480" WindowWidth="640" WindowHeight="480" xmlns:BeWo="clr-namespace:BeWo">
+<Page
+    x:Class="BeWo.LogoPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:BeWo="clr-namespace:BeWo"
+    x:Name="Page"
+    Width="640"
+    Height="480"
+    FlowDirection="LeftToRight"
+    WindowHeight="480"
+    WindowTitle="Page"
+    WindowWidth="640">

-	<Grid x:Name="LayoutRoot" Width="300" Height="300">
-		<BeWo:BSLogoControl Width="400" Height="400" />
-	</Grid>
+    <Grid
+        x:Name="LayoutRoot"
+        Width="300"
+        Height="300">
+        <BeWo:BSLogoControl Width="400" Height="400" />
+    </Grid>
 </Page>
--- a/BeWo/MainControl.xaml
+++ b/BeWo/MainControl.xaml
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
--- a/BeWo/MainWindow.xaml
+++ b/BeWo/MainWindow.xaml
@@ -1,9 +1,16 @@
-<Window x:Class="BeWo.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="BeWoPlaner" Height="768" Width="1024" WindowStartupLocation="CenterScreen" WindowState="Maximized"
-              BorderThickness="1" Closing="MainWindow_OnClosing">
+<Window
+    x:Class="BeWo.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="BeWoPlaner"
+    Width="1024"
+    Height="768"
+    BorderThickness="1"
+    Closing="MainWindow_OnClosing"
+    SizeChanged="Window_SizeChanged"
+    WindowStartupLocation="CenterScreen"
+    WindowState="Maximized">
    <Grid x:Name="rootGrid">
-        
+        <ComboBox Width="100" />
    </Grid>
 </Window>
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Threading;
 using System.Windows;
 using BeWo.Core.Config;
 using BeWo.MultiLanguage;
@@ -18,7 +19,6 @@ namespace BeWo
            InitializeComponent();

            ApplicationThemeHelper.ApplicationThemeName = "Office2010Black";
-
            ShowLoginControl();
        }

@@ -44,7 +44,7 @@ namespace BeWo
            //    dlg.ShowDialog();
            //}
 #else
-			if (BeWoApp.Tenant == "demo")
+			if (BeWoApp.Tenant == "demo" || BeWoApp.Tenant == "7514581436")
 			{
 				var dlg = new ConfirmDemoDialog();
 				dlg.ShowDialog();
@@ -101,9 +101,17 @@ namespace BeWo
                BeWoApp.MainControl.HomeView.ServiceChatView = null;
            }

-            BeWoApp.CurrentBeWo.DocumentWatcher.LoescheTempDateien();
+            BeWoApp.CurrentBeWo.DocumentWatcher.LoescheAlleTempDateien();

            Application.Current.Shutdown();
        }
-    }
+
+		private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+#if DEBUG
+            // Setze den Titel auf die aktuelle Breite und Höhe
+            this.Title = $"BeWoPlaner ({e.NewSize.Width}x{e.NewSize.Height})";
+#endif
+        }
+	}
 }
--- a/BeWo/MultiLanguage/ServiceTranslator.cs
+++ b/BeWo/MultiLanguage/ServiceTranslator.cs
@@ -54,5 +54,25 @@ namespace BeWo.MultiLanguage
            }
            return String.Format(this.currentCulture, input, args);
        }
+
+        public String TranslateKey(String key, String defaultText)
+        {
+            if (key != null && this.dict != null && this.dict.TryGetValue(key, out var translation))
+            {
+                return translation;
+            }
+            
+            return defaultText;
+        }
+
+        public String TranslateKey(String key, String defaultText, params Object[] args)
+        {
+            String translation;
+            if (!String.IsNullOrEmpty(key) && this.dict.TryGetValue(key, out translation))
+            {
+                return String.Format(this.currentCulture, translation, args);
+            }
+            return String.Format(this.currentCulture, defaultText, args);
+        }
    }
 }
--- a/BeWo/OpenOrSaveDialog.xaml
+++ b/BeWo/OpenOrSaveDialog.xaml
@@ -1,13 +1,20 @@
-<Window x:Class="BeWo.OpenOrSaveDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="OpenOrSaveDialog" Height="150" Width="300"
-        WindowStartupLocation="CenterOwner"
-        WindowStyle="None"
-        AllowsTransparency="True"
-        Background="Transparent" ResizeMode="NoResize" >
+<Window
+    x:Class="BeWo.OpenOrSaveDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="OpenOrSaveDialog"
+    Width="300"
+    Height="150"
+    AllowsTransparency="True"
+    Background="Transparent"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None">
    <Grid>
-        <GroupBox Style="{StaticResource MainContentGroupBoxWithoutMaximizeBtnStyle}" Header="Download" MouseLeftButtonDown="UIElement_OnMouseLeftButtonDown">
+        <GroupBox
+            Header="Download"
+            MouseLeftButtonDown="UIElement_OnMouseLeftButtonDown"
+            Style="{StaticResource MainContentGroupBoxWithoutMaximizeBtnStyle}">
            <Grid Background="{DynamicResource ObjectEditBackgroundBrush}">
                <Grid.RowDefinitions>
                    <RowDefinition Height="*" />
@@ -18,10 +25,35 @@
                    <ColumnDefinition Width="*" />
                    <ColumnDefinition Width="*" />
                </Grid.ColumnDefinitions>
-                <TextBlock Text="{Binding Question}" Grid.ColumnSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Foreground="#FF202020"/>
-                <Button Margin="0,0,0,5" Grid.Row="1" Grid.Column="0" Content="Öffnen" Width="85" Command="Open" />
-                <Button Margin="0,0,0,5" Grid.Row="1" Grid.Column="1" Content="Speichern" Width="85" Command="Save" />
-                <Button Margin="0,0,0,5" Grid.Row="1" Grid.Column="2" Content="Abbrechen" Width="85" Command="Close" />
+                <TextBlock
+                    Grid.ColumnSpan="3"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="#FF202020"
+                    Text="{Binding Question}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+                <Button
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Width="85"
+                    Margin="0,0,0,5"
+                    Command="Open"
+                    Content="Öffnen" />
+                <Button
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Width="85"
+                    Margin="0,0,0,5"
+                    Command="Save"
+                    Content="Speichern" />
+                <Button
+                    Grid.Row="1"
+                    Grid.Column="2"
+                    Width="85"
+                    Margin="0,0,0,5"
+                    Command="Close"
+                    Content="Abbrechen" />
            </Grid>
        </GroupBox>
    </Grid>
--- a/BeWo/PasswortSecurity/PasswortSicherheit.cs
+++ b/BeWo/PasswortSecurity/PasswortSicherheit.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -11,272 +8,424 @@ using BS.Shared.Extensions;

 namespace BeWo.PasswortSecurity
 {
-    class PasswortSicherheit
+    internal class PasswortSicherheit
    {
-        #region Variablen
+        #region Konstanten und Variablen
+        private const string Numbers = "0123456789";
+        private const string LowercaseLetters = "abcdefghijklmnopqrstuvwxyz";
+        private const string UppercaseLetters = "ABDEFGHIJKLMNOPQRSTUVWXYZ";
+        private const string LowercaseUmlauts = "äöüß";
+        private const string UppercaseUmlauts = "ÄÖÜ";
+        private const string SpecialCharacters = "\\\"\'µ@€!&/()=?+#*,.-;:_><|§$%'{[]}´`^°~²³";

-        private const string zahlen = "0123456789";
-        private const string grossBuchstaben = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        private const string kleinBuchstaben = "abcdefghijklmnopqrstuvwxyz";

-        private const string grossBuchstabenSonderLevel = "ÄÖÜ";
-        private const string kleinBuchstabenSonderLevel = "äöüß";
+        private const string numbers = "0123456789";
+        private const string uppercaseLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        private const string lowercaseLetters = "abcdefghijklmnopqrstuvwxyz";

-        private const string sonderzeichenLevel1 = "\\\"\'µ@€!";
-        private const string sonderzeichenLevel2 = "&/()=?+#*";
-        private const string sonderzeichenLevel3 = ",.-;:_><|";
-        private const string sonderzeichenLevel4 = "§$%'{[]}´";
-        private const string sonderzeichenLevel5 = "`^°~²³";
+        private const string uppercaseUmlauts = "ÄÖÜ";
+        private const string lowercaseUmlauts = "äöüß";

-        private string letztespw = "";
-        private bool retschalter = false;
-        private int distanz = 0;
+        private const string specialCharacters1 = "\\\"\'µ@€!";
+        private const string specialCharacters2 = "&/()=?+#*";
+        private const string specialCharacters3 = ",.-;:_><|";
+        private const string specialCharacters4 = "§$%'{[]}´";
+        private const string specialCharacters5 = "`^°~²³";

-        int score = 0;
-        int letzterwert = 0;
-        bool schalter = false;
+        private string partialPassword = "";
+        private bool isPartial;
+        private int passwordLengthDifference;
+
+        int score;
+        int previousValue;
+        bool schalter;
        List<int> letztewerte = new List<int>();

        #endregion
-
+        /*
+         * Länge prüfen und welche Zeichen vorhanden sind
+         */
        #region Passwort Stärke Ermitteln und Anzeigen
-        public Label ErmittleUndZeigePasswortStaerke(string s,Label lblPwAnzeige)
+
+        //public static Label ShowPasswordStrengthLabel(string passwordToValidate, Label passwordStrengthLabel)
+        //{
+        //    var passwordStrength = CalculatePasswordStrength(passwordToValidate);
+
+        //    var visibility = Visibility.Visible;
+        //    var content = "Passwortstärke: ";
+        //    var foreground = new SolidColorBrush(Colors.Black);
+
+        //    switch(passwordStrength)
+        //    {
+        //        case 0:
+        //            content += "sehr schwach";
+        //            foreground = new SolidColorBrush(Colors.Red);
+        //            break;
+        //        case 1:
+        //            content += "schwach";
+        //            foreground = new SolidColorBrush(Colors.OrangeRed);
+        //            break;
+        //        case 2:
+        //            content += "mittel";
+        //            foreground = new SolidColorBrush(Colors.Yellow);
+        //            break;
+        //        case 3:
+        //            content += "stark";
+        //            foreground = new SolidColorBrush(Colors.Green);
+        //            break;
+        //        case 4:
+        //            content += "sehr stark";
+        //            foreground = new SolidColorBrush(Colors.Green);
+        //            break;
+        //        default:
+        //            visibility = Visibility.Hidden;
+        //            content = string.Empty;
+        //            break;
+        //    }
+
+        //    passwordStrengthLabel.Visibility = visibility;
+        //    passwordStrengthLabel.Foreground = foreground;
+        //    passwordStrengthLabel.Content = content;
+
+        //    return passwordStrengthLabel;
+        //}
+
+        //private static int CalculatePasswordStrength(string passwordToValidate)
+        //{
+        //    var length = passwordToValidate?.Length ?? 0;
+        //    if(string.IsNullOrEmpty(passwordToValidate) || length < 6)
+        //    {
+        //        return -1;
+        //    }
+
+        //    var score = 0;
+
+        //    if(length < 9)
+        //    {
+        //        score += 1;
+        //    }
+        //    else if(length < 12)
+        //    {
+        //        score += 2;
+        //    }
+        //    else if(length < 18)
+        //    {
+        //        score += 3;
+        //    }
+        //    else
+        //    {
+        //        score += 4;
+        //    }
+
+        //    var numberCount = passwordToValidate.Count(c => Numbers.Contains(c));
+        //    var lowercaseLetterCount = passwordToValidate.Count(c => LowercaseLetters.Contains(c));
+        //    var uppercaseLetterCount = passwordToValidate.Count(c => UppercaseLetters.Contains(c));
+        //    var lowercaseUmlautsCount = passwordToValidate.Count(c => LowercaseUmlauts.Contains(c));
+        //    var uppercaseUmlautsCount = passwordToValidate.Count(c => UppercaseUmlauts.Contains(c));
+        //    var specialCharacterCount = passwordToValidate.Count(c => SpecialCharacters.Contains(c));
+
+        //    score += numberCount * 3;
+        //    score += lowercaseLetterCount * 2;
+        //    score += uppercaseLetterCount * 3;
+        //    score += lowercaseUmlautsCount * 2;
+        //    score += uppercaseUmlautsCount * 2;
+        //    score += specialCharacterCount * 4;
+
+        //    if(score < 16)
+        //    {
+        //        return 0;
+        //    }
+
+        //    if(score < 56)
+        //    {
+        //        return 1;
+        //    }
+
+        //    if(score < 116)
+        //    {
+        //        return 2;
+        //    }
+
+        //    return score < 156 ? 3 : 4;
+        //}
+
+        // Score, PreivousValue, Schalter, und LetzteWerte werden im Objekt gepeichert.
+        public Label ErmittleUndZeigePasswortStaerke(string passwordToValidate, Label passwordLabel)
        {
-            if (!s.IsNullOrEmpty())
+            if (!passwordToValidate.IsNullOrEmpty())
            {
-                string sx = "";
-
-                int i = -1;
+                var sx = "";
+                var passwordStrength = -1;
                
-                foreach (var item in s)
+                // Es wird durch jedes Zeichen des Passworts einzeln gegangen
+                foreach (var token in passwordToValidate)
                {
-                    sx += item.ToString();
+                    sx += token.ToString();

-                    if (sx.Length < letztespw.Length)
+                    if (sx.Length < partialPassword.Length)
                    {
-                        retschalter = true;
-                        distanz = letztespw.Length - sx.Length;
+                        isPartial = true;
+                        passwordLengthDifference = partialPassword.Length - sx.Length;
                    }

-                    if (!letztespw.Equals(sx))
-                        letztespw = sx;
+                    if (!partialPassword.Equals(sx))
+                    {
+                        partialPassword = sx;
+                    }

-                    i = PasswortStaerkeErmittler(sx); 
+                    passwordStrength = PasswortStaerkeErmittler(sx); 
                }
                
-                return ZeigePwStaerke(i, lblPwAnzeige);
+                return ZeigePwStaerke(passwordStrength, passwordLabel);
            }
-            else
-            {             
-                score = 0;
-                letzterwert = 0;
+
+            score = 0;
+            previousValue = 0;
                
-                return ZeigePwStaerke(-1, lblPwAnzeige);
-            }
+            return ZeigePwStaerke(-1, passwordLabel);
        }

-        private int PasswortStaerkeErmittler(string neuesPwBox)
+        private int PasswortStaerkeErmittler(string passwordToValidate)
        {
-            int i = 0;
-            letzterwert = 0;
-            //############### Score System  ############          
+            var passwordStrength = 0;
+            previousValue = 0;

-            if (retschalter == true)
+            // Es handelt sich nur um einen Teil des zu überprüfenden Passworts
+            if (isPartial)
            {
-                if (distanz == 1)
+                // Der zu überprüfende Teil ist nur ein Zeichen
+                if (passwordLengthDifference == 1)
                {
                    score -= letztewerte.Last();
                    letztewerte.RemoveAt(letztewerte.Count - 1);
                }
+                // Der zu überprüfende Teil ist mehr als ein Zeichen
                else
                {
-                    for (int s = 0; s < distanz; s++)
+                    for (int s = 0; s < passwordLengthDifference; s++)
                    {
                        score -= letztewerte.Last();
                        letztewerte.RemoveAt(letztewerte.Count - 1);
                    }
                }

-                retschalter = false;
-
-                //letzterwert = 0;
+                isPartial = false;
            }
            else
            {
-                //Passwort Längen Bonus Punkte 
-                if (neuesPwBox.Length >= 6 && neuesPwBox.Length < 9)
+                //Passwortlängen Bonuspunkte 
+                if (passwordToValidate.Length >= 6 && passwordToValidate.Length < 9)
                {
                    score += 1;
-                    letzterwert = 1;
+                    previousValue = 1;
                    schalter = true;
                }

-                if (neuesPwBox.Length >= 9 && neuesPwBox.Length < 12)
+                if (passwordToValidate.Length >= 9 && passwordToValidate.Length < 12)
                {
                    score += 2;
-                    letzterwert = 2;
+                    previousValue = 2;
                    schalter = true;
                }

-                if (neuesPwBox.Length >= 12 && neuesPwBox.Length < 18)
+                if (passwordToValidate.Length >= 12 && passwordToValidate.Length < 18)
                {
                    score += 3;
-                    letzterwert = 3;
+                    previousValue = 3;
                    schalter = true;
                }

-                if (neuesPwBox.Length >= 18)
+                if (passwordToValidate.Length >= 18)
                {
                    score += 4;
-                    letzterwert = 4;
+                    previousValue = 4;
                    schalter = true;
                }

-                //Zahlen und Buchstaben 
-                if (neuesPwBox.Any(x => zahlen.Contains(x)))
+                //Zahlen 
+                if (passwordToValidate.Any(x => numbers.Contains(x)))
                {
                    score += 3;

-                    if (schalter == true)
-                        letzterwert += 3;
+                    if (schalter)
+                    {
+                        previousValue += 3;
+                    }
                    else
-                        letzterwert = 3;
+                    {
+                        previousValue = 3;
+                    }
                }

-                if (neuesPwBox.Any(x => grossBuchstaben.Contains(x)))
+                // Großbuchstaben
+                if (passwordToValidate.Any(x => uppercaseLetters.Contains(x)))
                {
                    score += 3;

-                    if (schalter == true)
-                        letzterwert += 3;
+                    if (schalter)
+                    {
+                        previousValue += 3;
+                    }
                    else
-                        letzterwert = 3;
+                    {
+                        previousValue = 3;
+                    }
                }

-                if (neuesPwBox.Any(x => grossBuchstabenSonderLevel.Contains(x)))
+                // Großumlaute
+                if (passwordToValidate.Any(x => uppercaseUmlauts.Contains(x)))
                {
                    score += 2;

-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                    else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                }

-                if (neuesPwBox.Any(x => kleinBuchstaben.Contains(x)))
+                if (passwordToValidate.Any(x => lowercaseLetters.Contains(x)))
                {
                    score += 2;

-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                    else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                }

-                if (neuesPwBox.Any(x => kleinBuchstabenSonderLevel.Contains(x)))
+                // Kleinumlaute
+                if (passwordToValidate.Any(x => lowercaseUmlauts.Contains(x)))
                {
                    score += 2;

-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                    else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                }

                // Sonderzeichen 
-
-                if (neuesPwBox.Any(x => sonderzeichenLevel1.Contains(x)))
+                if (passwordToValidate.Any(x => specialCharacters1.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel2.Contains(x)))
+                // Sonderzeichen 2
+                if (passwordToValidate.Any(x => specialCharacters2.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                        previousValue += 4;
                    else
-                        letzterwert = 4;
+                        previousValue = 4;
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel3.Contains(x)))
+                // Sonderzeichen 3
+                if(passwordToValidate.Any(x => specialCharacters3.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel4.Contains(x)))
+                // Sonderzeichen 4
+                if(passwordToValidate.Any(x => specialCharacters4.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                if (neuesPwBox.Any(x => sonderzeichenLevel5.Contains(x)))
+                // Sonderzeichen 5
+                if(passwordToValidate.Any(x => specialCharacters5.Contains(x)))
                {
                    score += 4;

-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                    else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                }

-                letztewerte.Add(letzterwert);
+                letztewerte.Add(previousValue);
            }

-            //#########################################
-
-            // ########################################### PasswortStärke Bereich ##########################       
            //Sehr Schwach
            if (score <= 15)
            {
-                i = 0;
+                passwordStrength = 0;
            }

            //Schwach
            if (score >= 16 && score <= 55)
            {
-                i = 1;
+                passwordStrength = 1;
            }

            //Mittelmäßig
            if (score >= 56 && score <= 115)
            {
-                i = 2;
+                passwordStrength = 2;
            }

            //Stark
            if (score >= 116 && score <= 155)
            {
-                i = 3;
+                passwordStrength = 3;
            }

            //Sehr Stark
            if (score >= 156)
            {
-                i = 4;
+                passwordStrength = 4;
            }

-            return i;
+            return passwordStrength;
        }

-        private Label ZeigePwStaerke(int i, Label passwortprüfer)
+        private Label ZeigePwStaerke(int passwordStrength, Label passwortprüfer)
        {
-            switch (i)
+            switch (passwordStrength)
            {
                case -1:
                     passwortprüfer.Visibility = Visibility.Hidden; 
@@ -337,14 +486,14 @@ namespace BeWo.PasswortSecurity
                {
                    sx += item.ToString();

-                    if (sx.Length < letztespw.Length)
+                    if (sx.Length < partialPassword.Length)
                    {
-                        retschalter = true;
-                        distanz = letztespw.Length - sx.Length;
+                        isPartial = true;
+                        passwordLengthDifference = partialPassword.Length - sx.Length;
                    }

-                    if (!letztespw.Equals(sx))
-                        letztespw = sx;
+                    if (!partialPassword.Equals(sx))
+                        partialPassword = sx;

                    i = PasswortStaerkeErmittler(sx);
                }
@@ -354,7 +503,7 @@ namespace BeWo.PasswortSecurity
            else
            {
                score = 0;
-                letzterwert = 0;
+                previousValue = 0;

                return ZeigeSecutityStaerke(-1);
            }
--- a/BeWo/Properties/AssemblyInfo.cs
+++ b/BeWo/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Windows;
 [assembly: AssemblyTitle("BeWoPlaner")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("beyondSoft GmbH")]
+[assembly: AssemblyCompany("ownSoft GmbH")]
 [assembly: AssemblyProduct("BeWoPlaner")]
-[assembly: AssemblyCopyright("Copyright © 2013 beyondSoft GmbH")]
+[assembly: AssemblyCopyright("Copyright © 2022 ownSoft GmbH")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/BeWo/Properties/Resources.Designer.cs
+++ b/BeWo/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace BeWo.Properties {
    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/BeWo/Properties/Settings.Designer.cs
+++ b/BeWo/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace BeWo.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/BeWo/Properties/licenses.licx
+++ b/BeWo/Properties/licenses.licx
@@ -1 +1 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/BeWo/ProxyLoginView.xaml
+++ b/BeWo/ProxyLoginView.xaml
@@ -1,19 +1,75 @@
-<Window x:Class="BeWo.ProxyLoginView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Proxy Einstellungen" Height="200" Width="300">
+<Window
+    x:Class="BeWo.ProxyLoginView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    Title="Proxy Einstellungen"
+    Width="300"
+    Height="200">
    <Grid>
-        <Button x:Name="proxyOK" Content="OK" HorizontalAlignment="Left" Margin="75,120,0,0" VerticalAlignment="Top" Width="100" Click="proxyOK_Click"/>
-        <Button x:Name="proxyAbbr" Content="Abbrechen" HorizontalAlignment="Left" Margin="180,120,0,0" VerticalAlignment="Top" Width="100" Click="proxyAbbr_Click"/>
-        
-      
-      <Label Content="Proxyname:" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"  Width="100"/>
-      <Label Content="Benutzername:" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" Width="100"/>
-      <Label Content="Passwort:" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" Width="100"/>
-        
-      <TextBox x:Name="proxynametxt" HorizontalAlignment="Left" Height="23" Margin="120,15,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="160" SelectionOpacity="0.5" />
-      <TextBox x:Name="proxybenutzer" HorizontalAlignment="Left" Height="23" Margin="120,45,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="160" SelectionOpacity="0.5"/>
-      <PasswordBox x:Name="proxypasswort" HorizontalAlignment="Left" Height="23" Margin="120,75,0,0" VerticalAlignment="Top" Width="160" SelectionOpacity="0.5"/>
+        <Button
+            x:Name="proxyOK"
+            Width="100"
+            Margin="75,120,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Click="proxyOK_Click"
+            Content="OK" />
+        <Button
+            x:Name="proxyAbbr"
+            Width="100"
+            Margin="180,120,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Click="proxyAbbr_Click"
+            Content="Abbrechen" />
+
+
+        <Label
+            Width="100"
+            Margin="10,15,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Content="Proxyname:" />
+        <Label
+            Width="100"
+            Margin="10,45,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Content="{markup:Translate Benutzername:}" />
+        <Label
+            Width="100"
+            Margin="10,75,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Content="Passwort:" />
+
+        <TextBox
+            x:Name="proxynametxt"
+            Width="160"
+            Height="23"
+            Margin="120,15,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            SelectionOpacity="0.5"
+            TextWrapping="Wrap" />
+        <TextBox
+            x:Name="proxybenutzer"
+            Width="160"
+            Height="23"
+            Margin="120,45,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            SelectionOpacity="0.5"
+            TextWrapping="Wrap" />
+        <PasswordBox
+            x:Name="proxypasswort"
+            Width="160"
+            Height="23"
+            Margin="120,75,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            SelectionOpacity="0.5" />

    </Grid>
 </Window>
--- a/BeWo/ProxyLoginView.xaml.cs
+++ b/BeWo/ProxyLoginView.xaml.cs
@@ -1,36 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using BeWo.Security;

 namespace BeWo
 {
-    /// <summary>
-    /// Interaktionslogik für ProxyLoginView.xaml
-    /// </summary>
-    public partial class ProxyLoginView : Window
+    public partial class ProxyLoginView
    {
        public ProxyLoginView()
        {
            InitializeComponent();

-
-            überprüfe();
+            CheckBeWoProfile();
        }

-
-        private void überprüfe() {
+        private void CheckBeWoProfile() {

            if (proxynametxt.Text.Equals("") && proxybenutzer.Text.Equals("") && proxypasswort.Password.Equals("")) {

@@ -41,24 +27,34 @@ namespace BeWo

                try
                {
-					var filePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+					var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
 					if (!File.Exists(filePath))
 					{
-						filePath = System.IO.Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+						filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 					}

-                    var file = new System.IO.StreamReader(filePath);
-                    while ((line = file.ReadLine()) != null)
-                    {
+                    var allLines = File.ReadAllLines(filePath);

-                        byte[] decbuff = Convert.FromBase64String(line);
-                        var x= System.Text.Encoding.UTF8.GetString(decbuff);
-                        datai[counter] = x;
+                    foreach(var linex in allLines)
+                    {
+                        var decryptedLine = EncryptionUtils.DecryptString(linex);
+                        datai[counter] = decryptedLine;

                        counter++;
                    }

-                    file.Close();
+                    //var file = new StreamReader(filePath);
+                    //while ((line = file.ReadLine()) != null)
+                    //{
+
+                    //    byte[] decbuff = Convert.FromBase64String(line);
+                    //    var x= System.Text.Encoding.UTF8.GetString(decbuff);
+                    //    datai[counter] = x;
+
+                    //    counter++;
+                    //}
+
+                    //file.Close();

                    proxynametxt.Text = datai[0];
                    proxybenutzer.Text = datai[1];
@@ -70,50 +66,53 @@ namespace BeWo
        
        }

+        // TODO: Verschlüsselung einbauen!
        private void proxyOK_Click(object sender, RoutedEventArgs e)
        {
-            string ptname = proxynametxt.Text;
-            string ptbenutzer = proxybenutzer.Text;
-			string ptpasswd = proxypasswort.Password;
-
-            string[] lines = { ptname, ptbenutzer, ptpasswd };
+            string[] lines = { proxynametxt.Text, proxybenutzer.Text, proxypasswort.Password };
+            var encryptedLines = new List<string>();

            try
            {
-				var filePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+				var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
 				if (!File.Exists(filePath))
 				{
-					filePath = System.IO.Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+					filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 				}

-                using (System.IO.StreamWriter file =
-				new System.IO.StreamWriter(filePath))
+                foreach(var line in lines)
                {
-                    foreach (string line in lines)
-                    {
-                        byte[] encData_byte = new byte[line.Length];
-                        encData_byte = System.Text.Encoding.UTF8.GetBytes(line);
-                        string encodedData = Convert.ToBase64String(encData_byte);
-
-                        file.WriteLine(encodedData);
-                    }
+                    encryptedLines.Add(EncryptionUtils.EncryptString(line));
                }

-                ptname = "";
-                ptbenutzer = "";
-                ptpasswd = "";
+                File.WriteAllLines(filePath, encryptedLines);

-                this.Close();

-            }catch(IOException i){
+
+
+
+                //using (var file =  new StreamWriter(filePath))
+                //{
+                //    foreach (string line in lines)
+                //    {
+                //        byte[] encData_byte = new byte[line.Length];
+                //        encData_byte = System.Text.Encoding.UTF8.GetBytes(line);
+                //        string encodedData = Convert.ToBase64String(encData_byte);
+
+                //        file.WriteLine(encodedData);
+                //    }
+                //}
+
+                Close();
+
+            }catch(IOException){
                //Fehlermeldung
            }
        }

-
        private void proxyAbbr_Click(object sender, RoutedEventArgs e)
        {
-            this.Close();
+            Close();
        }
    }
 }
--- a/BeWo/PwVergessenView.xaml
+++ b/BeWo/PwVergessenView.xaml
@@ -1,30 +1,71 @@
-<Window x:Class="BeWo.PwVergessenView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="PwVergessenView" Height="135" Width="322" WindowStartupLocation="CenterScreen" WindowStyle="None" 
-		AllowsTransparency="True"
-        Background="Transparent"
-        ResizeMode="NoResize">
+<Window
+    x:Class="BeWo.PwVergessenView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    Title="PwVergessenView"
+    Width="322"
+    Height="135"
+    AllowsTransparency="True"
+    Background="Transparent"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None">
    <Grid>
-		<GroupBox Header="Passwort anfordern" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown">
-			<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-				</Grid.RowDefinitions>
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="*" />
-				</Grid.ColumnDefinitions>
-				<TextBlock Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Height="20" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Red" Margin="3,8,3,3"/>
-				<Label Grid.Row="1" Grid.Column="0" Margin="3" Content="Benutzername" />
-				<TextBox x:Name="BenutzernamenTextBox" Grid.Row="1" Grid.Column="1" MaxLines="1" Margin="3" />
-				<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
-					<Button Margin="3" Content="Neues Passwort anfordern" Width="150" Click="AnfordernClick" IsDefault="True" VerticalContentAlignment="Center" />
-					<Button Margin="3" Content="Abbrechen" Width="150" Command="Close" />
-				</StackPanel>
-			</Grid>
-		</GroupBox>
-	</Grid>
+        <GroupBox
+            Header="Passwort anfordern"
+            MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown"
+            Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}">
+            <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="3,8,3,3"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="Red" />
+                <Label
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="3"
+                    Content="{markup:Translate Benutzername}" />
+                <TextBox
+                    x:Name="BenutzernamenTextBox"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="3"
+                    MaxLines="1" />
+                <StackPanel
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalAlignment="Stretch"
+                    Orientation="Horizontal">
+                    <Button
+                        Width="150"
+                        Margin="3"
+                        VerticalContentAlignment="Center"
+                        Click="AnfordernClick"
+                        Content="Neues Passwort anfordern"
+                        IsDefault="True" />
+                    <Button
+                        Width="150"
+                        Margin="3"
+                        Command="Close"
+                        Content="Abbrechen" />
+                </StackPanel>
+            </Grid>
+        </GroupBox>
+    </Grid>
 </Window>
--- a/BeWo/PwVergessenView.xaml.cs
+++ b/BeWo/PwVergessenView.xaml.cs
@@ -31,7 +31,7 @@ namespace BeWo
 			var benutzername = BenutzernamenTextBox.Text;
 			if (benutzername.Equals(""))
 			{
-				MessageBox.Show("Bitte geben Sie einen Benutzernamen an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Bitte geben Sie einen " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}

@@ -42,7 +42,7 @@ namespace BeWo
 		{
 			if(email.Equals("") || !hatEmail)
 			{
-				MessageBox.Show("Es konnte kein Benutzer mit diesem Namen gefunden werden oder der Benutzer hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an Ihren Systemadministrator", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Es konnte " + BS.Shared.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.Shared.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.Shared.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}

--- a/BeWo/QueryServiceReferences.bat
+++ b/BeWo/QueryServiceReferences.bat
@@ -1 +0,0 @@
-svcutil.exe /noConfig /async /edb /n:*,BeWo.ServiceProxy /out:ServiceProxy\Generated2.cs /ct:System.Collections.Generic.List`1 http://christian-nb/Host/QueryService.svc?wsdl 
--- a/BeWo/Ressources/Icons/AB.png
+++ b/BeWo/Ressources/Icons/AB.png
--- a/BeWo/Ressources/Icons/BoyAndGirl.png
+++ b/BeWo/Ressources/Icons/BoyAndGirl.png
--- a/BeWo/Ressources/Icons/CalendarDisabledUnderConstruction.png
+++ b/BeWo/Ressources/Icons/CalendarDisabledUnderConstruction.png
--- a/BeWo/Ressources/Icons/Copy24.png
+++ b/BeWo/Ressources/Icons/Copy24.png
--- a/BeWo/Ressources/Icons/Favorites16.png
+++ b/BeWo/Ressources/Icons/Favorites16.png
--- a/BeWo/Ressources/Icons/Favorites32.png
+++ b/BeWo/Ressources/Icons/Favorites32.png
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" />`
				`@@ -1 +0,0 @@`
				svcutil.exe /noConfig /async /edb /n:*,BeWo.ServiceProxy /out:ServiceProxy\Generated2.cs /ct:System.Collections.Generic.List`1 http://christian-nb/Host/QueryService.svc?wsdl