Merge branch 'release-v2.3.2'

Write version info.
Bump version, write history.
2017-03-06 06:20:12 +01:00 · 2017-03-06 06:19:46 +01:00 · 2017-03-06 06:19:25 +01:00 · 2017-03-06 06:17:24 +01:00 · 2017-03-06 06:17:11 +01:00 · 2017-03-06 06:12:16 +01:00
154 changed files with 1445 additions and 1048 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -3,4 +3,4 @@
 	url = git@github.com:PHPMailer/PHPMailer.git
 [submodule "deploy/VstoAddinInstaller"]
 	path = deploy/VstoAddinInstaller
-	url = /home/daniel/local/Code/VstoAddinInstaller
+	url = git@github.com:bovender/VstoAddinInstaller.git
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.fedora.23-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple" version="4.3.0" />
+  <package id="runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.rhel.7-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+  <package id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography" version="4.3.0" />
+  <package id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" version="4.3.0" />
+</packages>
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,5 +1,58 @@
+Version 2.3.2 (2017-03-06)
+------------------------------------------------------------------------
+
+- Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.3.1 (2017-03-03)
+------------------------------------------------------------------------
+
+- Repariert: Der Begrüßungsdialog war manchmal hinter Word verborgen.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.3.0 (2017-03-03)
+------------------------------------------------------------------------
+
+- Verbessert: Benutzeroption für die Ausgabe von "mmol/l" anstatt "mM" (einstellbar pro Stil).
+- Verbessert: Das Installationsprogramm versucht jetzt nicht mehr, einen Zero Client zu erkennen, weil der Workaround für Zero Clients ohnehin nicht funktioniert hat.
+- Verbessert: Technische Verbesserungen bei Dialogen.
+- Verbesserung: Einstellungen werden in einem Format (YAML) gespeichert, das für Menschen besser lesbar und bearbeitbar ist als das bisher verwendete XML.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.6 (2017-02-23)
+------------------------------------------------------------------------
+
+- Repariert: Stilauswahl wurde immer ganz im Vordergrund dargestellt und verdeckte damit mitunter andere Hinweise.
+- Verbessert: Diverse technische Verbesserungen.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.5 (2016-10-03)
+------------------------------------------------------------------------
+
+- Repariert: Word bleibt nicht mehr hängen, wenn man versucht, ein Dokument zu speichern.
+- Verbessert: Multiple Verbesserungen im Programmcode.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.4 (2016-04-05)
+------------------------------------------------------------------------
+
+- VERBESSERT: Kleine Optimierungen beim Installationsprogramm.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.2.3 (2016-03-30)
-========================================================================
+------------------------------------------------------------------------

 - REPARIERT: Installationsskript hat Add-in nicht aktiviert.

@ -7,7 +60,7 @@ Version 2.2.3 (2016-03-30)


 Version 2.2.2 (2016-03-29)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Installationsprogramm erkennt jetzt, wenn Word bereits läuft, und bietet an, es zu schließen

@ -15,7 +68,7 @@ Version 2.2.2 (2016-03-29)


 Version 2.2.1 (2015-12-03)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: 'Alternative' Verordnungen wurden nicht erkannt, wenn in der selben Zeile nicht auch eine 'kanonische' Verordnung stand.
 - VERBESSERT: Fehlermeldung "Ein Name darf nicht mit dem Zeichen ' ' beginnen" wurde abgestellt (Fehlernr. 6a36e38b).
@ -24,7 +77,7 @@ Version 2.2.1 (2015-12-03)


 Version 2.2.0 (2015-12-03)
-========================================================================
+------------------------------------------------------------------------

 - NEU: Funktion zum Formatieren der Medikationsliste.
 - VERBESSERT: Kohlehydratdefizientes Transferrin hinzugefügt (als 'CDT') und Ambulanzstil angepaßt.
@ -34,7 +87,7 @@ Version 2.2.0 (2015-12-03)


 Version 2.1.13 (2015-11-12)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Parameter für Aldosteron, Renin und Schwangerschaftstest einprogrammiert.

@ -42,7 +95,7 @@ Version 2.1.13 (2015-11-12)


 Version 2.1.12 (2015-11-04)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Lp(a) zu den bekannten Parametern hinzugefügt.

@ -50,7 +103,7 @@ Version 2.1.12 (2015-11-04)


 Version 2.1.11 (2015-10-28)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Ambulanzstil überarbeitet, CK-MB wird jetzt mit ausgegeben.
 - VERBESSERT: Benutzereinstellungen werden nicht mehr jedes Mal zurückgesetzt.
@ -59,7 +112,7 @@ Version 2.1.11 (2015-10-28)


 Version 2.1.10 (2015-10-24)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: PSA wird jetzt richtig erkannt.

@ -67,7 +120,7 @@ Version 2.1.10 (2015-10-24)


 Version 2.1.9 (2015-10-18)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Integritätsprüfung für Updates wurde für besseren Algorithmus (SHA-256) vorbereitet.

@ -75,7 +128,7 @@ Version 2.1.9 (2015-10-18)


 Version 2.1.8 (2015-10-11)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Alpha-Fetoprotein (AFP) zu den bekannten Parametern hinzugefügt.
 - VERBESSERT: Einstellungen werden nach Office-Update nicht vergessen.
@ -84,7 +137,7 @@ Version 2.1.8 (2015-10-11)


 Version 2.1.7 (2015-10-02)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Statt Sekretariatsmodus stand zweimal Ärztemodus im Begrüßungsbildschirm.

@ -92,7 +145,7 @@ Version 2.1.7 (2015-10-02)


 Version 2.1.6. (2015-09-27)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Eingebaute Stile überarbeitet.
 - VERBESSERT: Troponin T wurde nicht richtig verarbeitet.
@ -101,7 +154,7 @@ Version 2.1.6. (2015-09-27)


 Version 2.1.5. (2015-09-24)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: NT-proBNP wird jetzt korrekt ausgegeben.

@ -109,7 +162,7 @@ Version 2.1.5. (2015-09-24)


 Version 2.1.4 (2015-09-23)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Unkonventionell ausgegebene Laborwerte (v.a. Cyclosporin-A vor Gabe) wurden nicht richtig erkannt.

@ -117,7 +170,7 @@ Version 2.1.4 (2015-09-23)


 Version 2.1.3. (2015-09-18)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf.
 - VERBESSERT: Extreme Werte (mit "<" oder ">") wurden nicht sehr schön formatiert.
@ -126,7 +179,7 @@ Version 2.1.3. (2015-09-18)


 Version 2.1.2 (2015-09-11)
-========================================================================
+------------------------------------------------------------------------

 - GEÄNDERT: Sammelurin-Proteinurie als Prot abgekürzt.
 - VERBESSERT: Ambulanzstil überarbeitet.
@ -136,7 +189,7 @@ Version 2.1.2 (2015-09-11)


 Version 2.1.1 (2015-09-07)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Fehler bei der Kommentaraufforderung wurden behoben.

@ -144,7 +197,7 @@ Version 2.1.1 (2015-09-07)


 Version 2.1.0 (2015-09-06)
-========================================================================
+------------------------------------------------------------------------

 - NEU: Optionale Kommentare zu Laborwerten.
 - NEU: Sekretariatsmodus (siehe 'Einstellungen'), um die Nachfrage nach Zusatz-Kommentaren zu unterdrücken.
@ -156,7 +209,7 @@ Version 2.1.0 (2015-09-06)


 Version 2.0.1 (2015-09-02)
-========================================================================
+------------------------------------------------------------------------

 - FEHLERBEHEBUNG: Kein Absturz mehr, wenn zwei Spalten formatiert werden.
 - VERBESSERT: Kein Absturz mehr, wenn das Demo-Dokument innerhalb der ZAA geöffnet wird (Exception ID 65a5c34e).
@ -167,7 +220,7 @@ Version 2.0.1 (2015-09-02)


 Version 2.0.0-beta.5 (2015-08-25)
-========================================================================
+------------------------------------------------------------------------

 - NEU: Auszeichnung pathologischer Werte kann eingestellt werden.
 - NEU: Für bestimmte Laborwerte ist die bevorzugte Nachkommastellenzahl hinterlegt (z.B. Kreatinin mit nur einer Nachkommastelle).
@ -178,7 +231,7 @@ Version 2.0.0-beta.5 (2015-08-25)


 Version 2.0.0-beta.4. (2015-08-23)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERUNG: Aliasse für fT3 und fT4.
 - VERBESSERUNG: Ambulanz-Stil überarbeitet.
@ -187,7 +240,7 @@ Version 2.0.0-beta.4. (2015-08-23)


 Version 2.0.0-beta.3. (2015-08-20)
-========================================================================
+------------------------------------------------------------------------

 - VERBESSERT: Bei Updates werden neue eingebaute Stile jetzt immer berücksichtigt.
 - VERBESSERT: Formatierung erscheint nur noch als 1 Undo-Schritt.
@ -199,7 +252,7 @@ Version 2.0.0-beta.3. (2015-08-20)


 Version 2.0.0-beta.2 (2015-08-16)
-========================================================================
+------------------------------------------------------------------------

 - FIX: Kleinere Bugfixes.
 - GEÄNDERT: Diff.-BB-Werte im Stations-Stil in Hämatologie-Zeile integriert.
@ -215,7 +268,7 @@ Version 2.0.0-beta.2 (2015-08-16)


 Version 2.0.0-beta.1 (2015-08-13)
-========================================================================
+------------------------------------------------------------------------

 - FIX: Datenimport funktioniert jetzt auch mit Word-Text und nicht nur in den Tests.
 - FIX: Mehrere Thesaurus-Fehler behoben.
@ -232,7 +285,7 @@ Version 2.0.0-beta.1 (2015-08-13)


 Version 2.0.0-alpha.5. (2015-08-04)
-========================================================================
+------------------------------------------------------------------------

 - FIX: Daniels Spezial löscht nicht mehr die Unterschriften.
 - NEU: Eingebautes Demo-Dokument zum Ausprobieren.
@ -242,7 +295,7 @@ Version 2.0.0-alpha.5. (2015-08-04)


 Version 2.0.0-alpha.3 (2015-07-31)
-========================================================================
+------------------------------------------------------------------------

 - FIX: Beim Start wird jetzt nach Updates gesucht.

@ -250,7 +303,7 @@ Version 2.0.0-alpha.3 (2015-07-31)


 Version 2.0.0-alpha.2 (2015-07-28)
-========================================================================
+------------------------------------------------------------------------

 - NEU: Fehlerbehandlung und Fehlerberichte.

@ -258,7 +311,7 @@ Version 2.0.0-alpha.2 (2015-07-28)


 Version 2.0.0-alpha.1 (2015-07-27)
-========================================================================
+------------------------------------------------------------------------

 - NEW: First release of version 2 series.

@ -266,7 +319,7 @@ Version 2.0.0-alpha.1 (2015-07-27)


 Version 2.0.0 (2015-08-30)
-========================================================================
+------------------------------------------------------------------------

 - FEHLERBEHEBUNG: Kein Absturz mehr, wenn zwei Spalten formatiert werden.
 - VERBESSERT: Kein Crash mehr, falls sich ein Komma in den Lauris-Block einschleicht.
--- a/29
+++ b/29
@ -0,0 +1,29 @@
+SHELL=/bin/bash
+.PHONY=all help upload website versioninfo
+
+help:
+	# Available targets:
+	# website     - update website on server
+	# versioninfo - create versioninfo file for the current release
+	# upload      - upload release files to server
+	# all         - all of the above
+
+all: versioninfo upload website
+	#
+	# Check repository status!
+	# 
+
+versioninfo:
+	head -n 1 zaaReloaded2/VERSION | tr -d '\r' > www/versioninfo.tmp
+	chmod 644 www/versioninfo.tmp
+	echo 'https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$$VERSION.exe' >> www/versioninfo.tmp
+	sha256sum deploy/releases/zaaReloaded-$$(head -n 1 zaaReloaded2/VERSION | tr -d '\r').exe >> www/versioninfo.tmp
+	echo '' >> www/versioninfo.tmp
+	todos www/versioninfo.tmp
+	mv www/versioninfo.tmp www/versioninfo.txt
+
+upload:
+	rsync -ruvz --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/
+
+website:
+	rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/
--- a/README.md
+++ b/README.md
@ -29,7 +29,7 @@ zaaReloaded2 ist in C# mit VSTO geschrieben, unter Zuhilfenahme von
 Visual Studio Professional 2013. Der Quellcode liegt in einem öffentlich
 zugänglichen Git-Repository:

-<http://git.bovender.de>
+<https://git.bovender.de>

 Clonen:

@ -212,7 +212,7 @@ dem [MVVM][]-Muster implementiert. Dabei wurde auf das Hilfs-Framework
 ## Updates

 Das Add-in sucht täglich nach einem Update; dabei wird die Datei
-<http://zaa.nephrowiki.de/versioninfo.txt> heruntergeladen. Updates
+<https://doktorkraus.de/zaareloaded/versioninfo.txt> heruntergeladen. Updates
 werden automatisch im Hintergrund geladen und beim Schließen von Word
 (bzw. der Zentralen Arztbriefablage) installiert und stehen dann beim
 nächsten Starten der Anwendung zur Verfügung.
--- a/Tests/Controller/Comments/CommentPoolTest.cs
+++ b/Tests/Controller/Comments/CommentPoolTest.cs
@ -1,7 +1,7 @@
 /* CommentPoolTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/Comments/ItemCommentTest.cs
+++ b/Tests/Controller/Comments/ItemCommentTest.cs
@ -1,7 +1,7 @@
 /* ItemCommentTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/Elements/CloneTest.cs
+++ b/Tests/Controller/Elements/CloneTest.cs
@ -1,7 +1,7 @@
 /* CloneTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/Elements/ItemsTest.cs
+++ b/Tests/Controller/Elements/ItemsTest.cs
@ -1,7 +1,7 @@
 /* ItemsTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -44,6 +44,7 @@ namespace Tests.Controller.Elements
        public void TearDown()
        {
            ((_Document)_document).Close(WdSaveOptions.wdDoNotSaveChanges);
+            Bovender.ComHelpers.ReleaseComObject(_document);
        }

        [Test]
--- a/Tests/Controller/SettingsRepositoryTest.cs
+++ b/Tests/Controller/SettingsRepositoryTest.cs
@ -1,7 +1,7 @@
 /* SettingsRepositoryTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -27,19 +27,19 @@ namespace Tests.Controller
    [TestFixture]
    class SettingsRepositoryTest
    {
-        string _savedSettings;
+        SettingsRepository _savedRepository;

        [SetUp]
        public void SetUp()
        {
-            _savedSettings = zaaReloaded2.Properties.Settings.Default.SettingsRepository;
+            _savedRepository = zaaReloaded2.UserSettings.Default.SettingsRepository;
        }

        [TearDown]
        public void TearDown()
        {
-            zaaReloaded2.Properties.Settings.Default.SettingsRepository = _savedSettings;
-            zaaReloaded2.Properties.Settings.Default.Save();
+            zaaReloaded2.UserSettings.Default.SettingsRepository = _savedRepository;
+            zaaReloaded2.UserSettings.Default.Save();
        }

        [Test]
--- a/Tests/Controller/SettingsTest.cs
+++ b/Tests/Controller/SettingsTest.cs
@ -1,7 +1,7 @@
 /* SettingsTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Formatter/DocumentWriterTest.cs
+++ b/Tests/Formatter/DocumentWriterTest.cs
@ -1,7 +1,7 @@
 /* DocumentWriterClass.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Formatter/FormatterTest.cs
+++ b/Tests/Formatter/FormatterTest.cs
@ -1,7 +1,7 @@
 /* FormatterTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -123,7 +123,7 @@ namespace Tests.Formatter
        {
            ZaaImporter importer = new ZaaImporter();
            importer.Import(
-                "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;  CK gesamt: 123 [<= 170] U/l;  Cholesterin: 211");
+                "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;  CK gesamt: 123 [<= 170] U/l;  Cholesterin: 211");
            Document document = new Document();
            f.Formatter formatter = new f.Formatter(document);
            formatter.Laboratory = importer.Laboratory;
@ -131,7 +131,7 @@ namespace Tests.Formatter
                new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") });
            formatter.Run();
            Assert.AreEqual(
-                "Laborwerte vom 17.09.2015 10:44:00:\rCsA (C0) 130 µg/l\r\r",
+                "Laborwerte vom 17.09.2015-201710:44:00:\rCsA (C0) 130 µg/l\r\r",
                document.Range().Text);
        }

--- a/Tests/Importer/ZaaImporter/LaurisItemTest.cs
+++ b/Tests/Importer/ZaaImporter/LaurisItemTest.cs
@ -1,7 +1,7 @@
 /* LaurisItemTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -153,7 +153,7 @@ namespace Tests.Importer.ZaaImporter

        [TestCase("Albumin (SU)/die: 149.9 [<= 30] mg/d; ", Material.SU)]
        [TestCase("Gesamt-Eiweiss/Creatinin (PU): 281 [<= 70] mg/g Crea;", Material.U)]
-        [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.B)]
+        [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.S)]
        public void ParseLaurisMaterial(string laurisString, Material expectedMaterial)
        {
            LaurisItem i = new LaurisItem(laurisString);
--- a/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs
+++ b/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs
@ -1,7 +1,7 @@
 /* LaurisParagraphTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Importer/ZaaImporter/TimePointTest.cs
+++ b/Tests/Importer/ZaaImporter/TimePointTest.cs
@ -1,7 +1,7 @@
 /* LaurisTimePointTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Importer/ZaaImporter/ZaaImporterTest.cs
+++ b/Tests/Importer/ZaaImporter/ZaaImporterTest.cs
@ -1,7 +1,7 @@
 /* ZaaImporterTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/LineParserTest.cs
+++ b/Tests/LineParserTest.cs
@ -1,7 +1,7 @@
 /* UnitTest1.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Medication/ImporterTest.cs
+++ b/Tests/Medication/ImporterTest.cs
@ -1,7 +1,7 @@
 /* ImporterTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Medication/PrescriptionTest.cs
+++ b/Tests/Medication/PrescriptionTest.cs
@ -1,7 +1,7 @@
 /* PrescriptionTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/SerializationTest.cs
+++ b/Tests/SerializationTest.cs
@ -1,7 +1,7 @@
 /* SelectFirstDayTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/TestHelpers.cs
+++ b/Tests/TestHelpers.cs
@ -1,7 +1,7 @@
 /* TestHelpers.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -41,16 +41,20 @@
    <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.17.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.17.0.0\lib\net40\Bovender.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
@ -66,6 +70,10 @@
    <Reference Include="System.Xaml" />
    <Reference Include="System.XML" />
    <Reference Include="WindowsBase" />
+    <Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
  </ItemGroup>
  <Choose>
    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@ -107,6 +115,7 @@
    <Compile Include="ViewModels\SettingsViewModelTest.cs" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="packages.config" />
    <None Include="Tests.licenseheader" />
    <None Include="zaaReloaded2.pfx" />
--- a/Tests/Thesaurus/ParametersTest.cs
+++ b/Tests/Thesaurus/ParametersTest.cs
@ -1,7 +1,7 @@
 /* ParametersTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Thesaurus/TestThesaurus.cs
+++ b/Tests/Thesaurus/TestThesaurus.cs
@ -2,7 +2,7 @@
 * {{
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Thesaurus/ThesaurusTest.cs
+++ b/Tests/Thesaurus/ThesaurusTest.cs
@ -1,7 +1,7 @@
 /* Class1.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/ElementPickerViewModelTest.cs
+++ b/Tests/ViewModels/ElementPickerViewModelTest.cs
@ -1,7 +1,7 @@
 /* ElementPickerViewModelTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/ItemCommentViewModelTest.cs
+++ b/Tests/ViewModels/ItemCommentViewModelTest.cs
@ -1,7 +1,7 @@
 /* ItemCommentViewModelTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/SettingsRepositoryViewModelTest.cs
+++ b/Tests/ViewModels/SettingsRepositoryViewModelTest.cs
@ -1,7 +1,7 @@
 /* SettingsRepositoryViewModel.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/SettingsViewModelTest.cs
+++ b/Tests/ViewModels/SettingsViewModelTest.cs
@ -1,7 +1,7 @@
 /* SettingsViewModelTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/app.config
+++ b/Tests/app.config
@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	app.config
+	part of zaaReloaded2
+	
+	Copyright 2016 Daniel Kraus
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	    http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/Tests/packages.config
+++ b/Tests/packages.config
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.5.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="NLog" version="4.4.3" targetFramework="net40" />
+  <package id="NUnit" version="3.6.1" targetFramework="net40" />
+  <package id="YamlDotNet.Signed" version="4.1.0" targetFramework="net40" />
 </packages>
--- a/deploy/VstoAddinInstaller
+++ b/deploy/VstoAddinInstaller
--- a/deploy/make-installer.iss
+++ b/deploy/make-installer.iss
@ -2,13 +2,13 @@
           "x:\Code\zaaReloaded2\zaaReloaded2\zaaReloaded2.csproj /Build Release")

 #define VERSIONFILE "..\zaaReloaded2\VERSION"
-#define PUB_YEARS "2015-2016"
+#define PUB_YEARS "2015-2017"
 #define TARGET_HOST "word"
 #define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}"
 #define ADDIN_NAME "zaaReloaded"
 #define COMPANY "Daniel Kraus (bovender)"
 #define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
-#define HOMEPAGE "http://zaa.nephrowiki.de"
+#define HOMEPAGE "https://doktorkraus.de/zaareloaded"
 #define REGKEY "zaaReloaded2"

 #define SOURCEDIR "..\zaaReloaded2\bin\Release\"
--- a/www/img/firstrun.png
+++ b/www/img/firstrun.png
--- a/www/img/preferences.png
+++ b/www/img/preferences.png
--- a/www/img/stilauswahl.png
+++ b/www/img/stilauswahl.png
--- a/www/img/stilbearbeiten.png
+++ b/www/img/stilbearbeiten.png
--- a/www/index.html
+++ b/www/index.html
@ -368,7 +368,7 @@

    <footer class="footer">
      <p>
-        &copy; 2015-2016 <a href="http://www.bovender.de">Daniel Kraus</a>
+        &copy; 2015-2017 <a href="https://www.bovender.de">Daniel Kraus</a>
        <span class="pull-right">
          Handarbeit mit
          <a href="http://www.vim.org">
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@ -1,4 +1,4 @@
-2.2.3
-http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-077df8d43cf97ef4082cda988393734a825b51cf0e023527cdc5752502c83f03  deploy/releases/zaaReloaded-2.2.3.exe
+2.3.2
+https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
+49d8383326222a88ce447a7c97eba596ffd5782f307f8730ffac83743821949f  deploy/releases/zaaReloaded-2.3.2.exe

--- a/zaaReloaded2.sln
+++ b/zaaReloaded2.sln
@ -1,12 +1,17 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zaaReloaded2", "zaaReloaded2\zaaReloaded2.csproj", "{0478F1B0-17F2-4151-8F93-1CB6EB9732C5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{529544E3-3C26-4688-B39D-04DA30F05E20}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{386B2FA0-E39A-4BC4-930F-0BCF3787DC5E}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
--- a/zaaReloaded2/Commands.cs
+++ b/zaaReloaded2/Commands.cs
@ -2,7 +2,7 @@
 /* Commands.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -20,6 +20,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Bovender.Extensions;
 using zaaReloaded2.Controller;
 using zaaReloaded2.Controller.Comments;
 using zaaReloaded2.Formatter;
@ -42,7 +43,7 @@ namespace zaaReloaded2
            if (CanFormat())
            {
                SettingsRepository repository = SettingsRepository.Load();
-                Guid lastSettingsUid = Properties.Settings.Default.LastSettings;
+                Guid lastSettingsUid = UserSettings.Default.LastSettings;
                Settings lastSettings = repository.FindByGuid(lastSettingsUid);
                if (lastSettings != null)
                {
@ -72,10 +73,9 @@ namespace zaaReloaded2
                SettingsViewModel settingsVM = args.Content.ViewModel as SettingsViewModel;
                Settings settings = settingsVM.RevealModelObject() as Settings;
                DoFormat(settings);
-                Properties.Settings.Default.LastSettings = settings.Uid;
-                Properties.Settings.Default.Save();
+                UserSettings.Default.LastSettings = settings.Uid;
            };
-            vm.InjectInto<SettingsRepositoryView>().ShowDialog();
+            vm.InjectInto<SettingsRepositoryView>().ShowDialogInForm();
        }

        /// <summary>
@ -108,7 +108,7 @@ namespace zaaReloaded2
                        + "wenn Word in der Zentralen Arztbriefablage ausgeführt wird.\r"
                        + "Bitte Word als eigenständige Anwendung starten und dann "
                        + "noch einmal versuchen.";
-                    a.OkButtonLabel = "Schließen";
+                    a.OkButtonText = "Schließen";
                    a.Invoke();
                }
                else
@ -122,13 +122,13 @@ namespace zaaReloaded2
        public static void ShowAbout()
        {
            ViewModels.AboutViewModel vm = new ViewModels.AboutViewModel();
-            vm.InjectInto<Views.AboutView>().ShowDialog();
+            vm.InjectInto<Views.AboutView>().ShowDialogInForm();
        }

        public static void ShowPreferences()
        {
-            ViewModels.PreferencesViewModel.Default.InjectInto<Views.PreferencesView>()
-                .ShowDialog();
+            ViewModels.PreferencesViewModel vm = new PreferencesViewModel();
+            vm.InjectInto<Views.PreferencesView>().ShowDialogInForm();
        }

        public static void ApplyDanielsStyle()
@ -149,34 +149,45 @@ namespace zaaReloaded2
            // (NB Technically, there is never _no_ selection in a document.)
            Word.Window activeWindow = Globals.ThisAddIn.Application.ActiveWindow;
            Word.Selection sel = activeWindow.Selection;
-            if (!(sel.Paragraphs.Count > 1
+            Word.Paragraphs paragraphs = sel.Paragraphs;
+            Word.Document document = activeWindow.Document;
+            if (!(paragraphs.Count > 1
                || (sel.Text.Length > 1 && sel.Text.EndsWith("\r"))))
            {
-                if (!Medication.Importer.AutoDetect(activeWindow.Document))
+                Logger.Info("FormatDrugs: Attempting to auto-detect");
+                if (!Medication.Importer.AutoDetect(document))
                {
+                    Logger.Info("FormatDrugs: Failed to auto-detect");
                    NotificationAction a = new NotificationAction();
                    a.Caption = "Formatieren nicht möglich";
                    a.Message = "Das Dokument scheint keine Medikationsliste zu enthalten.";
-                    a.OkButtonLabel = "Schließen";
+                    a.OkButtonText = "Schließen";
                    a.Invoke();
                    return;
                }
            }

-            Medication.Importer importer = new Medication.Importer(activeWindow.Selection.Text);
+            Logger.Info("FormatDrugs: Importing");
+            Medication.Importer importer = new Medication.Importer(sel.Text);
            Medication.Formatter formatter = new Medication.Formatter(importer.Prescriptions);

+            Logger.Info("FormatDrugs: Formatting");
            switch (columns)
            {
                case 1:
-                    formatter.FormatOneColumn(activeWindow.Document);
+                    formatter.FormatOneColumn(document);
                    break;
                case 2:
-                    formatter.FormatTwoColumns(activeWindow.Document);
+                    formatter.FormatTwoColumns(document);
                    break;
                default:
                    break;
            }
+            Logger.Info("FormatDrugs: Cleaning up");
+            Bovender.ComHelpers.ReleaseComObject(document);
+            Bovender.ComHelpers.ReleaseComObject(paragraphs);
+            Bovender.ComHelpers.ReleaseComObject(sel);
+            Bovender.ComHelpers.ReleaseComObject(activeWindow);
        }

        #endregion
@ -187,57 +198,84 @@ namespace zaaReloaded2
        {
            // If no "real" selection exists, attempt to auto-detect the lab data.
            // (NB Technically, there is never _no_ selection in a document.)
-            Word.Window activeWindow = Globals.ThisAddIn.Application.ActiveWindow;
-            Word.Selection sel = activeWindow.Selection;
-            if (!(sel.Paragraphs.Count > 1
-                || (sel.Text.Length > 1 && sel.Text.EndsWith("\r"))))
+            Word.Application word = Globals.ThisAddIn.Application;
+            Word.Document activeDocument = word.ActiveDocument;
+            Word.Window activeWindow = word.ActiveWindow;
+            Word.Selection selection = activeWindow.Selection;
+            Word.Paragraphs paragraphs = selection.Paragraphs;
+            if (!(paragraphs.Count > 1
+                || (selection.Text.Length > 1 && selection.Text.EndsWith("\r"))))
            {
-                if (!AutoDetect.Detect(activeWindow.Document))
+                Logger.Info("DoFormat: Attempting to auto-detect");
+                Word.Document doc = activeWindow.Document;
+                if (!AutoDetect.Detect(doc))
                {
+                    Logger.Info("DoFormat: Automatic detection failed");
                    NotificationAction a = new NotificationAction();
                    a.Caption = "Formatieren nicht möglich";
                    a.Message = "Das Dokument scheint keine Lauris-Labordaten zu enthalten.";
-                    a.OkButtonLabel = "Schließen";
+                    a.OkButtonText = "Schließen";
                    a.Invoke();
                    return;
                }
+                // Don't release the COM object here
+                // Bovender.ComHelpers.ReleaseComObject(doc);
            }

+            Logger.Info("DoFormat: Importing");
            ZaaImporter importer = new ZaaImporter();
-            importer.Import(Globals.ThisAddIn.Application.ActiveWindow.Selection.Text);
-            Formatter.Formatter formatter = new Formatter.Formatter(
-                Globals.ThisAddIn.Application.ActiveDocument);
+            importer.Import(selection.Text);
+            Formatter.Formatter formatter = new Formatter.Formatter(activeDocument);
+
            formatter.Settings = settings;
            formatter.Laboratory = importer.Laboratory;
            CommentPool.Default.Reset();
            CommentPool.Default.FillInComment += CommentPool_FillInComment;
            try
            {
+                Logger.Info("DoFormat: Formatting");
                formatter.Run();
            }
-            catch (NoLaboratoryDataException)
+            catch (NoLaboratoryDataException e)
            {
+                Logger.Warn("DoFormat: No lab data?!");
+                Logger.Warn(e);
                NotificationAction a = new NotificationAction();
                a.Caption = "Formatieren nicht möglich";
                a.Message = "Die aktuelle Markierung scheint keine Labordaten zu enthalten.";
-                a.OkButtonLabel = "Schließen";
+                a.OkButtonText = "Schließen";
                a.Invoke();
            }
+            Bovender.ComHelpers.ReleaseComObject(paragraphs);
+            Bovender.ComHelpers.ReleaseComObject(selection);
+            Bovender.ComHelpers.ReleaseComObject(activeWindow);
+            Bovender.ComHelpers.ReleaseComObject(activeDocument);
+            Logger.Info("DoFormat: Finished");
        }

        private static void CommentPool_FillInComment(object sender, ItemCommentEventArgs e)
        {
-            if (Preferences.Default.SuppressItemCommentInteraction)
+            if (UserSettings.Default.SuppressItemCommentInteraction)
            {
+                Logger.Info("CommentPool_FillInComment: Comment interaction is suppressed by user settings");
                e.Comment.IsCancelled = true;
            }
            else
            {
+                Logger.Info("CommentPool_FillInComment: Requesting user interaction");
                ItemCommentViewModel vm = new ItemCommentViewModel(e.Comment);
-                vm.InjectInto<ItemCommentView>().ShowDialog();
+                vm.InjectInto<ItemCommentView>().ShowDialogInForm();
            }
        }

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Controller/Comments/CommentPool.cs
+++ b/zaaReloaded2/Controller/Comments/CommentPool.cs
@ -1,7 +1,7 @@
 /* CommentPool.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Comments/ItemComment.cs
+++ b/zaaReloaded2/Controller/Comments/ItemComment.cs
@ -1,7 +1,7 @@
 /* ParameterComment.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Comments/ItemCommentEventArgs.cs
+++ b/zaaReloaded2/Controller/Comments/ItemCommentEventArgs.cs
@ -1,7 +1,7 @@
 /* ParameterCommentEventArgs.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/ControlElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/ControlElementBase.cs
@ -2,7 +2,7 @@
 /* ControlElementBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/CustomText.cs
+++ b/zaaReloaded2/Controller/Elements/CustomText.cs
@ -1,7 +1,7 @@
 /* Text.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -29,6 +29,7 @@ namespace zaaReloaded2.Controller.Elements
    [Serializable]
    public class CustomText : FormatElementBase, ISerializable
    {
+        [YamlDotNet.Serialization.YamlIgnore]
        public override string Label
        {
            get
--- a/zaaReloaded2/Controller/Elements/ElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/ElementBase.cs
@ -1,7 +1,7 @@
 /* ElementBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -33,6 +33,7 @@ namespace zaaReloaded2.Controller.Elements
        /// <summary>
        /// Returns the label for this formatting element.
        /// </summary>
+        [YamlDotNet.Serialization.YamlIgnore]
        abstract public string Label { get; }

        /// <summary>
--- a/zaaReloaded2/Controller/Elements/FormatElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/FormatElementBase.cs
@ -1,7 +1,7 @@
 /* FormatElementBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/Items.cs
+++ b/zaaReloaded2/Controller/Elements/Items.cs
@ -1,7 +1,7 @@
 /* Items.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -37,6 +37,7 @@ namespace zaaReloaded2.Controller.Elements
    {
        #region ElementBase implementation

+        [YamlDotNet.Serialization.YamlIgnore]
        public override string Label
        {
            get
--- a/zaaReloaded2/Controller/Elements/NextColumn.cs
+++ b/zaaReloaded2/Controller/Elements/NextColumn.cs
@ -1,7 +1,7 @@
 /* NextColumn.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/SelectEachDay.cs
+++ b/zaaReloaded2/Controller/Elements/SelectEachDay.cs
@ -1,7 +1,7 @@
 /* SelectEachDay.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -26,6 +26,7 @@ namespace zaaReloaded2.Controller.Elements
    [Serializable]
    public class SelectEachDay : ControlElementBase
    {
+        [YamlDotNet.Serialization.YamlIgnore]
        public override string Label
        {
            get { return "Jeder Tag"; }
--- a/zaaReloaded2/Controller/Elements/SelectFirstDay.cs
+++ b/zaaReloaded2/Controller/Elements/SelectFirstDay.cs
@ -1,7 +1,7 @@
 /* SelectFirstDay.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/SelectLastDay.cs
+++ b/zaaReloaded2/Controller/Elements/SelectLastDay.cs
@ -1,7 +1,7 @@
 /* SelectFirstDay - Copy.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/TwoColumns.cs
+++ b/zaaReloaded2/Controller/Elements/TwoColumns.cs
@ -1,7 +1,7 @@
 /* TwoColumns.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Settings.cs
+++ b/zaaReloaded2/Controller/Settings.cs
@ -1,7 +1,7 @@
 /* Settings.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -25,6 +25,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Soap;
+using YamlDotNet.Serialization;

 namespace zaaReloaded2.Controller
 {
@ -45,9 +46,22 @@ namespace zaaReloaded2.Controller
        /// SOAP XML that can be deserialized to a Settings object.</exception>
        public static Settings LoadFromFile(string fileName)
        {
+            Logger.Info("LoadFromFile: {0}", fileName);
            StreamReader reader = new StreamReader(fileName);
-            SoapFormatter formatter = new SoapFormatter();
-            Settings settings = formatter.Deserialize(reader.BaseStream) as Settings;
+            Deserializer deserializer = new DeserializerBuilder().Build();
+            Settings settings;
+            try
+            {
+                settings = deserializer.Deserialize<Settings>(reader);
+            }
+            catch (Exception e)
+            {
+                Logger.Fatal("LoadFromFile: Exception during deserialization");
+                Logger.Fatal(e);
+                throw;
+            }
+            // SoapFormatter formatter = new SoapFormatter();
+            // Settings settings = formatter.Deserialize(reader.BaseStream) as Settings;
            if (settings == null)
            {
                throw new InvalidDataException("Datei enthält keine Stil-Daten oder ist beschädigt.");
@ -62,9 +76,16 @@ namespace zaaReloaded2.Controller
        /// <param name="fileName">File to write to.</param>
        public void SaveToFile(string fileName)
        {
-            StreamWriter writer = new StreamWriter(fileName);
-            SoapFormatter formatter = new SoapFormatter();
-            formatter.Serialize(writer.BaseStream, this);
+            Logger.Info("SaveToFile: {0}", fileName);
+            using (StreamWriter writer = new StreamWriter(fileName))
+            {
+                Serializer serializer = new SerializerBuilder()
+                    //.EnsureRoundtrip()
+                    .Build();
+                serializer.Serialize(writer, this);
+            }
+            // SoapFormatter formatter = new SoapFormatter();
+            // formatter.Serialize(writer.BaseStream, this);
        }

        #endregion
@ -87,6 +108,11 @@ namespace zaaReloaded2.Controller
        /// </summary>
        public AbnormalStyle AbnormalStyle { get; set; }

+        /// <summary>
+        /// Indicates whether to prefer the more verbose "mmol/l" over "mM".
+        /// </summary>
+        public bool PreferVerboseMolar { get; set; }
+
        /// <summary>
        /// Gets the list of controlling elements.
        /// </summary>
@ -238,5 +264,13 @@ namespace zaaReloaded2.Controller
        static readonly Regex _persistenceHeaderRegex = new Regex(@"^\[(?<name>.+?)]$");

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Controller/SettingsRepository.cs
+++ b/zaaReloaded2/Controller/SettingsRepository.cs
@ -1,7 +1,7 @@
 /* SettingsRepository.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -59,20 +59,13 @@ namespace zaaReloaded2.Controller
        /// </remarks>
        public static SettingsRepository Load()
        {
-            string s = Properties.Settings.Default.SettingsRepository;
-            if (String.IsNullOrEmpty(s))
+            SettingsRepository repo = UserSettings.Default.SettingsRepository;
+            if (repo == null)
            {
                return new SettingsRepository();
            }
            else
            {
-                MemoryStream stream = new MemoryStream();
-                string encoded = Properties.Settings.Default.SettingsRepository;
-                byte[] bytes = Convert.FromBase64String(encoded);
-                stream.Write(bytes, 0, bytes.Length);
-                stream.Position = 0;
-                SoapFormatter serializer = new SoapFormatter();
-                SettingsRepository repo = serializer.Deserialize(stream) as SettingsRepository;
                repo.LoadDefaults();
                return repo;
            }
@ -89,13 +82,7 @@ namespace zaaReloaded2.Controller
        /// </remarks>
        public void Store()
        {
-            MemoryStream stream = new MemoryStream();
-            SoapFormatter serializer = new SoapFormatter();
-            serializer.Serialize(stream, this);
-            stream.Position = 0;
-            string encoded = Convert.ToBase64String(stream.ToArray());
-            Properties.Settings.Default.SettingsRepository =  encoded;
-            Properties.Settings.Default.Save();
+            UserSettings.Default.SettingsRepository = this;
        }

        #endregion
@ -196,19 +183,25 @@ namespace zaaReloaded2.Controller
        private void LoadDefaults()
        {
            Assembly myAssembly = this.GetType().Assembly;
-            SoapFormatter deserializer = new SoapFormatter();
-            Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded");
-            Settings settings = deserializer.Deserialize(stream) as Settings;
+            // SoapFormatter deserializer = new SoapFormatter();
+            var deserializer = new YamlDotNet.Serialization.DeserializerBuilder().Build();
+            using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded2"))
+            {
+                StreamReader reader = new StreamReader(stream);
+                Settings settings = deserializer.Deserialize<Settings>(reader);
                settings.Name = Properties.Settings.Default.SettingsNameWard + BUILTIN_LABEL;
                settings.Uid = Guid.Parse(DEFAULT_SETTINGS_1_UID);
                ReplaceOrAdd(settings);
-
-            stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded");
-            settings = deserializer.Deserialize(stream) as Settings;
+            }
+            using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded2"))
+            {
+                StreamReader reader = new StreamReader(stream);
+                Settings settings = deserializer.Deserialize<Settings>(reader);
                settings.Name = Properties.Settings.Default.SettingsNameClinic + BUILTIN_LABEL;
                settings.Uid = Guid.Parse(DEFAULT_SETTINGS_2_UID);
                ReplaceOrAdd(settings);
            }
+        }

        private void ReplaceOrAdd(Settings settings)
        {
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded
@ -1,177 +0,0 @@
-<SOAP-ENV:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:clr="http://schemas.microsoft.com/soap/encoding/clr/1.0" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-<SOAP-ENV:Body>
-<a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>-903942278</_a>
-<_b>-22298</_b>
-<_c>17811</_c>
-<_d>139</_d>
-<_e>190</_e>
-<_f>233</_f>
-<_g>83</_g>
-<_h>158</_h>
-<_i>73</_i>
-<_j>21</_j>
-<_k>115</_k>
-</Uid>
-<Name id="ref-3">Kopie von Standard für NepA</Name>
-<ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
-<AbnormalStyle xsi:type="a3:AbnormalStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">None</AbnormalStyle>
-<ElementsCount>1</ElementsCount>
-<Element0Type href="#ref-4"/>
-<Element0Object href="#ref-5"/>
-</a1:Settings>
-<a2:UnitySerializationHolder id="ref-4" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-6">zaaReloaded2.Controller.Elements.SelectEachDay</Data>
-<UnityType>4</UnityType>
-<AssemblyName id="ref-7">zaaReloaded2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6ec8d075a1ab1383</AssemblyName>
-</a2:UnitySerializationHolder>
-<a4:SelectEachDay id="ref-5" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<ChildrenCount>22</ChildrenCount>
-<Child0Type href="#ref-8"/>
-<Child0Object href="#ref-9"/>
-<Child1Type href="#ref-8"/>
-<Child1Object href="#ref-10"/>
-<Child2Type href="#ref-8"/>
-<Child2Object href="#ref-11"/>
-<Child3Type href="#ref-8"/>
-<Child3Object href="#ref-12"/>
-<Child4Type href="#ref-8"/>
-<Child4Object href="#ref-13"/>
-<Child5Type href="#ref-8"/>
-<Child5Object href="#ref-14"/>
-<Child6Type href="#ref-8"/>
-<Child6Object href="#ref-15"/>
-<Child7Type href="#ref-8"/>
-<Child7Object href="#ref-16"/>
-<Child8Type href="#ref-8"/>
-<Child8Object href="#ref-17"/>
-<Child9Type href="#ref-8"/>
-<Child9Object href="#ref-18"/>
-<Child10Type href="#ref-8"/>
-<Child10Object href="#ref-19"/>
-<Child11Type href="#ref-8"/>
-<Child11Object href="#ref-20"/>
-<Child12Type href="#ref-8"/>
-<Child12Object href="#ref-21"/>
-<Child13Type href="#ref-8"/>
-<Child13Object href="#ref-22"/>
-<Child14Type href="#ref-8"/>
-<Child14Object href="#ref-23"/>
-<Child15Type href="#ref-8"/>
-<Child15Object href="#ref-24"/>
-<Child16Type href="#ref-8"/>
-<Child16Object href="#ref-25"/>
-<Child17Type href="#ref-8"/>
-<Child17Object href="#ref-26"/>
-<Child18Type href="#ref-8"/>
-<Child18Object href="#ref-27"/>
-<Child19Type href="#ref-28"/>
-<Child19Object href="#ref-29"/>
-<Child20Type href="#ref-28"/>
-<Child20Object href="#ref-30"/>
-<Child21Type href="#ref-28"/>
-<Child21Object href="#ref-31"/>
-</a4:SelectEachDay>
-<a2:UnitySerializationHolder id="ref-8" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-32">zaaReloaded2.Controller.Elements.Items</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-7"/>
-</a2:UnitySerializationHolder>
-<a4:Items id="ref-9" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-33">Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure</Content>
-</a4:Items>
-<a4:Items id="ref-10" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-34">Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL</Content>
-</a4:Items>
-<a4:Items id="ref-11" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-35">Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP</Content>
-</a4:Items>
-<a4:Items id="ref-12" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-36">Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C</Content>
-</a4:Items>
-<a4:Items id="ref-13" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-37">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</Content>
-</a4:Items>
-<a4:Items id="ref-14" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest</Content>
-</a4:Items>
-<a4:Items id="ref-15" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-39">Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT</Content>
-</a4:Items>
-<a4:Items id="ref-16" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-40">Blutfette: TG, Chol, LDL, HDL, Lp(a)</Content>
-</a4:Items>
-<a4:Items id="ref-17" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-41">Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten</Content>
-</a4:Items>
-<a4:Items id="ref-18" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-42">Diff.-BB: Neu, Lym, Mon, Baso, Eos</Content>
-</a4:Items>
-<a4:Items id="ref-19" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-43">Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa</Content>
-</a4:Items>
-<a4:Items id="ref-20" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-44">Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin</Content>
-</a4:Items>
-<a4:Items id="ref-21" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-45">Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ</Content>
-</a4:Items>
-<a4:Items id="ref-22" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-46">Vitamine: B12, Folsäure</Content>
-</a4:Items>
-<a4:Items id="ref-23" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-47">Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.</Content>
-</a4:Items>
-<a4:Items id="ref-24" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-48">BGA: pH, Std.-Bic., BE</Content>
-</a4:Items>
-<a4:Items id="ref-25" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-49">Hepatitis-Serologie: Anti-HBs, Anti-HBc</Content>
-</a4:Items>
-<a4:Items id="ref-26" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CsA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
-</a4:Items>
-<a4:Items id="ref-27" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-51">Tumormarker: PSA, AFP</Content>
-</a4:Items>
-<a2:UnitySerializationHolder id="ref-28" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-52">zaaReloaded2.Controller.Elements.CustomText</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-7"/>
-</a2:UnitySerializationHolder>
-<a4:CustomText id="ref-29" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-53">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
-</a4:CustomText>
-<a4:CustomText id="ref-30" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-54">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
-</a4:CustomText>
-<a4:CustomText id="ref-31" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-55">Autoantikörper: ANCA (IF) 1: (Ref. &#60; 1:40), MPO-ANCA (ELISA) IU/ml (Ref. &#60; 9), PR3-ANCA (ELISA) IU/ml (Ref. &#60; 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
-</a4:CustomText>
-</SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded2
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded2
@ -0,0 +1,51 @@
+!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+Name: Kopie von Standard für NepA
+ReferenceStyle: IfSpecialItem
+Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
+- !zaaReloaded2.Controller.Elements.SelectEachDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Vitamine: B12, Folsäure'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'BGA: pH, Std.-Bic., BE'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Tumormarker: PSA, AFP'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
+Uid: 99b44ee9-2858-4651-84ad-eb7980832352
--- a/zaaReloaded2/Defaults/ward.zaaReloaded
+++ b/zaaReloaded2/Defaults/ward.zaaReloaded
@ -1,254 +0,0 @@
-<SOAP-ENV:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:clr="http://schemas.microsoft.com/soap/encoding/clr/1.0" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-<SOAP-ENV:Body>
-<a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>1038630179</_a>
-<_b>-1437</_b>
-<_c>19419</_c>
-<_d>151</_d>
-<_e>122</_e>
-<_f>7</_f>
-<_g>44</_g>
-<_h>130</_h>
-<_i>195</_i>
-<_j>52</_j>
-<_k>194</_k>
-</Uid>
-<Name id="ref-3">Station ganz neu</Name>
-<ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
-<AbnormalStyle xsi:type="a3:AbnormalStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">None</AbnormalStyle>
-<ElementsCount>4</ElementsCount>
-<Element0Type href="#ref-4"/>
-<Element0Object href="#ref-5"/>
-<Element1Type href="#ref-6"/>
-<Element1Object href="#ref-7"/>
-<Element2Type href="#ref-8"/>
-<Element2Object href="#ref-9"/>
-<Element3Type href="#ref-10"/>
-<Element3Object href="#ref-11"/>
-</a1:Settings>
-<a2:UnitySerializationHolder id="ref-4" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-12">zaaReloaded2.Controller.Elements.TwoColumns</Data>
-<UnityType>4</UnityType>
-<AssemblyName id="ref-13">zaaReloaded2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6ec8d075a1ab1383</AssemblyName>
-</a2:UnitySerializationHolder>
-<a4:TwoColumns id="ref-5" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<ChildrenCount>0</ChildrenCount>
-</a4:TwoColumns>
-<a2:UnitySerializationHolder id="ref-6" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-14">zaaReloaded2.Controller.Elements.SelectFirstDay</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-13"/>
-</a2:UnitySerializationHolder>
-<a4:SelectFirstDay id="ref-7" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<ChildrenCount>22</ChildrenCount>
-<Child0Type href="#ref-15"/>
-<Child0Object href="#ref-16"/>
-<Child1Type href="#ref-15"/>
-<Child1Object href="#ref-17"/>
-<Child2Type href="#ref-15"/>
-<Child2Object href="#ref-18"/>
-<Child3Type href="#ref-15"/>
-<Child3Object href="#ref-19"/>
-<Child4Type href="#ref-15"/>
-<Child4Object href="#ref-20"/>
-<Child5Type href="#ref-15"/>
-<Child5Object href="#ref-21"/>
-<Child6Type href="#ref-15"/>
-<Child6Object href="#ref-22"/>
-<Child7Type href="#ref-15"/>
-<Child7Object href="#ref-23"/>
-<Child8Type href="#ref-15"/>
-<Child8Object href="#ref-24"/>
-<Child9Type href="#ref-15"/>
-<Child9Object href="#ref-25"/>
-<Child10Type href="#ref-15"/>
-<Child10Object href="#ref-26"/>
-<Child11Type href="#ref-15"/>
-<Child11Object href="#ref-27"/>
-<Child12Type href="#ref-15"/>
-<Child12Object href="#ref-28"/>
-<Child13Type href="#ref-15"/>
-<Child13Object href="#ref-29"/>
-<Child14Type href="#ref-15"/>
-<Child14Object href="#ref-30"/>
-<Child15Type href="#ref-15"/>
-<Child15Object href="#ref-31"/>
-<Child16Type href="#ref-15"/>
-<Child16Object href="#ref-32"/>
-<Child17Type href="#ref-15"/>
-<Child17Object href="#ref-33"/>
-<Child18Type href="#ref-34"/>
-<Child18Object href="#ref-35"/>
-<Child19Type href="#ref-34"/>
-<Child19Object href="#ref-36"/>
-<Child20Type href="#ref-34"/>
-<Child20Object href="#ref-37"/>
-<Child21Type href="#ref-15"/>
-<Child21Object href="#ref-38"/>
-</a4:SelectFirstDay>
-<a2:UnitySerializationHolder id="ref-8" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-39">zaaReloaded2.Controller.Elements.NextColumn</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-13"/>
-</a2:UnitySerializationHolder>
-<a4:NextColumn id="ref-9" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<ChildrenCount>0</ChildrenCount>
-</a4:NextColumn>
-<a2:UnitySerializationHolder id="ref-10" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-40">zaaReloaded2.Controller.Elements.SelectLastDay</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-13"/>
-</a2:UnitySerializationHolder>
-<a4:SelectLastDay id="ref-11" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<ChildrenCount>22</ChildrenCount>
-<Child0Type href="#ref-15"/>
-<Child0Object href="#ref-16"/>
-<Child1Type href="#ref-15"/>
-<Child1Object href="#ref-17"/>
-<Child2Type href="#ref-15"/>
-<Child2Object href="#ref-18"/>
-<Child3Type href="#ref-15"/>
-<Child3Object href="#ref-19"/>
-<Child4Type href="#ref-15"/>
-<Child4Object href="#ref-20"/>
-<Child5Type href="#ref-15"/>
-<Child5Object href="#ref-21"/>
-<Child6Type href="#ref-15"/>
-<Child6Object href="#ref-22"/>
-<Child7Type href="#ref-15"/>
-<Child7Object href="#ref-23"/>
-<Child8Type href="#ref-15"/>
-<Child8Object href="#ref-24"/>
-<Child9Type href="#ref-15"/>
-<Child9Object href="#ref-25"/>
-<Child10Type href="#ref-15"/>
-<Child10Object href="#ref-26"/>
-<Child11Type href="#ref-15"/>
-<Child11Object href="#ref-27"/>
-<Child12Type href="#ref-15"/>
-<Child12Object href="#ref-28"/>
-<Child13Type href="#ref-15"/>
-<Child13Object href="#ref-29"/>
-<Child14Type href="#ref-15"/>
-<Child14Object href="#ref-30"/>
-<Child15Type href="#ref-15"/>
-<Child15Object href="#ref-31"/>
-<Child16Type href="#ref-15"/>
-<Child16Object href="#ref-32"/>
-<Child17Type href="#ref-15"/>
-<Child17Object href="#ref-33"/>
-<Child18Type href="#ref-34"/>
-<Child18Object href="#ref-35"/>
-<Child19Type href="#ref-34"/>
-<Child19Object href="#ref-36"/>
-<Child20Type href="#ref-34"/>
-<Child20Object href="#ref-37"/>
-<Child21Type href="#ref-15"/>
-<Child21Object href="#ref-38"/>
-</a4:SelectLastDay>
-<a2:UnitySerializationHolder id="ref-15" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-41">zaaReloaded2.Controller.Elements.Items</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-13"/>
-</a2:UnitySerializationHolder>
-<a4:Items id="ref-16" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-42">Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure</Content>
-</a4:Items>
-<a4:Items id="ref-17" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-43">Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL</Content>
-</a4:Items>
-<a4:Items id="ref-18" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-44">Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP</Content>
-</a4:Items>
-<a4:Items id="ref-19" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-45">Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C</Content>
-</a4:Items>
-<a4:Items id="ref-20" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-46">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</Content>
-</a4:Items>
-<a4:Items id="ref-21" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-47">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</Content>
-</a4:Items>
-<a4:Items id="ref-22" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-48">Leber: GOT, GGT, GPT, AP, Bilirubin, CHE</Content>
-</a4:Items>
-<a4:Items id="ref-23" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-49">Blutfette: TG, Chol, LDL, HDL, Lp(a)</Content>
-</a4:Items>
-<a4:Items id="ref-24" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-50">Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten</Content>
-</a4:Items>
-<a4:Items id="ref-25" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-51">Diff.-BB: Neu, Lym, Mon, Baso, Eos</Content>
-</a4:Items>
-<a4:Items id="ref-26" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-52">Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa</Content>
-</a4:Items>
-<a4:Items id="ref-27" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-53">Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin</Content>
-</a4:Items>
-<a4:Items id="ref-28" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-54">Hormone: iPTH, TSH, fT3, fT4</Content>
-</a4:Items>
-<a4:Items id="ref-29" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-55">Vitamine: B12, Folsäure</Content>
-</a4:Items>
-<a4:Items id="ref-30" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-56">Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.</Content>
-</a4:Items>
-<a4:Items id="ref-31" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-57">BGA: pH, Std.-Bic., BE</Content>
-</a4:Items>
-<a4:Items id="ref-32" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-58">Hepatitis-Serologie: Anti-HBs, Anti-HBc</Content>
-</a4:Items>
-<a4:Items id="ref-33" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-59">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CsA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
-</a4:Items>
-<a2:UnitySerializationHolder id="ref-34" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<Data id="ref-60">zaaReloaded2.Controller.Elements.CustomText</Data>
-<UnityType>4</UnityType>
-<AssemblyName href="#ref-13"/>
-</a2:UnitySerializationHolder>
-<a4:CustomText id="ref-35" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-61">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
-</a4:CustomText>
-<a4:CustomText id="ref-36" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-62">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
-</a4:CustomText>
-<a4:CustomText id="ref-37" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-63">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
-</a4:CustomText>
-<a4:Items id="ref-38" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
-<Version>2</Version>
-<Content id="ref-64">Tumormarker: PSA</Content>
-</a4:Items>
-</SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
--- a/zaaReloaded2/Defaults/ward.zaaReloaded2
+++ b/zaaReloaded2/Defaults/ward.zaaReloaded2
@ -0,0 +1,101 @@
+!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+Name: Kopie von Standard für Station
+ReferenceStyle: IfSpecialItem
+Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
+- !zaaReloaded2.Controller.Elements.TwoColumns,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 []
+- !zaaReloaded2.Controller.Elements.SelectFirstDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hormone: iPTH, TSH, fT3, fT4'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Vitamine: B12, Folsäure'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'BGA: pH, Std.-Bic., BE'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Tumormarker: PSA'
+- !zaaReloaded2.Controller.Elements.NextColumn,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 []
+- !zaaReloaded2.Controller.Elements.SelectLastDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+  Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hormone: iPTH, TSH, fT3, fT4'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Vitamine: B12, Folsäure'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'BGA: pH, Std.-Bic., BE'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
+  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'Tumormarker: PSA'
+Uid: 216d9bbb-94d8-47e5-b13b-59e0edd24d91
--- a/zaaReloaded2/Demo/Demo.cs
+++ b/zaaReloaded2/Demo/Demo.cs
@ -1,7 +1,7 @@
 /* Demo.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
@ -2,7 +2,7 @@
 	ExceptionDetailView.xaml
 	part of zaaReloaded2
 	
-	Copyright 2015 Daniel Kraus
+	Copyright 2015-2017 Daniel Kraus
 	
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@ -25,8 +25,8 @@
        xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
        xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
        xmlns:converter="clr-namespace:Bovender.Mvvm.Converters;assembly=Bovender"
-        SizeToContent="Height" Width="700" ShowInTaskbar="False"
-        WindowStyle="ToolWindow" Topmost="True" ResizeMode="CanResizeWithGrip"
+        SizeToContent="Height" Width="720"
+        ShowInTaskbar="False" ResizeMode="NoResize"
        x:Name="exceptionDetailView"
        Title="Technische Fehlerdetails"
        settings:WindowState.Save="True"
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs
@ -1,7 +1,7 @@
 /* ExceptionDetailView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
@ -2,7 +2,7 @@
 	ExceptionView.xaml
 	part of zaaReloaded2
 	
-	Copyright 2015 Daniel Kraus
+	Copyright 2015-2017 Daniel Kraus
 	
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@ -26,8 +26,8 @@
        xmlns:ex="clr-namespace:zaaReloaded2.ExceptionHandler"
        xmlns:actions="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
        xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
-        SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip"
-        WindowStyle="ToolWindow" ShowInTaskbar="False" Topmost="True"
+        SizeToContent="WidthAndHeight" ResizeMode="NoResize"
+        ShowInTaskbar="False" 
        WindowStartupLocation="CenterScreen"
        Title="zaaReloaded2: Fehler!"
        settings:WindowState.Save="True"
--- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs
@ -1,7 +1,7 @@
 /* ExceptionView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs
+++ b/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs
@ -1,7 +1,7 @@
 /* ExceptionViewModel.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -48,7 +48,7 @@ namespace zaaReloaded2.ExceptionHandler
        {
            get
            {
-                return zaaReloaded2.Updater.Version.CurrentVersion().ToString();
+                return zaaReloaded2.Updater.Version.Current.ToString();
            }
        }

@ -86,6 +86,11 @@ namespace zaaReloaded2.ExceptionHandler
            return @"x:\Code\zaaReloaded2\zaaReloaded2\";
        }

+        protected override Bovender.UserSettings.UserSettingsBase UserSettings
+        {
+            get { return zaaReloaded2.UserSettings.Default; }
+        }
+
        #endregion
    }
 }
--- a/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs
@ -1,7 +1,7 @@
 /* SubmissionCompletedAction.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
@ -2,7 +2,7 @@
 	SubmissionFailureView.xaml
 	part of zaaReloaded2
 	
-	Copyright 2015 Daniel Kraus
+	Copyright 2015-2017 Daniel Kraus
 	
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs
@ -1,7 +1,7 @@
 /* SubmissionFailureView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs
@ -1,7 +1,7 @@
 /* SubmissionProcessAction.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
@ -2,7 +2,7 @@
 	SubmissionProcessView.xaml
 	part of zaaReloaded2
 	
-	Copyright 2015 Daniel Kraus
+	Copyright 2015-2017 Daniel Kraus
 	
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs
@ -1,7 +1,7 @@
 /* SubmissionProcessView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
@ -2,7 +2,7 @@
 	SubmissionSuccessView.xaml
 	part of zaaReloaded2
 	
-	Copyright 2015 Daniel Kraus
+	Copyright 2015-2017 Daniel Kraus
 	
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs
@ -1,7 +1,7 @@
 /* SubmissionSuccessView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/AbnormalStyle.cs
+++ b/zaaReloaded2/Formatter/AbnormalStyle.cs
@ -1,7 +1,7 @@
 /* AbnormalStyle.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/DanielsStyle.cs
+++ b/zaaReloaded2/Formatter/DanielsStyle.cs
@ -1,7 +1,7 @@
 /* DanielsStyle.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/DocumentWriter.cs
+++ b/zaaReloaded2/Formatter/DocumentWriter.cs
@ -1,7 +1,7 @@
 /* DocumentWriter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/Formatter.cs
+++ b/zaaReloaded2/Formatter/Formatter.cs
@ -1,7 +1,7 @@
 /* Formatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -57,7 +57,8 @@ namespace zaaReloaded2.Formatter
                foreach (TimePoint tp in _laboratory.TimePoints.Values)
                {
                    _timePointFormatters[tp.TimeStamp] =
-                        new TimePointFormatter(tp, Settings.ReferenceStyle, Settings.AbnormalStyle);
+                        new TimePointFormatter(tp, Settings.ReferenceStyle,
+                            Settings.AbnormalStyle, Settings.PreferVerboseMolar);
                }
            }
        }
@ -272,15 +273,18 @@ namespace zaaReloaded2.Formatter
        {
            if (Document != null)
            {
+                Logger.Info("CreateStyles");
                Style style;
                // Don't see a better way to check for the existence of a particular
                // paragraph style than by using a try...catch construction.
                try
                {
                    style = Document.Styles[Properties.Settings.Default.StyleParagraph];
+                    Logger.Info("CreateStyles: Found paragraph style in document");
                }
                catch
                {
+                    Logger.Info("CreateStyles: Need to create paragraph style");
                    // Add default paragraph style for laboratory
                    style = Document.Styles.Add(Properties.Settings.Default.StyleParagraph);
                    style.Font.Size = 10; // pt
@ -293,13 +297,16 @@ namespace zaaReloaded2.Formatter
                    style.ParagraphFormat.FirstLineIndent = -36; // pt
                    style.ParagraphFormat.Alignment = WdParagraphAlignment.wdAlignParagraphJustify;
                }
+                Bovender.ComHelpers.ReleaseComObject(style);

                try
                {
                    style = Document.Styles[Properties.Settings.Default.StyleHeader];
+                    Logger.Info("CreateStyles: Found header style in document");
                }
                catch
                {
+                    Logger.Info("CreateStyles: Need to create header style");
                    // Add header paragraph style for laboratory
                    style = Document.Styles.Add(Properties.Settings.Default.StyleHeader);
                    style.Font.Size = 10; // pt
@ -313,6 +320,7 @@ namespace zaaReloaded2.Formatter
                    style.ParagraphFormat.Alignment = WdParagraphAlignment.wdAlignParagraphJustify;
                    style.set_NextParagraphStyle(Document.Styles[Properties.Settings.Default.StyleParagraph]);
                }
+                Bovender.ComHelpers.ReleaseComObject(style);

                /*
                try
@ -422,5 +430,13 @@ namespace zaaReloaded2.Formatter
        Table _table;

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Formatter/IItemFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/IItemFormatterDictionary.cs
@ -1,7 +1,7 @@
 /* IItemFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/ITimePointFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/ITimePointFormatterDictionary.cs
@ -1,7 +1,7 @@
 /* ITimePointFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/ItemFormatter.cs
+++ b/zaaReloaded2/Formatter/ItemFormatter.cs
@ -1,7 +1,7 @@
 /* ItemFormatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -47,6 +47,11 @@ namespace zaaReloaded2.Formatter
        /// </summary>
        public AbnormalStyle AbnormalStyle { get; set; }

+        /// <summary>
+        /// Indicates whether to prefer the more verbose "mmol/l" over "mM".
+        /// </summary>
+        public bool PreferVerboseMolar { get; set; }
+
        /// <summary>
        /// Gets or sets a flag that indicates whether this ItemFormatter
        /// has been used, i.e. whether the LabItem was written to a
@ -86,12 +91,14 @@ namespace zaaReloaded2.Formatter
        /// <param name="labItem">LabItem to wrap in this ItemFormatter.</param>
        public ItemFormatter(LabItem labItem,
            ReferenceStyle referenceStyle,
-            AbnormalStyle abnormalStyle)
+            AbnormalStyle abnormalStyle,
+            bool preferVerboseMolar)
        {
            IncludeMaterial = true;
            LabItem = labItem;
            ReferenceStyle = referenceStyle;
            AbnormalStyle = abnormalStyle;
+            PreferVerboseMolar = preferVerboseMolar;
        }

        #endregion
@ -147,7 +154,12 @@ namespace zaaReloaded2.Formatter
            if (LabItem.HasUnit)
            {
                string space = LabItem.Unit.StartsWith("/") ? String.Empty : " ";
-                unit = String.Format("{0}{1}", space, LabItem.Unit);
+                unit = LabItem.Unit;
+                if (PreferVerboseMolar)
+                {
+                    unit = LabItem.Unit.Replace("mM", "mmol/l");
+                }
+                unit = String.Format("{0}{1}", space, unit);
            }
            else
            {
--- a/zaaReloaded2/Formatter/ItemFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/ItemFormatterDictionary.cs
@ -1,7 +1,7 @@
 /* ItemFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/NoLaboratoryDataException.cs
+++ b/zaaReloaded2/Formatter/NoLaboratoryDataException.cs
@ -1,7 +1,7 @@
 /* NoLaboratoryDataException.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/ReferenceStyle.cs
+++ b/zaaReloaded2/Formatter/ReferenceStyle.cs
@ -1,7 +1,7 @@
 /* ReferenceStyle.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/TimePointFormatter.cs
+++ b/zaaReloaded2/Formatter/TimePointFormatter.cs
@ -1,7 +1,7 @@
 /* TimePointFormatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -105,14 +105,15 @@ namespace zaaReloaded2.Formatter
        /// used to create ItemFormatter objects.</param>
        public TimePointFormatter(TimePoint timePoint,
            ReferenceStyle referenceStyle,
-            AbnormalStyle abnormalStyle)
+            AbnormalStyle abnormalStyle,
+            bool preferVerboseMolar)
        {
            TimeStamp = timePoint.TimeStamp;
            ItemFormatters = new ItemFormatterDictionary();
            foreach (LabItem item in timePoint.Items.Values)
            {
                ItemFormatters[item.QualifiedName] = new ItemFormatter(
-                    item, referenceStyle, abnormalStyle);
+                    item, referenceStyle, abnormalStyle, preferVerboseMolar);
            }
        }

--- a/zaaReloaded2/Formatter/TimePointFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/TimePointFormatterDictionary.cs
@ -1,7 +1,7 @@
 /* TimePointFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Helpers.cs
+++ b/zaaReloaded2/Helpers.cs
@ -1,7 +1,7 @@
 /* Helpers.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Importer/IImporter.cs
+++ b/zaaReloaded2/Importer/IImporter.cs
@ -1,7 +1,7 @@
 /* IImporter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Importer/ZaaImporter/AutoDetect.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/AutoDetect.cs
@ -2,7 +2,7 @@
 /* AutoDetect.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
@ -1,7 +1,7 @@
 /* LabItem.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -103,14 +103,17 @@ namespace zaaReloaded2.Importer.ZaaImporter
            // "HBs-Antigen: neg. ;"
            // "Erythrozyten (U): + [negativ]"
            Match match;
+            Logger.Debug("ParseLauris: {0}", LaurisText);
            if (_numericalRegex.IsMatch(LaurisText))
            {
+                Logger.Debug("ParseLauris: Numerical match");
                match = _numericalRegex.Match(LaurisText);
                ParseLimits(match);
                Value = match.Groups["value"].Value.Trim().Replace(',', '.');
            }
            else
            {
+                Logger.Debug("ParseLauris: Not a numerical match");
                match = _categoricalRegex.Match(LaurisText);
                Normal = match.Groups["normal"].Value.Trim();
                Value = match.Groups["value"].Value.Trim();
@ -120,6 +123,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
                OriginalName = match.Groups["name"].Value.Trim();
                Name = OriginalName;
                Unit = match.Groups["unit"].Value.Trim();
+                Logger.Debug("ParseLauris: Match: {0}, {1}", Name, Unit);
+            }
+            else
+            {
+                Logger.Debug("ParseLauris: No match: \"{0}\"", LaurisText);
            }
        }

@ -132,9 +140,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
        {
            if (match.Groups["limits"].Success)
            {
+                Logger.Debug("ParseLimits: Has limits: {0}", match.Groups["limits"].Value);
                Match limitMatch = _limitRegex.Match(match.Groups["limits"].Value);
                if (limitMatch.Groups["limit1"].Success && limitMatch.Groups["limit2"].Success)
                {
+                    Logger.Debug("ParseLimits: Upper and lower limit detected");
                    // Use InvariantCulture because Lauris always outputs dots as decimal separator
                    // Only in rare cases, a comma sneaks in...
                    LowerLimit = Double.Parse(limitMatch.Groups["limit1"].Value.Replace(',', '.'),
@ -144,6 +154,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
                }
                else
                {
+                    Logger.Debug("ParseLimits: Single limit detected");
                    switch (limitMatch.Groups["operator"].Value.Trim())
                    {
                        case "<=":
@ -159,9 +170,9 @@ namespace zaaReloaded2.Importer.ZaaImporter
                            // Fixes exception ID 65ca8575.
                            break;
                        default:
-                            throw new InvalidOperationException(
-                                String.Format("Unknown operator in {0}",
-                                    match.Groups["limits"].Value));
+                            string unknown = match.Groups["limits"].Value;
+                            Logger.Fatal("ParseLimits: Unknown operator \"{0}\"", unknown);
+                            throw new InvalidOperationException(String.Format("Unknown operator in {0}",unknown));
                    }
                }
            }
@ -210,5 +221,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
        static readonly Regex _materialRegex = new Regex(@"\((?<material>(SU|PU))\)");

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisParagraph.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/LaurisParagraph.cs
@ -1,7 +1,7 @@
 /* LaurisParagraph.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -23,6 +23,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using zaaReloaded2.Thesaurus;
 using zaaReloaded2.LabModel;
+using Bovender.Extensions;

 namespace zaaReloaded2.Importer.ZaaImporter
 {
@ -109,9 +110,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
        /// </summary>
        void Parse()
        {
+            Logger.Info("Parse: \"{0}\"", OriginalParagraph.TruncateWithEllipsis(40));
            Match m = _expectedFormat.Match(OriginalParagraph);
            if (m.Success)
            {
+                Logger.Info("Parse: Matches Lauris paragraph format");
                Items = new ItemDictionary();
                if (m.Groups["caption"].Success)
                {
@ -127,6 +130,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
            }
            else
            {
+                Logger.Info("Parse: Does not match Lauris paragraph format");
                IsLaurisParagraph = false;
            }
        }
@ -140,5 +144,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
        Thesaurus.Units _unitDictionary;

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisTimePoint.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/LaurisTimePoint.cs
@ -1,7 +1,7 @@
 /* LaurisTimePoint.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -199,6 +199,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
            Match m = _timeStampRegex.Match(paragraph);
            if (m.Success)
            {
+                Logger.Info("ParseParagraph: Matches time stamp");
                DateTime dt;
                if (DateTime.TryParseExact(
                    m.Groups["datetime"].Value,
@ -213,27 +214,30 @@ namespace zaaReloaded2.Importer.ZaaImporter
                // Put the remainder of the line back to the
                // 'paragraph' parameter to deal with exceptional
                // lines such as 
-                // "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
+                // "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
                // We need to add a dummy caption because this is
                // the normal format of a paragraph generated from Lauris.
                if (m.Groups["tail"].Success)
                {
+                    Logger.Info("ParseParagraph: Time stamp has a tail -- putting it back with a dummy caption");
                    paragraph = "DUMMY CAPTION: " + m.Groups["tail"].Value;
                }
                else
                {
-                    paragraph = String.Empty;
+                    paragraph = null;
                }
            }

            if (!String.IsNullOrEmpty(paragraph))
            {
+                Logger.Info("ParseParagraph: Not a time stamp");
                LaurisParagraph lp = new LaurisParagraph(
                        paragraph,
                        _parameterDictionary,
                        _unitDictionary);
                if (lp.IsLaurisParagraph)
                {
+                    Logger.Debug("ParseParagraph: Merging Lauris paragraph");
                    Items.Merge(lp.Items);
                }
            }
@ -259,5 +263,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
        Units _unitDictionary;

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/Importer/ZaaImporter/ZaaImporter.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/ZaaImporter.cs
@ -1,7 +1,7 @@
 /* ZaaImporter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -67,15 +67,19 @@ namespace zaaReloaded2.Importer.ZaaImporter
        /// <param name="text">ZAA-formatted Lauris output to import.</param>
        public void Import(string text)
        {
+            Logger.Info("Import: \"{0}\"", text.TruncateWithEllipsis(120));
            string[] paragraphs = Helpers.SplitParagraphs(text);
+            Logger.Info("Import: {0} paragraph(s)", paragraphs.Length);
            LaurisTimePoint timePoint = null;

            foreach (string paragraph in paragraphs)
            {
+                Logger.Info("Import: \"{0}\"", paragraph.TruncateWithEllipsis(40));
                // If the current paragraph looks like a Lauris time stamp,
                // create a new time point.
                if (LaurisTimePoint.IsTimeStampLine(paragraph))
                {
+                    Logger.Info("Import: Time stamp detected", paragraph);
                    timePoint = new LaurisTimePoint(paragraph, _parameters, _units);
                    // Add the time point to the laboratory only if none
                    // with the same time stamp exists yet.
@ -94,6 +98,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
                // if no time point exists yet, create one.
                else if (LaurisParagraph.ResemblesLaurisParagraph(paragraph))
                {
+                    Logger.Info("Import: Lauris paragraph detected");
                    if (timePoint == null)
                    {
                        timePoint = new LaurisTimePoint(_parameters, _units);
@ -101,6 +106,10 @@ namespace zaaReloaded2.Importer.ZaaImporter
                    }
                    timePoint.AddParagraph(paragraph);
                }
+                else
+                {
+                    Logger.Debug("Import: Neither time stamp, nor Lauris paragraph");
+                }
            }
        }

@ -123,5 +132,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
        Units _units;

        #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
    }
 }
--- a/zaaReloaded2/LabModel/IItemDictionary.cs
+++ b/zaaReloaded2/LabModel/IItemDictionary.cs
@ -1,7 +1,7 @@
 /* ItemDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/ITimePointsDictionary.cs
+++ b/zaaReloaded2/LabModel/ITimePointsDictionary.cs
@ -1,7 +1,7 @@
 /* ITimePointsDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/ItemDictionary.cs
+++ b/zaaReloaded2/LabModel/ItemDictionary.cs
@ -1,7 +1,7 @@
 /* ItemDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/LabItem.cs
+++ b/zaaReloaded2/LabModel/LabItem.cs
@ -1,7 +1,7 @@
 /* LabItem.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -206,12 +206,13 @@ namespace zaaReloaded2.LabModel
        {
            get
            {
-                if (Material == LabModel.Material.B)
+                switch (Material)
                {
+                    case Material.S:
+                    case Material.E:
+                    case Material.B:
                        return Name;
-                }
-                else
-                {
+                    default:
                        return String.Format("{0}-{1}", Material.ToString(), Name);
                }
            }
--- a/zaaReloaded2/LabModel/Laboratory.cs
+++ b/zaaReloaded2/LabModel/Laboratory.cs
@ -1,7 +1,7 @@
 /* Laboratory.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/Material.cs
+++ b/zaaReloaded2/LabModel/Material.cs
@ -1,7 +1,7 @@
 /* Materials.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -28,6 +28,12 @@ namespace zaaReloaded2.LabModel
    /// </summary>
    public enum Material
    {
+        [Description("Serum")]
+        /// Serum (default -- first declared)
+        S,
+        [Description("EDTA-Blut")]
+        /// EDTA blood
+        E,
        [Description("Blut")]
        /// Blood
        B,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Kraus	a38d0d76d4	Merge branch 'release-v2.3.2'	2017-03-06 06:20:12 +01:00
Daniel Kraus	b417107d33	Write version info.	2017-03-06 06:19:46 +01:00
Daniel Kraus	118a822332	Bump version, write history.	2017-03-06 06:19:25 +01:00
Daniel Kraus	12bb372137	Use 500 ms delay to display FirstRunView.	2017-03-06 06:17:24 +01:00
Daniel Kraus	c23fd4986d	Fix SettingsRepositoryTest.	2017-03-06 06:17:11 +01:00
Daniel Kraus	cc0573c326	Fix display of welcome screen. - Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt.	2017-03-06 06:12:16 +01:00
Daniel Kraus	dc6e1f9eaf	Update some screenshots.	2017-03-04 05:48:15 +01:00
Daniel Kraus	b9be245227	Merge branch 'release-2.3.1' into develop	2017-03-03 21:52:29 +01:00
Daniel Kraus	eb524689b2	Merge branch 'release-2.3.1'	2017-03-03 21:52:09 +01:00
Daniel Kraus	14b4de52c7	Update version info file.	2017-03-03 21:52:04 +01:00
Daniel Kraus	f0f234ad9f	Bump version and write history.	2017-03-03 21:50:51 +01:00
Daniel Kraus	9653403189	Fix some views. - Repariert: Der Begrüßungsdialog war manchmal hinter Word verborgen.	2017-03-03 21:49:49 +01:00
Daniel Kraus	da2057bd26	Merge branch 'release-2.3.0' into develop	2017-03-03 16:25:03 +01:00
Daniel Kraus	85b0356971	Merge branch 'release-2.3.0'	2017-03-03 16:24:22 +01:00
Daniel Kraus	1361bcf739	Write version info.	2017-03-03 16:24:13 +01:00
Daniel Kraus	fb5af6a581	Bump version, write history.	2017-03-03 16:22:32 +01:00
Daniel Kraus	c783fdb64d	Enable verbose molar units (mmol/l instead of mM). - Verbessert: Benutzeroption für die Ausgabe von "mmol/l" anstatt "mM" (einstellbar pro Stil).	2017-03-03 16:20:15 +01:00
Daniel Kraus	0896f007da	Serialize settings to YAML, rather than XML. - Verbesserung: Einstellungen werden in einem Format (YAML) gespeichert, das für Menschen besser lesbar und bearbeitbar ist als das bisher verwendete XML.	2017-03-03 15:04:41 +01:00
Daniel Kraus	9f7b0313a3	Improve IoErrorView.	2017-03-02 16:32:46 +01:00
Daniel Kraus	2cbfe5c3fa	Update VstoAddinInstaller to v1.4.1. - Verbessert: Das Installationsprogramm versucht jetzt nicht mehr, einen Zero Client zu erkennen, weil der Workaround für Zero Clients ohnehin nicht funktioniert hat.	2017-03-02 15:34:04 +01:00
Daniel Kraus	40fbcd279b	Bump copyright year.	2017-03-02 15:30:11 +01:00
Daniel Kraus	3a1559c4a3	Fix views. - Verbessert: Technische Verbesserungen bei Dialogen.	2017-03-02 15:27:37 +01:00
Daniel Kraus	acbd3833ed	Merge branch 'release-2.2.6' into develop	2017-02-23 17:14:24 +01:00
Daniel Kraus	2755655e8f	Merge branch 'release-2.2.6'	2017-02-23 16:56:20 +01:00
Daniel Kraus	65b2da1071	Version info.	2017-02-23 16:56:14 +01:00
Daniel Kraus	b7246ca0ed	Update copyright; website.	2017-02-23 16:44:07 +01:00
Daniel Kraus	a5b4daae7a	Merge branch 'release-2.2.6'	2017-02-23 15:52:42 +01:00
Daniel Kraus	40d06b9811	Bump version and write history.	2017-02-23 15:52:37 +01:00
Daniel Kraus	23e2f3c2ca	Fix SettingsRepositoryView. - Repariert: Stilauswahl wurde immer ganz im Vordergrund dargestellt und verdeckte damit mitunter andere Hinweise.	2017-02-23 15:50:31 +01:00
Daniel Kraus	1eeaa32336	Update bovender framework to 0.16.2. - Verbessert: Diverse technische Verbesserungen.	2017-02-23 15:31:56 +01:00
Daniel Kraus	091a7e5c97	Fix Makefile.	2016-10-03 18:08:48 +02:00
Daniel Kraus	cf317ef5f0	Write history for v2.5.5.	2016-10-03 18:04:49 +02:00
Daniel Kraus	1cfe4c57c5	Add Makefile.	2016-10-03 18:03:36 +02:00
Daniel Kraus	9f118757a6	Merge branch 'release-2.2.5' into develop	2016-10-03 17:31:59 +02:00
Daniel Kraus	3267bd9d5a	Merge branch 'release-2.2.5'	2016-10-03 17:16:45 +02:00
Daniel Kraus	5a9e7fe444	Bump version number, update versioninfo.txt.	2016-10-03 17:14:28 +02:00
Daniel Kraus	f199b2f1bf	Improve logging.	2016-10-03 17:12:47 +02:00
Daniel Kraus	eae8cb718b	Update homepage URLs in installer and About view.	2016-10-03 17:09:30 +02:00
Daniel Kraus	ae012d42fb	Merge branch 'refactor' into develop - Repariert: Word bleibt nicht mehr hängen, wenn man versucht, ein Dokument zu speichern. - Verbessert: Multiple Verbesserungen im Programmcode.	2016-10-03 16:29:27 +02:00
Daniel Kraus	aea6d037c3	Update homepage URLs.	2016-10-03 16:29:09 +02:00
Daniel Kraus	26c0d9e456	Update VstoAddinInstaller to v1.4.0.	2016-10-03 16:09:52 +02:00
Daniel Kraus	e190e85b89	Fix additional tests.	2016-10-03 16:09:43 +02:00
Daniel Kraus	ba07293385	Fix window handle provider.	2016-10-03 16:09:03 +02:00
Daniel Kraus	46b4af54c5	Update Bovender framework to v0.14.5.	2016-09-03 23:44:30 +02:00
Daniel Kraus	63012281db	Refactor, using latest bovender framework.	2016-09-03 23:18:43 +02:00
Daniel Kraus	812042d4bf	Update notification action property names.	2016-09-03 11:14:25 +02:00
Daniel Kraus	ad34141909	Update bovender framework to v0.14.1.	2016-09-03 11:13:49 +02:00
Daniel Kraus	523e6ac438	Update versioninfo.txt for 2.2.4.	2016-04-05 14:14:04 +02:00
Daniel Kraus	e20b967b44	Merge branch 'release-2.2.4' into develop	2016-04-05 14:12:59 +02:00
Daniel Kraus	753219c1eb	Merge branch 'release-2.2.4'	2016-04-05 14:11:34 +02:00
Daniel Kraus	19ffff86ff	Write history.	2016-04-05 14:11:03 +02:00
Daniel Kraus	5b8cea34de	Bump version number. - VERBESSERT: Kleine Optimierungen beim Installationsprogramm.	2016-04-05 14:10:07 +02:00
Daniel Kraus	999f2def41	Update VstoInstaller to 1.1.0.	2016-04-03 15:35:11 +02:00
Daniel Kraus	1ba74bbc29	Use VstoAddinInstaller from Github repository.	2016-03-30 17:18:50 +02:00
Daniel Kraus	474a292991	Remove local VstoAddinInstaller submodule.	2016-03-30 17:14:42 +02:00
Daniel Kraus	eaaed3b659	Update publication year.	2016-03-30 15:51:43 +02:00
Daniel Kraus	1be66fbd71	Merge branch 'release-2.2.3' into develop	2016-03-30 14:12:30 +02:00