biblatex-archaeology (11jun18)

git-svn-id: svn://tug.org/texlive/trunk@47989 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2018-06-11 22:19:39 +0000
committer: Karl Berry <karl@freefriends.org> 2018-06-11 22:19:39 +0000
commit: 97fd3780f5c37e7667a82e30184b6c91469ad1ac (patch)
tree: 7c972a9f40057fbee3e6da82578ad48530fcfc59
parent: b00bffe83bc1a4c66e79fe6a340b20b075a2aea6 (diff)
389 files changed, 11283 insertions, 2904 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/README.htm b/Master/texmf-dist/doc/latex/biblatex-archaeology/README.htm
new file mode 100644
index 00000000000..a93ca2bf3b8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/README.htm
@@ -0,0 +1,91 @@
+<!doctype html><html><meta charset="utf-8"></html><body><h1>The <code>biblatex-archaeology</code> styles [v2.0]</h1>
+
+<h2>Objective</h2>
+
+<p><code>biblatex-archaeology</code> provides a collection of style files for the <code>biblatex</code> bibliography package. It is designed for the use of German researchers into material culture, especially prehistorians and medieval archaeologists. Generally their bibliography styles are more or less variations of the <a href="https://www.uni-bamberg.de/fileadmin/uni/fakultaeten/ggeo_professuren/fruehgesch_archaeologie/Dateien/RGK_Richtlinien.pdf">guide lines of the Römisch-Germanische Kommission (RGK)</a>, nowithstanding of being verbose or inline styles. I tried to develop generic styles, that cover all the needs and allow for easy generation of local styles. Refer to the enclosed manual document for further details.</p>
+
+<h2>Installing</h2>
+
+<p>Get the sources from <a href="http://www.ctan.org/pkg/biblatex-archaeology">CTAN</a> or clone them from GitHub:</p>
+
+<pre><code>git clone https://github.com/CarlOrff/biblatex-archaeology.git
+</code></pre>
+
+<p>Create the directories <code>{TEXMF}/bibtex/bib/biblatex-archaeology</code> and <code>{TEXMF}/tex/latex/biblatex-archaeology</code> and run</p>
+
+<pre><code>pdftex -8bit biblatex-archaeology.ins
+texhash
+</code></pre>
+
+<p>Create a directory <code>{TEXMF}/doc/latex/biblatex-archaeology</code> and move <code>biblatex-archaeology.pdf</code> and the example folder there. In case you want to compile the manual yourself, do </p>
+
+<pre><code>lualatex biblatex-archaeology
+Biber biblatex-archaeology
+makeindex -s gglo.ist -o biblatex-archaeology.gls biblatex-archaeology.glo
+makeindex -s gind.ist biblatex-archaeology.idx
+lualatex biblatex-archaeology
+lualatex biblatex-archaeology
+</code></pre>
+
+<p>Remark that you MUST employ Biber. BibTeX won't work.</p>
+
+<p>In contrast to CPAN the GitHub sources include Perl scripts and Windows batch files in addition. These are tools for speeding up the development process and have no meaning for end users.</p>
+
+<h2>Usage</h2>
+
+<p>The package provides several style files for the <code>biblatex</code> bibliography package. It is called through <code>biblatex</code>' style option, fi.:</p>
+
+<pre><code>\usepackage[style=rgk-verbose]{biblatex}
+</code></pre>
+
+<p>Remark that <code>biblatex-archaeology</code> makes heavy use of Biber-only features. It won't work properly with BibTeX as backend. For a detailed styles and commands reference refer to the manual. At present the following end user styles are provided:</p>
+
+<ul>
+<li>aefkw</li>
+<li>afwl</li>
+<li>amit</li>
+<li>archa</li>
+<li>dguf</li>
+<li>dguf-alt</li>
+<li>dguf-apa</li>
+<li>eaz</li>
+<li>eaz-alt</li>
+<li>foe</li>
+<li>jb-halle</li>
+<li>jb-kreis-neuss</li>
+<li>karl</li>
+<li>maja</li>
+<li>mpk</li>
+<li>mpkoeaw</li>
+<li>nnu</li>
+<li>offa</li>
+<li>rgk-inline</li>
+<li>rgk-numeric</li>
+<li>rgk-verbose</li>
+<li>rgzm-inline</li>
+<li>rgzm-numeric</li>
+<li>rgzm-verbose</li>
+<li>ufg-muenster-inline</li>
+<li>ufg-muenster-numeric</li>
+<li>ufg-muenster-verbose</li>
+<li>volkskunde</li>
+<li>zaak</li>
+<li>zaes</li>
+</ul>
+
+<h2>Help</h2>
+
+<p>The package is hosted on <a href="https://github.com/CarlOrff/biblatex-archaeology">GitHub</a>. If you have any concerns it is by far best to use the issue tracker there.
+Alternatively you can e-mail me through the <a href="https://ingram-braun.net/public/about/legal-notice/#ib_campaign=biblatex-archaeology-2.0.4&amp;ib_medium=readme.htm&amp;ib_source=ctan&amp;ib_content=helpsection">contact form on my website</a>. Or you can employ the comment script of a project page on my personal website: <a href="https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf/#ib_campaign=biblatex-archaeology-2.0&amp;ib_medium=readme.htm&amp;ib_source=ctan&amp;ib_content=helpsection">The <code>biblatex-archaeology</code> styles for German cultural anthropology</a>.</p>
+
+<p>Normally you will get the latest production version through the update script of your TeX distribution. If you want to keep track actively, use
+the news feeds of CTAN, GitHub, Academia or my personal website.</p>
+
+<h2>Copyright</h2>
+
+<p>© 2005–2018 by <a href="https://ingram-braun.net/#ib_campaign=biblatex-archaeology-1.4&amp;ib_medium=readme.htm&amp;ib_source=ctan&amp;ib_content=copyright">Ingram Braun</a></p>
+
+<h2>License</h2>
+
+<p><a href="http://www.latex-project.org/lppl.txt">The LaTeX Project Public License 1.3c or later</a></p>
+</body>
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/README.md b/Master/texmf-dist/doc/latex/biblatex-archaeology/README.md
index 7f74ce2404a..c744d511c57 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/README.md
@@ -1,28 +1,28 @@
-# The `biblatex-archaeology` package
+# The `biblatex-archaeology` styles [v2.0]
 
 ## Objective
 
-`biblatex-archaeology` provides a collection of style files for the `biblatex` bibliography package. It is designed for the use of German researchers into material culture, especially prehistorians and medieval archaeologists. Generally their bibliography styles are more or less variations of the [guide lines of the Römisch-Germanische Kommission (RGK)](http://www.av-rheinland.de/Richtlinien.pdf), nowithstanding of being verbose or inline styles. I tried to develop generic styles, that cover all the needs and allow for easy generation of local styles. Refer to the enclosed manual document for further details.
+`biblatex-archaeology` provides a collection of style files for the `biblatex` bibliography package. It is designed for the use of German researchers into material culture, especially prehistorians and medieval archaeologists. Generally their bibliography styles are more or less variations of the [guide lines of the Römisch-Germanische Kommission (RGK)](https://www.uni-bamberg.de/fileadmin/uni/fakultaeten/ggeo_professuren/fruehgesch_archaeologie/Dateien/RGK_Richtlinien.pdf), nowithstanding of being verbose or inline styles. I tried to develop generic styles, that cover all the needs and allow for easy generation of local styles. Refer to the enclosed manual document for further details.
 
 ## Installing
 
 Get the sources from [CTAN](http://www.ctan.org/pkg/biblatex-archaeology) or clone them from GitHub:
 
-    git clone https://github.com/CarlOrff/biblatex-archaeology.git
+	git clone https://github.com/CarlOrff/biblatex-archaeology.git
 
 Create the directories `{TEXMF}/bibtex/bib/biblatex-archaeology` and `{TEXMF}/tex/latex/biblatex-archaeology` and run
 
-    pdftex -8bit biblatex-archaeology.ins
-    texhash
+	pdftex -8bit biblatex-archaeology.ins
+	texhash
 	
 Create a directory `{TEXMF}/doc/latex/biblatex-archaeology` and move `biblatex-archaeology.pdf` and the example folder there. In case you want to compile the manual yourself, do 
 
-    pdflatex biblatex-archaeology
-    Biber biblatex-archaeology
-    makeindex -s gglo.ist -o biblatex-archaeology.gls biblatex-archaeology.glo
-    makeindex -s gind.ist biblatex-archaeology.idx
-    pdflatex biblatex-archaeology
-	pdflatex biblatex-archaeology
+	lualatex biblatex-archaeology
+	Biber biblatex-archaeology
+	makeindex -s gglo.ist -o biblatex-archaeology.gls biblatex-archaeology.glo
+	makeindex -s gind.ist biblatex-archaeology.idx
+	lualatex biblatex-archaeology
+	lualatex biblatex-archaeology
 
 Remark that you MUST employ Biber. BibTeX won't work.
 
@@ -30,9 +30,9 @@ In contrast to CPAN the GitHub sources include Perl scripts and Windows batch fi
 
 ## Usage
 
-The package provides several style files for the `biblatex` bibliography package. It is called through `biblatex`' style option, e. g.:
+The package provides several style files for the `biblatex` bibliography package. It is called through `biblatex`' style option, fi.:
 
-    \usepackage[style=rgk-verbose,backend=biber]{biblatex}
+	\usepackage[style=rgk-verbose]{biblatex}
 
 Remark that `biblatex-archaeology` makes heavy use of Biber-only features. It won't work properly with BibTeX as backend. For a detailed styles and commands reference refer to the manual. At present the following end user styles are provided:
 
@@ -51,13 +51,17 @@ Remark that `biblatex-archaeology` makes heavy use of Biber-only features. It wo
 - karl
 - maja
 - mpk
+- mpkoeaw
 - nnu
 - offa
 - rgk-inline
+- rgk-numeric
 - rgk-verbose
 - rgzm-inline
+- rgzm-numeric
 - rgzm-verbose
 - ufg-muenster-inline
+- ufg-muenster-numeric
 - ufg-muenster-verbose
 - volkskunde
 - zaak
@@ -65,15 +69,15 @@ Remark that `biblatex-archaeology` makes heavy use of Biber-only features. It wo
 
 ## Help
 
-The package ist hosted on [GitHub](https://github.com/CarlOrff/biblatex-archaeology). If you have any concerns it is by far best to use the issue tracker there.
-Alternatively you can e-mail me through the [contact form on my website](https://ingram-braun.net/public/about/legal-notice/). Or you can employ the comment script of a project page on my personal website: [The `biblatex-archaeology` styles for German cultural anthropology](https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf).
+The package is hosted on [GitHub](https://github.com/CarlOrff/biblatex-archaeology). If you have any concerns it is by far best to use the issue tracker there.
+Alternatively you can e-mail me through the [contact form on my website](https://ingram-braun.net/public/about/legal-notice/#ib_campaign=biblatex-archaeology-2.0.4&ib_medium=readme.md&ib_source=ctan&ib_content=helpsection). Or you can employ the comment script of a project page on my personal website: [The `biblatex-archaeology` styles for German cultural anthropology](https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf/#ib_campaign=biblatex-archaeology-2.0&ib_medium=readme.md&ib_source=ctan&ib_content=helpsection).
 
 Normally you will get the latest production version through the update script of your TeX distribution. If you want to keep track actively, use
-the news feeds of CTAN, GitHub or my personal website.
+the news feeds of CTAN, GitHub, Academia or my personal website.
 
 ## Copyright
 
-© 2005–2017 by [Ingram Braun](https://ingram-braun.net/)
+© 2005–2018 by [Ingram Braun](https://ingram-braun.net/#ib_campaign=biblatex-archaeology-1.4&ib_medium=readme.md&ib_source=ctan&ib_content=copyright)
 
 ## License
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-example.bib b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-example.bib
index 25f7f7ae824..673276c8c6b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-example.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-example.bib
@@ -47,6 +47,7 @@
   OPTIONS = {uselabeltitle=true},
   SHORTTITLE = {Maifischfilet},
   LANGUAGE = {german},
+  REALDATE = {2015},
 }
 @INREFERENCE{authen-blom:1989,
   AUTHOR = {Authén-Blom, Grethe},
@@ -60,7 +61,7 @@
 }
 @INREFERENCE{bauchhenss:et:al:1978,
   AUTHOR = {Bauchhenß, G. AND Beck, Heinrich AND Hassel, F. J. AND Capelle,
-Torsten AND Wilson, David M.},
+    Torsten AND Wilson, David M.},
   TITLE = {Brettspiel},
   EDITION = {2},
   PAGES = {450--458},
@@ -90,6 +91,29 @@ Torsten AND Wilson, David M.},
   XREF = {stanzl:1998},
   GENDER = {sf},
 }
+@ARTICLE{caselitz:1980a,
+  AUTHOR = {Caselitz, Peter},
+  TITLE = {Schwangerschaft im archäologischen Befund},
+  JOURNALTITLE = ufg-ArchAdvertiser,
+  LOCATION = {Bad Bramstedt},
+  PUBLISHER = {Moreland \& Co.},
+  DATE = {1980},
+  PAGES = {20--26},
+  ABSTRACT = {Über Funde von Feten im Pelvis.},
+  KEYWORDS = {Schwangerschaft, Anthropologie, Mortalität}
+}
+@ARTICLE{cossel:1933-35,
+  AUTHOR = {von Cossel, Otto},
+  TITLE = {Pfarrer und Schulmeister},
+  JOURNALTITLE = ufg-DtRoland,
+  LOCATION = {Berlin},
+  DATE = {1933/1935},
+  SUBTITLE = {Ein Beitrag zur Geschichte der Kirchenbuchführung},
+  VOLUME = {6},
+  NUMBER = {21--23},
+  PAGES = {121},
+  KEYWORDS = {Kirchenbuch, Pfarrer, Lehrer, Sozialgeschichte, Historische Demographie}
+}
 @INCOLLECTION{edenmo:1997,
   AUTHOR = {Edenmo, Roger},
   TITLE = {Gravar som samhällspegel?},
@@ -119,6 +143,20 @@ Torsten AND Wilson, David M.},
   XREF = {de:laet:o:j},
   GENDER = {sm},
 }
+@ARTICLE{ib:domino:dormagen,
+  AUTHOR = {Braun, Ingram},
+  TITLE = {Der archäologische Fund eines Dominosteins aus Dor\-ma\-gen\--Stür\-zel\-berg},
+  JOURNALTITLE = ufg-JbNeuss,
+  LOCATION = {Neuss},
+  PUBLISHER = {Kreisheimatbund},
+  DATE = {2018},
+  REALDATE = {2017-11},
+  PAGES = {96--109},
+  LANGUAGE = {german},
+  GENDER = {sm},
+  KEYWORDS = {Spiel, Domino, Dormagen, Nordrhein-Westfalen, 19. Jahrhundert, Landwirtschaft, Archäologie},
+  IDS = {ib:2016},
+}
 @ARTICLE{ib:domino:europa,
   AUTHOR = {Braun, Ingram},
   TITLE = {Die Kenntnis des Dominospiels in Europa: Archäologie, Geschichte, Bibliographie},
@@ -130,12 +168,12 @@ Torsten AND Wilson, David M.},
   KEYWORDS = {Spiel, Domino, Europa, Spielbücher, Grafik, Druck, Knochenschnitzerei, Archäologie},
   SHORTTITLE = {Kenntnis},
   VOLUME = 10,
-  NUMBER = 1,
   DATE = 2016,
   DOI = {10.1515/bgs-2016-0004},
   URL = {https://www.degruyter.com/view/j/bgs.2016.10.issue-1/bgs-2016-0004/bgs-2016-0004.xml},
   PAGES = {61--100},
   IDS = {ib:2016a},
+  ISSN = {1604-7982},
 }
 @ARTICLE{ilinskaja:1965,
   AUTHOR = {Il’inskaja, V.~A.},
@@ -149,6 +187,28 @@ Torsten AND Wilson, David M.},
   LANGUAGE = {russian},
   GENDER = {sf},
 }
+@ARTICLE{michaelsen:1978,
+  AUTHOR = {Michaelsen, K.},
+  TITLE = {Die Ausgrabung der beiden Hünenbetten von Kleinenkneten in Oldenburg
+    1934--39},
+  JOURNALTITLE = ufg-OldenburgerJahrb,
+  LOCATION = {Oldenburg},
+  PUBLISHER = {Isensee-Verlag},
+  DATE = {1975/1976},
+  VOLUME = {75/76},
+  PAGES = {215--249},
+  KEYWORDS = {Kleinenkneten, Megalithik, Neolithikum, Niedersachsen},
+  REALDATE = {1978},
+}
+@ARTICLE{nass:1938,
+  AUTHOR = {Naß, Karl},
+  TITLE = {Karolingische Reihengräberfelder aus Hessen},
+  JOURNALTITLE = ufg-Germania,
+  DATE = {1938},
+  VOLUME = {22},
+  PAGES = {41--50},
+  KEYWORDS = {Karolingerzeit, Frühmittelalter, Totenkult, Hessen}
+}
 @INPROCEEDINGS{schaedler:1999,
   AUTHOR = {Schädler, Ulrich},
   TITLE = {Damnosa alea -- Würfelspiel in Griechenland und Rom},
@@ -171,10 +231,20 @@ Torsten AND Wilson, David M.},
   GENDER = {sf},
   LOCATION = {London},
 }
+@ARTICLE{steinmetz:strahl:wilbers:1979,
+  AUTHOR = {Steinmetz, Wolf-Dieter AND Strahl, Erwin AND Wilbers, Susanne},
+  TITLE = {Vor- und frühgeschichtliche Ausgrabungen im Landkreis Osnabrück
+    1978},
+  JOURNALTITLE = ufg-OsnabrueckerMitt,
+  DATE = {1979},
+  VOLUME = {85},
+  PAGES = {9--15},
+  KEYWORDS = {Ur- und Frühgeschichte, Niedersachsen}
+}
 @INCOLLECTION{summerhayes:et:al:1993,
   AUTHOR = {Summerhayes, G. R. AND Gosden, C. AND Fullagar, Richard AND Specht,
-J. AND Torrence, R. AND Bird, J. Roger AND Shahgholi, N. AND Katsaros,
-A.},
+    J. AND Torrence, R. AND Bird, J. Roger AND Shahgholi, N. AND Katsaros,
+    A.},
   TITLE = {West New Britain obsidian},
   SUBTITLE = {Production and consumption patterns},
   PAGES = {57--68},
@@ -192,12 +262,12 @@ A.},
 @THESIS{apetz:1989,
   AUTHOR = {Apetz, Rotraud},
   TITLE = {Zetel, Ketzendorf, Maschen, Oldendorf -- Gräberfelder an der
-Peripherie des karolingischen Reiches},
+    Peripherie des karolingischen Reiches},
   TYPE = {magisterthesis},
   DATE = {1989},
   SUBTITLE = {Grabformen und Grabsitten am Übergang zum Christentum},
   KEYWORDS = {Zetel, Ketzendorf, Oldendorf, Maschen, Niedersachsen, Frühmittelalter,
-Sachsen, Friesen, Bestattung, Christentum, Totenkult},
+    Sachsen, Friesen, Bestattung, Christentum, Totenkult},
   LOCATION = {Kiel},
   VOLUMES = {2},
   GENDER = {sf},
@@ -213,10 +283,23 @@ Sachsen, Friesen, Bestattung, Christentum, Totenkult},
   LANGUAGE = {swedish},
   GENDER = {pp},
 }
+@BOOK{buss:2004,
+  AUTHOR = {Buss, David M.},
+  TITLE = {Evolutionäre Psychologie},
+  DATE = {2004},
+  EDITION = {2},
+  PUBLISHER = {Pearson Studium},
+  ISBN = {3827370949},
+  PAGETOTAL = {599},
+  TRANSLATOR = {Hoffrage, Ulrich},
+  ORIGLANGUAGE = {american},
+  LOCATION = {München},
+  KEYWORDS = {Psychologie, Ethologie, Evolution, Methodologie, Biologie}
+}
 @THESIS{czarnetzki:1966,
   AUTHOR = {Czarnetzki, Alfred},
   TITLE = {Die menschlichen Skelettreste aus vier neolithischen Steinkisten
-Hessens und Niedersachsens},
+    Hessens und Niedersachsens},
   TYPE = {Diss. rer. nat.},
   DATE = {1966},
   KEYWORDS = {Neolithikum, Niedersachsen, Calden, Anthropologie, Megalithik, Hessen},
@@ -244,7 +327,7 @@ Hessens und Niedersachsens},
   TITLE = {Dramatizations of social change},
   DATE = {1978},
   SUBTITLE = {Herman Heijermans' plays as compared with selected dramas by Ibsen,
-Hauptmann and Chekhov},
+    Hauptmann and Chekhov},
   PUBLISHER = {Martinus Nijhoff},
   ISBN = {90 247 2117 7},
   PAGETOTAL = {81},
@@ -252,7 +335,7 @@ Hauptmann and Chekhov},
   NUMBER = {5},
   LOCATION = {The Hague AND Boston AND London},
   ABSTRACT = {Behandelt \mkbibquote{Ghetto}, \mkbibquote{Op Hoop van Zegen} und \mkbibquote{Ora
-et Labora}},
+    et Labora}},
   KEYWORDS = {Niederlande, Literatur, Theater, Naturalismus},
   GENDER = {sf},
   LANGUAGE = {english},
@@ -275,14 +358,14 @@ et Labora}},
   SERIES = ufg-OccasionalPapersPrehist,
   NUMBER = {22},
   PUBLISHER = {Department of Prehistory, Research School of Pacific Studies, The
-Australian National University},
+    Australian National University},
   LOCATION = {Canberra},
   LANGUAGE = {english},
   GENDER = {pm},
 }
 @COLLECTION{fuchs:kh:et:al:1998,
   EDITOR = {Fuchs, Karl-Heinz AND Kempa, Martin AND Redies, Rainer AND Theune-Großkopf,
-Claudia AND Wais, Andr\'e},
+    Claudia AND Wais, Andr\'e},
   TITLE = {Die Alamannen},
   DATE = {1998},
   EDITION = {3},
@@ -394,7 +477,7 @@ Claudia AND Wais, Andr\'e},
   GENDER = {sm},
   KEYWORDS = {Spiel, München, Wien, 19. Jahrhundert, Handel},
 }
-@book{linnaeus:2003,
+@BOOK{linnaeus:2003,
   AUTHOR = {Linnæus, Carl},
   EDITOR = {Fries, Ingegerd AND Fries, Sigurd},
   COMMENTATOR = {Fries, Ingegerd AND Fries, Sigurd},
@@ -406,21 +489,51 @@ Claudia AND Wais, Andr\'e},
   DATE = {2003},
   ISBN = {9186438247},
   KEYWORDS = {Schweden, Lappland, Ethnologie, Biologie, Botanik, 18. Jahrhundert,
-Norwegen, Finnland},
+    Norwegen, Finnland},
   ORIGDATE = {1732},
   PAGETOTAL = {532},
   PUBLISHER = {Kungl. Skytteanska Samfundet},
   SUBTITLE = {Lappländska resan 1732},
   LANGUAGE = {swedish},
   GENDER = {pp},
+  OPTIONS = {usesourceeditor},
+}
+@BOOK{mette:1990,
+  AUTHOR = {Mette, Otto},
+  TITLE = {Affoldern},
+  DATE = {1990},
+    date+an = {=attributed},
+  PUBLISHER = {Waldeckischer Geschichtsverein e.\,V.},
+  SERIES = {Waldeckische Ortssippenbücher},
+  NUMBER = {34},
+  LOCATION = {Arolsen},
+  KEYWORDS = {Ortssippenbuch, Affoldern, Historische Demographie, Waldeck, Neuzeit,
+    Hessen, Genealogie, Edertal},
+  LANGUAGE = {german},
+  GENDER = {sm},
+}
+@BOOK{molleson:cox:1993,
+  AUTHOR = {Molleson, Theya AND Cox, Margaret},
+  MAINTITLE = {The Spitalfields Project Volume},
+  VOLUME = 2,
+  TITLE = {the anthropology},
+  DATE = {1993},
+  SUBTITLE = {The Middling Sort},
+  PUBLISHER = {Council for British Archaeology},
+  SERIES = ufg-CBAResearchReport,
+  NUMBER = {86},
+  LOCATION = {Walmgate},
+  KEYWORDS = {Anthropologie, Osteologie, Paläodemographie, Paläopathologie,
+    Kirchenarchäologie, Bestattung, Frühneuzeit, England, Spitalfields,
+    Hugenotten}
 }
 @PROCEEDINGS{oberlechner:1999,
   EDITOR = {Oberlechner, Manfred},
   SERIES = ufg-HomoludensSondernr,
   DATE = {1999},
   TITLE = {5000 Jahre Würfelspiel},
-  TITLEADDON = {Katalog zur Austellung im Schloß Kleßheim vom 31. August--31. Oktober 1999 und im Casino Linz (Casineum) vom 12. November--9. Dezember 1999 sowie 2000 im Casino Baden},
-  NUMBER = {9},
+  TITLEADDON = {Katalog zur Ausstellung im Schloß Kleßheim vom 31. August--31. Oktober 1999 und im Casino Linz (Casineum) vom 12. November--9. Dezember 1999 sowie 2000 im Casino Baden},
+  NUMBER = 9,
   EDITORTYPE = {redactor},
   LOCATION = {Salzburg},
   PUBLISHER = {Institut für Spielforschung und Spielpädagogik der Universität Mozarteum Salzburg},
@@ -463,7 +576,7 @@ Norwegen, Finnland},
 }
 @COLLECTION{siebert:u:et:al:o:j,
   EDITOR = {Siebert, Ursula AND Rousselot, Jean-Loup AND Jaeger, Astrid AND Jaeger,
-Halvor},
+    Halvor},
   TITLE = {Schachspiele},
   SUBTITLE = {Wandel im Laufe der Kunst- und Kulturgeschichte},
   TITLEADDON = {Privatsammlung Jaeger},
@@ -539,7 +652,7 @@ Halvor},
   MULTIVENUE = {Oldenburg AND Hannover},
   MULTIEVENTDATE = {1981/82 AND 1982},
   ORGANIZATION = {Braunschweigisches Landesmuseum AND Staatliches Museum für Naturkunde
-und Vorgeschichte AND Niedersächsisches Landesmuseum},
+    und Vorgeschichte AND Niedersächsisches Landesmuseum},
   VENUE = {Wolfenbüttel},
   EVENTDATE = {1981},
   EVENTTYPE = {exhibition},
@@ -549,14 +662,14 @@ und Vorgeschichte AND Niedersächsisches Landesmuseum},
 @THESIS{volk:1972,
   AUTHOR = {Volk, Peter},
   TITLE = {Medizingeschichtliche Überlieferung der römischen Antike
-und moderner archäologisch-pathologischer Befund am Beispiel
-eines römischen Brandgräberfeldes},
+    und moderner archäologisch-pathologischer Befund am Beispiel
+    eines römischen Brandgräberfeldes},
   TYPE = {postdocthesis},
   DATE = {1972},
   SUBTITLE = {Paläopathologische, paläodemographische und medizingeschichtliche
-Untersuchungen},
+    Untersuchungen},
   KEYWORDS = {Römer, Paläodemographie, Paläopathologie, Medizingeschichte,
-Anthropologie, Baden-Württemberg},
+    Anthropologie, Baden-Württemberg},
   LOCATION = {Freiburg/Br.},
   LANGUAGE = {german},
   GENDER = {sm},
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-manual.bib b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-manual.bib
index 450279262b2..8f0a5da6291 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-manual.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-manual.bib
@@ -1,3 +1,16 @@
+@ARTICLE{grando:bernhard:2003,
+  AUTHOR = {Grando, Sergei A. AND Bernhard, Jeffrey D.},
+  TITLE = {\mkbibquote{First Author, Second Author, et Int, and Last Author}: A Proposed Citation System for Biomedical Papers},
+  DATE = 2003,
+  JOURNALTITLE = ufg-ScienEditor,
+  VOLUME = 26,
+  NUMBER = 4,
+  PAGES = {122--123},
+  LANGUAGE = {american},
+  URL = {https://www.councilscienceeditors.org/wp-content/uploads/v26n4p122-123.pdf},
+  URLDATE = {2018-05-18},
+  GENDER = {pm},
+}
 @ARTICLE{guidelines:foe:2013,
   AUTHOR = {Hofer, Nikolaus},
   TITLE = {Die Redaktionsrichtlinien der Fundberichte aus Österreich},
@@ -32,7 +45,7 @@
   PAGES = {973--998},
   LANGUAGE = {german},
   SHORTAUTHOR = {RGK},
-  URL = {http://www.av-rheinland.de/Richtlinien.pdf},
+  URL = {https://web.archive.org/web/20160723214608/http://www.av-rheinland.de/Richtlinien.pdf},
   GENDER = {sf},
   URLDATE = {2016-07-23},
   AUTHORTYPE = {editor},
@@ -77,7 +90,7 @@
   TITLE = {Archaeologia Austriaca (ArchA) -- Richtlinien},
   LANGUAGE = {german},
   SHORTAUTHOR = {OREA},
-  URL = {http://www.oeaw.ac.at/praehist/fileadmin/template/main/res/pdf/OREA_EU_Richtlinien_ArchA_2013.pdf},
+  URL = {https://web.archive.org/web/20160723154732/http://www.oeaw.ac.at/praehist/fileadmin/template/main/res/pdf/OREA_EU_Richtlinien_ArchA_2013.pdf},
   GENDER = {sn},
   URLDATE = {2016-07-23},
 }
@@ -217,6 +230,7 @@
   URLDATE = {2016-10-20},
   GENDER = {pp},
   SHORTAUTHOR = {{Kunstgeschichte Göttingen}},
+  EDITORTYPE = {editors},
 }
 @ONLINE{guidelines:lda:2009,
   AUTHOR = {Schlenker, Monika},
@@ -249,13 +263,35 @@
 @ONLINE{guidelines:mpk:2013,
   AUTHOR = {{Institut für Orientalische und Europäische Archäologie, Österreichische Akademie der Wissenschaften}},
   TITLE = {Mitteilungen der Prähistorischen Kommission (MPK) -- Richtlinien},
-  DATE = {2015-03-31},
+  DATE = {2013},
   LANGUAGE = {german},
   SHORTAUTHOR = {OREA},
-  URL = {http://www.orea.oeaw.ac.at/fileadmin/user_upload/publikationsrichtlinien/Richtlinien_MPK/OREA_EU_Richtlinien_MPK_2013.pdf},
+  URL = {https://web.archive.org/web/20160723214538/http://www.orea.oeaw.ac.at/fileadmin/user_upload/publikationsrichtlinien/Richtlinien_MPK/OREA_EU_Richtlinien_MPK_2013.pdf},
   GENDER = {sn},
   URLDATE = {2016-07-23},
 }
+@ONLINE{guidelines:mpk:2016:de,
+  AUTHOR = {{Institut für Orientalische und Europäische Archäologie, Österreichische Akademie der Wissenschaften}},
+  TITLE = {Richtlinien für MPK Manuskripte},
+  DATE = 2016,
+  LANGUAGE = {german},
+  URL = {https://www.orea.oeaw.ac.at/fileadmin/Institute/OREA/pdf/Publikationen/MPK_Publikationsrichtlinien_de.pdf},
+  URLDATE = {2016-05-21},
+  GENDER = {sn},
+  SHORTAUTHOR = {OREA},
+  PAGETOTAL = 8,
+}
+@ONLINE{guidelines:mpk:2016:en,
+  AUTHOR = {{Institut für Orientalische und Europäische Archäologie, Österreichische Akademie der Wissenschaften}},
+  TITLE = {Guidelines for MPK Manuscripts},
+  DATE = 2016,
+  LANGUAGE = {english},
+  URL = {https://www.orea.oeaw.ac.at/fileadmin/Institute/OREA/pdf/Publikationen/MPK_Guidelines_en.pdf},
+  URLDATE = {2016-05-21},
+  GENDER = {sn},
+  SHORTAUTHOR = {OREA},
+  PAGETOTAL = 9,
+}
 @ONLINE{guidelines:muenster,
   AUTHOR = {Woltermann, G. AND Graefe, J.},
   TITLE = {Zitier-Regeln},
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full-subtitle.bib b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full-subtitle.bib
index f39608510fd..f5bc23d688e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full-subtitle.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full-subtitle.bib
@@ -259,6 +259,7 @@
 @STRING{ufg-ArbeitsuForschberSaechsBodendenkmalpfl = "Arbeits-und Forschungsberichte zur Sächsischen Bodendenkmalpflege"}
 @STRING{ufg-Arbok = "Árbók. Hins Islenzka Fornleifafélags"}
 @STRING{ufg-ArchAbroad = "Archaeology Abroad"}
+@STRING{ufg-ArchAdvertiser = "The Archaeological Advertiser"}
 @STRING{ufg-ArchAeliana = "Archaeologia Aeliana or Miscellaneous Tracts Relating to Antiquity"}
 @STRING{ufg-Archaeographie = "Archäographie. Archäologie und Elektronische Datenverarbeitung"}
 @STRING{ufg-Archaeologia = "Archaeologia or Miscellaneous Tracts Relating to Archaeology"}
@@ -865,6 +866,7 @@
 @STRING{ufg-CasopisZgodovinoinNarodopisje = "Časopis za Zgodovino in Narodopisje"}
 @STRING{ufg-Castrelos = "Castrelos. Revista do Museo Municipal \mkbibquote{Quiñones de León}"}
 @STRING{ufg-CastrumNovum = "Castrum Novum"}
+@STRING{ufg-CBAResearchReport = "CBA Research Report"}
 @STRING{ufg-CEDAC = "CÉDAC \mkbibparens{Centre d'Études et de Documentation Archéologique de la Conservation de Carthage} Carthage Bulletin"}
 @STRING{ufg-Celticum = "Celticum"}
 @STRING{ufg-CentroStudCeramici = "Centro di Studi Ceramici. Bollettino Mensile del Laboratorio Sperimentale di S. Salvatore in Lauro"}
@@ -968,6 +970,7 @@
 @STRING{ufg-DtJahrbNum = "Deutsches Jahrbuch für Numismatik"}
 @STRING{ufg-DtLitztg = "Deutsche Literaturzeitung für Kritik der Internationalen Wissenschaft"}
 @STRING{ufg-DtMuenzbl = "Deutsche Münzblätter"}
+@STRING{ufg-DtRoland = "Der Deutsche Roland"}
 @STRING{ufg-DtWissZeitschrPolen = "Deutsche Wissenschaftliche Zeitschrift für Polen"}
 @STRING{ufg-DuerenerGeschbl = "Dürener Geschichtsblätter. Mitteilungen des Dürener Geschichtsvereins e.\,V\adddot"}
 @STRING{ufg-DuesseldorferJahrb = "Düsseldorfer Jahrbuch. Beiträge zur Geschichte des Niederrheins"}
@@ -2017,7 +2020,8 @@
 @STRING{ufg-Pallas = "Pallas"}
 @STRING{ufg-PamaMuz = "Pamiatky a Múzeá"}
 @STRING{ufg-PamaPrirodaBratislavy = "Pamiatky a Príroda Bratislavy"}
-@STRING{ufg-PamArchMistopisnePamArch = "Památky Archaeologické a Místopisné Památky Archeologické"}
+@STRING{ufg-PamArch = "Památky Archaeologické"}
+@STRING{ufg-PamArchMistopisne = "Památky Archaeologické a Místopisné"}
 @STRING{ufg-Pamatky = "Památky. Listy pro Archaeologii a Historii"}
 @STRING{ufg-PamKultury = "Pamjatniki Kuľtury"}
 @STRING{ufg-PamMuzMiedzi = "Pamiętnik Muzeum Miedzi"}
@@ -2339,6 +2343,7 @@
 @STRING{ufg-SchwaebMus = "Das Schwäbische Museum. Zeitschrift für Kultur, Kunst und Geschichte Schwabens"}
 @STRING{ufg-SchweizerMuenzbl = "Schweizer Münzblätter"}
 @STRING{ufg-SchweizerNumRundschau = "Schweizerische Numismatische Rundschau"}
+@STRING{ufg-ScienEditor = "Science Editor"}
 @STRING{ufg-Sciliar = "Der Sciliar. Illustrierte Monatsschrift für Heimat-und Volkskunde"}
 @STRING{ufg-ScottishArchForum = "Scottish Archaeological Forum"}
 @STRING{ufg-ScottishArchRev = "Scottish Archaeological Review"}
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full.bib b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full.bib
index 5f87b8e3bdb..1a9bedea5ad 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-full.bib
@@ -259,6 +259,7 @@
 @STRING{ufg-ArbeitsuForschberSaechsBodendenkmalpfl = "Arbeits-und Forschungsberichte zur Sächsischen Bodendenkmalpflege"}
 @STRING{ufg-Arbok = "Árbók"}
 @STRING{ufg-ArchAbroad = "Archaeology Abroad"}
+@STRING{ufg-ArchAdvertiser = "The Archaeological Advertiser"}
 @STRING{ufg-ArchAeliana = "Archaeologia Aeliana or Miscellaneous Tracts Relating to Antiquity"}
 @STRING{ufg-Archaeographie = "Archäographie"}
 @STRING{ufg-Archaeologia = "Archaeologia or Miscellaneous Tracts Relating to Archaeology"}
@@ -865,6 +866,7 @@
 @STRING{ufg-CasopisZgodovinoinNarodopisje = "Časopis za Zgodovino in Narodopisje"}
 @STRING{ufg-Castrelos = "Castrelos"}
 @STRING{ufg-CastrumNovum = "Castrum Novum"}
+@STRING{ufg-CBAResearchReport = "CBA Research Report"}
 @STRING{ufg-CEDAC = "CÉDAC \mkbibparens{Centre d'Études et de Documentation Archéologique de la Conservation de Carthage} Carthage Bulletin"}
 @STRING{ufg-Celticum = "Celticum"}
 @STRING{ufg-CentroStudCeramici = "Centro di Studi Ceramici"}
@@ -968,6 +970,7 @@
 @STRING{ufg-DtJahrbNum = "Deutsches Jahrbuch für Numismatik"}
 @STRING{ufg-DtLitztg = "Deutsche Literaturzeitung für Kritik der Internationalen Wissenschaft"}
 @STRING{ufg-DtMuenzbl = "Deutsche Münzblätter"}
+@STRING{ufg-DtRoland = "Der Deutsche Roland"}
 @STRING{ufg-DtWissZeitschrPolen = "Deutsche Wissenschaftliche Zeitschrift für Polen"}
 @STRING{ufg-DuerenerGeschbl = "Dürener Geschichtsblätter"}
 @STRING{ufg-DuesseldorferJahrb = "Düsseldorfer Jahrbuch"}
@@ -2017,7 +2020,8 @@
 @STRING{ufg-Pallas = "Pallas"}
 @STRING{ufg-PamaMuz = "Pamiatky a Múzeá"}
 @STRING{ufg-PamaPrirodaBratislavy = "Pamiatky a Príroda Bratislavy"}
-@STRING{ufg-PamArchMistopisnePamArch = "Památky Archaeologické a Místopisné Památky Archeologické"}
+@STRING{ufg-PamArch = "Památky Archaeologické"}
+@STRING{ufg-PamArchMistopisne = "Památky Archaeologické a Místopisné"}
 @STRING{ufg-Pamatky = "Památky"}
 @STRING{ufg-PamKultury = "Pamjatniki Kuľtury"}
 @STRING{ufg-PamMuzMiedzi = "Pamiętnik Muzeum Miedzi"}
@@ -2339,6 +2343,7 @@
 @STRING{ufg-SchwaebMus = "Das Schwäbische Museum"}
 @STRING{ufg-SchweizerMuenzbl = "Schweizer Münzblätter"}
 @STRING{ufg-SchweizerNumRundschau = "Schweizerische Numismatische Rundschau"}
+@STRING{ufg-ScienEditor = "Science Editor"}
 @STRING{ufg-Sciliar = "Der Sciliar"}
 @STRING{ufg-ScottishArchForum = "Scottish Archaeological Forum"}
 @STRING{ufg-ScottishArchRev = "Scottish Archaeological Review"}
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-rgk.bib b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-rgk.bib
index 032e74c0ab6..9e4386144ca 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-rgk.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology-strings-rgk.bib
@@ -259,6 +259,7 @@
 @STRING{ufg-ArbeitsuForschberSaechsBodendenkmalpfl = "Arbeits-u. Forschber. Sächs. Bodendenkmalpfl\adddot"}
 @STRING{ufg-Arbok = "Árbók"}
 @STRING{ufg-ArchAbroad = "Arch. Abroad"}
+@STRING{ufg-ArchAdvertiser = "Arch. Advertiser"}
 @STRING{ufg-ArchAeliana = "Arch. Aeliana"}
 @STRING{ufg-Archaeographie = "Archäographie"}
 @STRING{ufg-Archaeologia = "Archaeologia"}
@@ -865,6 +866,7 @@
 @STRING{ufg-CasopisZgodovinoinNarodopisje = "Časopis Zgodovino in Narodopisje"}
 @STRING{ufg-Castrelos = "Castrelos"}
 @STRING{ufg-CastrumNovum = "Castrum Novum"}
+@STRING{ufg-CBAResearchReport = "CBA Research Report"}
 @STRING{ufg-CEDAC = "CÉDAC"}
 @STRING{ufg-Celticum = "Celticum"}
 @STRING{ufg-CentroStudCeramici = "Centro Stud. Ceramici"}
@@ -968,6 +970,7 @@
 @STRING{ufg-DtJahrbNum = "Dt. Jahrb. Num\adddot"}
 @STRING{ufg-DtLitztg = "Dt. Litztg\adddot"}
 @STRING{ufg-DtMuenzbl = "Dt. Münzbl\adddot"}
+@STRING{ufg-DtRoland = "Dt. Roland"}
 @STRING{ufg-DtWissZeitschrPolen = "Dt. Wiss. Zeitschr. Polen"}
 @STRING{ufg-DuerenerGeschbl = "Dürener Geschbl\adddot"}
 @STRING{ufg-DuesseldorferJahrb = "Düsseldorfer Jahrb\adddot"}
@@ -2017,7 +2020,8 @@
 @STRING{ufg-Pallas = "Pallas"}
 @STRING{ufg-PamaMuz = "Pam. a Múz\adddot"}
 @STRING{ufg-PamaPrirodaBratislavy = "Pam. a Príroda Bratislavy"}
-@STRING{ufg-PamArchMistopisnePamArch = "Pam. Arch. Místopisné Pam. Arch\adddot"}
+@STRING{ufg-PamArch = "Pam. Arch\adddot"}
+@STRING{ufg-PamArchMistopisne = "Pam. Arch. Místopisné"}
 @STRING{ufg-Pamatky = "Památky"}
 @STRING{ufg-PamKultury = "Pam. Kul'tury"}
 @STRING{ufg-PamMuzMiedzi = "Pam. Muz. Miedzi"}
@@ -2339,6 +2343,7 @@
 @STRING{ufg-SchwaebMus = "Schwäb. Mus\adddot"}
 @STRING{ufg-SchweizerMuenzbl = "Schweizer Münzbl\adddot"}
 @STRING{ufg-SchweizerNumRundschau = "Schweizer. Num. Rundschau"}
+@STRING{ufg-ScienEditor = "Scien. Editor"}
 @STRING{ufg-Sciliar = "Sciliar"}
 @STRING{ufg-ScottishArchForum = "Scottish Arch. Forum"}
 @STRING{ufg-ScottishArchRev = "Scottish Arch. Rev\adddot"}
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.conf b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.conf
new file mode 100644
index 00000000000..efc296d4f73
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.conf
@@ -0,0 +1,1451 @@
+<!-- REPLACE THE <DATAMODEL> GROUP IN THE BIBER *.CONF FILE WITH THE GROUP BELOW -->
+  <datamodel>
+    <constants>
+      <constant name="gender" type="list">sf,sm,sn,pf,pm,pn,pp</constant>
+      <constant name="nameparts" type="list">family,given,prefix,suffix</constant>
+      <constant name="optiondatatypes" type="list">boolean,integer,string,xml</constant>
+    </constants>
+    <entrytypes>
+      <entrytype>article</entrytype>
+      <entrytype>artwork</entrytype>
+      <entrytype>audio</entrytype>
+      <entrytype>bibnote</entrytype>
+      <entrytype>book</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>booklet</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>commentary</entrytype>
+      <entrytype>customa</entrytype>
+      <entrytype>customb</entrytype>
+      <entrytype>customc</entrytype>
+      <entrytype>customd</entrytype>
+      <entrytype>custome</entrytype>
+      <entrytype>customf</entrytype>
+      <entrytype>inbook</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>image</entrytype>
+      <entrytype>jurisdiction</entrytype>
+      <entrytype>legal</entrytype>
+      <entrytype>legislation</entrytype>
+      <entrytype>letter</entrytype>
+      <entrytype>manual</entrytype>
+      <entrytype>misc</entrytype>
+      <entrytype>movie</entrytype>
+      <entrytype>music</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>online</entrytype>
+      <entrytype>patent</entrytype>
+      <entrytype>performance</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>report</entrytype>
+      <entrytype>review</entrytype>
+      <entrytype>set</entrytype>
+      <entrytype>software</entrytype>
+      <entrytype>standard</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <entrytype>thesis</entrytype>
+      <entrytype>unpublished</entrytype>
+      <entrytype>video</entrytype>
+      <entrytype skip_output="true">xdata</entrytype>
+    </entrytypes>
+    <fields>
+      <field datatype="integer" fieldtype="field">number</field>
+      <field datatype="integer" fieldtype="field">volume</field>
+      <field datatype="integer" fieldtype="field">volumes</field>
+      <field datatype="literal" fieldtype="field">abstract</field>
+      <field datatype="literal" fieldtype="field">addendum</field>
+      <field datatype="literal" fieldtype="field">annotation</field>
+      <field datatype="literal" fieldtype="field">booksubtitle</field>
+      <field datatype="literal" fieldtype="field">booktitle</field>
+      <field datatype="literal" fieldtype="field">booktitleaddon</field>
+      <field datatype="literal" fieldtype="field">chapter</field>
+      <field datatype="literal" fieldtype="field">edition</field>
+      <field datatype="literal" fieldtype="field">eid</field>
+      <field datatype="literal" fieldtype="field">entrysubtype</field>
+      <field datatype="literal" fieldtype="field">eprintclass</field>
+      <field datatype="literal" fieldtype="field">eprinttype</field>
+      <field datatype="literal" fieldtype="field">eventtitle</field>
+      <field datatype="literal" fieldtype="field">eventtitleaddon</field>
+      <field datatype="literal" fieldtype="field">gender</field>
+      <field datatype="literal" fieldtype="field">howpublished</field>
+      <field datatype="literal" fieldtype="field">indexsorttitle</field>
+      <field datatype="literal" fieldtype="field">indextitle</field>
+      <field datatype="literal" fieldtype="field">isan</field>
+      <field datatype="literal" fieldtype="field">isbn</field>
+      <field datatype="literal" fieldtype="field">ismn</field>
+      <field datatype="literal" fieldtype="field">isrn</field>
+      <field datatype="literal" fieldtype="field">issn</field>
+      <field datatype="literal" fieldtype="field">issue</field>
+      <field datatype="literal" fieldtype="field">issuesubtitle</field>
+      <field datatype="literal" fieldtype="field">issuetitle</field>
+      <field datatype="literal" fieldtype="field">iswc</field>
+      <field datatype="literal" fieldtype="field">journalsubtitle</field>
+      <field datatype="literal" fieldtype="field">journaltitle</field>
+      <field datatype="literal" fieldtype="field">label</field>
+      <field datatype="literal" fieldtype="field">langid</field>
+      <field datatype="literal" fieldtype="field">langidopts</field>
+      <field datatype="literal" fieldtype="field">library</field>
+      <field datatype="literal" fieldtype="field">mainsubtitle</field>
+      <field datatype="literal" fieldtype="field">maintitle</field>
+      <field datatype="literal" fieldtype="field">maintitleaddon</field>
+      <field datatype="literal" fieldtype="field">nameaddon</field>
+      <field datatype="literal" fieldtype="field">note</field>
+      <field datatype="literal" fieldtype="field">origtitle</field>
+      <field datatype="literal" fieldtype="field">pagetotal</field>
+      <field datatype="literal" fieldtype="field">part</field>
+      <field datatype="literal" fieldtype="field">relatedstring</field>
+      <field datatype="literal" fieldtype="field">relatedtype</field>
+      <field datatype="literal" fieldtype="field">reprinttitle</field>
+      <field datatype="literal" fieldtype="field">series</field>
+      <field datatype="literal" fieldtype="field">shorthandintro</field>
+      <field datatype="literal" fieldtype="field">subtitle</field>
+      <field datatype="literal" fieldtype="field">title</field>
+      <field datatype="literal" fieldtype="field">titleaddon</field>
+      <field datatype="literal" fieldtype="field">usera</field>
+      <field datatype="literal" fieldtype="field">userb</field>
+      <field datatype="literal" fieldtype="field">userc</field>
+      <field datatype="literal" fieldtype="field">userd</field>
+      <field datatype="literal" fieldtype="field">usere</field>
+      <field datatype="literal" fieldtype="field">userf</field>
+      <field datatype="literal" fieldtype="field">venue</field>
+      <field datatype="literal" fieldtype="field">version</field>
+      <field datatype="literal" fieldtype="field" label="true">shorthand</field>
+      <field datatype="literal" fieldtype="field" label="true">shortjournal</field>
+      <field datatype="literal" fieldtype="field" label="true">shortseries</field>
+      <field datatype="literal" fieldtype="field" label="true">shorttitle</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sortyear</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sorttitle</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sortshorthand</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sortkey</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">presort</field>
+      <field datatype="literal" fieldtype="list">institution</field>
+      <field datatype="literal" fieldtype="list">lista</field>
+      <field datatype="literal" fieldtype="list">listb</field>
+      <field datatype="literal" fieldtype="list">listc</field>
+      <field datatype="literal" fieldtype="list">listd</field>
+      <field datatype="literal" fieldtype="list">liste</field>
+      <field datatype="literal" fieldtype="list">listf</field>
+      <field datatype="literal" fieldtype="list">location</field>
+      <field datatype="literal" fieldtype="list">organization</field>
+      <field datatype="literal" fieldtype="list">origlocation</field>
+      <field datatype="literal" fieldtype="list">origpublisher</field>
+      <field datatype="literal" fieldtype="list">publisher</field>
+      <field datatype="name" fieldtype="list">afterword</field>
+      <field datatype="name" fieldtype="list">annotator</field>
+      <field datatype="name" fieldtype="list">author</field>
+      <field datatype="name" fieldtype="list">bookauthor</field>
+      <field datatype="name" fieldtype="list">commentator</field>
+      <field datatype="name" fieldtype="list">editor</field>
+      <field datatype="name" fieldtype="list">editora</field>
+      <field datatype="name" fieldtype="list">editorb</field>
+      <field datatype="name" fieldtype="list">editorc</field>
+      <field datatype="name" fieldtype="list">foreword</field>
+      <field datatype="name" fieldtype="list">holder</field>
+      <field datatype="name" fieldtype="list">introduction</field>
+      <field datatype="name" fieldtype="list">namea</field>
+      <field datatype="name" fieldtype="list">nameb</field>
+      <field datatype="name" fieldtype="list">namec</field>
+      <field datatype="name" fieldtype="list">translator</field>
+      <field datatype="name" fieldtype="list" label="true">shortauthor</field>
+      <field datatype="name" fieldtype="list" label="true">shorteditor</field>
+      <field datatype="name" fieldtype="list" skip_output="true">sortname</field>
+      <field datatype="key" fieldtype="field">authortype</field>
+      <field datatype="key" fieldtype="field">editoratype</field>
+      <field datatype="key" fieldtype="field">editorbtype</field>
+      <field datatype="key" fieldtype="field">editorctype</field>
+      <field datatype="key" fieldtype="field">editortype</field>
+      <field datatype="key" fieldtype="field">bookpagination</field>
+      <field datatype="key" fieldtype="field">nameatype</field>
+      <field datatype="key" fieldtype="field">namebtype</field>
+      <field datatype="key" fieldtype="field">namectype</field>
+      <field datatype="key" fieldtype="field">pagination</field>
+      <field datatype="key" fieldtype="field">pubstate</field>
+      <field datatype="key" fieldtype="field">type</field>
+      <field datatype="key" fieldtype="list">language</field>
+      <field datatype="key" fieldtype="list">origlanguage</field>
+      <field datatype="entrykey" fieldtype="field">crossref</field>
+      <field datatype="entrykey" fieldtype="field">xref</field>
+      <field datatype="date" fieldtype="field" skip_output="true">date</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">endyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">year</field>
+      <field datatype="datepart" fieldtype="field">month</field>
+      <field datatype="datepart" fieldtype="field">day</field>
+      <field datatype="datepart" fieldtype="field">hour</field>
+      <field datatype="datepart" fieldtype="field">minute</field>
+      <field datatype="datepart" fieldtype="field">second</field>
+      <field datatype="datepart" fieldtype="field">timezone</field>
+      <field datatype="datepart" fieldtype="field">season</field>
+      <field datatype="datepart" fieldtype="field">endmonth</field>
+      <field datatype="datepart" fieldtype="field">endday</field>
+      <field datatype="datepart" fieldtype="field">endhour</field>
+      <field datatype="datepart" fieldtype="field">endminute</field>
+      <field datatype="datepart" fieldtype="field">endsecond</field>
+      <field datatype="datepart" fieldtype="field">endtimezone</field>
+      <field datatype="datepart" fieldtype="field">endseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">eventdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">eventendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">eventyear</field>
+      <field datatype="datepart" fieldtype="field">eventmonth</field>
+      <field datatype="datepart" fieldtype="field">eventday</field>
+      <field datatype="datepart" fieldtype="field">eventhour</field>
+      <field datatype="datepart" fieldtype="field">eventminute</field>
+      <field datatype="datepart" fieldtype="field">eventsecond</field>
+      <field datatype="datepart" fieldtype="field">eventtimezone</field>
+      <field datatype="datepart" fieldtype="field">eventseason</field>
+      <field datatype="datepart" fieldtype="field">eventendmonth</field>
+      <field datatype="datepart" fieldtype="field">eventendday</field>
+      <field datatype="datepart" fieldtype="field">eventendhour</field>
+      <field datatype="datepart" fieldtype="field">eventendminute</field>
+      <field datatype="datepart" fieldtype="field">eventendsecond</field>
+      <field datatype="datepart" fieldtype="field">eventendtimezone</field>
+      <field datatype="datepart" fieldtype="field">eventendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">origdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origyear</field>
+      <field datatype="datepart" fieldtype="field">origmonth</field>
+      <field datatype="datepart" fieldtype="field">origday</field>
+      <field datatype="datepart" fieldtype="field">orighour</field>
+      <field datatype="datepart" fieldtype="field">origminute</field>
+      <field datatype="datepart" fieldtype="field">origsecond</field>
+      <field datatype="datepart" fieldtype="field">origtimezone</field>
+      <field datatype="datepart" fieldtype="field">origseason</field>
+      <field datatype="datepart" fieldtype="field">origendmonth</field>
+      <field datatype="datepart" fieldtype="field">origendday</field>
+      <field datatype="datepart" fieldtype="field">origendhour</field>
+      <field datatype="datepart" fieldtype="field">origendminute</field>
+      <field datatype="datepart" fieldtype="field">origendsecond</field>
+      <field datatype="datepart" fieldtype="field">origendtimezone</field>
+      <field datatype="datepart" fieldtype="field">origendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">urldate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">urlendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">urlyear</field>
+      <field datatype="datepart" fieldtype="field">urlmonth</field>
+      <field datatype="datepart" fieldtype="field">urlday</field>
+      <field datatype="datepart" fieldtype="field">urlhour</field>
+      <field datatype="datepart" fieldtype="field">urlminute</field>
+      <field datatype="datepart" fieldtype="field">urlsecond</field>
+      <field datatype="datepart" fieldtype="field">urltimezone</field>
+      <field datatype="datepart" fieldtype="field">urlseason</field>
+      <field datatype="datepart" fieldtype="field">urlendmonth</field>
+      <field datatype="datepart" fieldtype="field">urlendday</field>
+      <field datatype="datepart" fieldtype="field">urlendhour</field>
+      <field datatype="datepart" fieldtype="field">urlendminute</field>
+      <field datatype="datepart" fieldtype="field">urlendsecond</field>
+      <field datatype="datepart" fieldtype="field">urlendtimezone</field>
+      <field datatype="datepart" fieldtype="field">urlendseason</field>
+      <field datatype="verbatim" fieldtype="field">doi</field>
+      <field datatype="verbatim" fieldtype="field">eprint</field>
+      <field datatype="verbatim" fieldtype="field">file</field>
+      <field datatype="verbatim" fieldtype="field">verba</field>
+      <field datatype="verbatim" fieldtype="field">verbb</field>
+      <field datatype="verbatim" fieldtype="field">verbc</field>
+      <field datatype="uri" fieldtype="field">url</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv" skip_output="true">xdata</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv" skip_output="true">ids</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv" skip_output="true">entryset</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv">related</field>
+      <field datatype="keyword" fieldtype="field" format="xsv">keywords</field>
+      <field datatype="option" fieldtype="field" format="xsv" skip_output="true">options</field>
+      <field datatype="option" fieldtype="field" format="xsv" skip_output="true">relatedoptions</field>
+      <field datatype="range" fieldtype="field">pages</field>
+      <field datatype="code" fieldtype="field">execute</field>
+      <field datatype="literal" fieldtype="field">shortsubseries</field>
+      <field datatype="literal" fieldtype="field">subseries</field>
+      <field datatype="integer" fieldtype="field">subnumber</field>
+      <field datatype="literal" fieldtype="field">titlenote</field>
+      <field datatype="literal" fieldtype="field">maintitlenote</field>
+      <field datatype="literal" fieldtype="field">booktitlenote</field>
+      <field datatype="literal" fieldtype="field">summarytitle</field>
+      <field datatype="literal" fieldtype="field">shortform</field>
+      <field datatype="name" fieldtype="list">festschrift</field>
+      <field datatype="literal" fieldtype="field">festschriftaddon</field>
+      <field datatype="integer" fieldtype="field">eventnumber</field>
+      <field datatype="literal" fieldtype="field">eventtype</field>
+      <field datatype="literal" fieldtype="list">multieventdate</field>
+      <field datatype="literal" fieldtype="list">multivenue</field>
+      <field datatype="date" fieldtype="field" skip_output="true">realdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realyear</field>
+      <field datatype="datepart" fieldtype="field">realmonth</field>
+      <field datatype="datepart" fieldtype="field">realday</field>
+      <field datatype="datepart" fieldtype="field">realhour</field>
+      <field datatype="datepart" fieldtype="field">realminute</field>
+      <field datatype="datepart" fieldtype="field">realsecond</field>
+      <field datatype="datepart" fieldtype="field">realtimezone</field>
+      <field datatype="datepart" fieldtype="field">realseason</field>
+      <field datatype="datepart" fieldtype="field">realendmonth</field>
+      <field datatype="datepart" fieldtype="field">realendday</field>
+      <field datatype="datepart" fieldtype="field">realendhour</field>
+      <field datatype="datepart" fieldtype="field">realendminute</field>
+      <field datatype="datepart" fieldtype="field">realendsecond</field>
+      <field datatype="datepart" fieldtype="field">realendtimezone</field>
+      <field datatype="datepart" fieldtype="field">realendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">origrealdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealyear</field>
+      <field datatype="datepart" fieldtype="field">origrealmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealday</field>
+      <field datatype="datepart" fieldtype="field">origrealhour</field>
+      <field datatype="datepart" fieldtype="field">origrealminute</field>
+      <field datatype="datepart" fieldtype="field">origrealsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealseason</field>
+      <field datatype="datepart" fieldtype="field">origrealendmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealendday</field>
+      <field datatype="datepart" fieldtype="field">origrealendhour</field>
+      <field datatype="datepart" fieldtype="field">origrealendminute</field>
+      <field datatype="datepart" fieldtype="field">origrealendsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealendtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">fulleventdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">fulleventendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">fulleventyear</field>
+      <field datatype="datepart" fieldtype="field">fulleventmonth</field>
+      <field datatype="datepart" fieldtype="field">fulleventday</field>
+      <field datatype="datepart" fieldtype="field">fulleventhour</field>
+      <field datatype="datepart" fieldtype="field">fulleventminute</field>
+      <field datatype="datepart" fieldtype="field">fulleventsecond</field>
+      <field datatype="datepart" fieldtype="field">fulleventtimezone</field>
+      <field datatype="datepart" fieldtype="field">fulleventseason</field>
+      <field datatype="datepart" fieldtype="field">fulleventendmonth</field>
+      <field datatype="datepart" fieldtype="field">fulleventendday</field>
+      <field datatype="datepart" fieldtype="field">fulleventendhour</field>
+      <field datatype="datepart" fieldtype="field">fulleventendminute</field>
+      <field datatype="datepart" fieldtype="field">fulleventendsecond</field>
+      <field datatype="datepart" fieldtype="field">fulleventendtimezone</field>
+      <field datatype="datepart" fieldtype="field">fulleventendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">newsdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">newsendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">newsyear</field>
+      <field datatype="datepart" fieldtype="field">newsmonth</field>
+      <field datatype="datepart" fieldtype="field">newsday</field>
+      <field datatype="datepart" fieldtype="field">newshour</field>
+      <field datatype="datepart" fieldtype="field">newsminute</field>
+      <field datatype="datepart" fieldtype="field">newssecond</field>
+      <field datatype="datepart" fieldtype="field">newstimezone</field>
+      <field datatype="datepart" fieldtype="field">newsseason</field>
+      <field datatype="datepart" fieldtype="field">newsendmonth</field>
+      <field datatype="datepart" fieldtype="field">newsendday</field>
+      <field datatype="datepart" fieldtype="field">newsendhour</field>
+      <field datatype="datepart" fieldtype="field">newsendminute</field>
+      <field datatype="datepart" fieldtype="field">newsendsecond</field>
+      <field datatype="datepart" fieldtype="field">newsendtimezone</field>
+      <field datatype="datepart" fieldtype="field">newsendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">realdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realyear</field>
+      <field datatype="datepart" fieldtype="field">realmonth</field>
+      <field datatype="datepart" fieldtype="field">realday</field>
+      <field datatype="datepart" fieldtype="field">realhour</field>
+      <field datatype="datepart" fieldtype="field">realminute</field>
+      <field datatype="datepart" fieldtype="field">realsecond</field>
+      <field datatype="datepart" fieldtype="field">realtimezone</field>
+      <field datatype="datepart" fieldtype="field">realseason</field>
+      <field datatype="datepart" fieldtype="field">realendmonth</field>
+      <field datatype="datepart" fieldtype="field">realendday</field>
+      <field datatype="datepart" fieldtype="field">realendhour</field>
+      <field datatype="datepart" fieldtype="field">realendminute</field>
+      <field datatype="datepart" fieldtype="field">realendsecond</field>
+      <field datatype="datepart" fieldtype="field">realendtimezone</field>
+      <field datatype="datepart" fieldtype="field">realendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">origrealdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealyear</field>
+      <field datatype="datepart" fieldtype="field">origrealmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealday</field>
+      <field datatype="datepart" fieldtype="field">origrealhour</field>
+      <field datatype="datepart" fieldtype="field">origrealminute</field>
+      <field datatype="datepart" fieldtype="field">origrealsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealseason</field>
+      <field datatype="datepart" fieldtype="field">origrealendmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealendday</field>
+      <field datatype="datepart" fieldtype="field">origrealendhour</field>
+      <field datatype="datepart" fieldtype="field">origrealendminute</field>
+      <field datatype="datepart" fieldtype="field">origrealendsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealendtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealendseason</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">date+an</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">origdate+an</field>
+    </fields>
+    <entryfields>
+      <field>abstract</field>
+      <field>annotation</field>
+      <field>authortype</field>
+      <field>bookpagination</field>
+      <field>crossref</field>
+      <field>day</field>
+      <field>endday</field>
+      <field>endhour</field>
+      <field>endminute</field>
+      <field>endmonth</field>
+      <field>endseason</field>
+      <field>endsecond</field>
+      <field>endtimezone</field>
+      <field>endyear</field>
+      <field>entryset</field>
+      <field>entrysubtype</field>
+      <field>execute</field>
+      <field>file</field>
+      <field>gender</field>
+      <field>hour</field>
+      <field>ids</field>
+      <field>indextitle</field>
+      <field>indexsorttitle</field>
+      <field>isan</field>
+      <field>ismn</field>
+      <field>iswc</field>
+      <field>keywords</field>
+      <field>label</field>
+      <field>langid</field>
+      <field>langidopts</field>
+      <field>library</field>
+      <field>lista</field>
+      <field>listb</field>
+      <field>listc</field>
+      <field>listd</field>
+      <field>liste</field>
+      <field>listf</field>
+      <field>minute</field>
+      <field>month</field>
+      <field>nameaddon</field>
+      <field>options</field>
+      <field>origday</field>
+      <field>origendday</field>
+      <field>origendhour</field>
+      <field>origendminute</field>
+      <field>origendmonth</field>
+      <field>origendseason</field>
+      <field>origendsecond</field>
+      <field>origendtimezone</field>
+      <field>origendyear</field>
+      <field>orighour</field>
+      <field>origminute</field>
+      <field>origmonth</field>
+      <field>origseason</field>
+      <field>origsecond</field>
+      <field>origtimezone</field>
+      <field>origyear</field>
+      <field>origlocation</field>
+      <field>origpublisher</field>
+      <field>origtitle</field>
+      <field>pagination</field>
+      <field>presort</field>
+      <field>related</field>
+      <field>relatedoptions</field>
+      <field>relatedstring</field>
+      <field>relatedtype</field>
+      <field>season</field>
+      <field>second</field>
+      <field>shortauthor</field>
+      <field>shorteditor</field>
+      <field>shorthand</field>
+      <field>shorthandintro</field>
+      <field>shortjournal</field>
+      <field>shortseries</field>
+      <field>shorttitle</field>
+      <field>sortkey</field>
+      <field>sortname</field>
+      <field>sortshorthand</field>
+      <field>sorttitle</field>
+      <field>sortyear</field>
+      <field>timezone</field>
+      <field>url</field>
+      <field>urlday</field>
+      <field>urlendday</field>
+      <field>urlendhour</field>
+      <field>urlendminute</field>
+      <field>urlendmonth</field>
+      <field>urlendsecond</field>
+      <field>urlendtimezone</field>
+      <field>urlendyear</field>
+      <field>urlhour</field>
+      <field>urlminute</field>
+      <field>urlmonth</field>
+      <field>urlsecond</field>
+      <field>urltimezone</field>
+      <field>urlyear</field>
+      <field>usera</field>
+      <field>userb</field>
+      <field>userc</field>
+      <field>userd</field>
+      <field>usere</field>
+      <field>userf</field>
+      <field>verba</field>
+      <field>verbb</field>
+      <field>verbc</field>
+      <field>xdata</field>
+      <field>xref</field>
+      <field>year</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>set</entrytype>
+      <field>entryset</field>
+      <field>crossref</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>article</entrytype>
+      <field>addendum</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eid</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>issn</field>
+      <field>issue</field>
+      <field>issuetitle</field>
+      <field>issuesubtitle</field>
+      <field>journalsubtitle</field>
+      <field>journaltitle</field>
+      <field>language</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>version</field>
+      <field>volume</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>bibnote</entrytype>
+      <field>note</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>book</entrytype>
+      <field>author</field>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>mainsubtitle</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>mvbook</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pagetotal</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>suppbook</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>booktitle</field>
+      <field>bookauthor</field>
+      <field>booksubtitle</field>
+      <field>booktitleaddon</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pages</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>booklet</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>howpublished</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>collection</entrytype>
+      <entrytype>reference</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvreference</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>incollection</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>inreference</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>booksubtitle</field>
+      <field>booktitle</field>
+      <field>booktitleaddon</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>manual</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>misc</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>howpublished</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>organization</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>online</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>language</field>
+      <field>note</field>
+      <field>organization</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>patent</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>doi</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>holder</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>periodical</entrytype>
+      <field>addendum</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>issn</field>
+      <field>issue</field>
+      <field>issuesubtitle</field>
+      <field>issuetitle</field>
+      <field>language</field>
+      <field>note</field>
+      <field>number</field>
+      <field>pubstate</field>
+      <field>season</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>volume</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>mvproceedings</entrytype>
+      <field>addendum</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pagetotal</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>venue</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>proceedings</entrytype>
+      <field>addendum</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>venue</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inproceedings</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>booksubtitle</field>
+      <field>booktitle</field>
+      <field>booktitleaddon</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pages</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>venue</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>report</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>institution</field>
+      <field>isrn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>thesis</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>institution</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>unpublished</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>howpublished</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>venue</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>book</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>inbook</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>shortsubseries</field>
+      <field>subnumber</field>
+      <field>subseries</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>shortform</field>
+      <field>festschrift</field>
+      <field>festschriftaddon</field>
+      <field>eventnumber</field>
+      <field>eventtype </field>
+      <field>eventdate</field>
+      <field>venue</field>
+      <field>multieventdate</field>
+      <field>multivenue</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>booktitlenote</field>
+    </entryfields>
+    <entryfields>
+      <field>summarytitle</field>
+      <field>titlenote</field>
+    </entryfields>
+    <entryfields>
+      <field>realdate</field>
+      <field>origrealdate</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>fulleventdate</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>article</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <entrytype>review</entrytype>
+      <field>newsdate</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>article</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>review</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <field>location</field>
+    </entryfields>
+    <constraints>
+      <entrytype>article</entrytype>
+      <entrytype>book</entrytype>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>booklet</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>manual</entrytype>
+      <entrytype>misc</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>online</entrytype>
+      <entrytype>patent</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>report</entrytype>
+      <entrytype>set</entrytype>
+      <entrytype>thesis</entrytype>
+      <entrytype>unpublished</entrytype>
+      <constraint type="mandatory">
+        <fieldxor>
+          <field>date</field>
+          <field>year</field>
+        </fieldxor>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>set</entrytype>
+      <constraint type="mandatory">
+        <field>entryset</field>
+        <field>crossref</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>article</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>journaltitle</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>book</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvreference</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>suppbook</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>booktitle</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>booklet</entrytype>
+      <constraint type="mandatory">
+        <fieldor>
+          <field>author</field>
+          <field>editor</field>
+        </fieldor>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>collection</entrytype>
+      <entrytype>reference</entrytype>
+      <constraint type="mandatory">
+        <field>editor</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>incollection</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>inreference</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>editor</field>
+        <field>title</field>
+        <field>booktitle</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>manual</entrytype>
+      <constraint type="mandatory">
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>misc</entrytype>
+      <constraint type="mandatory">
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>online</entrytype>
+      <constraint type="mandatory">
+        <field>title</field>
+        <field>url</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>patent</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>number</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>periodical</entrytype>
+      <constraint type="mandatory">
+        <field>editor</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>proceedings</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <constraint type="mandatory">
+        <field>editor</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>inproceedings</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>booktitle</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>report</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>type</field>
+        <field>institution</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>thesis</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>type</field>
+        <field>institution</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>unpublished</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <constraint datatype="isbn" type="data">
+        <field>isbn</field>
+      </constraint>
+      <constraint datatype="issn" type="data">
+        <field>issn</field>
+      </constraint>
+      <constraint datatype="ismn" type="data">
+        <field>ismn</field>
+      </constraint>
+      <constraint datatype="date" type="data">
+        <field>date</field>
+        <field>eventdate</field>
+        <field>origdate</field>
+        <field>urldate</field>
+      </constraint>
+      <constraint datatype="pattern" pattern="(?:sf|sm|sn|pf|pm|pn|pp)" type="data">
+        <field>gender</field>
+      </constraint>
+    </constraints>
+  </datamodel>
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.pdf
index 8920852be1a..92ff96d8af8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/biblatex-archaeology.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/aefkw-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/aefkw-example.pdf
index e98d26fe634..593f3ea35cf 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/aefkw-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/aefkw-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/afwl-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/afwl-example.pdf
index f0cc7850786..03b9784855c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/afwl-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/afwl-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/amit-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/amit-example.pdf
index 0d2caf15c0a..ab0ef535b64 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/amit-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/amit-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/archa-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/archa-example.pdf
index 22437c5c4db..e1b3b53029a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/archa-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/archa-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-archaeology-example.pdf
index 91938ca2979..6043e496bc3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-archaeology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-comp-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-comp-archaeology-example.pdf
index c0d98f607ad..d5e33a82494 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-comp-archaeology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-comp-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-ibid-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-ibid-archaeology-example.pdf
index 8e507d41f11..ce5484ee9c1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-ibid-archaeology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-ibid-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-icomp-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-icomp-archaeology-example.pdf
index 82521a47620..2dd87e7ea81 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-icomp-archaeology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/authoryear-icomp-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/biblatex-archaeology_example.tex b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/biblatex-archaeology_example.tex
index 45c357dd7cf..79150750fa3 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/biblatex-archaeology_example.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/biblatex-archaeology_example.tex
@@ -4,6 +4,7 @@
 \ifdefined\HCode% detect tex4ht
     \usepackage[T1]{fontenc}
     \usepackage[utf8]{inputenc} 
+    %\usepackage[ansinew]{inputenc}
     \usepackage[USenglish,nswissgerman]{babel}
     \usepackage{lmodern}
     \usepackage[osf,sc]{mathpazo}
@@ -14,10 +15,10 @@
     \makeatother
     \raggedright
 \else 
-    \usepackage{fontspec,polyglossia}
-    \setdefaultlanguage{german}
-    \setotherlanguage{english}
-    \setmainfont{TeX Gyre Termes}
+    \usepackage{fontspec,polyglossia,noto}
+    \setmonofont{NotoMono}[HyphenChar=None]
+    %\setdefaultlanguage{english}\setotherlanguage{german}
+    \setdefaultlanguage{german}\setotherlanguage{english}
 % command is missing in some fonts:
 %    \DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\} 
 \fi
@@ -38,13 +39,17 @@
     %style=historische-zeitschrift,
     %style=ijsra,
     %style=musuos,
+    %style=numeric-comp,
     %style=verbose-trad1,
     %style=verbose-trad2,
     %style=verbose-trad3,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    %style=authoryear-archaeology,
     %style=authoryear-ibid-archaeology,
+    %style=numeric-comp-archaeology,
     %style=verbose-trad2note-archaeology,
     %style=verbose-ibid-archaeology,
+    %style=verbose-archaeology,
     %style=aefkw,
     %style=afwl,
     %style=amit,
@@ -57,27 +62,34 @@
     %style=foe,
     %style=jb-halle,
     %style=jb-kreis-neuss,
-    style=karl,
+    %style=karl,
     %style=kunde,
-    %style=maja,
+    style=maja,
     %style=mpk,
+    %style=mpkoeaw,
     %style=nnu,
     %style=nnu-alt,
     %style=offa,
     %style=rgk-inline,
+    %style=rgk-numeric,
     %style=rgk-verbose,
     %style=rgzm-inline,
+    %style=rgzm-numeric,
     %style=rgzm-verbose,
     %style=ufg-muenster-inline,
+    %style=ufg-muenster-numeric,
     %style=ufg-muenster-verbose,
     %style=volkskunde,
     %style=zaak,
     %style=zaes,
+    bibencoding=utf8, % necessary if *.tex file is in other encoding
 ]{biblatex}
+\providetoggle{archbool:shortseries}
+\providetoggle{archbool:shortjournal}
 \providecommand{\ResolveBibtexStrings}{
     \ifboolexpr{
         togl {archbool:shortseries}
-        and
+        or
         togl {archbool:shortjournal}
     }
         {\addbibresource{biblatex-archaeology-strings-rgk.bib}}
@@ -88,7 +100,6 @@
     {\usepackage{ingram-braun-local}
      \addbibresource{\IBbibmain}}
     {\addbibresource{biblatex-archaeology-example.bib}}
-
     \usepackage{xcolor}
 % heading (after biblatex!)
 \usepackage{scrpage2}
@@ -98,30 +109,28 @@
 \usepackage[useregional]{datetime2}
 \let\today\DTMnow
 \ifcsdef{archaeobibstyletitle}
-    {\def\explhead{\archaeobibstyletitle\ (\texttt{bibstyle}) --- \archaeocitestyletitle\ (\texttt{citestyle})}}
+    {\def\explhead{\scriptsize{\texttt{bibstyle}: \archaeobibstyletitle\\\texttt{citestyle}: \archaeocitestyletitle}}}
     {\def\explhead{no biblatex-archaeology style}}
-\title{biblatex-archaeology example document}
+\title{biblatex-archaeology [v2.0] sample document}
 \subtitle{\explhead}
 \author{Ingram Braun}
-    
-\ifcsdef{shortformcite}{}{\let\shortformcite\autocite}
-\ifcsdef{shortformcites}{}{\let\shortformcites\autocites}
-    
+      
 % technical expressions
-\newcommand{\Befehl}[1]{\texttt{\textbackslash#1}}
-\newcommand{\Typ}[1]{\texttt{\symbol{64}#1}}
-\newcommand{\Feld}[1]{\texttt{#1}}
+\newcommand*{\Befehl}[1]{\texttt{\textbackslash#1}}
+\newcommand*{\Typ}[1]{\texttt{\symbol{64}#1}}
+\newcommand*{\Feld}[1]{\texttt{#1}}
 
 \newcommand{\exmplwarn}[1]{\textcolor{red}{\Huge!} #1\\}
 
 \makeatletter
 %%% PASTE EXPERIMENTAL CODE HERE:
 
-\makeatother 
 
-\begin{document}
+%%% END EXPERIMENTAL CODE HERE:
+\makeatother
 
-\selectlanguage{german}
+
+\begin{document}
 
 \maketitle
 \tableofcontents
@@ -137,74 +146,96 @@
 \section{Blindtext}
 
 \ifcsdef{blxarch@fork@authordate}
-{Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat \autocite{auler:hiller:2015}. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi \autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}[69]{auler:hiller:2011}. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit \tvolcite{1}[156]{linnaeus:2003} lobortis nisl ut aliquip ex ea commodo consequat \autocite{kenmore}. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi \autocite{kenmore}. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum \autocite[145--146]{todorova:et:al:1981}.}
-{Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.\autocite{auler:hiller:2015} Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}[69]{auler:hiller:2011} Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit\fvolcite{1}[156]{linnaeus:2003} lobortis nisl ut aliquip ex ea commodo consequat.\autocite{kenmore} Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\autocite{kenmore} Nam liber tempor cum soluta nobis eleifend\autocite[41--43]{auler:hiller:2015} option congue nihil imperdiet\autocite[19]{de:neck:yoder:1978} doming id quod mazim placerat facer possim assum.\autocite[145--146]{todorova:et:al:1981}}
+    {Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat \autocite{auler:hiller:2015}. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi \autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}[69]{auler:hiller:2011}. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit \tvolcite{1}[156]{linnaeus:2003} lobortis nisl ut aliquip ex ea commodo consequat \autocite{kenmore}. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi \autocite{kenmore}. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum \autocite[145--146]{todorova:et:al:1981}.}
+    {\ifcsdef{blxarch@fork@verbose}
+        {Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.\autocite{auler:hiller:2015} Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}[69]{auler:hiller:2011} Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit\fvolcite{1}[156]{linnaeus:2003} lobortis nisl ut aliquip ex ea commodo consequat.\autocite{kenmore} Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.\autocite{kenmore} Nam liber tempor cum soluta nobis eleifend\autocite[41--43]{auler:hiller:2015} option congue nihil imperdiet\autocite[19]{de:neck:yoder:1978} doming id quod mazim placerat facer possim assum.\autocite[145--146]{todorova:et:al:1981}}
+        {\ifcsdef{blxarch@fork@numeric}
+            {Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat \autocite{auler:hiller:2015}. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi \autocite{auler:hiller:2011,auler:hiller:2015a,auler:hiller:2015,auler:hiller:2016,tacitus:1981,de:neck:yoder:1978}. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit  lobortis nisl ut aliquip ex ea commodo consequat \autocite{kenmore}. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi \autocite{kenmore}. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum \autocite{todorova:et:al:1981}.}
+            {}%
+        }%
+    }%
 
 \section{Citation commands}
 
-\begin{itemize}
-	\item\Befehl{cite}: \cite[159--187]{auler:hiller:2015}
-	\item\Befehl{Cite}: \Cite[159--187]{auler:hiller:2015}
-	\item\Befehl{cite*}: \cite*[159--187]{auler:hiller:2015}
-	\item\Befehl{autocite}: \autocite[159--187]{auler:hiller:2015}.
-	\item\Befehl{Autocite}: \Autocite[159--187]{auler:hiller:2015}
-	\item\Befehl{autocite*}: \autocite*[159--187]{auler:hiller:2015}.-
-	\item\Befehl{Autocite*}: \Autocite*[159--187]{auler:hiller:2015}
-	\item\Befehl{parencite}: \parencite[159--187]{auler:hiller:2015}.
-	\item\Befehl{parencite*}: \parencite*[159--187]{auler:hiller:2015}.
-	\item\Befehl{Parencite}: \Parencite[159--187]{auler:hiller:2015}.
-	\item\Befehl{textcite}: \textcite[159--187]{auler:hiller:2015}.
-	\item\Befehl{Textcite}: \Textcite[159--187]{auler:hiller:2015}.
-	%\item\Befehl{supercite}: \supercite{auler:hiller:2015}.
-	\item\Befehl{footcite}: \footcite[159--187]{auler:hiller:2015}.
-	\item\Befehl{footcitetext}: \footcitetext[159--187]{auler:hiller:2015}.
-%	\item\Befehl{smartcite}: \smartcite[159--187]{auler:hiller:2015}.
-%	\item\Befehl{Smartcite}: \smartcite[159--187]{auler:hiller:2015}.
-	\item\Befehl{cites}: \cites[159--187]{auler:hiller:2015}
-	\item\Befehl{Cites}: \Cites[159--187]{auler:hiller:2015}
-	\item\Befehl{autocites}: \autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{Autocites}: \Autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-    \item\Befehl{footcites}: \footcites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{footcitetexts}: \footcitetexts[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{parencites}: \parencites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{Parencites}: \Parencites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{textcites}: \textcites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{Textcites}: \Textcites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
-	\item\Befehl{citeauthor}: \citeauthor{auler:hiller:2015}
-	\item\Befehl{citeauthor}: \Citeauthor{auler:hiller:2015}
-	\item\Befehl{citetitle}: \citetitle{auler:hiller:2015}
-	\item\Befehl{citetitle*}: \citetitle*{auler:hiller:2015}
-	\item\Befehl{citedate}: \citedate{auler:hiller:2015}
-	\item\Befehl{citeyear}: \citeyear{auler:hiller:2015}
-	\item\Befehl{citeurl}: \citeurl{kenmore}
-	\item\Befehl{fullcite}: \fullcite{auler:hiller:2015}.
-	\item\Befehl{footfullcite}: \footfullcite[159--187]{auler:hiller:2015}.
-\ifcsdef{archaeobibstyletitle}
-    {\item\Befehl{shortformcite}: \shortformcite[433]{bauchhenss:et:al:1978}%
-    \item\Befehl{shortformcites}: \shortformcites[433]{bauchhenss:et:al:1978}[501]{authen-blom:1989}%
-    \item\Befehl{sfcite}: \sfcite[433]{bauchhenss:et:al:1978}%
-    \item\Befehl{sfcites}: \sfcites[433]{bauchhenss:et:al:1978}[501]{authen-blom:1989}}%
-    {}
-    \item\Befehl{footcite}: \footcites{auler:hiller:2015}{harsdoerffer:1656}
-\end{itemize}
+\begin{enumerate}
+    \item[\footnotesize\Befehl{cite}] \cite[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{Cite}] \Cite[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{cite*}] \cite*[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{autocite}] \autocite[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{Autocite}] \Autocite[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{autocite*}] \autocite*[159--187]{auler:hiller:2015}.-
+    \item[\footnotesize\Befehl{Autocite*}] \Autocite*[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{parencite}] \parencite[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{parencite*}] \parencite*[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{Parencite}] \Parencite[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{textcite}] \textcite[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{Textcite}] \Textcite[159--187]{auler:hiller:2015}.
+    %\item[\footnotesize\Befehl{supercite}] \supercite{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{footcite}] \footcite[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{footcitetext}] \footcitetext[159--187]{auler:hiller:2015}.
+%    \item[\footnotesize\Befehl{smartcite}] \smartcite[159--187]{auler:hiller:2015}.
+%    \item[\footnotesize\Befehl{Smartcite}] \smartcite[159--187]{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{cites}] \cites[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{Cites}] \Cites[159--187]{auler:hiller:2015}
+    \item[\footnotesize\Befehl{autocites}] \autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{Autocites}] \Autocites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{footcites}] \footcites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{footcitetexts}] \footcitetexts[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{parencites}] \parencites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{Parencites}] \Parencites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{textcites}] \textcites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{Textcites}] \Textcites[68]{auler:hiller:2011}[48]{auler:hiller:2015a}[159--187]{auler:hiller:2015}[40--41]{auler:hiller:2016}[15--23]{tacitus:1981}[19]{de:neck:yoder:1978}.
+    \item[\footnotesize\Befehl{citeauthor}] \citeauthor{auler:hiller:2015}
+    \item[\footnotesize\Befehl{citeauthor}] \Citeauthor{auler:hiller:2015}
+    \item[\footnotesize\Befehl{citetitle}] \citetitle{auler:hiller:2015}
+    \item[\footnotesize\Befehl{citetitle*}] \citetitle*{auler:hiller:2015}
+    \item[\footnotesize\Befehl{citedate}] \citedate{auler:hiller:2015}
+    \item[\footnotesize\Befehl{citeyear}] \citeyear{auler:hiller:2015}
+    \item[\footnotesize\Befehl{citeurl}] \citeurl{kenmore}
+    \item[\footnotesize\Befehl{fullcite}] \fullcite{auler:hiller:2015}.
+    \item[\footnotesize\Befehl{footfullcite}] \footfullcite[159--187]{auler:hiller:2015}.
+    \ifcsdef{shortformcite}
+        {\item[\footnotesize\Befehl{shortformcite}] \shortformcite[433]{bauchhenss:et:al:1978}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{shortformcites}
+        {\item[\footnotesize\Befehl{shortformcites}] \shortformcites[433]{bauchhenss:et:al:1978}[501]{authen-blom:1989}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{sfcite}
+        {\item[\footnotesize\Befehl{sfcite}] \sfcite[433]{bauchhenss:et:al:1978}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{sfcites}
+        {\item[\footnotesize\Befehl{sfcites}] \sfcites[433]{bauchhenss:et:al:1978}[501]{authen-blom:1989}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{posscite}
+        {\item[\footnotesize\Befehl{posscite}] \posscite[48]{auler:hiller:2015a}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{posscites}
+        {\item[\footnotesize\Befehl{posscites}] \posscites[48]{auler:hiller:2015a}[19]{de:neck:yoder:1978}[123]{buss:2004}{nass:1938}{caselitz:1980a}[187--190]{molleson:cox:1993}[11--12]{steinmetz:strahl:wilbers:1979}{domino:1780}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{Posscite}
+        {\item[\footnotesize\Befehl{Posscite}] \Posscite[48]{auler:hiller:2015a}}
+        {\texfbf{undefined!}}%
+    \ifcsdef{Posscites}
+        {\item[\footnotesize\Befehl{Posscites}] \Posscites[48]{auler:hiller:2015a}[19]{de:neck:yoder:1978}[123]{buss:2004}{nass:1938}{caselitz:1980a}[187--190]{molleson:cox:1993}[11--12]{steinmetz:strahl:wilbers:1979}{domino:1780}}
+        {\texfbf{undefined!}}%
+    \item[\footnotesize\Befehl{footcite}] \footcites{auler:hiller:2015}{harsdoerffer:1656}
+\end{enumerate}
 
-\section{Ligatures}
 
-%\subsection{Print the whole list}
-%\printaddligatureslist
+\section{Ligatures}
 
 \subsection{First name ligatures}
 \begin{itemize}
-	\item\cite{test::firstnames::2}%
-	\item\cite{test::firstnames::1}%
+    \item\cite{test::firstnames::2}%
+    \item\cite{test::firstnames::1}%
     \item\fullcite{test::firstnames::2}%
-	\item\fullcite{test::firstnames::1}%
+    \item\fullcite{test::firstnames::1}%
 \end{itemize}
 
 \subsection{Name prefixes}
 \begin{itemize}
-	\item\cite{test::prefixnames::1}%
-	\item\fullcite{test::prefixnames::1}%
+    \item\cite{test::prefixnames::1}%
+    \item\fullcite{test::prefixnames::1}%
 \end{itemize}
 
 \section{entry types}
@@ -212,30 +243,30 @@
 \subsection{Auctions}
 \begin{itemize}
     \item\cite{hesse:c:1995}%
-	\item\fullcite{hesse:c:1995}
+    \item\fullcite{hesse:c:1995}
 \end{itemize}
 
 \subsection{Exhibitions}
 \begin{itemize}
     \item\cite{schaedler:1999}%
-	\item\fullcite{schaedler:1999}%
+    \item\fullcite{schaedler:1999}%
     \item\cite{oberlechner:1999}%
-	\item\fullcite{oberlechner:1999}%
+    \item\fullcite{oberlechner:1999}%
 \end{itemize}
 
 
 \subsection{Festschrifts}
 \begin{itemize}
-	\item\cite{kronsbein:siepen:2015}%
-	\item\fullcite{kronsbein:siepen:2015}%
+    \item\cite{kronsbein:siepen:2015}%
+    \item\fullcite{kronsbein:siepen:2015}%
     \item\cites{auler:hiller:2015a}%
     \item\fullcite{auler:hiller:2015a}%
 \end{itemize}
 
 \subsection{Sources}
 \begin{itemize}
-	\item\fullcite{tacitus:1981}
-	\item\fullcite{linnaeus:2003}
+    \item\fullcite{tacitus:1981}
+    \item\fullcite{linnaeus:2003}
     \item\cites{test::source}%
     \item\fullcite{test::source}%
 \end{itemize}
@@ -245,84 +276,88 @@
 \subsection{\Feld{title} field ends with question mark}
 \begin{itemize}
     \item\cite{edenmo:1997}%
-	\item\fullcite{edenmo:1997}
+    \item\fullcite{edenmo:1997}
 \end{itemize}
 
 \subsection{Monograph lacking \Feld{date}}
 \begin{itemize}
-	\item\cite{siebert:u:et:al:o:j}%
-	\item\fullcite{siebert:u:et:al:o:j}%
+    \item\cite{siebert:u:et:al:o:j}%
+    \item\fullcite{siebert:u:et:al:o:j}%
 \end{itemize}
 
 \subsection{\Typ{collection} lacks \Feld{date}, \Typ{incollection} has \Feld{realdate}}
 \begin{itemize}
-	\item\cite{huet:o:j}%
-	\item\fullcite{huet:o:j}%
+    \item\cite{huet:o:j}%
+    \item\fullcite{huet:o:j}%
+    \item\cite{mette:1990}%
+    \item\fullcite{mette:1990}%
 \end{itemize}
 
 \subsection{No \Feld{date} and no \Feld{location} fields}
 \begin{itemize}
-	\item\cite{fuchs:o:j}%
-	\item\fullcite{fuchs:o:j}%
+    \item\cite{fuchs:o:j}%
+    \item\fullcite{fuchs:o:j}%
 \end{itemize}
 
 \subsection{No \Feld{author}, no \Feld{editor} but \Feld{translator}}
 \begin{itemize}
-	\item\cite{sterk:1777}%
-	\item\fullcite{sterk:1777}%
+    \item\cite{sterk:1777}%
+    \item\fullcite{sterk:1777}%
 \end{itemize}
 
 \subsection{No \Feld{author} or \Feld{editor} at all}
 \begin{itemize}
-	\item\cite{domino:1780}%
-	\item\fullcite{domino:1780}%
+    \item\cite{domino:1780}%
+    \item\fullcite{domino:1780}%
 \end{itemize}
 
 \subsection{Website with corporate \Feld{author} and \Feld{shortauthor}}
 \begin{itemize}
-	\item\cite{kenmore}%
-	\item\fullcite{kenmore}%
+    \item\cite{kenmore}%
+    \item\fullcite{kenmore}%
 \end{itemize}
 
 \subsection{Edition of a book}
 \begin{itemize}
-	\item\cite{fuchs:kh:et:al:1998}%
-	\item\fullcite{fuchs:kh:et:al:1998}%
+    \item\cite{fuchs:kh:et:al:1998}%
+    \item\fullcite{fuchs:kh:et:al:1998}%
 \end{itemize}
 
 \subsection{Date ranges}
 \begin{itemize}
-	\item\cite{bhattacharyya:1973}%
-	\item\fullcite{bhattacharyya:1973}%
+    \item\cite{bhattacharyya:1973}%
+    \item\fullcite{bhattacharyya:1973}%
+    \item\cite{cossel:1933-35}%
+    \item\fullcite{cossel:1933-35}%
 \end{itemize}
 
 \subsection{Journal with \Feld{number}}
 \begin{itemize}
-	\item\cite{ib:2016a}%
-	\item\fullcite{ib:2016a}%
+    \item\cite{ib:domino:europa}%
+    \item\fullcite{ib:domino:europa}%
 \end{itemize}
 
 \subsection{\Typ{inbook}}
 \begin{itemize}
-	\item\cites{boppert:1998}%
+    \item\cites{boppert:1998}%
     \item\fullcite{boppert:1998}%
 \end{itemize}
 
 %\subsection{Shorthands}
 %\begin{itemize}
-%	\item\cites{mueller:jh:1878}{luening:oj}%
+%    \item\cites{mueller:jh:1878}{luening:oj}%
 %\end{itemize}
 
 \subsection{\Typ{inreference}}
 \begin{itemize}
-	\item\cite{bauchhenss:et:al:1978}%
-	\item\fullcite{bauchhenss:et:al:1978}%
+    \item\cite{bauchhenss:et:al:1978}%
+    \item\fullcite{bauchhenss:et:al:1978}%
 \end{itemize}
 
 \subsection{\Feld{summarytitle}}
 \begin{itemize}
-	\item\cite{ilinskaja:1965}%
-	\item\fullcite{ilinskaja:1965}%
+    \item\cite{ilinskaja:1965}%
+    \item\fullcite{ilinskaja:1965}%
 \end{itemize}
 
 \subsection{\Typ{thesis}}
@@ -336,27 +371,33 @@
 \subsection{\Feld{subseries} and \Feld{subnumber}}
 \begin{itemize}
     \item\cite{kossack:et:al:1980}%
-	\item\fullcite{kossack:et:al:1980}%
+    \item\fullcite{kossack:et:al:1980}%
     \item\cite{harck:1980}%
-	\item\fullcite{harck:1980}%
+    \item\fullcite{harck:1980}%
 \end{itemize}
 
 \subsection{Literal \Feld{realdate} and \Feld{eprint}}
 \begin{itemize}
     \item\cite{lindauer:oj}%
-	\item\fullcite{lindauer:oj}%
+    \item\fullcite{lindauer:oj}%
 \end{itemize}
 
 \subsection{Article of eight authors}
 \begin{itemize}
     \item\cite{summerhayes:et:al:1993}%
-	\item\fullcite{summerhayes:et:al:1993}%
+    \item\fullcite{summerhayes:et:al:1993}%
 \end{itemize}
 
 \subsection{Newspaper article}
 \begin{itemize}
     \item\cite{stafford:2004}%
-	\item\fullcite{stafford:2004}%
+    \item\fullcite{stafford:2004}%
+\end{itemize}
+
+\subsection{\Feld{realdate}}
+\begin{itemize}
+    \item[$\Delta 1$ y.]\fullcite{ib:domino:dormagen}%
+    \item[$\Delta 3$ y.]\fullcite{michaelsen:1978}%
 \end{itemize}
 
 %\printshorthands
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-alt-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-alt-example.pdf
index 165510bafb5..2b253100164 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-alt-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-alt-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-apa-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-apa-example.pdf
index 48b827cd9bd..599e06cb7c0 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-apa-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-apa-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-example.pdf
index 4f9bf54d6f5..3a1e669a986 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/dguf-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-alt-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-alt-example.pdf
index 06eb0a898b4..883c945a5a5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-alt-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-alt-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-example.pdf
index 3379d8df814..9937b436dd5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/eaz-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/foe-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/foe-example.pdf
index ab1b89a4699..5a8e88576b2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/foe-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/foe-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-halle-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-halle-example.pdf
index f683d35459a..d73dc6d2d20 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-halle-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-halle-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-kreis-neuss-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-kreis-neuss-example.pdf
index ea0dcf289da..39b9dcba385 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-kreis-neuss-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/jb-kreis-neuss-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/karl-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/karl-example.pdf
index 802057daaeb..5228a592d46 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/karl-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/karl-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/maja-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/maja-example.pdf
index 5241de2a887..9468b69e11d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/maja-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/maja-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpk-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpk-example.pdf
index 41c1502134d..ff4796ab56c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpk-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpk-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpkoeaw-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpkoeaw-example.pdf
new file mode 100644
index 00000000000..f32dff401e5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/mpkoeaw-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/nnu-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/nnu-example.pdf
index 7a7d6caa4be..c19680fbe5e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/nnu-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/nnu-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/numeric-comp-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/numeric-comp-archaeology-example.pdf
new file mode 100644
index 00000000000..4ef98dd5385
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/numeric-comp-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/offa-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/offa-example.pdf
index f41245c0b6b..b994f733fd2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/offa-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/offa-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-inline-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-inline-example.pdf
index 0551dbf5265..840d0ba3294 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-inline-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-inline-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-numeric-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-numeric-example.pdf
new file mode 100644
index 00000000000..04e3e4001e4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-numeric-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-verbose-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-verbose-example.pdf
index e70fa18f5ea..293e70ecb08 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-verbose-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgk-verbose-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-inline-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-inline-example.pdf
index fc972d72084..2980963858d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-inline-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-inline-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-numeric-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-numeric-example.pdf
new file mode 100644
index 00000000000..27067edcbc0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-numeric-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-verbose-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-verbose-example.pdf
index 74e580772b8..969cf009b4d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-verbose-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/rgzm-verbose-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-inline-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-inline-example.pdf
index 61f3021124d..dbd9707fb0e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-inline-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-inline-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-numeric-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-numeric-example.pdf
new file mode 100644
index 00000000000..00cd2549f4f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-numeric-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-verbose-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-verbose-example.pdf
index 45d61d995a4..226d525f2fa 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-verbose-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/ufg-muenster-verbose-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-archaeology-example.pdf
new file mode 100644
index 00000000000..e4dccdf6ef6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-ibid-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-ibid-archaeology-example.pdf
index 8f75c5b7804..fc2e55b6bfc 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-ibid-archaeology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-ibid-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-trad2note-archaeology-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-trad2note-archaeology-example.pdf
index e90d4be58f2..89c1f48f710 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-trad2note-archaeology-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/verbose-trad2note-archaeology-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/volkskunde-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/volkskunde-example.pdf
index 2ce95cb17e6..7bf0dd416bc 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/volkskunde-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/volkskunde-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaak-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaak-example.pdf
index 6bf4e2f3ddc..a1c6a29f295 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaak-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaak-example.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaes-example.pdf b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaes-example.pdf
index 8968100367e..c088c6d605d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaes-example.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-archaeology/example/zaes-example.pdf
diff --git a/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology-nodoc.dtx b/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology-nodoc.dtx
index 7369bef830a..eb9d7f2ee7d 100644
--- a/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology-nodoc.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology-nodoc.dtx
@@ -1,5 +1,19 @@
+% biblatex-archaeology sources not to include in documentation
 %<*manualBIB>
 %    \begin{macrocode}
+@ARTICLE{grando:bernhard:2003,
+  AUTHOR = {Grando, Sergei A. AND Bernhard, Jeffrey D.},
+  TITLE = {\mkbibquote{First Author, Second Author, et Int, and Last Author}: A Proposed Citation System for Biomedical Papers},
+  DATE = 2003,
+  JOURNALTITLE = ufg-ScienEditor,
+  VOLUME = 26,
+  NUMBER = 4,
+  PAGES = {122--123},
+  LANGUAGE = {american},
+  URL = {https://www.councilscienceeditors.org/wp-content/uploads/v26n4p122-123.pdf},
+  URLDATE = {2018-05-18},
+  GENDER = {pm},
+}
 @ARTICLE{guidelines:foe:2013,
   AUTHOR = {Hofer, Nikolaus},
   TITLE = {Die Redaktionsrichtlinien der Fundberichte aus Österreich},
@@ -34,7 +48,7 @@
   PAGES = {973--998},
   LANGUAGE = {german},
   SHORTAUTHOR = {RGK},
-  URL = {http://www.av-rheinland.de/Richtlinien.pdf},
+  URL = {https://web.archive.org/web/20160723214608/http://www.av-rheinland.de/Richtlinien.pdf},
   GENDER = {sf},
   URLDATE = {2016-07-23},
   AUTHORTYPE = {editor},
@@ -79,7 +93,7 @@
   TITLE = {Archaeologia Austriaca (ArchA) -- Richtlinien},
   LANGUAGE = {german},
   SHORTAUTHOR = {OREA},
-  URL = {http://www.oeaw.ac.at/praehist/fileadmin/template/main/res/pdf/OREA_EU_Richtlinien_ArchA_2013.pdf},
+  URL = {https://web.archive.org/web/20160723154732/http://www.oeaw.ac.at/praehist/fileadmin/template/main/res/pdf/OREA_EU_Richtlinien_ArchA_2013.pdf},
   GENDER = {sn},
   URLDATE = {2016-07-23},
 }
@@ -219,6 +233,7 @@
   URLDATE = {2016-10-20},
   GENDER = {pp},
   SHORTAUTHOR = {{Kunstgeschichte Göttingen}},
+  EDITORTYPE = {editors},
 }
 @ONLINE{guidelines:lda:2009,
   AUTHOR = {Schlenker, Monika},
@@ -251,13 +266,35 @@
 @ONLINE{guidelines:mpk:2013,
   AUTHOR = {{Institut für Orientalische und Europäische Archäologie, Österreichische Akademie der Wissenschaften}},
   TITLE = {Mitteilungen der Prähistorischen Kommission (MPK) -- Richtlinien},
-  DATE = {2015-03-31},
+  DATE = {2013},
   LANGUAGE = {german},
   SHORTAUTHOR = {OREA},
-  URL = {http://www.orea.oeaw.ac.at/fileadmin/user_upload/publikationsrichtlinien/Richtlinien_MPK/OREA_EU_Richtlinien_MPK_2013.pdf},
+  URL = {https://web.archive.org/web/20160723214538/http://www.orea.oeaw.ac.at/fileadmin/user_upload/publikationsrichtlinien/Richtlinien_MPK/OREA_EU_Richtlinien_MPK_2013.pdf},
   GENDER = {sn},
   URLDATE = {2016-07-23},
 }
+@ONLINE{guidelines:mpk:2016:de,
+  AUTHOR = {{Institut für Orientalische und Europäische Archäologie, Österreichische Akademie der Wissenschaften}},
+  TITLE = {Richtlinien für MPK Manuskripte},
+  DATE = 2016,
+  LANGUAGE = {german},
+  URL = {https://www.orea.oeaw.ac.at/fileadmin/Institute/OREA/pdf/Publikationen/MPK_Publikationsrichtlinien_de.pdf},
+  URLDATE = {2016-05-21},
+  GENDER = {sn},
+  SHORTAUTHOR = {OREA},
+  PAGETOTAL = 8,
+}
+@ONLINE{guidelines:mpk:2016:en,
+  AUTHOR = {{Institut für Orientalische und Europäische Archäologie, Österreichische Akademie der Wissenschaften}},
+  TITLE = {Guidelines for MPK Manuscripts},
+  DATE = 2016,
+  LANGUAGE = {english},
+  URL = {https://www.orea.oeaw.ac.at/fileadmin/Institute/OREA/pdf/Publikationen/MPK_Guidelines_en.pdf},
+  URLDATE = {2016-05-21},
+  GENDER = {sn},
+  SHORTAUTHOR = {OREA},
+  PAGETOTAL = 9,
+}
 @ONLINE{guidelines:muenster,
   AUTHOR = {Woltermann, G. AND Graefe, J.},
   TITLE = {Zitier-Regeln},
@@ -637,6 +674,7 @@
 @STRING{ufg-ArbeitsuForschberSaechsBodendenkmalpfl = "Arbeits-und Forschungsberichte zur Sächsischen Bodendenkmalpflege"}
 @STRING{ufg-Arbok = "Árbók"}
 @STRING{ufg-ArchAbroad = "Archaeology Abroad"}
+@STRING{ufg-ArchAdvertiser = "The Archaeological Advertiser"}
 @STRING{ufg-ArchAeliana = "Archaeologia Aeliana or Miscellaneous Tracts Relating to Antiquity"}
 @STRING{ufg-Archaeographie = "Archäographie"}
 @STRING{ufg-Archaeologia = "Archaeologia or Miscellaneous Tracts Relating to Archaeology"}
@@ -1243,6 +1281,7 @@
 @STRING{ufg-CasopisZgodovinoinNarodopisje = "Časopis za Zgodovino in Narodopisje"}
 @STRING{ufg-Castrelos = "Castrelos"}
 @STRING{ufg-CastrumNovum = "Castrum Novum"}
+@STRING{ufg-CBAResearchReport = "CBA Research Report"}
 @STRING{ufg-CEDAC = "CÉDAC \mkbibparens{Centre d'Études et de Documentation Archéologique de la Conservation de Carthage} Carthage Bulletin"}
 @STRING{ufg-Celticum = "Celticum"}
 @STRING{ufg-CentroStudCeramici = "Centro di Studi Ceramici"}
@@ -1346,6 +1385,7 @@
 @STRING{ufg-DtJahrbNum = "Deutsches Jahrbuch für Numismatik"}
 @STRING{ufg-DtLitztg = "Deutsche Literaturzeitung für Kritik der Internationalen Wissenschaft"}
 @STRING{ufg-DtMuenzbl = "Deutsche Münzblätter"}
+@STRING{ufg-DtRoland = "Der Deutsche Roland"}
 @STRING{ufg-DtWissZeitschrPolen = "Deutsche Wissenschaftliche Zeitschrift für Polen"}
 @STRING{ufg-DuerenerGeschbl = "Dürener Geschichtsblätter"}
 @STRING{ufg-DuesseldorferJahrb = "Düsseldorfer Jahrbuch"}
@@ -2395,7 +2435,8 @@
 @STRING{ufg-Pallas = "Pallas"}
 @STRING{ufg-PamaMuz = "Pamiatky a Múzeá"}
 @STRING{ufg-PamaPrirodaBratislavy = "Pamiatky a Príroda Bratislavy"}
-@STRING{ufg-PamArchMistopisnePamArch = "Památky Archaeologické a Místopisné Památky Archeologické"}
+@STRING{ufg-PamArch = "Památky Archaeologické"}
+@STRING{ufg-PamArchMistopisne = "Památky Archaeologické a Místopisné"}
 @STRING{ufg-Pamatky = "Památky"}
 @STRING{ufg-PamKultury = "Pamjatniki Kuľtury"}
 @STRING{ufg-PamMuzMiedzi = "Pamiętnik Muzeum Miedzi"}
@@ -2717,6 +2758,7 @@
 @STRING{ufg-SchwaebMus = "Das Schwäbische Museum"}
 @STRING{ufg-SchweizerMuenzbl = "Schweizer Münzblätter"}
 @STRING{ufg-SchweizerNumRundschau = "Schweizerische Numismatische Rundschau"}
+@STRING{ufg-ScienEditor = "Science Editor"}
 @STRING{ufg-Sciliar = "Der Sciliar"}
 @STRING{ufg-ScottishArchForum = "Scottish Archaeological Forum"}
 @STRING{ufg-ScottishArchRev = "Scottish Archaeological Review"}
@@ -3224,6 +3266,7 @@
 @STRING{ufg-ArbeitsuForschberSaechsBodendenkmalpfl = "Arbeits-und Forschungsberichte zur Sächsischen Bodendenkmalpflege"}
 @STRING{ufg-Arbok = "Árbók. Hins Islenzka Fornleifafélags"}
 @STRING{ufg-ArchAbroad = "Archaeology Abroad"}
+@STRING{ufg-ArchAdvertiser = "The Archaeological Advertiser"}
 @STRING{ufg-ArchAeliana = "Archaeologia Aeliana or Miscellaneous Tracts Relating to Antiquity"}
 @STRING{ufg-Archaeographie = "Archäographie. Archäologie und Elektronische Datenverarbeitung"}
 @STRING{ufg-Archaeologia = "Archaeologia or Miscellaneous Tracts Relating to Archaeology"}
@@ -3830,6 +3873,7 @@
 @STRING{ufg-CasopisZgodovinoinNarodopisje = "Časopis za Zgodovino in Narodopisje"}
 @STRING{ufg-Castrelos = "Castrelos. Revista do Museo Municipal \mkbibquote{Quiñones de León}"}
 @STRING{ufg-CastrumNovum = "Castrum Novum"}
+@STRING{ufg-CBAResearchReport = "CBA Research Report"}
 @STRING{ufg-CEDAC = "CÉDAC \mkbibparens{Centre d'Études et de Documentation Archéologique de la Conservation de Carthage} Carthage Bulletin"}
 @STRING{ufg-Celticum = "Celticum"}
 @STRING{ufg-CentroStudCeramici = "Centro di Studi Ceramici. Bollettino Mensile del Laboratorio Sperimentale di S. Salvatore in Lauro"}
@@ -3933,6 +3977,7 @@
 @STRING{ufg-DtJahrbNum = "Deutsches Jahrbuch für Numismatik"}
 @STRING{ufg-DtLitztg = "Deutsche Literaturzeitung für Kritik der Internationalen Wissenschaft"}
 @STRING{ufg-DtMuenzbl = "Deutsche Münzblätter"}
+@STRING{ufg-DtRoland = "Der Deutsche Roland"}
 @STRING{ufg-DtWissZeitschrPolen = "Deutsche Wissenschaftliche Zeitschrift für Polen"}
 @STRING{ufg-DuerenerGeschbl = "Dürener Geschichtsblätter. Mitteilungen des Dürener Geschichtsvereins e.\,V\adddot"}
 @STRING{ufg-DuesseldorferJahrb = "Düsseldorfer Jahrbuch. Beiträge zur Geschichte des Niederrheins"}
@@ -4982,7 +5027,8 @@
 @STRING{ufg-Pallas = "Pallas"}
 @STRING{ufg-PamaMuz = "Pamiatky a Múzeá"}
 @STRING{ufg-PamaPrirodaBratislavy = "Pamiatky a Príroda Bratislavy"}
-@STRING{ufg-PamArchMistopisnePamArch = "Památky Archaeologické a Místopisné Památky Archeologické"}
+@STRING{ufg-PamArch = "Památky Archaeologické"}
+@STRING{ufg-PamArchMistopisne = "Památky Archaeologické a Místopisné"}
 @STRING{ufg-Pamatky = "Památky. Listy pro Archaeologii a Historii"}
 @STRING{ufg-PamKultury = "Pamjatniki Kuľtury"}
 @STRING{ufg-PamMuzMiedzi = "Pamiętnik Muzeum Miedzi"}
@@ -5304,6 +5350,7 @@
 @STRING{ufg-SchwaebMus = "Das Schwäbische Museum. Zeitschrift für Kultur, Kunst und Geschichte Schwabens"}
 @STRING{ufg-SchweizerMuenzbl = "Schweizer Münzblätter"}
 @STRING{ufg-SchweizerNumRundschau = "Schweizerische Numismatische Rundschau"}
+@STRING{ufg-ScienEditor = "Science Editor"}
 @STRING{ufg-Sciliar = "Der Sciliar. Illustrierte Monatsschrift für Heimat-und Volkskunde"}
 @STRING{ufg-ScottishArchForum = "Scottish Archaeological Forum"}
 @STRING{ufg-ScottishArchRev = "Scottish Archaeological Review"}
@@ -5811,6 +5858,7 @@
 @STRING{ufg-ArbeitsuForschberSaechsBodendenkmalpfl = "Arbeits-u. Forschber. Sächs. Bodendenkmalpfl\adddot"}
 @STRING{ufg-Arbok = "Árbók"}
 @STRING{ufg-ArchAbroad = "Arch. Abroad"}
+@STRING{ufg-ArchAdvertiser = "Arch. Advertiser"}
 @STRING{ufg-ArchAeliana = "Arch. Aeliana"}
 @STRING{ufg-Archaeographie = "Archäographie"}
 @STRING{ufg-Archaeologia = "Archaeologia"}
@@ -6417,6 +6465,7 @@
 @STRING{ufg-CasopisZgodovinoinNarodopisje = "Časopis Zgodovino in Narodopisje"}
 @STRING{ufg-Castrelos = "Castrelos"}
 @STRING{ufg-CastrumNovum = "Castrum Novum"}
+@STRING{ufg-CBAResearchReport = "CBA Research Report"}
 @STRING{ufg-CEDAC = "CÉDAC"}
 @STRING{ufg-Celticum = "Celticum"}
 @STRING{ufg-CentroStudCeramici = "Centro Stud. Ceramici"}
@@ -6520,6 +6569,7 @@
 @STRING{ufg-DtJahrbNum = "Dt. Jahrb. Num\adddot"}
 @STRING{ufg-DtLitztg = "Dt. Litztg\adddot"}
 @STRING{ufg-DtMuenzbl = "Dt. Münzbl\adddot"}
+@STRING{ufg-DtRoland = "Dt. Roland"}
 @STRING{ufg-DtWissZeitschrPolen = "Dt. Wiss. Zeitschr. Polen"}
 @STRING{ufg-DuerenerGeschbl = "Dürener Geschbl\adddot"}
 @STRING{ufg-DuesseldorferJahrb = "Düsseldorfer Jahrb\adddot"}
@@ -7569,7 +7619,8 @@
 @STRING{ufg-Pallas = "Pallas"}
 @STRING{ufg-PamaMuz = "Pam. a Múz\adddot"}
 @STRING{ufg-PamaPrirodaBratislavy = "Pam. a Príroda Bratislavy"}
-@STRING{ufg-PamArchMistopisnePamArch = "Pam. Arch. Místopisné Pam. Arch\adddot"}
+@STRING{ufg-PamArch = "Pam. Arch\adddot"}
+@STRING{ufg-PamArchMistopisne = "Pam. Arch. Místopisné"}
 @STRING{ufg-Pamatky = "Památky"}
 @STRING{ufg-PamKultury = "Pam. Kul'tury"}
 @STRING{ufg-PamMuzMiedzi = "Pam. Muz. Miedzi"}
@@ -7891,6 +7942,7 @@
 @STRING{ufg-SchwaebMus = "Schwäb. Mus\adddot"}
 @STRING{ufg-SchweizerMuenzbl = "Schweizer Münzbl\adddot"}
 @STRING{ufg-SchweizerNumRundschau = "Schweizer. Num. Rundschau"}
+@STRING{ufg-ScienEditor = "Scien. Editor"}
 @STRING{ufg-Sciliar = "Sciliar"}
 @STRING{ufg-ScottishArchForum = "Scottish Arch. Forum"}
 @STRING{ufg-ScottishArchRev = "Scottish Arch. Rev\adddot"}
diff --git a/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.dtx b/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.dtx
index 44b18c474c0..2128804123c 100644
--- a/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.dtx
@@ -1,13 +1,13 @@
 % \iffalse meta-comment
 % !TEX program  = pdfLaTeX
 %
-% Copyright (C) 2005-2017 by Ingram Braun
+% Copyright (C) 2005-2018 by Ingram Braun
 %
 % This file may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version.The latest version of this license is in:
-% 
+% \
 % http://www.latex-project.org/lppl.txt
 %
 % and version 1.3c or later is part of all distributions of
@@ -17,19 +17,20 @@
 % \iffalse 
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{biblatex-archaeology}
-%<package>[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+%<package>[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 %
 %<*driver>
-%\listfiles
-\documentclass[11pt]{ltxdoc}
-\usepackage[osf,sc]{mathpazo}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-% select teletext font (Luximono is non-free):
-\IfFileExists{luximono.sty}
-    {\usepackage[scaled=.75]{luximono}}
-    {\usepackage[ttscale=.8]{libertine}}
-\usepackage[french,latin,ngerman,english]{babel}
+\listfiles
+\documentclass[10pt]{ltxdoc}
+\usepackage{fontspec}
+% it's best to use the ltxdoc defaults for monospace.
+\setmainfont[Ligatures=TeX]{NotoSerif}
+\setsansfont{NotoSans}
+\usepackage{polyglossia}
+\setdefaultlanguage{english}
+\setotherlanguage[spelling=new]{german}
+\setotherlanguage[frenchfootnote=false]{french}
+\setotherlanguage{latin}
 \usepackage{csquotes,dox,ellipsis,fancyhdr,longtable,sectsty,xcolor,xspace}
 \usepackage[toc,page]{appendix}
 \usepackage[many]{tcolorbox}
@@ -39,8 +40,7 @@
             % dass alle Passagen in Kapitälchen automatisch leicht
             % gesperrt werden.
 \usepackage[
-    style=foe,
-    backend=biber,
+    style=mpkoeaw,
     sortcites=true,
     url=true,
 ]{biblatex}
@@ -58,7 +58,6 @@
     {\usepackage{ingram-braun-local}
      \addbibresource{\IBbibmain}}
     {\addbibresource{biblatex-archaeology-manual.bib}}
-
 \pagestyle{fancy}% muss vor \renewcommand{\sectionmark} stehen
 \fancyhf{}
 \fancyhead[L]{\thepage}% gerade Seiten, links
@@ -87,40 +86,44 @@
 \DeclareRobustCommand{\bibtex}{%
     {\normalfont B\kern-.05em{\scshape i\kern-.025em b}\kern-.08em \TeX\xspace}%
 }
-\newcommand{\blx}{\Paket{bib\-la\-tex}\xspace}
+\newrobustcmd*{\blx}{\Paket{bib\-la\-tex}\xspace}
 \makeatletter
-\newcommand{\archbib}{\Paket{\blxarch@name@hyph}\xspace}
+\newrobustcmd*{\archbib}{\Paket{\blxarch@name@hyph}\xspace}
+\newrobustcmd*{\Biber}{\Paket{Biber}\xspace}
 \makeatother
-\newcommand{\Befehl}[1]{\texttt{\cs{#1}}}
-\newcommand{\Datei}[1]{\texttt{#1}}
-\newcommand{\Format}[1]{\texttt{#1}}
-\newcommand{\Environment}[1]{\texttt{#1}}
-\newcommand{\Typ}[1]{\texttt{\symbol{64}#1}}
+\newrobustcmd*{\Befehl}[1]{\texttt{\cs{#1}}}
+\newrobustcmd*{\Datei}[1]{\texttt{#1}}
+\newrobustcmd*{\Format}[1]{\texttt{#1}}
+\newrobustcmd*{\Environment}[1]{\texttt{#1}}
+\newrobustcmd*{\Typ}[1]{\texttt{\symbol{64}#1}}
 % no hyphenation within tt fonts:
-\newcommand{\Paket}[1]{\textsf{#1}}
-\newcommand{\Feld}[1]{\texttt{#1}}
-\newcommand{\Option}[1]{\texttt{#1}}
-\newcommand{\Kbd}[1]{\texttt{#1}}
-\newcommand{\Stil}[1]{\texttt{#1}}
+\newrobustcmd*{\Paket}[1]{\textsf{#1}}
+\newrobustcmd*{\Feld}[1]{\texttt{#1}}
+\newrobustcmd*{\Option}[1]{\texttt{#1}}
+\newrobustcmd*{\Kbd}[1]{\texttt{#1}}
+\newrobustcmd*{\Stil}[1]{\texttt{#1}}
 \newcommand{\subsubsubsection}[1]{\paragraph{#1}\mbox{}\\}
 \newcommand{\subsubsubsubsection}[1]{\subparagraph{#1}\mbox{}\\}
-\newcommand{\Deutsch}[1]{\selectlanguage{ngerman}{\textit{#1}}}
-\newcommand{\Latein}[1]{\selectlanguage{latin}{\textit{#1}}}
+\newcommand*{\Deutsch}[1]{\emph{\begin{hyphenrules}{ngerman}#1\end{hyphenrules}}}
+\newcommand*{\Latein}[1]{\emph{\begin{hyphenrules}{latin}#1\end{hyphenrules}}}
 \setcounter{tocdepth}{5}
 \setcounter{secnumdepth}{5}
 \newcommand{\Stark}[1]{\textcolor{\headingscolor}{\textbf{#1}}}
 % Example boxes:
-\newcommand{\Beispiel}[1]{%
-    \tcbox[
-        center,
+\newenvironment{Beispiel}
+    {\begin{tcolorbox}[
         colback=\backgroundcolor,
         colframe=\headingscolor,
         fonttitle=\bfseries\sffamily,
         title=\vspace{0.7ex}Example,
-    ]{#1}%
-}
-\newcommand{\Mittelpfeil}{\multicolumn{1}{c}{$\Downarrow$}}
+        halign=flush left,
+    ]}%
+    {\end{tcolorbox}}
 \newcommand{\StringBox}[2]{\parbox{\textwidth}{\raggedright#1 #2}}
+\usepackage{enumitem}
+\newenvironment{optkeys}[1]
+    {\begin{enumerate}[align=parleft, labelsep=#1,itemsep=0.0ex,]}
+    {\end{enumerate}}
 \usepackage{hypdoc,hyperxmp}
 \hypersetup{
     linktocpage=true,       % only page numbers are clickable
@@ -135,6 +138,7 @@
     pdfpagemode={UseOutlines}, % show pdf bookmarks (indices) on startup; does not function all the time
     pdfdisplaydoctitle=true,
     pdfauthor={Ingram Braun},
+    pdfcaptionwriter={Ingram Braun},
     pdflang=en,
     pdfmenubar=true,        % make PDF viewer's menu bar visible
     pdfkeywords={archaeology, anthropology, bibliography, typesetting, LaTeX, BibTeX, biblatex, history, Egyptology},
@@ -142,10 +146,11 @@
     pdfaconformance=B,
     pdfmetalang=en,
     pdfcaptionwriter={Ingram Braun},
-    pdfcontacturl={https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf/, https://github.com/CarlOrff/biblatex-archaeology, https://twitter.com/Ingram_Braun, https://www.facebook.com/ingram.braun.7},
+    pdfcontacturl={https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf/\#ib_campaign=biblatex-archaeology-2.0&ib_medium=manual&ib_source=ctan&ib_content=pdfcontacturl, https://github.com/CarlOrff/biblatex-archaeology, https://twitter.com/Ingram_Braun, https://www.facebook.com/ingram.braun.7},
     pdflicenseurl = {http://www.latex-project.org/lppl.txt},
+    pdfsource={\jobname.dtx},
     pdftype=Software,
-    pdftitle={The biblatex-archaeology styles [v1.3]},
+    pdftitle={The biblatex-archaeology styles [v2.0]},
     baseurl={http://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-archaeology}
 }
 \EnableCrossrefs
@@ -183,8 +188,23 @@
 % \changes{1.3}{2017/11/15}{Renamed style-specific \Kbd{.lbx} files in order to fit to \blx' new \Befehl{DeclareLanguageMappingSuffix} macro}
 % \changes{1.3}{2017/11/15}{\blx version check added}
 % \changes{1.3}{2017/11/16}{Added \Kbd{.lbx} pointer files for language variants}
-% \changes{1.3}{2017/11/16}{\Befehl{nametypedelim} removed}
-% 
+% \changes{1.3}{2017/11/16}{\Stark{Incompatible:} \Befehl{nametypedelim} removed}
+% \changes{2.0}{2018/11/19}{Fixed some formatting in style \Stil{karl}}
+% \changes{2.0}{2018/03/20}{CTAN files in read-only mode (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/11}{issue \#11})}
+% \changes{2.0}{2018/03/20}{Some German expressions not translated into English (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/12}{issue \#12})}
+% \changes{2.0}{2018/03/21}{Added XML datamodel snippet for \Biber's tool mode (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/10}{issue \#10})}
+% \changes{2.0}{2018/04/04}{Added new generic style \Stil{numeric-comp-archaeology} (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/13}{issue \#13})}
+% \changes{2.0}{2018/04/04}{Added new style \Stil{rgk-numeric}}
+% \changes{2.0}{2018/04/04}{Added new style \Stil{rgzm-numeric}}
+% \changes{2.0}{2018/05/10}{Added new style \Stil{ufg-muenster-numeric}}
+% \changes{2.0}{2018/05/10}{Separated \Kbd{development} from {master} branch on GitHub}
+% \changes{2.0}{2018/05/19}{Manual layout enhanced}
+% \changes{2.0}{2018/05/21}{Suppress warnings of missing files \Kbd{\textless{}language\textgreater-archaeology-\textless{}style\textgreater.lbx} (\href{https://github.com/plk/biblatex/issues/745}{\blx issue 745})}
+% \changes{2.0}{2018/05/21}{New style \Stil{mpkoeaw}}
+% \changes{2.0}{2018/05/30}{Added script \Datei{version.pl} to development repository}
+% \changes{2.0}{2018/06/06}{New generic style \Stil{verbose-archaeology}}
+% \changes{2.0}{2018/10/06}{Fixed style \Stil{maja}}
+%
 % \GetFileInfo{biblatex-archaeology.sty}
 % \DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ }
 % \DoNotIndex{\@ne}
@@ -196,8 +216,8 @@
 % \IndexPrologue{\section*{Index}\addcontentsline{toc}{section}{Index}}
 % \GlossaryPrologue{\section*{Changelog}\addcontentsline{toc}{section}{Changelog}}
 %
-% \title{\LARGE\color{\headingscolor}The \textsf{\jobname} styles\thanks{This document corresponds to \archbib~v1.3, dated~2017/11/16.}}
-% \author{\Large Ingram Braun \\ \url{https://ingram-braun.net/}}
+% \title{\LARGE\color{\headingscolor}The \archbib styles [v2.0]}
+% \author{\Large Ingram Braun \\ \href{https://ingram-braun.net/\#ib_campaign=biblatex-archaeology-2.0\&ib_medium=manual\&ib_source=ctan\&ib_content=titlepage}{\Kbd{https://ingram-braun.net/}}}
 %
 % \maketitle
 %
@@ -206,13 +226,20 @@
 % purpose is to enable the referencing rules of the \Deutsch{Römisch-Germanische Kommission}, 
 % the department of prehistory of the \Deutsch{Deutsches Archäologisches Institut}
 % (German Archaeological Institute), since these are referenced by most guidelines in German prehistory
-% and medieval archaeology and serve as a kind of template. \archbib contains verbose and author date styles as well.
+% and medieval archaeology and serve as a kind of template. \archbib contains verbose, numeric and author date styles as well.
 % \end{abstract}
 % 
 % \tableofcontents
 % 
 % \section{Introduction}
 % 
+% \subsection{Objective}\label{kap:objective}
+% \archbib provides a collection of style files for the \blx bibliography package. It is designed for the use of German researchers into material culture,
+% especially prehistorians and medieval archaeologists. Generally their bibliography styles are more or less variations of the guide lines of the
+% \Deutsch{Römisch-Germanische Kommission}, nowithstanding of being verbose or inline styles. I tried to develop generic styles, that cover all the needs and allow
+% for easy generation of local styles. Besides author date and verbose styles that are in real use numeric styles are provided, too. They may prove useful
+% for project proposals or generic web publishing.
+%
 % \subsection{Installation}\label{kap:install}
 % \par Most likeley you got \archbib via a \TeX{} distribution. If not, you can obtain installable files from CTAN as usual. Create the
 % directories \Kbd{\{TEXMF\}/bibtex/bib/biblatex-archaeology} and \Kbd{\{TEXMF\}/tex/latex/biblatex-archaeology} and run
@@ -232,12 +259,12 @@
 %<*verbman>
 % \fi
 % \begin{verbatim}
-   pdflatex biblatex-archaeology
+   lualatex biblatex-archaeology
    Biber biblatex-archaeology
    makeindex -s gglo.ist -o biblatex-archaeology.gls biblatex-archaeology.glo
    makeindex -s gind.ist biblatex-archaeology.idx
-   pdflatex biblatex-archaeology
-   pdflatex biblatex-archaeology
+   lualatex biblatex-archaeology
+   lualatex biblatex-archaeology
  \end{verbatim}
 % \iffalse
 %</verbman>
@@ -264,13 +291,14 @@
 % employ \bibtex. Doing so will issue an error.
 % 
 % \subsection{Usage}
-% \par As usual, \archbib is loaded if one of its styles is selected with \blx' \Option{style} option.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Befehl{usepackage}\Kbd{[style=rgk-verbose,backend=biber]\{biblatex\}}\\
-%       \Befehl{addbibresource}\{mybibliography.bib\}\\
-%   \end{tabular}
-% }
+%
+% \par As usual, \archbib gets loaded if one of its styles is selected with \blx' \Option{style} option.
+%
+% \begin{Beispiel}
+%   \Befehl{usepackage}\Kbd{[style=rgk-verbose]\{biblatex\}}\\
+%   \Befehl{addbibresource}\Kbd{\{mybibliography.bib\}}\\
+% \end{Beispiel}
+%
 % \par Please study the main part of this manual and the example database \Datei{biblatex-archaeology-example.bib} (see \ref{kap:bib}) carefully!
 % 
 % \subsection{Other solutions}
@@ -279,21 +307,21 @@
 % \archbib and ships with a database of shortened journal and series titles. For German historians there is the well-known
 % \Paket{biblatex-dw} which contains the \Stil{authortitle-dw} and \Stil{footnote-dw} styles. There is also a verbose style
 % \Stil{historische-zeitschrift}. \Stil{geschichtsfrkl} implements a verbose style used by historians
-% from the University Freiburg/Br. Non-German solution include the author date style \Stil{biblatex-historian}, an adaption of the
-% \textit{Chicago Manual of Style} to the needs of historians, or \Stil{biblatex-ijsra} for the
-% \textit{International Journal of Student Research in Archaeology}.
+% from the University Freiburg/Br. Non-German solution include \Stil{biblatex-ijsra} for the
+% \emph{International Journal of Student Research in Archaeology}.\footnote{The style \Stil{biblatex-historian}, that was mentioned here
+% in former editions, has not been updated for a long time and is not compatible with current \blx releases.}
 % 
 % \subsection{Help}\label{kap:help}
 % \par If there are any concerns you can reach me directly via the
-% \href{https://github.com/CarlOrff/biblatex-archaeology/issues}{GitHub tracker} or the comment section on
-% a \href{https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf}
+% \href{https://github.com/CarlOrff/biblatex-archaeology/issues}{GitHub tracker} or comment section on
+% a \href{https://ingram-braun.net/public/programming/tex/latex-typography-prehistory-egyptology-anthropology-rgk-rgzm-dguf/\#ib_campaign=biblatex-archaeology-2.0&ib_medium=manual&ib_source=ctan\&ib_content=helpsection}
 %{small project page on my personal website}.
-% Alternatively you can e-mail me through the \href{https://ingram-braun.net/public/about/legal-notice/}{contact form} there.
+% Alternatively you can e-mail me through the \href{https://ingram-braun.net/public/about/legal-notice/\#ib_campaign=biblatex-archaeology-2.0&ib_medium=manual&ib_source=ctan\&ib_content=helpsection}{contact form} there.
 % Of course, \href{http://tex.stackexchange.com}{TeX Stack Exchange} is always worth a try.
-% \par The \href{https://ingram-braun.net/public/programming/tex/bibtex-database-latex-bibliography-form/}{Online \blx Editor}
+% \par The \href{https://ingram-braun.net/public/programming/tex/bibtex-database-latex-bibliography-form/\#ib_campaign=biblatex-archaeology-2.0&ib_medium=manual&ib_source=ctan\&ib_content=helpsection}{Online \blx Editor}
 % on my website provides the additional \archbib fields.
 % 
-% \section{Reference} 
+% \section{Reference}
 % 
 % \subsection{Styles}
 %
@@ -315,6 +343,12 @@
 % \item[]\DescribeStyle{authoryear-icomp-archaeology}
 % Imports \Kbd{authoryear-icomp} into \archbib.
 %
+% \item[]\DescribeStyle{numeric-comp-archaeology}
+% Imports \Kbd{numeric-comp} into \archbib.
+%
+% \item[]\DescribeStyle{verbose-archaeology}
+% Imports \Kbd{verbose} into \archbib.
+%
 % \item[]\DescribeStyle{verbose-ibid-archaeology}
 % Imports \Kbd{verbose-ibid} into \archbib.
 %
@@ -336,19 +370,20 @@
 % The author date style of the \Deutsch{Eurasien-Abteilung des Deutschen Arch\"aologischen Instituts}.\autocite{guidelines:amit:2002}
 %
 % \item[]\DescribeStyle{archa}
-% The author date style of the Austrian journal \Deutsch{Archaeologia Austriaca}
-% (ArchA).\autocites{guidelines:austriaca:2013}{guidelines:austriaca:de}{guidelines:austriaca:en}
+% The now obsolete author date style of the Austrian journal \Deutsch{Archaeologia Austriaca}
+% (ArchA).\autocites{guidelines:austriaca:2013}{guidelines:austriaca:de}{guidelines:austriaca:en} The current style is identical with
+% \Deutsch{Mitteilungen der Pr\"ahistorischen Kommission der \"Osterreichischen Akademie der Wissenschaften} (\Stil{mpkoeaw}).
 %
 % \item[]\DescribeStyle{dguf}
-% An obsolete author date style of the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"ugeschichte}.\autocite{guidelines:dguf:neu} Their
+% An obsolete author date style of the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}.\autocite{guidelines:dguf:neu} Their
 % current style is \Kbd{dguf-apa} (\ref{kap:dguf:apa}).
 %
 % \item[]\DescribeStyle{dguf-alt}
-% An obsolete author date style of the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"ugeschichte}.\autocite{guidelines:dguf:alt} Their
+% An obsolete author date style of the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}.\autocite{guidelines:dguf:alt} Their
 % current style is \Kbd{dguf-apa} (\ref{kap:dguf:apa}).
 %
 % \item[]\DescribeStyle{dguf-apa}\label{kap:dguf:apa}
-% The current author date style of the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"ugeschichte}.\autocite{guidelines:dguf:apa}
+% The current author date style of the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}.\autocite{guidelines:dguf:apa}
 %
 % \item[]\DescribeStyle{eaz}
 % The author date style of the \Deutsch{Ethnographisch-Arch\"aologische Zeitschrift}.\autocite{guidelines:eaz:article}
@@ -363,18 +398,23 @@
 % The author date style of the \Deutsch{Landesamt f\"ur Denkmalpflege und Arch\"aologie Sachsen-Anhalt}.\autocite{guidelines:lda:2009}
 %
 % \item[]\DescribeStyle{jb-kreis-neuss}
-% The verbose style of the \Deutsch{Kreisheimatbund Neuss e.~V.}.\autocite{guidelines:kreisheimatbund:neuss}
+% The verbose style of the \Deutsch{Kreisheimatbund Neuss e.\,V.}\autocite{guidelines:kreisheimatbund:neuss}
 %
 % \item[]\DescribeStyle{karl}
-% \Deutsch{Karl. Das kulturelle Schachmagazin} lacks a uniform style. This is a an author date style that was used in several articles.
+% \Deutsch{Karl. Das kulturelle Schachmagazin} lacks an uniform style. This is a an author date style that was used in several articles.
 %
 % \item[]\DescribeStyle{maja}
 % The verbose style of the \Deutsch{M\"unchner Arbeitskreis Junge Aegyptologie}.\autocite{guidelines:maja:2015}
 %
 % \item[]\DescribeStyle{mpk}
-% The author date style of the
+% The obsolete author date style of the
 % \Deutsch{Mitteilungen der Pr\"ahistorischen Kommission der \"Osterreichischen Akademie der Wissenschaften}.\autocite{guidelines:mpk:2013}
 %
+% \item[]\DescribeStyle{mpkoeaw}
+% The current author date style of the
+% \Deutsch{Mitteilungen der Pr\"ahistorischen Kommission der \"Osterreichischen Akademie der Wissenschaften}.\autocite{guidelines:mpk:2016:de,guidelines:mpk:2016:en}
+% It is structurally different from a \blx point of view, therefore it was forked.
+%
 % \item[]\DescribeStyle{nnu}\label{kap:nnu}
 % The current author date style of the department of archaeology of the
 % \Deutsch{Nieders\"achsisches Landesamt f\"ur Denkmalpflege}.\autocite{guidelines:nnu:2015}
@@ -386,6 +426,9 @@
 % \item[]\DescribeStyle{rgk-inline}
 % The author date style of the \Deutsch{R\"omisch-Germanische Kommission des Deutschen Arch\"aologischen Instituts}.\autocite{guidelines:rgk:1991}
 %
+% \item[]\DescribeStyle{rgk-numeric}
+% The RGK style with numeric labels. Keep in mind that \Feld{prenote} and \Feld{postnote} fields are senseless in numeric styles.
+%
 % \item[]\DescribeStyle{rgk-verbose}
 % The verbose style of the \Deutsch{R\"omisch-Germanische Kommission des Deutschen Arch\"aologischen Instituts}.\autocite{guidelines:rgk:1991}
 %
@@ -395,12 +438,19 @@
 % The style of the \Deutsch{Zeitschrift Restaurierung und Arch\"aologie} is the same but journals and
 % serieses not abridged.\autocite{guidelines:rgzm:ra}
 %
+% \item[]\DescribeStyle{rgzm-inline}
+% The RGZM style with numeric labels. Keep in mind that \Feld{prenote} and \Feld{postnote} fields are senseless in numeric styles.
+%
 % \item[]\DescribeStyle{rgzm-verbose}
 % The verbose style of the \Deutsch{R\"omisch-Germanisches Zentralmuseum}.\autocites{guidelines:rgzm:2007}{guidelines:rgzm:2014:fr}{guidelines:rgzm:2014:en}{guidelines:rgzm:2014:de}
 %
 % \item[]\DescribeStyle{ufg-muenster-inline}
 % The author date style of the \Deutsch{Westf\"alische Wilhelms-Universit\"at M\"unster, Historisches Seminar, Abteilung f\"ur Ur- und Fr\"uhgeschichtliche Arch\"aologie}.\autocite{guidelines:muenster}
 %
+% \item[]\DescribeStyle{ufg-muenster-numeric}
+% The style of the \Deutsch{Westf\"alische Wilhelms-Universit\"at M\"unster, Historisches Seminar, Abteilung f\"ur Ur- und Fr\"uhgeschichtliche Arch\"aologie} with numeric labels.
+% Keep in mind that \Feld{prenote} and \Feld{postnote} fields are senseless in numeric styles.
+%
 % \item[]\DescribeStyle{ufg-muenster-verbose}
 % The verbose style of the \Deutsch{Westf\"alische Wilhelms-Universit\"at M\"unster, Historisches Seminar, Abteilung f\"ur Ur- und Fr\"uhgeschichtliche Arch\"aologie}.\autocite{guidelines:muenster}
 %
@@ -421,9 +471,16 @@
 %
 % \begin{itemize}
 %
+% \item[]\DescribeOption{citeshortin}=\meta{bool}\\
+% If \meta{true}, then short citations for \Typ{inreference} and \Typ{article} are not build with \Feld{labelname}, but with \Kbd{in: \textellipsis}:
+%
+% \begin{Beispiel}
+%    Bergmann, \Stark{in: LÄ \RN{3}} (2015)
+% \end{Beispiel}
+%
 % \item[]\DescribeOption{editionsuperscript}=\meta{key}\\
 % This option controls where to print the edition number. The following keys are available:
-% \begin{itemize}
+% \begin{optkeys}{4em}
 %   \item[\Kbd{none}] use the \blx standard.
 %   \item[\Kbd{predate}] superscript ahead of \Feld{date}.
 %   \item[\Kbd{postdate}] superscript after \Feld{date}.
@@ -432,7 +489,7 @@
 %   \item[\Kbd{preloc}] superscript ahead of \Feld{location}.
 %   \item[\Kbd{postloc}] superscript after \Feld{location}.
 %   \item[\Kbd{posttitle}] superscript after \Format{title}.
-% \end{itemize}
+% \end{optkeys}
 % Except \Kbd{none}, the content of the edition field is copied into the \Feld{usere} field.
 %
 % \item[]\DescribeOption{giveninitligatures}=\meta{csv}\\
@@ -440,21 +497,23 @@
 % the list stops after the first hit. If you want to have Christian abbreviated Chr. and Cheryl
 % Ch., then Chr must be enlisted before Ch. Provide an empty list in order to disable this function.
 % Of course, the list must be enclosed in braces.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[givenintligatures=\{Ch,Ph,St,Th\},style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       \Stark{Th}. G. \Stark{St}. Ackermann 2015: \dots\\
-%       R. \Stark{Ph}. Bauer 2012: \dots
-%   \end{tabular}
-% }
+%
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[givenintligatures=\{Ch,Ph,St,Th\},style=xyz]\\
+%     \{biblatex\}}
+%    \tcblower%
+%    \Stark{Th}. G. \Stark{St}. Ackermann 2015: \textellipsis\\
+%    R. \Stark{Ph}. Bauer 2012: \textellipsis
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{idemincitation}=\meta{bool}\\
 % \blx never uses \Kbd{idem} idem strings in \Befehl{fullcite} commands. The option enables this.
 %
 % \item[]\DescribeOption{injournal}=\meta{bool}\\
 % If \meta{true}, journal titles are preceeded by an \Kbd{in}.
-% \Beispiel{G. Popp, A title. \Stark{In:} Journal of Things 56 \dots}
+% \begin{Beispiel}
+%   G. Popp, A title. \Stark{In:} Journal of Things 56 \textellipsis
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{journallocation}=\meta{bool}\\
 % If \meta{true}, the \Feld{location} field is printed in \Typ{article}.
@@ -465,6 +524,11 @@
 % \item[]\DescribeOption{minbooknames}=\meta{integer}\\
 % Similar to \Option{minnames}, but only affects bookauthors/editors.
 %
+% \item[]\DescribeOption{minrealdatediff}=\meta{integer}\\
+% If both \Feld{date} and \Feld{realdate} (or \Feld{origdate} and \Feld{origrealdate} respectively) contain numeric years, \Feld{realdate}
+% only gets printed if its difference from \Feld{date} is greater equal \Option{minrealdatediff}. This is to rule out those cases where the item
+% appeared only one year earlier or later than its given copyright date or journal year.
+%
 % \item[]\DescribeOption{nothesistitlepunct}=\meta{bool}\\
 % If \meta{true}, in \Typ{thesis} there is no punctuation between the title and the institution/location block.
 %
@@ -475,52 +539,52 @@
 % \item[]\DescribeOption{origfields}=\meta{bool}\\
 % If \meta{true}, an expression indicating a reprint is printed.
 %
-% \item[]\DescribeOption{origfields}=\meta{bool}\\
+% \item[]\DescribeOption{pagesfirst}=\meta{bool}\\
 % If \meta{true}, the \Feld{pages} field is printed ahead of the location/publisher block.
 %
 % \item[]\DescribeOption{positionlabeldate}=\meta{key}\\
 % This option controls the position of the \Feld{labelyear} in the bibliography only in author date styles.
 % The following keys are available:
-% \begin{itemize}
+% \begin{optkeys}{3em}
 %   \item[\Kbd{both}] after author names and after location.
 %   \item[\Kbd{label}] after author names.
 %   \item[\Kbd{location}] after location.
-% \end{itemize}
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[positionlabeldate=both,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       G. Ackermann \Stark{2015}: A title. Hamburg \Stark{2015}.
-%   \end{tabular}
-% }
+% \end{optkeys}
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[positionlabeldate=both,style=xyz]\{biblatex\}}\\
+%    \tcblower
+%    G. Ackermann \Stark{2015}: A title. Hamburg \Stark{2015}.
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{preservelastauthor}=\meta{bool}\\
-% \blx truncates name lists by omitting the last names und mark it with et~al. If this option is \meta{true}
+% \blx truncates name lists by omitting the last names und marks them with \emph{et~al.} If this option is \meta{true}
 % the names beetwen \Kbd{maxnames}$-1$ and the last names are omitted:
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[preservelastauthor=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       G. Ackermann, R. Bauer \Stark{\dots} F. Berger: A title. Hamburg 2015.
-%   \end{tabular}
-% }
-%
-% \item[]\DescribeOption{repeatlabel}=\meta{bool}\\
-% If \meta{true}, the exact label is printed in the bibliography. This affects author date styles only.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Stark{Ackermann et~al. 2015}\\
+% 
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[preservelastauthor=true,style=xyz]\{biblatex\}}
+%    \tcblower%
+%    G. Ackermann, R. Bauer \Stark{\textellipsis} F. Berger: A title. Hamburg 2015.
+% \end{Beispiel}
+%
+% \item[]\DescribeOption{repeatlabel}=\meta{key}\\
+% If \meta{true} or \meta{dashed}, the exact label is printed in the bibliography. This affects author date styles only.
+% \begin{optkeys}{3em}
+%   \item[\Kbd{dashed}] repeat labels and dash repeated names.
+%   \item[\Kbd{false}] do not repeat labels.
+%   \item[\Kbd{true}] repeat labels and print \Befehl{labelname}s every time.
+% \end{optkeys}
+% \begin{Beispiel}
+%       \Stark{Ackermann et\,al. 2015}\\
 %       G. Ackermann, R. Bauer, F. Berger: A title. Hamburg 2015.
-%   \end{tabular}
-% }
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{shortform}=\meta{key}\\
-% If to print short forms like \Deutsch{RGA} or \Latein{CIL} in bibliographies. The following keys are available:
-% \begin{itemize}
+% Wether to print short forms like \Deutsch{RGA} or \Latein{CIL} in bibliographies. The following keys are available:
+% \begin{optkeys}{3em}
 %   \item[\Kbd{false}] no short forms in  the bibliography.
 %   \item[\Kbd{title}] replace \Feld{title} by \Feld{shortform} field.
 %   \item[\Kbd{true}] use full short forms.
-% \end{itemize}
+% \end{optkeys}
 % Verbose styles have a \Befehl{shortformcite} command that prints shortforms in footnotes.
 % See \ref{kap:citecmd} for details.
 %
@@ -538,106 +602,92 @@
 %
 % \item[]\DescribeOption{tabbedlabeldate}=\meta{bool}\\
 % If \meta{true}, the label date is written into an extra column. This works with author date styles only.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[tabbedlabeldate=true,style=xyz]\{biblatex\}}\\
-%       \Kbd{\textbackslash renewcommand\{\textbackslash nameyeardelim\}\{\textbackslash newline\}}\\
-%       \Mittelpfeil\\
-%       G. Ackermann\\
-%       \begin{tabular}{ll}
-%           \Stark{2013} & A title. In: Journal of Most Important Issues 80,\\
-%           \empty & pp.~34--67.
-%       \end{tabular}
+% \begin{Beispiel}
+%   \Kbd{\textbackslash usepackage[tabbedlabeldate=true,style=xyz]\{biblatex\}}\\
+%   \Kbd{\textbackslash renewcommand\{\textbackslash nameyeardelim\}\{\textbackslash newline\}}
+%   \tcblower%
+%   G. Ackermann\\[0.3\baselineskip]
+%   \begin{tabular}{ll}
+%      \Stark{2013} & A title. In: Journal of Most Important Issues 80,\\
+%      \empty & pp.~34--67.
 %   \end{tabular}
-% }
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{titlebrackets}=\meta{bool}\\
 % If \meta{true}, the \Feld{titleaddon} is not printed as a field of its own but as an addendum in parentheses
 % to the \Feld{title} field.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[titlebrackets=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
+%   \begin{Beispiel}
+%       \Kbd{\textbackslash usepackage[titlebrackets=true,style=xyz]\{biblatex\}}
+%       \tcblower%
 %       G. Popp (ed.) 2011: A title \Stark{(Conference proceedings Oxford 2010)}. Oxford.
-%   \end{tabular}
-% }
+%   \end{Beispiel}
+% This option is also settable on a per-entry basis.
 %
 % \item[]\DescribeOption{titlenote}=\meta{bool}\\
 % If \meta{true}, the \Feld{titleaddon} is replaced by a shorthand:
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[titlenote=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       G. Popp (ed.) 2011: A title. \Stark{Conf. Oxford}. Oxford.
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[titlenote=true,style=xyz]\{biblatex\}}
+%    \tcblower%
+%    G. Popp (ed.) 2011: A title. \Stark{Conf. Oxford}. Oxford.
+% \end{Beispiel}
+% This option is also settable on a per-entry basis.
 %
 % \item[]\DescribeOption{useeventdate}=\meta{bool}\\
 % If \meta{true}, \Feld{eventdate} is used in \Feld{titlenote}s.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[useeventdate=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
+% \begin{Beispiel}
+%       \Kbd{\textbackslash usepackage[useeventdate=true,style=xyz]\{biblatex\}}
+%       \tcblower%
 %       G. Popp (ed.) 2011: A title. Conf. Oxford \Stark{2010}. Oxford.
-%   \end{tabular}
-% }
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{useeventnumber}=\meta{bool}\\
 % If \meta{true}, \Feld{eventnumber} is used in \Feld{titlenote}s.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[useeventnumber=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       Sotheby's 2011: A title. Auction \Stark{311} Oxford. Oxford.
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[useeventnumber=true,style=xyz]\{biblatex\}}\\
+%    \tcblower%
+%    Sotheby's 2011: A title. Auction \Stark{311} Oxford. Oxford.
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{usefestschriftaddon}=\meta{bool}\\
 % If \meta{true}, \Feld{usefestschriftaddon} is used in \Feld{titlenote}s.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[usefestschriftaddon=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       G. Popp (ed.) 2011: A title. Festschr. \Stark{65. Geb.} H. Maulwurf. Bochum.
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[usefestschriftaddon=true,style=xyz]\{biblatex\}}\\
+%    \tcblower%
+%    G. Popp (ed.) 2011: A title. Festschr. \Stark{65. Geb.} H. Maulwurf. Bochum.
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{useinstitution}=\meta{key}\\
 % If and how to handle the \Feld{institution} field in \Typ{thesis}.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[useinstitution=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       H. Gallert 2013: A title. PhD thesis \Stark{Univ. Hamburg}, Hamburg.
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[useinstitution=true,style=xyz]\{biblatex\}}\\
+%    \tcblower%
+%    H. Gallert 2013: A title. PhD thesis \Stark{Univ. Hamburg}, Hamburg.
+% \end{Beispiel}
 % The following keys are available:
-% \begin{itemize}
-%   \item[\Kbd{aspublisher}] Handles \Feld{type} field like \Feld{publisher} field.
-%   \item[\Kbd{false}] Omits \Feld{institution} field.
-%   \item[\Kbd{locationfirst }] Similar to \Kbd{false}, but \Feld{type} field is printed after \Feld{location} field.
-%   \item[\Kbd{omitlocation}] Omits \Feld{location} field
-%   \item[\Kbd{omitlocatonifurl}] Omits \Feld{location} field if URL available.
-%   \item[\Kbd{pluslocation}] Prints both fields \Feld{institution} and \Feld{location}.
-% \end{itemize}
+% \begin{optkeys}{7em}
+%   \item[\Kbd{aspublisher}] handles \Feld{type} field like \Feld{publisher} field.
+%   \item[\Kbd{false}] omits \Feld{institution} field.
+%   \item[\Kbd{locationfirst }] similar to \Kbd{false}, but \Feld{type} field is printed after \Feld{location} field.
+%   \item[\Kbd{omitlocation}] omits \Feld{location} field.
+%   \item[\Kbd{omitlocatonifurl}] omits \Feld{location} field if URL available.
+%   \item[\Kbd{pluslocation}] prints both fields \Feld{institution} and \Feld{location}.
+% \end{optkeys}
 %
 % \item[]\DescribeOption{usemultivenue}=\meta{bool}\\
 % If \meta{true}, \Feld{multivenue} is used in \Feld{titlenote}s. This is mainly meant for travelling exhibitions.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[useeventdate=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
-%       N. Taylor (ed.) 2009: A title. Exhibition catalogue \Stark{London, New York, Canberra}. London.
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%    \Kbd{\textbackslash usepackage[useeventdate=true,style=xyz]\{biblatex\}}\\
+%    \tcblower%
+%    N. Taylor (ed.) 2009: A title. Exhibition catalogue \Stark{London, New York, Canberra}. London.
+% \end{Beispiel}
 %
 % \item[]\DescribeOption{uselocation}=\meta{key}\\
 % If to print the \Feld{location} field.
-% \begin{itemize}
-%   \item[\Kbd{false}] Omits \Feld{location} field.
-%   \item[\Kbd{omitlocatonifseries}] Omits \Feld{location} field if series available.
-%   \item[\Kbd{true}] Always print \Feld{location} field.
-% \end{itemize}
+% \begin{optkeys}{5em}
+%   \item[\Kbd{false}] omits \Feld{location} field.
+%   \item[\Kbd{omitifseries}] omits \Feld{location} field if series available.
+%   \item[\Kbd{true}] always print \Feld{location} field.
+% \end{optkeys}
 %
 % \item[]\DescribeOption{useunpublishedthesis}=\meta{bool}\\
 % If \meta{true}, unpublished theses preceed the \Feld{type} field with the string \enquote{unpublished}.
@@ -648,13 +698,12 @@
 % \item[]\DescribeOption{usesourceeditor}=\meta{bool}\\
 % Typically \Feld{editor}s are not printed in self-contained works if there is an \Feld{author}. If \meta{true}, such secondary
 % authors are printed, too. This affects particularly editions of historical texts.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\textbackslash usepackage[usesourceeditor=true,style=xyz]\{biblatex\}}\\
-%       \Mittelpfeil\\
+% \begin{Beispiel}
+%       \Kbd{\textbackslash usepackage[usesourceeditor=true,style=xyz]\{biblatex\}}
+%       \tcblower%
 %       P. C. Tacitus 1981: Germania. \Stark{Ed. by A. Editor}. Stuttgart.
-%   \end{tabular}
-% }
+% \end{Beispiel}
+% This option is also settable on a per-entry basis.
 %
 % \item[]\DescribeOption{volumeafterseries}=\meta{bool}\\
 % Typically \Feld{volume} numbers of self-contained works are printed immediatly after the title. If this option is \meta{true}, it is
@@ -666,9 +715,18 @@
 %
 % \begin{itemize}
 %
+% \item[]\DescribeOption{titlebrackets}=\meta{bool}\\
+% Like global option \Option{titlebrackets} (\ref{kap:pkgopt}) but on a per-entry basis.
+%
+% \item[]\DescribeOption{titlenote}=\meta{bool}\\
+% Like global option \Option{titlenote} (\ref{kap:pkgopt}) but on a per-entry basis.
+%
 % \item[]\DescribeOption{uselabeltitle}=\meta{bool}\\
 % If \meta{true}, back references in \Stil{verbose-trad2note} have a \Feld{shorttitle} (see \ref{kap:trad2note}).
 %
+% \item[]\DescribeOption{usesourceeditor}=\meta{bool}\\
+% Like global option \Option{titlenote} (\ref{kap:pkgopt}) but on a per-entry basis.
+%
 % \end{itemize}
 % 
 % \subsection{New entry types}\label{kap:subentrytypes}
@@ -739,23 +797,33 @@
 % then it is automatically generated. See \ref{kap:entry}.
 %
 % \item[]\DescribeFormat{origrealdate} field (date)\\
-% Similar to \Feld{realdate}, but intended for the use in conjunction with other \Kbd{orig\dots} fields.
+% Similar to \Feld{realdate}, but intended for the use in conjunction with other \Kbd{orig\textellipsis} fields.
 %
 % \item[]\DescribeFormat{realdate} field (date)\\
 % This field holds the real date of a publication if the official date lacks or is wrong. This fairly often happens with delayed journal issues which are
 % counted as if they had appeared regularly. Uncertain dates according to \blx' Extended Date/Time Format are allowed here.
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       \Kbd{\symbol{64}BOOKLET\{unknown:date,}\\
-%       \Kbd{\dots}\\
-%       \Kbd{location = \{London\},}\\
-%       \Kbd{realdate = \{1930\textasciitilde\},}\\
-%       \Kbd{\}}\\
-%       \Mittelpfeil\\
-%       \dots London n.~d. \Stark{[ca. 1930]}.
-%   \end{tabular}
-% }
-% Do not confuse it with \Feld{origdate}, which refers to the primary edition of a reprint.
+% \begin{Beispiel}
+%    \Kbd{\symbol{64}BOOKLET\{unknown:date,}\\
+%    \Kbd{\textellipsis}\\
+%    \Kbd{location = \{London\},}\\
+%    \Kbd{realdate = \{1930\textasciitilde\},}\\
+%    \Kbd{\}}
+%    \tcblower%
+%    \textellipsis{} London n.\,d. \Stark{[ca. 1930]}.
+% \end{Beispiel}
+% Do not confuse it with \Feld{origdate}, which refers to the primary edition of a reprint. Since \blx 3.11 it is possible to mark attributed dates
+% by employing \blx' field annotation feature:
+% \begin{Beispiel}
+%    \Kbd{\symbol{64}BOOKLET\{attributed:date,}\\
+%    \Kbd{\textellipsis}\\
+%    \Kbd{date = \{1930\},}\\
+%    \Kbd{date+an = \{=attributed\},}\\
+%    \Kbd{\}}
+%    \tcblower%
+%    \textellipsis{} London n.\,d. \Stark{[1930]}.
+% \end{Beispiel}
+% \archbib supports this format, too. The problem here is that this works only with lacking dates, not with wrong or falsified ones. Nonetheless, in order to keep
+% compatibility with standard styles as much as possible, you should prefer this style as long as it fits to the data.
 %
 % \item[]\DescribeFormat{shortform} field (literal)\\
 % This field holds an acronym of an encyclopedia that is cited in a special manner. Fi. \enquote{RGA} for \Deutsch{Reallexikon der Germanischen Altertumskunde}.
@@ -787,7 +855,7 @@
 % \begin{itemize}
 %
 % \item[]\DescribeFormat{lnyvt}
-% This sorting scheme is intended for the use in conjunction with option \Option{repeatlabel}\Kbd{=true}.
+% This sorting scheme is intended for the use in conjunction with option \Option{repeatlabel}\Kbd{=true$\|$dashed}.
 % It evaluates the \Feld{label}, \Feld{shortauthor} and \Feld{shorttitle} fields
 % in order to sort the exact labels.
 %
@@ -799,31 +867,48 @@
 %
 % \begin{itemize}
 %
-% \item[]\DescribeMacro{\sfcite}[\meta{prenote}][\meta{postnote}]\marg{key}\\
-% Similar to \Befehl{shortformcite}, but not wrapped in a footnote and falls back to \Befehl{cite}.
-%
-% \item[]\DescribeMacro{\sfcites}(\meta{multiprenote})(\meta{multipostnote})[\meta{prenote}][\meta{postnote}]\marg{key}\dots[\meta{prenote}][\meta{postnote}]\marg{key}\\
-% Similar to \Befehl{shortformcites}, but not wrapped in a footnote and falls back to \Befehl{cites}.
+% \item[]\DescribeMacro{\posscite}[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% The same as \Befehl{textcite} but as genitive form. The cite label is handled as an entity in that way that only the last \Feld{labelname} (or the \enquote{et.\,al.}
+% part respectively) is in the genitive.
+% \begin{Beispiel}
+%    In \Stark{Bowman \& Miller's (2015)} famous book \textellipsis
+% \end{Beispiel}
+% Remark that this does not work in the -- probably rare -- case of a corporate author in the plural. For German or Scandinavian languages with a special handling
+% depending on the last character(s) of the noun there is a mechanism to define such tokens (see \ref{kap:langset}).
+%
+% \item[]\DescribeMacro{\Posscite}[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% Like \Befehl{posscite} but capitalizes a trailing prefix.
+% 
+% \item[]\DescribeMacro{\posscites}(\meta{multiprenote})(\meta{multipostnote})[\meta{prenote}][\meta{postnote}]\marg{key}\textellipsis[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% The multicite variant of \Befehl{posscite}.
+% 
+% \item[]\DescribeMacro{\Posscites}(\meta{multiprenote})(\meta{multipostnote})[\meta{prenote}][\meta{postnote}]\marg{key}\textellipsis[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% Like \Befehl{posscites} but capitalizes a trailing prefix.
 %
 % \item[]\DescribeMacro{\shortformcite}[\meta{prenote}][\meta{postnote}]\marg{key}\\
 % Some verbose styles format entries in encyclopedias in a special way:
-% \Beispiel{%
-%    \begin{tabular}{l}
-%       \Kbd{\textbackslash shortformcite\{rga:bewaffnung\}}\\
-%       \Mittelpfeil\\
-%       \begin{minipage}{.5\textwidth}
-%           \dots\footnote{RGA \RN{2}, 422 s.~v. Bewaffnung (J. Garbsch)}
-%       \end{minipage}
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%   \Kbd{\textbackslash shortformcite\{rga:bewaffnung\}}
+%   \tcblower%
+%   \begin{minipage}{\textwidth}
+%      \textellipsis\textsuperscript{1}\vspace{0.5\baselineskip}\footnoterule%
+%      \footnotesize\textsuperscript{1}RGA \RN{2}, 422 s.\,v. Bewaffnung (J. Garbsch)
+%   \end{minipage}
+% \end{Beispiel}
 % As usual, the pre- and postnote arguments are optional. Styles that do not use these short forms
 % (some verbose styles and all author date styles) fall back to \Befehl{autocite}. Some author date
 % styles use these short forms in the bibliography; this is enabled by the option \Option{shortform} (see \ref{kap:pkgopt})
 % and has no relation to this particular command.
 %
-% \item[]\DescribeMacro{\shortformcites}(\meta{multiprenote})(\meta{multipostnote})[\meta{prenote}][\meta{postnote}]\marg{key}\dots[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% \item[]\DescribeMacro{\shortformcites}(\meta{multiprenote})(\meta{multipostnote})[\meta{prenote}][\meta{postnote}]\marg{key}\textellipsis[\meta{prenote}][\meta{postnote}]\marg{key}\\
 % The multicite version of \Befehl{shortformcite}. Note: all keys must be short forms.
 %
+% \item[]\DescribeMacro{\sfcite}[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% Similar to \Befehl{shortformcite}, but not wrapped in a footnote and falls back to \Befehl{cite}.
+%
+% \item[]\DescribeMacro{\sfcites}(\meta{multiprenote})(\meta{multipostnote})[\meta{prenote}][\meta{postnote}]\marg{key}\textellipsis[\meta{prenote}][\meta{postnote}]\marg{key}\\
+% Similar to \Befehl{shortformcites}, but not wrapped in a footnote and falls back to \Befehl{cites}.
+%
 % \end{itemize}
 % 
 % \subsubsection{Formatting commands}
@@ -875,13 +960,11 @@
 % \item[]\DescribeMacro{\mkbiblocationaddon}\marg{text}\\
 % In comma separated location lists American-style addons to locations do not look pretty well. Therefore \archbib wraps
 % these addons into a formatting command:
-% \Beispiel{%
-%    \begin{tabular}{l}
-%       \Kbd{location = "Menlo Park, Cal."}\\
-%       \Mittelpfeil\\
-%       \Kbd{location = "Menlo Park\Befehl{mkbiblocationaddon}\{Cal.\}"}
-%    \end{tabular}
-% }
+% \begin{Beispiel}
+%    \Kbd{location = "Menlo Park, Cal."}
+%    \tcblower%
+%    \Kbd{location = "Menlo Park\Befehl{mkbiblocationaddon}\{Cal.\}"}
+% \end{Beispiel}
 %
 % \item[]\DescribeMacro{\mkbibrepeatfamily}\marg{text}\\
 % Formatting of the family name if labels are printed in the bibliography by \Option{repeatlabel} (see \ref{kap:pkgopt}).
@@ -907,8 +990,8 @@
 % \item[]\DescribeMacro{\mkbibsourcenamesuffix}\marg{text}\\
 % Similar to \Befehl{mkbibsourcenamefamily}, but intended for the name suffix.
 %
-% \item[]\DescribeMacro{\repeatlabelwrap}\marg{text}\\
-% This is a wrapper around repeatlabel in order to contain formatting commands.
+% \item[]\DescribeMacro{\mkbibandothers}\marg{text}\\
+% Formatting the \emph{et\,al.} part in labels.
 %
 % \end{itemize}
 % 
@@ -945,8 +1028,9 @@
 % Does \meta{true} if \meta{name} is one of the keys of option \Option{positionlabeldate} (see \ref{kap:pkgopt})
 % and \meta{false} otherwise. Issues an error if \marg{name} does not exist.
 %
-% \item[]\DescribeMacro{\ifrepeatlabel}\marg{true}\marg{false}\\
-% Does \meta{true} if option \Option{repeatlabel} is enabled and in bibliography.
+% \item[]\DescribeMacro{\ifrepeatlabel}\marg{string}\marg{true}\marg{false}\\
+% \meta{string} must be one of the keys of the \Option{repeatlabel} option  (see \ref{kap:pkgopt}) and checks wether it was set so. Outside bibliographies only \Kbd{false}
+% evaluates to \marg{true}.
 %
 % \item[]\DescribeMacro{\ifseenote}\marg{true}\marg{false}\\
 % A complex test that checks the conditions for a back reference in \Stil{verbose-trad2note}. In all other generic
@@ -984,7 +1068,10 @@
 % \item[]\DescribeMacro{\articlesubtitlepunct}\\
 % The punctuation between \Feld{title} and \Feld{subtitle} in journal articles if it is different than in books and other types.
 %
-% \item[]\DescribeMacro{\\booklabelnamepunct}\\
+% \item[]\DescribeMacro{\articletitlepunct}\\
+% The punctuation between \Feld{title} and \Feld{journaltitle}.
+%
+% \item[]\DescribeMacro{\booklabelnamepunct}\\
 % Similar to \Befehl{labelnamepunct} but intended for the \Feld{bookauthor}/\Feld{editor} block.
 %
 % \item[]\DescribeMacro{\daterealdatedelim}\\
@@ -1000,7 +1087,7 @@
 % The delimiter between the next to last and the last secondary \Feld{editor}.
 %
 % \item[]\DescribeMacro{\inbookbookdelim}\\
-% The punctuation after the \Feld{title} of an \Typ{in\dots} type.
+% The punctuation after the \Feld{title} of an \Typ{in\textellipsis} type.
 %
 % \item[]\DescribeMacro{\institutionlocationdelim}\\
 % The delimiter between \Feld{institution} and \Feld{location}.
@@ -1023,6 +1110,9 @@
 % \item[]\DescribeMacro{\noseriespunct}\\
 % The punctuation after the \Feld{series} field if it is undefined.
 %
+% \item[]\DescribeMacro{\repeatlabeldash}\\
+% The replacements for repeated names in repeated labels.
+%
 % \item[]\DescribeMacro{\repeatlabeldelim}\\
 % The delimiter between a repeated label in the bibliography and its bibliography entry.
 %
@@ -1039,7 +1129,9 @@
 % Some styles differentiate between the usual \Befehl{multicitedelim} and a strong version, in fact a replacement for
 % paragraphs which are typically not allowed in footnotes. \Befehl{strongcitedelim} can not be set within a multicite
 % command. Do something like this instead:
-% \Beispiel{\Befehl{footnote}\Kbd{\{}\Befehl{cite}\Kbd{\{key1\}}\Befehl{strongcitedelim}\Befehl{cite}\Kbd{\{key2\}}\Kbd{\}}}
+% \begin{Beispiel}
+%    \Befehl{footnote}\Kbd{\{}\Befehl{cite}\Kbd{\{key1\}}\Befehl{strongcitedelim}\Befehl{cite}\Kbd{\{key2\}}\Kbd{\}}
+% \end{Beispiel}
 %
 % \item[]\DescribeMacro{\subnumberseriesdelim}\\
 % The delimiter between \Feld{subnumber} and \Feld{series} fields.
@@ -1058,6 +1150,27 @@
 %
 % \end{itemize}
 % 
+% \subsubsection{Language settings}\label{kap:langset}
+%
+% \begin{itemize}
+%
+% \item[]\DescribeMacro{\DefineGenitiveApostropheChars}\marg{language}\marg{csv}\\
+% The second argument takes a comma separated list of trailing substrings requiring a different genitive token (fi. \enquote{'} instead of \enquote{s} in German).
+% \begin{Beispiel}
+%    \Deutsch{\textellipsis \Stark{in Fischers (2018)} Buch und \Stark{in Hess' (2018)} Artikel.}
+% \end{Beispiel}
+% This command is for use in the document preamble only. The language must be one of the languages loaded with the
+% \Paket{babel} or \Paket{polyglossia} packages. The default list for German is \Kbd{ce,s,x,z,\ss,\detokenize{\ss}}.
+% Please note that checks on non-ASCII characters are likely to be false negative or fail to compile at
+% all!\footnote{cf. \href{https://tex.stackexchange.com/questions/431475/different-results-of-xstring-test-with-inputenc-and-fontspec}{my question on TeX.StackExchange}}
+%
+% \item[]\DescribeMacro{\DeclareGenitiveApostropheChars}\marg{csv}\\
+% The same as \Befehl{DefineGenitiveApostropheChars} but for use in \Kbd{*.lbx} files.
+%
+% \item[]\DescribeMacro{\SuppressAdditiveLbxSuffixes}\marg{csv}\\
+% Suppresses useless warnings of missing \Kbd{*.lbx} files.\footnote{\url{https://github.com/plk/biblatex/issues/745}}
+% \end{itemize}
+%
 % \subsubsection{Counters and length registers}
 %
 % \begin{itemize}
@@ -1178,57 +1291,91 @@
 % The expression \enquote{symposium} (\Deutsch{Symposium}).
 %
 % \end{itemize}
+%
+% \subsubsection{Possessive forms}\label{kap:possform}
+%
+% \begin{itemize}
+%
+% \item[]\DescribeLocalization{genitives}\\
+% The regular genitive suffix like \enquote{'s} in English or \enquote{s} in German.
+%
+% \item[]\DescribeLocalization{genitiveapostrophe}\\
+% The divergent genitive suffix in some Germanic languages (German, Scandinavian) after particular trailing characters. These characters must
+% be declared in the \Kbd{*.lbx} file with \Befehl{DeclareGenitiveApostropheChars} or in the preamble with \Befehl{DefineGenitiveApostropheChars}
+% (see \ref{kap:langset}).
+%
+% \item[]\DescribeLocalization{genitiveandothers}\\
+% The expression \enquote{et.\,al.} in the genitive.
+%
+% \end{itemize}
 % 
 % \section{Bugs, hints and caveats}
 %
 % \subsection{Disambiguition in \Stil{verbose-trad2note}}\label{kap:trad2note}
 %
 % Verbose styles that use backreferences to footnotes are vulnerable to disambiguition problems. Conceive the following case:
-% \Beispiel{%
-%   \begin{minipage}{.5\textwidth}
-%       \dots\footnote{G. Miller, A title (London 2013).-- Idem, Another title (Cambridge 2013).}\\
-%       \dots\footnote{Miller (see note a) 25 ff.}
+% \begin{Beispiel}
+%   \begin{minipage}{\textwidth}
+%      \textellipsis\textsuperscript{1}\\
+%      \textellipsis\textsuperscript{2}\vspace{0.5\baselineskip}\footnoterule%
+%      \footnotesize\textsuperscript{1}G. Miller, A title (London 2013).-- Idem, Another title (Cambridge 2013).\\
+%      \textsuperscript{2}Miller (see note 1) 25 ff.
 %   \end{minipage}
-% }
+% \end{Beispiel}
 % \blx does not provide a disambiguition check for this. It always prints the \Feld{shorttitle} field and falls back to the \Feld{title} field
 % if there is none. \Stil{verbose-trad2note} behaves in a different manner. It only prints a \Feld{shorttitle} or \Feld{title} if the entry
 % option \Option{uselabeltitle} is \Kbd{true}. But this has to be controlled manually by the author.
 %
-% \subsection{Sorting with name prefixes}
+% \subsection{Sorting in author date styles}
+%
+% Sorting in author date styles is pretty delicate. It is carried out by \Biber ahead of any \LaTeX{} macro expansion. Fi. it is not possible to define a \Befehl{bibstring} for \enquote{Anonymous}
+% or \enquote{N.\,N.} analogous to \enquote{no date} or \enquote{no place} as set automatically by \archbib because \Biber would not know how to sort it when used as \Feld{labelname}.
+%
+% \subsubsection{\textellipsis{} with name prefixes}
 %
 % Handling of name prefixes (also referred to as the \enquote{von part}) like Otto \Stark{von} Hessen, Frits \Stark{van der} Meer and Ernest \Stark{de} Sarzec is directed by \blx' \Option{useprefix} package option. If \Kbd{false}, then
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       (Hessen 1989.-- Meer 1938.-- Sarzec 1888)\\
-%       \dots\\
-%       Hessen, O. von 1989: \dots\\
-%       Meer, F. van der 1938: \dots\\
-%       Sarzec, E. de 1888: \dots
-%   \end{tabular}
-% }
+% \begin{Beispiel}
+%    (Hessen 1989.-- Meer 1938.-- Sarzec 1888)\\
+%    \textellipsis\\
+%    Hessen, O. von 1989: \textellipsis\\
+%    Meer, F. van der 1938: \textellipsis\\
+%    Sarzec, E. de 1888: \textellipsis
+% \end{Beispiel}
 % If \Kbd{true}, then
-% \Beispiel{%
-%   \begin{tabular}{l}
-%       (von Hessen 1989.-- van der Meer 1938.-- de Sarzec 1888)\\
-%       \dots\\
-%       de Sarzec, E. 1888: \dots\\
-%       van der Meer, F. 1938: \dots\\
-%       von Hessen, O. 1989: \dots
-%   \end{tabular}
-% }
-% Usually \archbib styles have \Option{useprefix}\Kbd{=true} by default. Some styles differentiate between non-sorting (von, van) and sorting prefixes (de). This can not get handled by \blx or \archbib. Use the \Feld{sortname} field if wrong ordering occurs or the \Feld{shortname} field to affect label generation.
+% \begin{Beispiel}
+%    (von Hessen 1989.-- van der Meer 1938.-- de Sarzec 1888)\\
+%    \textellipsis\\
+%    de Sarzec, E. 1888: \textellipsis\\
+%    van der Meer, F. 1938: \textellipsis\\
+%    von Hessen, O. 1989: \textellipsis
+% \end{Beispiel}
+% Usually \archbib styles have \Option{useprefix}\Kbd{=true} by default. Some styles differentiate between non-sorting (von, van) and sorting prefixes (de). This can not get handled by \blx or \archbib. Use the \Feld{sortname} field if only wrong ordering occurs or the \Feld{shortname} field to
+% affect label generation.
+%
+% \subsubsection{\textellipsis{} with bigraphs and trigraphs}
+%
+% Bigraphs and trigraphs -- I won't change the awkward designator \Option{giveninitligatures} due to backward compatibility -- are generated by a \archbib macro after sorting. This may lead to wrong
+% sorting. Conceive the following case:
+% \begin{Beispiel}
+%    Meier, Tanja 2005: \textellipsis\\
+%    Meier, Thomas 2013: \textellipsis\\
+%    Meier, Trude 2017: \textellipsis
+%    \tcblower
+%    Meier,~T. 2013: \textellipsis\\
+%    Meier,~Th. 2013: \textellipsis\\
+%    Meier,~T. 2017: \textellipsis
+% \end{Beispiel}
+% Except for employing the \Feld{sortname} field, I would recommend to set \Option{repeatlabel}\Kbd{=true$\|$dashed} here.
 %
 % \subsection{Sequentes in postnotes}
 %
 % Some styles compress page ranges. This can happen in the postnotes of citation commands and in the bibliography as well:
-% \Beispiel{%
-%   \begin{tabular}{l}
+% \begin{Beispiel}
 %       (Schulz 2015, \Stark{123~f.}-- Zeller 2016, \Stark{75~ff.})\\
-%       \dots\\
+%       \textellipsis\\
 %       Bolle,~C. 2013: Some title. In: Journal of Magic 45, \Stark{310~ff.} 
-%   \end{tabular}
-% }
-% Biber is able to parse the \Feld{pages} field and compress the ranges. But it only affects the bibliography since Biber does not see the citation postnotes.
+% \end{Beispiel}
+% \Biber is able to parse the \Feld{pages} field and compress the ranges. But it only affects the bibliography since \Biber does not see the citation postnotes.
 %
 % \subsection{Authors in auction catalogues}
 %
@@ -1253,7 +1400,8 @@
 % they are needed to discriminate ambigous titles. \Datei{biblatex-archaeology-strings-full-subtitle.bib} contains full titles plus subtitles. If you followed the
 % installation instructions from \ref{kap:install}, you can call these databases without path. Appendix \ref{kap:strings} provides a list of availabe strings ordered
 % by string, and \ref{kap:journals} ordered by journal. The strings are namespaced in order to allow the use of other lists alongside, especially those from
-% \Stil{archaeologie}. The strings were automatically generated from an MS Excel data sheet provided by the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"ugeschichte}.\footnote{\url{http://www.dguf.de/fileadmin/user_upload/Arbeitskreise/AK_DGUF-Zotero/RGK_Zeitschriften.xls}}
+% \Stil{archaeologie}. The strings were automatically generated from a MS Excel data sheet provided by the \Deutsch{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}.
+%\footnote{\url{http://www.dguf.de/fileadmin/user_upload/Arbeitskreise/AK_DGUF-Zotero/RGK_Zeitschriften.xls} -- mind that the raw file is full of OCR errors and typos!}
 % If they are ambigous due to modified (sub-)titles there are counted by adding colon and number from the the second onwards.
 %
 % \subsection{Electronic identifiers}
@@ -1271,18 +1419,27 @@
 % \archbib styles never print languages. But in some cases the \Feld{language} field influences the localization of a particular entry.
 % Therefore it is useful to provide it, especially if it differs from the main document language.
 %
+%
 % \subsection{The \Feld{gender} field}
 %
 % In German documents the \Feld{gender} field is needed if the style replaces repeated names by \Deutsch{ders[elbe]},
-% \Deutsch{dies[elbe(n)]} or \Deutsch{dass[elbe]}.
+% \Deutsch{dies[elbe(n)]} or \Deutsch{dass[elbe]}.%
+% \subsection{Additional fields in \Biber's tool mode}\label{kap:bibertool}
+%
+% \Biber does not see any data model file (\Kbd{*.dbx}) when in tool mode (with option \Kbd{--}\Option{tool} instead of job name)
+% and therefore omits all fields unknown to the standard styles. In order to avoid this we must provide our extended data model
+% in \Biber's \Kbd{*.conf} file. Find it in the file \Datei{biblatex-archaeology.conf} (or \ref{kap:biberconf}) and replace the 
+% \Kbd{<datamodel>\textellipsis</datamodel>} group in \Biber's \Kbd{*.conf} file by it. If you do not know where it is located, you
+% can retrieve the path by calling \Biber with the single option \Kbd{--}\Option{tool-config}. If you do not want to manipulate 
+% the original file, copy it to a new one and call \Biber with option \Kbd{--}\Option{configfile}\Kbd{ /path/to/custom/biber.conf}.
 %
 % \PrintChanges
-% \nocite{guidelines:ethno:ffm,guidelines:ethno:goe:2014,guidelines:aaa:2009,guidelines:rlm:trier,guidelines:kunstgeschichte:goettingen,guidelines:kunstgeschichte:freiburg,guidelines:aja,guidelines:schlagworte:dai,guidelines:egypt:goe}
+% \nocite{guidelines:ethno:ffm,guidelines:ethno:goe:2014,guidelines:aaa:2009,guidelines:rlm:trier,guidelines:kunstgeschichte:goettingen,guidelines:kunstgeschichte:freiburg,guidelines:aja,guidelines:schlagworte:dai,guidelines:egypt:goe,grando:bernhard:2003}
 % \printbibliography[heading=bibintoc,title=References]
 %
 % \StopEventually{}
 %
-% \setcounter{IndexColumns}{2}\PrintIndex
+% %\setcounter{IndexColumns}{2}\PrintIndex
 %
 % \begin{appendices}
 %
@@ -1338,6 +1495,7 @@
   OPTIONS = {uselabeltitle=true},
   SHORTTITLE = {Maifischfilet},
   LANGUAGE = {german},
+  REALDATE = {2015},
 }
 @INREFERENCE{authen-blom:1989,
   AUTHOR = {Authén-Blom, Grethe},
@@ -1351,7 +1509,7 @@
 }
 @INREFERENCE{bauchhenss:et:al:1978,
   AUTHOR = {Bauchhenß, G. AND Beck, Heinrich AND Hassel, F. J. AND Capelle,
-	Torsten AND Wilson, David M.},
+    Torsten AND Wilson, David M.},
   TITLE = {Brettspiel},
   EDITION = {2},
   PAGES = {450--458},
@@ -1381,6 +1539,29 @@
   XREF = {stanzl:1998},
   GENDER = {sf},
 }
+@ARTICLE{caselitz:1980a,
+  AUTHOR = {Caselitz, Peter},
+  TITLE = {Schwangerschaft im archäologischen Befund},
+  JOURNALTITLE = ufg-ArchAdvertiser,
+  LOCATION = {Bad Bramstedt},
+  PUBLISHER = {Moreland \& Co.},
+  DATE = {1980},
+  PAGES = {20--26},
+  ABSTRACT = {Über Funde von Feten im Pelvis.},
+  KEYWORDS = {Schwangerschaft, Anthropologie, Mortalität}
+}
+@ARTICLE{cossel:1933-35,
+  AUTHOR = {von Cossel, Otto},
+  TITLE = {Pfarrer und Schulmeister},
+  JOURNALTITLE = ufg-DtRoland,
+  LOCATION = {Berlin},
+  DATE = {1933/1935},
+  SUBTITLE = {Ein Beitrag zur Geschichte der Kirchenbuchführung},
+  VOLUME = {6},
+  NUMBER = {21--23},
+  PAGES = {121},
+  KEYWORDS = {Kirchenbuch, Pfarrer, Lehrer, Sozialgeschichte, Historische Demographie}
+}
 @INCOLLECTION{edenmo:1997,
   AUTHOR = {Edenmo, Roger},
   TITLE = {Gravar som samhällspegel?},
@@ -1410,6 +1591,20 @@
   XREF = {de:laet:o:j},
   GENDER = {sm},
 }
+@ARTICLE{ib:domino:dormagen,
+  AUTHOR = {Braun, Ingram},
+  TITLE = {Der archäologische Fund eines Dominosteins aus Dor\-ma\-gen\--Stür\-zel\-berg},
+  JOURNALTITLE = ufg-JbNeuss,
+  LOCATION = {Neuss},
+  PUBLISHER = {Kreisheimatbund},
+  DATE = {2018},
+  REALDATE = {2017-11},
+  PAGES = {96--109},
+  LANGUAGE = {german},
+  GENDER = {sm},
+  KEYWORDS = {Spiel, Domino, Dormagen, Nordrhein-Westfalen, 19. Jahrhundert, Landwirtschaft, Archäologie},
+  IDS = {ib:2016},
+}
 @ARTICLE{ib:domino:europa,
   AUTHOR = {Braun, Ingram},
   TITLE = {Die Kenntnis des Dominospiels in Europa: Archäologie, Geschichte, Bibliographie},
@@ -1421,12 +1616,12 @@
   KEYWORDS = {Spiel, Domino, Europa, Spielbücher, Grafik, Druck, Knochenschnitzerei, Archäologie},
   SHORTTITLE = {Kenntnis},
   VOLUME = 10,
-  NUMBER = 1,
   DATE = 2016,
   DOI = {10.1515/bgs-2016-0004},
   URL = {https://www.degruyter.com/view/j/bgs.2016.10.issue-1/bgs-2016-0004/bgs-2016-0004.xml},
   PAGES = {61--100},
   IDS = {ib:2016a},
+  ISSN = {1604-7982},
 }
 @ARTICLE{ilinskaja:1965,
   AUTHOR = {Il’inskaja, V.~A.},
@@ -1440,6 +1635,28 @@
   LANGUAGE = {russian},
   GENDER = {sf},
 }
+@ARTICLE{michaelsen:1978,
+  AUTHOR = {Michaelsen, K.},
+  TITLE = {Die Ausgrabung der beiden Hünenbetten von Kleinenkneten in Oldenburg
+    1934--39},
+  JOURNALTITLE = ufg-OldenburgerJahrb,
+  LOCATION = {Oldenburg},
+  PUBLISHER = {Isensee-Verlag},
+  DATE = {1975/1976},
+  VOLUME = {75/76},
+  PAGES = {215--249},
+  KEYWORDS = {Kleinenkneten, Megalithik, Neolithikum, Niedersachsen},
+  REALDATE = {1978},
+}
+@ARTICLE{nass:1938,
+  AUTHOR = {Naß, Karl},
+  TITLE = {Karolingische Reihengräberfelder aus Hessen},
+  JOURNALTITLE = ufg-Germania,
+  DATE = {1938},
+  VOLUME = {22},
+  PAGES = {41--50},
+  KEYWORDS = {Karolingerzeit, Frühmittelalter, Totenkult, Hessen}
+}
 @INPROCEEDINGS{schaedler:1999,
   AUTHOR = {Schädler, Ulrich},
   TITLE = {Damnosa alea -- Würfelspiel in Griechenland und Rom},
@@ -1462,10 +1679,20 @@
   GENDER = {sf},
   LOCATION = {London},
 }
+@ARTICLE{steinmetz:strahl:wilbers:1979,
+  AUTHOR = {Steinmetz, Wolf-Dieter AND Strahl, Erwin AND Wilbers, Susanne},
+  TITLE = {Vor- und frühgeschichtliche Ausgrabungen im Landkreis Osnabrück
+    1978},
+  JOURNALTITLE = ufg-OsnabrueckerMitt,
+  DATE = {1979},
+  VOLUME = {85},
+  PAGES = {9--15},
+  KEYWORDS = {Ur- und Frühgeschichte, Niedersachsen}
+}
 @INCOLLECTION{summerhayes:et:al:1993,
   AUTHOR = {Summerhayes, G. R. AND Gosden, C. AND Fullagar, Richard AND Specht,
-	J. AND Torrence, R. AND Bird, J. Roger AND Shahgholi, N. AND Katsaros,
-	A.},
+    J. AND Torrence, R. AND Bird, J. Roger AND Shahgholi, N. AND Katsaros,
+    A.},
   TITLE = {West New Britain obsidian},
   SUBTITLE = {Production and consumption patterns},
   PAGES = {57--68},
@@ -1483,12 +1710,12 @@
 @THESIS{apetz:1989,
   AUTHOR = {Apetz, Rotraud},
   TITLE = {Zetel, Ketzendorf, Maschen, Oldendorf -- Gräberfelder an der
-	Peripherie des karolingischen Reiches},
+    Peripherie des karolingischen Reiches},
   TYPE = {magisterthesis},
   DATE = {1989},
   SUBTITLE = {Grabformen und Grabsitten am Übergang zum Christentum},
   KEYWORDS = {Zetel, Ketzendorf, Oldendorf, Maschen, Niedersachsen, Frühmittelalter,
-	Sachsen, Friesen, Bestattung, Christentum, Totenkult},
+    Sachsen, Friesen, Bestattung, Christentum, Totenkult},
   LOCATION = {Kiel},
   VOLUMES = {2},
   GENDER = {sf},
@@ -1504,10 +1731,23 @@
   LANGUAGE = {swedish},
   GENDER = {pp},
 }
+@BOOK{buss:2004,
+  AUTHOR = {Buss, David M.},
+  TITLE = {Evolutionäre Psychologie},
+  DATE = {2004},
+  EDITION = {2},
+  PUBLISHER = {Pearson Studium},
+  ISBN = {3827370949},
+  PAGETOTAL = {599},
+  TRANSLATOR = {Hoffrage, Ulrich},
+  ORIGLANGUAGE = {american},
+  LOCATION = {München},
+  KEYWORDS = {Psychologie, Ethologie, Evolution, Methodologie, Biologie}
+}
 @THESIS{czarnetzki:1966,
   AUTHOR = {Czarnetzki, Alfred},
   TITLE = {Die menschlichen Skelettreste aus vier neolithischen Steinkisten
-	Hessens und Niedersachsens},
+    Hessens und Niedersachsens},
   TYPE = {Diss. rer. nat.},
   DATE = {1966},
   KEYWORDS = {Neolithikum, Niedersachsen, Calden, Anthropologie, Megalithik, Hessen},
@@ -1535,7 +1775,7 @@
   TITLE = {Dramatizations of social change},
   DATE = {1978},
   SUBTITLE = {Herman Heijermans' plays as compared with selected dramas by Ibsen,
-	Hauptmann and Chekhov},
+    Hauptmann and Chekhov},
   PUBLISHER = {Martinus Nijhoff},
   ISBN = {90 247 2117 7},
   PAGETOTAL = {81},
@@ -1543,7 +1783,7 @@
   NUMBER = {5},
   LOCATION = {The Hague AND Boston AND London},
   ABSTRACT = {Behandelt \mkbibquote{Ghetto}, \mkbibquote{Op Hoop van Zegen} und \mkbibquote{Ora
-	et Labora}},
+    et Labora}},
   KEYWORDS = {Niederlande, Literatur, Theater, Naturalismus},
   GENDER = {sf},
   LANGUAGE = {english},
@@ -1566,14 +1806,14 @@
   SERIES = ufg-OccasionalPapersPrehist,
   NUMBER = {22},
   PUBLISHER = {Department of Prehistory, Research School of Pacific Studies, The
-	Australian National University},
+    Australian National University},
   LOCATION = {Canberra},
   LANGUAGE = {english},
   GENDER = {pm},
 }
 @COLLECTION{fuchs:kh:et:al:1998,
   EDITOR = {Fuchs, Karl-Heinz AND Kempa, Martin AND Redies, Rainer AND Theune-Großkopf,
-	Claudia AND Wais, Andr\'e},
+    Claudia AND Wais, Andr\'e},
   TITLE = {Die Alamannen},
   DATE = {1998},
   EDITION = {3},
@@ -1685,7 +1925,7 @@
   GENDER = {sm},
   KEYWORDS = {Spiel, München, Wien, 19. Jahrhundert, Handel},
 }
-@book{linnaeus:2003,
+@BOOK{linnaeus:2003,
   AUTHOR = {Linnæus, Carl},
   EDITOR = {Fries, Ingegerd AND Fries, Sigurd},
   COMMENTATOR = {Fries, Ingegerd AND Fries, Sigurd},
@@ -1697,21 +1937,51 @@
   DATE = {2003},
   ISBN = {9186438247},
   KEYWORDS = {Schweden, Lappland, Ethnologie, Biologie, Botanik, 18. Jahrhundert,
-	Norwegen, Finnland},
+    Norwegen, Finnland},
   ORIGDATE = {1732},
   PAGETOTAL = {532},
   PUBLISHER = {Kungl. Skytteanska Samfundet},
   SUBTITLE = {Lappländska resan 1732},
   LANGUAGE = {swedish},
   GENDER = {pp},
+  OPTIONS = {usesourceeditor},
+}
+@BOOK{mette:1990,
+  AUTHOR = {Mette, Otto},
+  TITLE = {Affoldern},
+  DATE = {1990},
+    date+an = {=attributed},
+  PUBLISHER = {Waldeckischer Geschichtsverein e.\,V.},
+  SERIES = {Waldeckische Ortssippenbücher},
+  NUMBER = {34},
+  LOCATION = {Arolsen},
+  KEYWORDS = {Ortssippenbuch, Affoldern, Historische Demographie, Waldeck, Neuzeit,
+    Hessen, Genealogie, Edertal},
+  LANGUAGE = {german},
+  GENDER = {sm},
+}
+@BOOK{molleson:cox:1993,
+  AUTHOR = {Molleson, Theya AND Cox, Margaret},
+  MAINTITLE = {The Spitalfields Project Volume},
+  VOLUME = 2,
+  TITLE = {the anthropology},
+  DATE = {1993},
+  SUBTITLE = {The Middling Sort},
+  PUBLISHER = {Council for British Archaeology},
+  SERIES = ufg-CBAResearchReport,
+  NUMBER = {86},
+  LOCATION = {Walmgate},
+  KEYWORDS = {Anthropologie, Osteologie, Paläodemographie, Paläopathologie,
+    Kirchenarchäologie, Bestattung, Frühneuzeit, England, Spitalfields,
+    Hugenotten}
 }
 @PROCEEDINGS{oberlechner:1999,
   EDITOR = {Oberlechner, Manfred},
   SERIES = ufg-HomoludensSondernr,
   DATE = {1999},
   TITLE = {5000 Jahre Würfelspiel},
-  TITLEADDON = {Katalog zur Austellung im Schloß Kleßheim vom 31. August--31. Oktober 1999 und im Casino Linz (Casineum) vom 12. November--9. Dezember 1999 sowie 2000 im Casino Baden},
-  NUMBER = {9},
+  TITLEADDON = {Katalog zur Ausstellung im Schloß Kleßheim vom 31. August--31. Oktober 1999 und im Casino Linz (Casineum) vom 12. November--9. Dezember 1999 sowie 2000 im Casino Baden},
+  NUMBER = 9,
   EDITORTYPE = {redactor},
   LOCATION = {Salzburg},
   PUBLISHER = {Institut für Spielforschung und Spielpädagogik der Universität Mozarteum Salzburg},
@@ -1754,7 +2024,7 @@
 }
 @COLLECTION{siebert:u:et:al:o:j,
   EDITOR = {Siebert, Ursula AND Rousselot, Jean-Loup AND Jaeger, Astrid AND Jaeger,
-	Halvor},
+    Halvor},
   TITLE = {Schachspiele},
   SUBTITLE = {Wandel im Laufe der Kunst- und Kulturgeschichte},
   TITLEADDON = {Privatsammlung Jaeger},
@@ -1830,7 +2100,7 @@
   MULTIVENUE = {Oldenburg AND Hannover},
   MULTIEVENTDATE = {1981/82 AND 1982},
   ORGANIZATION = {Braunschweigisches Landesmuseum AND Staatliches Museum für Naturkunde
-	und Vorgeschichte AND Niedersächsisches Landesmuseum},
+    und Vorgeschichte AND Niedersächsisches Landesmuseum},
   VENUE = {Wolfenbüttel},
   EVENTDATE = {1981},
   EVENTTYPE = {exhibition},
@@ -1840,14 +2110,14 @@
 @THESIS{volk:1972,
   AUTHOR = {Volk, Peter},
   TITLE = {Medizingeschichtliche Überlieferung der römischen Antike
-	und moderner archäologisch-pathologischer Befund am Beispiel
-	eines römischen Brandgräberfeldes},
+    und moderner archäologisch-pathologischer Befund am Beispiel
+    eines römischen Brandgräberfeldes},
   TYPE = {postdocthesis},
   DATE = {1972},
   SUBTITLE = {Paläopathologische, paläodemographische und medizingeschichtliche
-	Untersuchungen},
+    Untersuchungen},
   KEYWORDS = {Römer, Paläodemographie, Paläopathologie, Medizingeschichte,
-	Anthropologie, Baden-Württemberg},
+    Anthropologie, Baden-Württemberg},
   LOCATION = {Freiburg/Br.},
   LANGUAGE = {german},
   GENDER = {sm},
@@ -2120,6 +2390,7 @@
 % \StringBox{\Stark{\texttt{ufg-ArbeitsuForschberSaechsBodendenkmalpfl}}}{Arbeits-und Forschungsberichte zur Sächsischen Bodendenkmalpflege}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Arbok}}}{Árbók. Hins Islenzka Fornleifafélags}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-ArchAbroad}}}{Archaeology Abroad}\\[1.3ex]
+% \StringBox{\Stark{\texttt{ufg-ArchAdvertiser}}}{The Archaeological Advertiser}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-ArchAeliana}}}{Archaeologia Aeliana or Miscellaneous Tracts Relating to Antiquity}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Archaeographie}}}{Archäographie. Archäologie und Elektronische Datenverarbeitung}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Archaeologia}}}{Archaeologia or Miscellaneous Tracts Relating to Archaeology}\\[1.3ex]
@@ -2726,6 +2997,7 @@
 % \StringBox{\Stark{\texttt{ufg-CasopisZgodovinoinNarodopisje}}}{Časopis za Zgodovino in Narodopisje}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Castrelos}}}{Castrelos. Revista do Museo Municipal \mkbibquote{Quiñones de León}}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-CastrumNovum}}}{Castrum Novum}\\[1.3ex]
+% \StringBox{\Stark{\texttt{ufg-CBAResearchReport}}}{CBA Research Report}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-CEDAC}}}{CÉDAC \mkbibparens{Centre d'Études et de Documentation Archéologique de la Conservation de Carthage} Carthage Bulletin}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Celticum}}}{Celticum}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-CentroStudCeramici}}}{Centro di Studi Ceramici. Bollettino Mensile del Laboratorio Sperimentale di S. Salvatore in Lauro}\\[1.3ex]
@@ -2829,6 +3101,7 @@
 % \StringBox{\Stark{\texttt{ufg-DtJahrbNum}}}{Deutsches Jahrbuch für Numismatik}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-DtLitztg}}}{Deutsche Literaturzeitung für Kritik der Internationalen Wissenschaft}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-DtMuenzbl}}}{Deutsche Münzblätter}\\[1.3ex]
+% \StringBox{\Stark{\texttt{ufg-DtRoland}}}{Der Deutsche Roland}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-DtWissZeitschrPolen}}}{Deutsche Wissenschaftliche Zeitschrift für Polen}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-DuerenerGeschbl}}}{Dürener Geschichtsblätter. Mitteilungen des Dürener Geschichtsvereins e.\,V.}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-DuesseldorferJahrb}}}{Düsseldorfer Jahrbuch. Beiträge zur Geschichte des Niederrheins}\\[1.3ex]
@@ -3878,7 +4151,8 @@
 % \StringBox{\Stark{\texttt{ufg-Pallas}}}{Pallas}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-PamaMuz}}}{Pamiatky a Múzeá}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-PamaPrirodaBratislavy}}}{Pamiatky a Príroda Bratislavy}\\[1.3ex]
-% \StringBox{\Stark{\texttt{ufg-PamArchMistopisnePamArch}}}{Památky Archaeologické a Místopisné Památky Archeologické}\\[1.3ex]
+% \StringBox{\Stark{\texttt{ufg-PamArch}}}{Památky Archaeologické}\\[1.3ex]
+% \StringBox{\Stark{\texttt{ufg-PamArchMistopisne}}}{Památky Archaeologické a Místopisné}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Pamatky}}}{Památky. Listy pro Archaeologii a Historii}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-PamKultury}}}{Pamjatniki Kuľtury}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-PamMuzMiedzi}}}{Pamiętnik Muzeum Miedzi}\\[1.3ex]
@@ -4200,6 +4474,7 @@
 % \StringBox{\Stark{\texttt{ufg-SchwaebMus}}}{Das Schwäbische Museum. Zeitschrift für Kultur, Kunst und Geschichte Schwabens}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-SchweizerMuenzbl}}}{Schweizer Münzblätter}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-SchweizerNumRundschau}}}{Schweizerische Numismatische Rundschau}\\[1.3ex]
+% \StringBox{\Stark{\texttt{ufg-ScienEditor}}}{Science Editor}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-Sciliar}}}{Der Sciliar. Illustrierte Monatsschrift für Heimat-und Volkskunde}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-ScottishArchForum}}}{Scottish Archaeological Forum}\\[1.3ex]
 % \StringBox{\Stark{\texttt{ufg-ScottishArchRev}}}{Scottish Archaeological Review}\\[1.3ex]
@@ -5284,6 +5559,7 @@
 % \StringBox{Časopis Zemského Musea v Brně}{\Stark{\texttt{ufg-CasopisZemskehoMusBrno}}}\\[1.3ex]
 % \StringBox{Castrelos. Revista do Museo Municipal \mkbibquote{Quiñones de León}}{\Stark{\texttt{ufg-Castrelos}}}\\[1.3ex]
 % \StringBox{Castrum Novum}{\Stark{\texttt{ufg-CastrumNovum}}}\\[1.3ex]
+% \StringBox{CBA Research Report}{\Stark{\texttt{ufg-CBAResearchReport}}}\\[1.3ex]
 % \StringBox{CÉDAC \mkbibparens{Centre d'Études et de Documentation Archéologique de la Conservation de Carthage} Carthage Bulletin}{\Stark{\texttt{ufg-CEDAC}}}\\[1.3ex]
 % \StringBox{Celticum}{\Stark{\texttt{ufg-Celticum}}}\\[1.3ex]
 % \StringBox{Centro di Studi Ceramici. Bollettino Mensile del Laboratorio Sperimentale di S. Salvatore in Lauro}{\Stark{\texttt{ufg-CentroStudCeramici}}}\\[1.3ex]
@@ -5373,6 +5649,7 @@
 % \StringBox{Der Alte Orient}{\Stark{\texttt{ufg-AlteOrient}}}\\[1.3ex]
 % \StringBox{Der Anschnitt. Zeitschrift für Kunst und Kultur im Bergbau}{\Stark{\texttt{ufg-Anschnitt}}}\\[1.3ex]
 % \StringBox{Der Bayerische Vorgeschichtsfreund. Blätter zur Förderung der Vor-und Frühgeschichtsforschung}{\Stark{\texttt{ufg-BayerVorgeschfreund}}}\\[1.3ex]
+% \StringBox{Der Deutsche Roland}{\Stark{\texttt{ufg-DtRoland}}}\\[1.3ex]
 % \StringBox{Der Isargau. Zeitschrift für Heimatgeschichte und Volkstum}{\Stark{\texttt{ufg-Isargau}}}\\[1.3ex]
 % \StringBox{Der Karlsruher Altertumsverein}{\Stark{\texttt{ufg-KarlsruherAltver}}}\\[1.3ex]
 % \StringBox{Der Niederrhein. Zeitschrift für Heimatpflege und Wandern}{\Stark{\texttt{ufg-Niederrhein}}}\\[1.3ex]
@@ -6439,7 +6716,8 @@
 % \StringBox{Palestine Exploration Fund. Quarterly Statement}{\Stark{\texttt{ufg-PalestineExplorFund}}}\\[1.3ex]
 % \StringBox{Palestine Exploration Quarterly}{\Stark{\texttt{ufg-PalestineExplorQuart}}}\\[1.3ex]
 % \StringBox{Pallas}{\Stark{\texttt{ufg-Pallas}}}\\[1.3ex]
-% \StringBox{Památky Archaeologické a Místopisné Památky Archeologické}{\Stark{\texttt{ufg-PamArchMistopisnePamArch}}}\\[1.3ex]
+% \StringBox{Památky Archaeologické}{\Stark{\texttt{ufg-PamArch}}}\\[1.3ex]
+% \StringBox{Památky Archaeologické a Místopisné}{\Stark{\texttt{ufg-PamArchMistopisne}}}\\[1.3ex]
 % \StringBox{Památky. Listy pro Archaeologii a Historii}{\Stark{\texttt{ufg-Pamatky}}}\\[1.3ex]
 % \StringBox{Pamiatky a Múzeá}{\Stark{\texttt{ufg-PamaMuz}}}\\[1.3ex]
 % \StringBox{Pamiatky a Príroda Bratislavy}{\Stark{\texttt{ufg-PamaPrirodaBratislavy}}}\\[1.3ex]
@@ -6756,6 +7034,7 @@
 % \StringBox{Schwabenland}{\Stark{\texttt{ufg-Schwabenland}}}\\[1.3ex]
 % \StringBox{Schweizer Münzblätter}{\Stark{\texttt{ufg-SchweizerMuenzbl}}}\\[1.3ex]
 % \StringBox{Schweizerische Numismatische Rundschau}{\Stark{\texttt{ufg-SchweizerNumRundschau}}}\\[1.3ex]
+% \StringBox{Science Editor}{\Stark{\texttt{ufg-ScienEditor}}}\\[1.3ex]
 % \StringBox{Scottish Archaeological Forum}{\Stark{\texttt{ufg-ScottishArchForum}}}\\[1.3ex]
 % \StringBox{Scottish Archaeological Review}{\Stark{\texttt{ufg-ScottishArchRev}}}\\[1.3ex]
 % \StringBox{Seminarium Kondakovianum. Recueil d'Études. Archéologie, Histoire de l'Art, Études Byzantines}{\Stark{\texttt{ufg-SeminariumKondakovianum}}}\\[1.3ex]
@@ -6902,6 +7181,7 @@
 % \StringBox{The Annual of the Ephesus Museum}{\Stark{\texttt{ufg-AnnuEphesusMus}}}\\[1.3ex]
 % \StringBox{The Annual of the Ruins and Museum of Ephesus}{\Stark{\texttt{ufg-AnnuRuinsandMusEphesus}}}\\[1.3ex]
 % \StringBox{The Antiquaries Journal, being the Journal of the Society of Antiquaries of London}{\Stark{\texttt{ufg-AntJournal}}}\\[1.3ex]
+% \StringBox{The Archaeological Advertiser}{\Stark{\texttt{ufg-ArchAdvertiser}}}\\[1.3ex]
 % \StringBox{The Archaeological Journal}{\Stark{\texttt{ufg-ArchJournal}}}\\[1.3ex]
 % \StringBox{The Archaeological News Letter}{\Stark{\texttt{ufg-ArchNewsLetterLondon}}}\\[1.3ex]
 % \StringBox{The Archaeologist}{\Stark{\texttt{ufg-Archaeologist}}}\\[1.3ex]
@@ -7033,6 +7313,8 @@
 %
 % \section{Implementation}
 %
+% This section presents the commented \LaTeX{} source code for \archbib. Read this section only if you want to learn how \archbib is implemented.
+%
 %<*sty>
 % \subsection{File \Datei{\filename}}
 %
@@ -7153,6 +7435,28 @@
 % \end{macro}
 % \end{macro}
 %
+% \subsubsubsection{repeated labels in author date styles}
+%
+% \begin{macro}{\blxarch@opt@repeatlabel@dashed}
+% \begin{macro}{\blxarch@opt@repeatlabel@false}
+% \begin{macro}{\blxarch@opt@repeatlabel@true}
+% \begin{macro}{\blxarch@errstr@repeatlabel}
+% Predefined values of \Option{repeatlabel}
+%    \begin{macrocode}
+\def\blxarch@opt@repeatlabel@dashed{%
+    \edef\blxarch@repeatlabel@value{dashed}}
+\def\blxarch@opt@repeatlabel@false{%
+    \edef\blxarch@repeatlabel@value{false}}
+\def\blxarch@opt@repeatlabel@true{%
+    \edef\blxarch@repeatlabel@value{true}}
+\def\blxarch@repeatlabel@errstr#1{%
+    Invalid value of #1}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \subsubsubsection{edition}
 %
 % \begin{macro}{\blxarch@opt@editionsuperscript@none}
@@ -7289,7 +7593,7 @@
 \def\blxarch@giveninitialletters#1{%
     \fullexpandarg%
     \StrLeft{#1}{1}[\blxarch@str]%
-    \renewcommand{\do}[1]{%
+    \renewcommand*{\do}[1]{%
         \IfBeginWith{#1}{##1}
             {\def\blxarch@str{##1}\listbreak}
             {}%
@@ -7368,7 +7672,7 @@
 % \end{macro}
 %
 % \begin{macro}{\blxarch@nextnamefirstsep}
-% \marg{string} \\
+% \marg{string}\\
 % Looks for the position of the argument in \Befehl{blxarch@currstr}, a
 % local buffer in \Befehl{blxarch@giveninitialletters}.
 %    \begin{macrocode}
@@ -7379,7 +7683,7 @@
     {}
     {\ifthenelse{\blxarch@posbuffer<\blxarch@namefirstsepposition}{%
             \let\blxarch@namefirstsepposition\blxarch@posbuffer%
-            \renewcommand{\blxarch@namefirstsep}{#1}}
+            \renewcommand*{\blxarch@namefirstsep}{#1}}
         {}}%
 }
 %    \end{macrocode}
@@ -7406,14 +7710,14 @@
 %
 %    \begin{macrocode}
 \ProvidesPackage{biblatex-archaeology}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 \RequirePackage{xpatch}
 %    \end{macrocode}
 %
-% Restrictions: \Kbd{biber} only and minimum \Paket{biblatex} version
+% Restrictions: \Biber only and minimum \Paket{biblatex} version
 %    \begin{macrocode}
 \RequireBiber[3]
-\@ifpackagelater{biblatex}{2017/11/05}
+\@ifpackagelater{biblatex}{2018/03/04}
     {}
     {\blxarch@errmsg{too old\MessageBreak biblatex version - update required}}
 %    \end{macrocode}
@@ -7427,6 +7731,7 @@
 %    \begin{macrocode}
     abbreviate=true,      % abbreviates bibstrings
     arxiv=pdf,            % although I've never seen an arXiv link we point them to PDFs.
+    autopunct=true,       % wether cite commands should scan ahead for punctuation
     autolang=hyphen,      % language-dependent hyphenation rules
     backref=false,        % wether to print back references in the bilbiography
     block=none,           % no extra spacing between blocks
@@ -7487,12 +7792,15 @@
 %    \end{macrocode}
 %
 % \begin{format}{bibtex}
+% \changes{2.0}{2018/04/01}{Added support for attributed dates in \blx 3.11 style (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/14}{issue \#14})}
 %    \begin{macrocode}
     \DeclareDriverSourcemap[datatype=bibtex]{
 %    \end{macrocode}
 % Replace literal thesis types like \enquote{Diss. phil} with \Befehl{bibstring}.
 %    \begin{macrocode}
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \pertype{thesis}
             \step[
                 fieldsource=type,
@@ -7502,9 +7810,55 @@
             ]
         }
 %    \end{macrocode}
+% Find exhibitions lacking \Feld{eventtype} field.
+%    \begin{macrocode}
+        \map[
+            overwrite=true,
+            foreach={titleaddon,booktitleaddon,maintitleaddon},
+        ]{
+			\pernottype{article}
+            \pernottype{review}
+            \pernottype{reference}
+            \pernottype{inreference}
+            \pernottype{mvreference}
+            \pernottype{thesis}
+             \step[
+                fieldsource=\regexp{$MAPLOOP},
+                match=\regexp{[Ee]xhibi[ct]|[Aa]usstellung|[Uu][dt]st[iä]ll[n]ing|[Tt]entoonstelling|[Ee][xs]posi[cçtz]},
+                fieldset=eventtype,
+                fieldvalue=exhibition,
+                append=true,
+                notfield=eventtype,
+            ]
+%    \end{macrocode}
+% Find conferences lacking \Feld{eventtype} field.
+%    \begin{macrocode}
+             \step[
+                fieldsource=\regexp{$MAPLOOP},
+                match=\regexp{[KkCc]onf[eé]ren[cstz]|[Ss]ymposi|[KkCc]ol{1,2}[oó]qu|[KkCc]onvent|[Mm]eeting|},
+                fieldset=eventtype,
+                fieldvalue=conference,
+                append=true,
+                notfield=eventtype,
+            ]
+%    \end{macrocode}
+% Find auctions lacking \Feld{eventtype} field.
+%    \begin{macrocode}
+             \step[
+                fieldsource=\regexp{$MAPLOOP},
+                match=\regexp{[Aa]u[ck]tion|Versteigerung|\b[Ee]nchère|[Vv]eiling|[Ss]ubasta|[Ll]eil(ões|ão)},
+                fieldset=eventtype,
+                fieldvalue=auction,
+                append=true,
+                notfield=eventtype,
+            ]
+        }
+%    \end{macrocode}
 % Auctions need a copy of \Feld{eventdate} in order to always have access to the full date.
 %    \begin{macrocode}
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \step[
                 fieldsource=eventtype,
                 match=\regexp{[Aa]u[ck]tion},
@@ -7517,9 +7871,51 @@
             ]
         }
 %    \end{macrocode}
-% Newspapers that must keep their full date:
+% Attributed dates in biblatex (since 3.11) are mapped to our \Feld{realdate} field:
+%    \begin{macrocode}
+        \map[
+            overwrite
+        ]{
+            \step[
+                fieldsource=date+an,
+                match=\regexp{\battributed\b}, % find all date+an field that match "attributed" (<field>+an are csv)
+                final=true, % do not add entries in further steps
+            ]
+            \step[
+                fieldsource=date,
+                fieldtarget=realdate,
+            ]
+        }
+%    \end{macrocode}
+% Attributed dates wrapped in brackets are mapped to our \Feld{realdate} field:
 %    \begin{macrocode}
+        \map[
+            overwrite
+        ]{
+            \step[
+                fieldsource=year,
+                match=\regexp{\A\[.+\]\Z},
+                fieldtarget=realdate,
+            ]
+            \step[
+                fieldsource=date,
+                match=\regexp{\A\[.+\]\Z},
+                fieldtarget=realdate,
+            ]
+        }
         \map[overwrite]{
+            \step[
+                fieldsource=realdate,
+                match=\regexp{\A\[(.+)\]\Z},
+                replace={$1},
+            ]
+        }
+%    \end{macrocode}
+% Newspapers that must keep their full date:
+%    \begin{macrocode}
+        \map[
+            overwrite
+        ]{
             \pertype{article}
             \pertype{periodical}
             \pertype{suppperiodical}
@@ -7538,7 +7934,9 @@
 %    \end{macrocode}
 % If there are words (e.\,g. \enquote{revised}) in field \Feld{edition}, we extract the number.
 %    \begin{macrocode}
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \step[
                 fieldsource=edition,
                 match=\regexp{(\d+)},
@@ -7548,14 +7946,19 @@
 %    \end{macrocode}
 % Wrap American-style location addons into a formatting command:
 %    \begin{macrocode}
-        \map[overwrite, foreach={location, multivenue}]{
+        \map[
+            overwrite,
+            foreach={location, multivenue}
+        ]{
             \step[
                 fieldsource=\regexp{$MAPLOOP},
                 match={\blxarch@regex@location@match},
                 replace={\blxarch@regex@location@replace},
             ]
         }
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \step[
                 fieldsource=venue,
                 match={\blxarch@regex@location@match},
@@ -7774,7 +8177,7 @@
 % \begin{macro}{\mkbibacro}
 % No small caps here.
 %    \begin{macrocode}
-\renewcommand{\mkbibacro}[1]{\MakeLowercase{#1}}
+\renewcommand*{\mkbibacro}[1]{\MakeLowercase{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7793,9 +8196,10 @@
 % \subsubsubsection{Local name formatting}
 %
 % \begin{macro}{\mkbibletterspacing}
-% A wrapper for letter spaced names.
+% A wrapper for letter spaced names. Falls back to small caps if \Befehl{textls} is not at hand.
 %    \begin{macrocode}
-\newcommand{\mkbibletterspacing}[1]{\ifcsdef{textls}{\textls{#1}}{#1}}
+\newcommand*{\mkbibletterspacing}[1]{\textls{#1}}
+\providecommand*{\textls}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -7805,10 +8209,10 @@
 % \begin{macro}{\mkbibnamesuffix}
 % Different name formatting in the \texttt{by author/editor} block.
 %    \begin{macrocode}
-\renewcommand{\mkbibnamegiven}[1]{#1}
-\renewcommand{\mkbibnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibnamesuffix}[1]{#1}
+\renewcommand*{\mkbibnamegiven}[1]{#1}
+\renewcommand*{\mkbibnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibnamesuffix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -7821,10 +8225,10 @@
 % \begin{macro}{\mkbibrepeatsuffix}
 % Different name formatting in repeated labels.
 %    \begin{macrocode}
-\newcommand{\mkbibrepeatgiven}[1]{#1}
-\newcommand{\mkbibrepeatfamily}[1]{\textsc{#1}}
-\newcommand{\mkbibrepeatprefix}[1]{\textsc{#1}}
-\newcommand{\mkbibrepeatsuffix}[1]{#1}
+\newcommand*{\mkbibrepeatgiven}[1]{#1}
+\newcommand*{\mkbibrepeatfamily}[1]{\textsc{#1}}
+\newcommand*{\mkbibrepeatprefix}[1]{\textsc{#1}}
+\newcommand*{\mkbibrepeatsuffix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -7837,10 +8241,10 @@
 % \begin{macro}{\mkbibbooknamesuffix}
 % Different name formatting of \Feld{bookauthor}/\Feld{editor}.
 %    \begin{macrocode}
-\newcommand{\mkbibbooknamegiven}[1]{#1}
-\newcommand{\mkbibbooknamefamily}[1]{#1}
-\newcommand{\mkbibbooknameprefix}[1]{#1}
-\newcommand{\mkbibbooknamesuffix}[1]{#1}
+\newcommand*{\mkbibbooknamegiven}[1]{#1}
+\newcommand*{\mkbibbooknamefamily}[1]{#1}
+\newcommand*{\mkbibbooknameprefix}[1]{#1}
+\newcommand*{\mkbibbooknamesuffix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -7853,10 +8257,10 @@
 % \begin{macro}{\mkbibsourcenamesuffix}
 % Different name formatting of \Feld{bookauthor}/\Feld{editor}.
 %    \begin{macrocode}
-\newcommand{\mkbibsourcenamegiven}[1]{#1}
-\newcommand{\mkbibsourcenamefamily}[1]{#1}
-\newcommand{\mkbibsourcenameprefix}[1]{#1}
-\newcommand{\mkbibsourcenamesuffix}[1]{#1}
+\newcommand*{\mkbibsourcenamegiven}[1]{#1}
+\newcommand*{\mkbibsourcenamefamily}[1]{#1}
+\newcommand*{\mkbibsourcenameprefix}[1]{#1}
+\newcommand*{\mkbibsourcenamesuffix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -7869,10 +8273,10 @@
 % \begin{macro}{\mkbiblistnamesuffix}
 % Different name formatting of \Feld{author}/\Feld{editor}.
 %    \begin{macrocode}
-\newcommand{\mkbiblistnamegiven}[1]{#1}
-\newcommand{\mkbiblistnamefamily}[1]{#1}
-\newcommand{\mkbiblistnameprefix}[1]{#1}
-\newcommand{\mkbiblistnamesuffix}[1]{#1}
+\newcommand*{\mkbiblistnamegiven}[1]{#1}
+\newcommand*{\mkbiblistnamefamily}[1]{#1}
+\newcommand*{\mkbiblistnameprefix}[1]{#1}
+\newcommand*{\mkbiblistnamesuffix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -7882,7 +8286,7 @@
 % \subsubsubsection{Short forms}
 %
 % \begin{macro}{\ifshortform}
-% \meta{string}\meta{true}\meta{false}
+% \meta{string}\meta{true}\meta{false}\\
 % \Kbd{string} must be one of the valid values from option \Option{shortform}.
 %    \begin{macrocode}
 \newcommand{\ifshortform}[3]{%
@@ -7896,10 +8300,12 @@
 %
 % \begin{option}{shortform}
 % =\meta{string}\\
-% Where to print the label date. The following expressions are allowed:\\
-% \Kbd{both} = date after label name and location;\\
-% \Kbd{label} = date after label name;\\
-% \Kbd{location} = date after location;\\
+% Wether to print short forms like \Deutsch{RGA} or \Latein{CIL} in bibliographies. The following keys are available:
+% \begin{optkeys}{3em}
+%   \item[\Kbd{false}] no short forms in  the bibliography.
+%   \item[\Kbd{title}] replace \Feld{title} by \Feld{shortform} field.
+%   \item[\Kbd{true}] use full short forms.
+% \end{optkeys}
 %    \begin{macrocode}
 \DeclareBibliographyOption[string]{shortform}[true]{%
     \ifcsdef{blxarch@opt@shortform@#1}
@@ -7972,7 +8378,7 @@
 %
 % \begin{macro}{\nameshortformdelim}
 %    \begin{macrocode}
-\newcommand{\nameshortformdelim}{\usebibmacro{in:}}
+\newcommand*{\nameshortformdelim}{\usebibmacro{in:}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8017,47 +8423,67 @@
 %    \end{macrocode}
 % \end{bibliographydriver}
 %
-% \subsubsubsection{Start entry}
+% \subsubsubsection{Display citation labels in bibliography}
+%
+% \begin{macro}{\ifrepeatlabel}
+% \meta{string}\meta{true}\meta{false}
+% \changes{2.0}{2018/05/09}{\Stark{Incompatible}: \Befehl{ifrepeatlabel} has a third parameter}
+% \Kbd{string} must be one of the valid values from option \Option{repeatlabel}. \Kbd{true} only if in
+% in bibliography and if option \Option{repeatlabel} not \Kbd{false}.
+%    \begin{macrocode}
+\newcommand{\ifrepeatlabel}[3]{%
+    \ifbibliography
+        {\ifdefstring{\blxarch@repeatlabel@value}{#1}
+            {#2}
+            {\ifcsdef{blxarch@opt@repeatlabel@#1}
+                {#3}
+                {\blxarch@errmsg{\blxarch@repeatlabel@errstr{\unexpanded{\ifrepeatlabel}}}}}}%
+        {\ifstrequal{false}{#1}
+            {#2}
+            {\ifcsdef{blxarch@opt@repeatlabel@#1}
+                {#3}
+                {\blxarch@errmsg{\blxarch@repeatlabel@errstr{\unexpanded{\ifrepeatlabel}}}}}}%
+}
+%    \end{macrocode}
+% \end{macro}
 %
 % \begin{option}{repeatlabel}
-% =\meta{bool}\\
-% If exact label should be repeated in the bibliography.
-% ATTENTION: must be \Kbd{false} in verbose styles.
-%    \begin{macrocode}
-\newtoggle{archbool:repeatlabel}
-\DeclareBibliographyOption{repeatlabel}[true]{%
-    \settoggle{archbool:repeatlabel}{#1}}
+% =\meta{string}
+% \changes{2.0}{2018/05/09}{Option \Option{repeatlabel} has a third value: \Kbd{dashed}}
+% \begin{optkeys}{4em}
+%     \item[\Kbd{dashed}] cite label shall be repeated and repeated names dashed;
+%     \item[\Kbd{false}] don't;
+%     \item[\Kbd{true}] cite label shall be repeated, always with full names;
+% \end{optkeys}
+%    \begin{macrocode}
+\DeclareBibliographyOption[string]{repeatlabel}[true]{%
+    \ifcsdef{blxarch@opt@repeatlabel@#1}
+        {\csuse{blxarch@opt@repeatlabel@#1}}%
+        {\blxarch@errmsg{\blxarch@repeatlabel@errstr{option 'repeatlabel'}}}}
 \ExecuteBibliographyOptions{repeatlabel}
 %    \end{macrocode}
 % \end{option}
 %
-% \begin{macro}{\ifrepeatlabel}
-% \Kbd{true} if \Option{repeatlabel} is active (only in bibliographies).
+% \begin{macro}{\repeatlabeldash}
+% \changes{2.0}{2018/05/09}{New command \Befehl{repeatlabeldash}}
+% Replaces repeated names in repeated labels.
 %    \begin{macrocode}
-\newcommand{\ifrepeatlabel}[2]{%
-    \ifboolexpr{
-        togl {archbool:repeatlabel}
-        and
-        test {\ifbibliography}
-    }
-        {#1}
-        {#2}}
+\newcommand*{\repeatlabeldash}{--\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\repeatlabelwrap}
-% =\marg{code}\\
-% A wrapper around the \Format{repeatlabel} bibmacro in order to
-% wrap it into formatting commands like \Befehl{textbf} for instance.
+% \begin{format}{repeatlabel}
+% \changes{2.0}{2018/05/09}{\Stark{Incompatible:} removed \Befehl{repeatlabelwrap}} 
+% Format the repeated label.
 %    \begin{macrocode}
-\newcommand{\repeatlabelwrap}[1]{#1}
+\DeclareFieldFormat*{repeatlabel}{#1}
 %    \end{macrocode}
-% \end{macro}
+% \end{format}
 %
 % \begin{macro}{\repeatlabeldelim}
 % The delimiter after an repeated label
 %    \begin{macrocode}
-\newcommand{\repeatlabeldelim}{\newline}
+\newcommand*{\repeatlabeldelim}{\newline}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8067,43 +8493,56 @@
 % anchors are not useful here.
 %    \begin{macrocode}
 \newbibmacro*{repeatlabel}{%
-    \repeatlabelwrap{%
-        \let\blxarch@buffer@repeatfamily\mkbibnamefamily
-        \let\blxarch@buffer@repeatprefix\mkbibnameprefix
-        \let\blxarch@buffer@repeatgiven\mkbibnamegiven
-        \let\blxarch@buffer@repeatsuffix\mkbibnamesuffix
-        \let\mkbibnamefamily\mkbibrepeatfamily
-        \let\mkbibnameprefix\mkbibrepeatprefix
-        \let\mkbibnamegiven\mkbibrepeatgiven
-        \let\mkbibnamesuffix\mkbibrepeatsuffix
-        \let\blxarch@buffer@repeatnames\c@minnames
-        \let\blxarch@buffer@maxnames\c@maxnames
-        \let\blxarch@buffer@minnames\c@minnames
-        \let\c@maxnames\blx@maxcitenames
-        \let\c@minnames\blx@mincitenames
-        \ifhyperref
-            {\let\bibhyperref\@empty}
-            {}%
+    \let\blxarch@buffer@repeatfamily\mkbibnamefamily%
+    \let\blxarch@buffer@repeatprefix\mkbibnameprefix%
+    \let\blxarch@buffer@repeatgiven\mkbibnamegiven%
+    \let\blxarch@buffer@repeatsuffix\mkbibnamesuffix%
+    \let\mkbibnamefamily\mkbibrepeatfamily%
+    \let\mkbibnameprefix\mkbibrepeatprefix%
+    \let\mkbibnamegiven\mkbibrepeatgiven%
+    \let\mkbibnamesuffix\mkbibrepeatsuffix%
+    \let\blxarch@buffer@repeatnames\c@minnames%
+    \let\blxarch@buffer@maxnames\c@maxnames%
+    \let\blxarch@buffer@minnames\c@minnames%
+    \let\c@maxnames\blx@maxcitenames%
+    \let\c@minnames\blx@mincitenames%
+    \ifhyperref
+        {\let\bibhyperref\@empty}
+        {}%
+    \printtext[repeatlabel]{%
         \iffieldundef{shorthand}
-            {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
-                {\usebibmacro{cite:label}%
-                \setunit{\printdelim{nonameyeardelim}}}
-                {\printnames{labelname}%
-                \setunit{\printdelim{nameyeardelim}}}%
-             \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}%
-             \usebibmacro{cite:labeldate+extradate}%
-             \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}}%
+            {\ifboolexpr{
+                test {\ifrepeatlabel{dashed}}
+                and
+                test {\iffieldequalcs{namehash}{blxarch@field@namehash}}}
+                {\printtext{\repeatlabeldash}%
+                 \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}%
+                 \usebibmacro{cite:labeldate+extradate}%
+                 \ifeditionsuperscript{postlabel}{\usebibmacro{editionsuperscript}}{}}
+                {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+                    {\usebibmacro{cite:label}%
+                     \setunit{\printdelim{nonameyeardelim}}}
+                    {\printnames{labelname}%
+                     \setunit{\printdelim{nameyeardelim}}}%
+                 \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}%
+                 \usebibmacro{cite:labeldate+extradate}%
+                 \ifeditionsuperscript{postlabel}{\usebibmacro{editionsuperscript}}{}}}%
             {\usebibmacro{cite:shorthand}}%
-        \ifhyperref{\let\bibhyperref\blxarch@buffer@hyperref}{}%
-        \let\c@maxnames\blxarch@buffer@maxnames
-        \let\c@minnames\blxarch@buffer@minnames
-        \let\mkbibnamefamily\blxarch@buffer@repeatfamily
-        \let\mkbibnameprefix\blxarch@buffer@repeatprefix
-        \let\mkbibnamegiven\blxarch@buffer@repeatgiven
-        \let\mkbibnamesuffix\blxarch@buffer@repeatsuffix}}%
+    }%
+    \ifhyperref{\let\bibhyperref\blxarch@buffer@hyperref}{}%
+    \let\c@maxnames\blxarch@buffer@maxnames%
+    \let\c@minnames\blxarch@buffer@minnames%
+    \let\mkbibnamefamily\blxarch@buffer@repeatfamily%
+    \let\mkbibnameprefix\blxarch@buffer@repeatprefix%
+    \let\mkbibnamegiven\blxarch@buffer@repeatgiven%
+    \let\mkbibnamesuffix\blxarch@buffer@repeatsuffix%
+    \savefield{namehash}{\blxarch@field@namehash}%
+}
 %    \end{macrocode}
 % \end{bibmacro} 
 %
+% \subsubsubsection{Start entry}
+%
 % \begin{bibmacro}{begentry}
 % Code at the beginning of an entry.
 %    \begin{macrocode}
@@ -8129,7 +8568,7 @@
         and
         not test {\iffieldundef{shortform}}
     }
-        {\savefield{shortform}{\blxarch@field@shortform}%
+        {\savefield*{shortform}{\blxarch@field@shortform}%
          \restorefield{booktitle}{\blxarch@field@shortform}%
          \clearfield{booksubtitle}%
          \clearfield{booktitleaddon}}
@@ -8139,7 +8578,7 @@
 %    \begin{macrocode}
     \iffieldundef{volume}
         {}
-        {\savefield{volume}{\blxarch@field@volume}%
+        {\savefield*{volume}{\blxarch@field@volume}%
          \restorefield{usera}{\blxarch@field@volume}}%
     \ifboolexpr{
         test {\iffieldequalstr{entrysubtype}{digital}}
@@ -8191,7 +8630,7 @@
 %    \begin{macrocode}  
     \ifeditionsuperscript{none}
         {\clearfield{usere}}
-        {\savefield{edition}{\blxarch@field@edition}%
+        {\savefield*{edition}{\blxarch@field@edition}%
         \clearfield{edition}%
         \restorefield{usere}{\blxarch@field@edition}}%
     \ifboolexpr{
@@ -8205,10 +8644,10 @@
         and
         not test {\ifselfcontained}
     }
-        {\savefield{maintitle}{\blxarch@field@maintitle}%
-         \savefield{mainsubtitle}{\blxarch@field@mainsubtitle}%
-         \savefield{maintitleaddon}{\blxarch@field@maintitleaddon}%
-         \savefield{maintitlenote}{\blxarch@field@maintitlenote}%
+        {\savefield*{maintitle}{\blxarch@field@maintitle}%
+         \savefield*{mainsubtitle}{\blxarch@field@mainsubtitle}%
+         \savefield*{maintitleaddon}{\blxarch@field@maintitleaddon}%
+         \savefield*{maintitlenote}{\blxarch@field@maintitlenote}%
          \restorefield{booktitle}{\blxarch@field@maintitle}%
          \restorefield{booksubtitle}{\blxarch@field@mainsubtitle}%
          \restorefield{booktitleaddon}{\blxarch@field@maintitleaddon}%
@@ -8228,7 +8667,7 @@
         and
         not test {\iffieldundef{shortjournal}}
     }
-        {\savefield{shortjournal}{\blxarch@field@shortjournal}%
+        {\savefield*{shortjournal}{\blxarch@field@shortjournal}%
          \restorefield{journaltitle}{\blxarch@field@shortjournal}%
          \clearfield{journalsubtitle}}
         {}%
@@ -8248,8 +8687,8 @@
         and
         not test {\iffieldundef{shortseries}}
     }
-        {\savefield{shortseries}{\blxarch@field@shortseries}%
-         \savefield{shortsubseries}{\blxarch@field@shortsubseries}%
+        {\savefield*{shortseries}{\blxarch@field@shortseries}%
+         \savefield*{shortsubseries}{\blxarch@field@shortsubseries}%
          \iffieldundef{shortsubseries}
             {}
             {\restorefield{series}{\blxarch@field@shortseries}%
@@ -8259,9 +8698,9 @@
 %    \end{macrocode}   
 % Do name formatting for repeated labels.
 %    \begin{macrocode}
-    \ifrepeatlabel
-        {\usebibmacro{repeatlabel}\repeatlabeldelim}
-        {}%
+    \ifrepeatlabel{false}
+        {}
+        {\usebibmacro{repeatlabel}\repeatlabeldelim}%
     \let\blxarch@buffer@list@namegiven\mkbibnamegiven%
     \let\blxarch@buffer@list@namefamily\mkbibnamefamily%
     \let\blxarch@buffer@list@nameprefix\mkbibnameprefix%
@@ -8279,7 +8718,6 @@
 % \begin{option}{usemultivenue}
 % =\meta{bool}\\
 % Wether to use \Feld{multivenue} in title notes.
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:usemultivenue}
 \DeclareBibliographyOption{usemultivenue}[false]{%
@@ -8291,7 +8729,6 @@
 % \begin{option}{useeventdate}
 % =\meta{bool}\\
 % Wether to use \Feld{eventdate} in title notes.
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:useeventdate}
 \DeclareBibliographyOption{useeventdate}[true]{%
@@ -8303,7 +8740,6 @@
 % \begin{option}{useeventnumber}
 % =\meta{bool}\\
 % Wether to use \Feld{eventnumber} in title notes.
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:useeventnumber}
 \DeclareBibliographyOption{useeventnumber}[true]{%
@@ -8315,7 +8751,6 @@
 % \begin{option}{usefestschriftaddon}
 % =\meta{bool}\\
 % Wether to use \Feld{usefestschriftaddon} in title notes.
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:usefestschriftaddon}
 \DeclareBibliographyOption{usefestschriftaddon}[true]{%
@@ -8336,10 +8771,10 @@
 % \begin{macro}{\mkbibfestschriftnamesuffix}
 % Name formatting of persons to whom a festschrift is dedicatetd.
 %    \begin{macrocode}
-\newcommand{\mkbibfestschriftnamegiven}[1]{#1}
-\newcommand{\mkbibfestschriftnamefamily}[1]{#1}
-\newcommand{\mkbibfestschriftnameprefix}[1]{#1}
-\newcommand{\mkbibfestschriftnamesuffix}[1]{#1}
+\newcommand*{\mkbibfestschriftnamegiven}[1]{#1}
+\newcommand*{\mkbibfestschriftnamefamily}[1]{#1}
+\newcommand*{\mkbibfestschriftnameprefix}[1]{#1}
+\newcommand*{\mkbibfestschriftnamesuffix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -8347,7 +8782,7 @@
 % \end{macro}
 %
 % \begin{bibmacro}{festschrift}
-% \marg{string}
+% \marg{string}\\
 % Formatting of the festschrift string. \meta{string} should be \Feld{title},
 % \Feld{maintitle} or \Feld{booktitle}.
 %    \begin{macrocode}
@@ -8381,7 +8816,7 @@
 % \end{bibmacro}
 %
 % \begin{bibmacro}{auction}
-% \marg{string}
+% \marg{string}\\
 % Formatting of an event with {fullevendate}. \meta{string} should be \Feld{title},
 % \Feld{maintitle} or \Feld{booktitle}.
 %    \begin{macrocode}
@@ -8406,7 +8841,7 @@
 % \end{bibmacro}
 %
 % \begin{bibmacro}{exhibition/conference}
-% \marg{string}
+% \marg{string}\\
 % Formatting of an event with {fullevendate}. \meta{string} should be \Feld{title},
 % \Feld{maintitle} or \Feld{booktitle}.
 %    \begin{macrocode}
@@ -8471,16 +8906,16 @@
 % \end{bibmacro}
 %
 % \begin{macro}{\multivenuedelim}
-% The delimiter after an repeated label.
+% The delimiter between venues.
 %    \begin{macrocode}
-\newcommand{\multivenuedelim}{\addcomma\space}
+\newcommand*{\multivenuedelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\eventtypepunct}
 % The punctuation after the eventtype.
 %    \begin{macrocode}
-\newcommand{\eventtypepunct}{\addspace}
+\newcommand*{\eventtypepunct}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8492,9 +8927,9 @@
 % \end{format}
 %
 % \begin{bibmacro}{titlenote}
-% \marg{string}
-% Prints a title note. The \Befehl{printrext} command must be inside
-% the conditions, otherwise a lot of empty brackets are printed.
+% \marg{string}\\
+% Prints a title note. The \Befehl{printtext} command must be inside
+% the conditions, otherwise a lot of empty brackets gets printed.
 % \Format{issue+date} was overwritten in author date styles. \meta{string} should be \Feld{title},
 % \Feld{maintitle} or \Feld{booktitle}.
 %    \begin{macrocode}
@@ -8555,24 +8990,22 @@
 % Setup at the beginning of a bibliography.
 % \Format{issue+date} was overwritten in author date styles.
 %    \begin{macrocode}
-\renewcommand{\bibsetup}{%
+\xpretocmd{\bibsetup}{%
     \def\blxarch@buffer@hyperref{\bibhyperref}%
-    \ifcsdef{blxarch@fork@authordate}
-        {\csuse{blxarch@issuedate}}
-        {}
-}
+    \let\blxarch@field@namehash\undefined%
+}{}{Patching macro '\bibsetup' failed}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{bibmacro}{finentry}
 % End of an entry.
 %    \begin{macrocode}
-\xpretobibmacro*{finentry}{%
+\xpretobibmacro{finentry}{%
    \let\mkbibnamegiven\blxarch@buffer@list@namegiven%
    \let\mkbibnamefamily\blxarch@buffer@list@nameprefix%
    \let\mkbibnameprefix\blxarch@buffer@list@namefamily%
    \let\mkbibnamesuffix\blxarch@buffer@list@namesuffix%
-}
+}{}{Patching 'finentry' failed (1)}
 %    \end{macrocode}
 % \end{bibmacro}
 %
@@ -8581,15 +9014,22 @@
 % \begin{bibliographydriver}{article}
 % \begin{bibliographydriver}{book}
 % \begin{bibliographydriver}{inbook}
-% We are going to reimplement Feld{volume} formatting.
-%    \begin{macrocode}
-\xpatchbibdriver{book}{\printfield {volume}}{}{}{}
-\xpatchbibdriver{book}{\printfield {part}}{}{}{}
-\xpatchbibdriver{inbook}{\printfield {volume}}{}{}{}
-\xpatchbibdriver{inbook}{\printfield {part}}{}{}{}
-\xpatchbibdriver{book}{\iffieldundef {maintitle} {} {}\newunit}{}{}{}
-\xpatchbibdriver{inbook}{\iffieldundef {maintitle} {} {}\newunit}{}{}{}
-\xpatchbibdriver{article}{\usebibmacro{byeditor+others}}{}{}{}
+% We are going to reimplement \Feld{volume} formatting.
+%    \begin{macrocode}
+\xpatchbibdriver{book}{\printfield {volume}}{}
+  {}{Patching driver 'book' failed (1)}
+\xpatchbibdriver{book}{\printfield {part}}{}
+  {}{Patching driver 'book' failed (2)}
+\xpatchbibdriver{inbook}{\printfield {volume}}{}
+  {}{blxarch@warning{patching driver 'inbook' failed (1)}
+\xpatchbibdriver{inbook}{\printfield {part}}{}
+  {}{Patching driver 'inbook' failed  (2)}
+\xpatchbibdriver{book}{\iffieldundef {maintitle} {} {}\newunit}{}
+  {}{Patching driver 'book' failed (3)}
+\xpatchbibdriver{inbook}{\iffieldundef {maintitle} {} {}\newunit}{}
+  {}{Patching driver 'inbook' failed (3)}}
+\xpatchbibdriver{article}{\usebibmacro{byeditor+others}}{}
+  {}{Patching driver 'book' failed (4)}
 %    \end{macrocode}
 % \end{bibliographydriver}
 % \end{bibliographydriver}
@@ -8598,7 +9038,15 @@
 % \begin{macro}{\titleseriesdelim}
 % The delimiter after an repeated label
 %    \begin{macrocode}
-\newcommand{\titleseriesdelim}{\addperiod\space}
+\newcommand*{\titleseriesdelim}{\addperiod\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\articletitlepunct}
+% \changes{2.0}{2018/05/23}{New command \Befehl{articletitlepunct}}
+% The punctuation after article titles if other than \Befehl{newunit}.
+%    \begin{macrocode}
+\newcommand*{\articletitlepunct}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8606,14 +9054,14 @@
 % \begin{macro}{\inbookbookdelim}
 % Change \Befehl{newunit} ahead of \Format{in:}
 %    \begin{macrocode}
-\xpatchbibdriver{inbook}{newunit \newblock \usebibmacro {in:}}{printunit{\inbookbookdelim}\newblock\usebibmacro{in:}}{}{}
+\xpatchbibdriver{inbook}{newunit \newblock \usebibmacro {in:}}{printunit{\inbookbookdelim}\newblock\usebibmacro{in:}}
+  {}{Patching driver 'inbook' failed (4)}
 \newcommand{\inbookbookdelim}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 % \end{bibliographydriver}
 %
 % \begin{format}{dictionary}
-% \marg{text}\\
 % Formatting of dictionary entries
 %    \begin{macrocode}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space\mkbibquote{#1\isdot}}
@@ -8622,21 +9070,27 @@
 %
 % \begin{option}{titlebrackets}
 % =\meta{bool}\\
+% \changes{2.0}{2018/05/23}{\Option{titlenote} also settable on a per-entry basis}
 %    \begin{macrocode}
 \newtoggle{archbool:titlebrackets}
 \DeclareBibliographyOption{titlebrackets}[true]{%
     \settoggle{archbool:titlebrackets}{#1}}
 \ExecuteBibliographyOptions{titlebrackets}
+\DeclareEntryOption{titlebrackets}[true]{%
+    \settoggle{archbool:titlebrackets}{#1}}
 %    \end{macrocode}
 % \end{option}
 %
 % \begin{option}{titlenote}
 % =\meta{bool}\\
+% \changes{2.0}{2018/05/23}{\Option{titlenote} also settable on a per-entry basis}
 %    \begin{macrocode}
 \newtoggle{archbool:titlenote}
 \DeclareBibliographyOption{titlenote}[true]{%
     \settoggle{archbool:titlenote}{#1}}
 \ExecuteBibliographyOptions{titlenote}
+\DeclareEntryOption{titlenote}[true]{%
+    \settoggle{archbool:titlenote}{#1}}
 %    \end{macrocode}
 % \end{option}
 %
@@ -8688,7 +9142,7 @@
 %
 % \begin{macro}{\subtitlepunct}
 %    \begin{macrocode}
-\renewcommand{\subtitlepunct}{\addperiod\space}
+\renewcommand*{\subtitlepunct}{\addperiod\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8704,6 +9158,7 @@
 % \begin{format}{multivenue}
 % \begin{format}{multieventdate}
 % \begin{format}{shortform}
+% \begin{format}{options}
 %    \begin{macrocode}
 \DeclareDataInheritance
 {mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference}
@@ -8719,6 +9174,10 @@
   \inherit[override=true]{venue}{venue}
   \inherit[override=true]{multivenue}{multivenue}
   \inherit[override=true]{multieventdate}{multieventdate}
+%    \end{macrocode}
+% Entry option \Option{uselabeltitle} should not be inherited
+%    \begin{macrocode}
+  \inherit[override=true]{options}{options}
   \noinherit{summarytitle}
 }
 %    \end{macrocode}
@@ -8734,6 +9193,7 @@
 % \end{format}
 % \end{format}
 % \end{format}
+% \end{format}
 %
 % \begin{bibmacro}{maintitle+title}
 % \begin{bibmacro}{maintitle+booktitle}
@@ -8841,7 +9301,9 @@
                     {\usebibmacro{titlenote}{title}}
                     {\printfield[titlenote]{titleaddon}}}%
                 {}%
-            \newunit}}%
+            \iffieldundef{journaltitle}
+                {\newunit}
+                {\printunit{\articletitlepunct}}}}%
         \iftoggle{archbool:titlebrackets}
             {}
             {\ifselfcontained
@@ -8967,20 +9429,30 @@
 % \begin{macro}{\articlesubtitlepunct}
 % Subtitle puncuation differs between \Typ{article} and \Typ{book}.
 %    \begin{macrocode}
-\newcommand{\articlesubtitlepunct}{\addcolon\space\midsentence}
+\newcommand*{\articlesubtitlepunct}{\addcolon\space\midsentence}
 %    \end{macrocode}
 % \end{macro}
 %
 % \subsubsubsection{Secondary editors}
 %
+% \begin{bibmacro}{bytranslator+others}
+% Never needed. \Feld{translator}s are occassionally printed as source authors.
+%    \begin{macrocode}
+\renewbibmacro*{bytranslator+others}{}
+%    \end{macrocode}
+% \end{bibmacro}
+%
 % \begin{option}{usesourceeditor}
 % =\meta{bool}\\
+% \changes{2.0}{2018/05/23}{\Option{usesourceeditor} also settable on a per-entry basis}
 % If editions of historical sources are printed with print secondary editors.
 %    \begin{macrocode}
 \newtoggle{archbool:usesourceeditor}
 \DeclareBibliographyOption{usesourceeditor}[true]{%
     \settoggle{archbool:usesourceeditor}{#1}}
 \ExecuteBibliographyOptions{usesourceeditor}
+\DeclareEntryOption{usesourceeditor}[true]{%
+    \settoggle{archbool:usesourceeditor}{#1}}
 %    \end{macrocode}
 % \end{option}
 %
@@ -9003,8 +9475,8 @@
 % \begin{macro}{\finalsourceeditordelim}
 % Delimiters between the names of multiple secondary editors.
 %    \begin{macrocode}
-\newcommand{\multisourceeditordelim}{\addcomma\space}
-\newcommand{\finalsourceeditordelim}{\addspace\bibstring{and}\space}
+\newcommand*{\multisourceeditordelim}{\addcomma\space}
+\newcommand*{\finalsourceeditordelim}{\addspace\bibstring{and}\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -9020,16 +9492,16 @@
 %    \begin{macrocode}
 \xpretobibmacro{byeditor}{%
     \usebibmacro{byeditor:start}
-}{}{}
+}{}{Patching bibmacro 'byeditor' failed (1)}
 \xpretobibmacro{byeditor+others}{%
     \usebibmacro{byeditor:start}
-}{}{}             
+}{}{Patching bibmacro 'byeditor:others' failed (1)}             
 \xapptobibmacro{byeditor}{%
     \usebibmacro{byeditor:end}
-}{}{}
+}{}{Patching bibmacro 'byeditor:' failed (2)}
 \xapptobibmacro{byeditor+others}{%
     \usebibmacro{byeditor:end}
-}{}{}
+}{}{Patching bibmacro 'byeditor:others' failed (2)}
 %    \end{macrocode}
 % \end{bibmacro}
 % \end{bibmacro}
@@ -9133,7 +9605,7 @@
 % The punctuation after the \Format{in:} block.
 %    \begin{macrocode}
 \DeclareDelimFormat{booknametitledelim}{\booklabelnamepunct}
-\newcommand{\booklabelnamepunct}{\addcomma\space}
+\newcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -9144,6 +9616,7 @@
 % Remove parenthesis' from journal years and use \Format{bibliographydate} macro.
 %    \begin{macrocode}
 \def\blxarch@issuedate{%
+    \savebibmacro{issue+date}%
     \renewbibmacro*{issue+date}{%
       \printtext[journaldateparens]{%
         \printfield{issue}%
@@ -9172,21 +9645,21 @@
 % \begin{macro}{\volumedatedelim}
 % The punctuation between volume and date in journals.
 %    \begin{macrocode}
-\newcommand{\volumedatedelim}{\addcomma\space}
+\newcommand*{\volumedatedelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\journalvolumedelim}
 % The punctuation between journal and its volume.
 %    \begin{macrocode}
-\newcommand{\journalvolumedelim}{\addspace}
+\newcommand*{\journalvolumedelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\volumenumberdelim}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\newcommand{\volumenumberdelim}{\addslash}
+\newcommand*{\volumenumberdelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -9216,7 +9689,7 @@
         {\newunit%
          \usebibmacro{location}{location}}
         {}%
-}
+}{}{Patching bibmacro 'note+pages' failed}
 %    \end{macrocode}
 % \end{bibmacro}
 %
@@ -9294,15 +9767,17 @@
 %
 % \begin{option}{editionsuperscript}
 % =\meta{expression}\\
-% Where to print the edition number. The following expressions are allowed:\\
-% \Kbd{predate} = superscript ahead of date;\\
-% \Kbd{postdate} = superscript after date;\\
-% \Kbd{prelabel} = superscript ahead of label year;\\
-% \Kbd{postlabel} = superscript after label year;\\
-% \Kbd{preloc} = superscript ahead of location;\\
-% \Kbd{postloc} = superscript after location;\\
-% \Kbd{posttitle} = superscript after title;\\
-% \Kbd{none} = normal text ahead of \Feld{location}/\Feld{date} as the standard styles do.
+% Where to print the edition number. The following expressions are allowed:
+% \begin{optkeys}{4em}
+%     \item[\Kbd{predate}] superscript ahead of date;
+%     \item[\Kbd{postdate}] superscript after date;
+%     \item[\Kbd{prelabel}] superscript ahead of label year;
+%     \item[\Kbd{postlabel}] superscript after label year;
+%     \item[\Kbd{preloc}] superscript ahead of location;
+%     \item[\Kbd{postloc}]  superscript after location;
+%     \item[\Kbd{posttitle}] superscript after title;
+%     \item[\Kbd{none}] normal text ahead of \Feld{location}/\Feld{date} as the standard styles do;
+% \end{optkeys}
 %    \begin{macrocode}
 \DeclareBibliographyOption[string]{editionsuperscript}[posttitle]{%
     \ifcsdef{blxarch@opt@editionsuperscript@#1}
@@ -9346,13 +9821,13 @@
 % \begin{macro}{\mkbiblocationaddon}
 % Wrap American-style location addons into a formatting command and omit them by default.
 %    \begin{macrocode}
-\newcommand{\mkbiblocationaddon}[1]{}
+\newcommand*{\mkbiblocationaddon}[1]{}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\finallistdelim}
 %    \begin{macrocode}
-\renewcommand{\finallistdelim}{\multilistdelim}
+\renewcommand*{\finallistdelim}{\multilistdelim}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -9371,10 +9846,12 @@
 %
 % \begin{option}{uselocation}
 % =\meta{expression}\\
-% Where to print the label date. The following expressions are allowed:\\
-% \Kbd{false} = print no location at all;\\
-% \Kbd{omitifseries} = print location or series;\\
-% \Kbd{true} = always print location;\\
+% Where to print the label date. The following expressions are allowed:
+% \begin{optkeys}{5em}
+%     \item[\Kbd{false}] print no location at all;
+%     \item[\Kbd{omitifseries}] print location or series;
+%     \item[\Kbd{true}] always print location;
+% \end{optkeys}
 %    \begin{macrocode}
 \DeclareBibliographyOption[string]{uselocation}[true]{%
     \ifcsdef{blxarch@opt@uselocation@#1}
@@ -9398,7 +9875,7 @@
 % \begin{macro}{\ifpagesfirst}
 % checks if option \Option{pagesfirst} is true and applies to the current entry type.
 %    \begin{macrocode}
-\newcommand{\ifpagesfirst}[2]{%
+\newcommand*{\ifpagesfirst}[2]{%
     \iftoggle{archbool:pagesfirst}
         {#1}
         {#2}}%
@@ -9408,7 +9885,6 @@
 % \begin{option}{origfields}
 % =\meta{bool}\\
 % If true, then fields \Feld{origdate} and \Feld{origlocation} apply. \Feld{date} and \Feld{location}
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:origfields}
 \DeclareBibliographyOption{origfields}[true]{%
@@ -9420,7 +9896,6 @@
 % \begin{option}{usepublisher}
 % =\meta{bool}\\
 % Wether to use \Feld{publisher} and \Feld{origpublisher} apply. \Feld{date} and \Feld{location}
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:usepublisher}
 \DeclareBibliographyOption{usepublisher}[true]{%
@@ -9432,7 +9907,7 @@
 % \begin{macro}{\locationpublisherdelim}
 % The delimiter between \Feld{location} and \Feld{publisher}.
 %    \begin{macrocode}
-\newcommand{\locationpublisherdelim}{\addcolon\space}
+\newcommand*{\locationpublisherdelim}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -9493,7 +9968,7 @@
 % \begin{format}{locationdateparens}
 % \begin{bibmacro}{location+date+edition}
 % We add the possibility to enclose this macro in parenthesis.
-% Adds something like "sine loco" by default.
+% Adds something like \enquote{sine loco} by default.
 %    \begin{macrocode}
 \DeclareFieldFormat*{locationdateparens}{\mkbibparens{#1}}
 \newbibmacro*{location+date+edition}{%
@@ -9514,12 +9989,12 @@
 % \end{bibmacro}
 % \end{format}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 % \begin{bibmacro}{origfields+reprint}
 % The same as before but with original fields instead and an addendum.
-% Adds something like "sine loco" by default.
+% Adds something like \enquote{sine loco} by default.
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\mkbibbrackets{#1}}
+\DeclareFieldFormat*{reprintparens}{\mkbibbrackets{#1}}
 \newbibmacro*{origfields+reprint}{%
     \printtext[locationdateparens]{%
         \ifeditionsuperscript{preloc}
@@ -9538,7 +10013,7 @@
         \usebibmacro{origdate}
         \usebibmacro{editionsuperscript}%
         \setunit{\addspace}%
-        \printtext[reprintbrackets]{%
+        \printtext[reprintparens]{%
             \bibstring{reprint}\addspace%
             \printtext{\usebibmacro{location}{location}}%
             \setunit{\locationpublisherdelim}%
@@ -9554,13 +10029,15 @@
 %
 % \begin{option}{useinstitution}
 % =\meta{string}\\
-% Whether to print the \Feld{institution} field:\\
-% \Kbd{aspublisher} = handle \Feld{type} like \Feld{publisher};\\
-% \Kbd{false} = omit \Feld{institution} field;\\
-% \Kbd{locationfirst} = like \Kbd{false}, but \Feld{type} after \Feld{location};\\
-% \Kbd{omitlocation} = omit \Feld{location};\\
-% \Kbd{omitlocatonifurl} = omit \Feld{institution} if URL available;\\
-% \Kbd{pluslocation} = print both \Feld{institution} and \Feld{location};\\
+% Whether to print the \Feld{institution} field:
+% \begin{optkeys}{7em}
+%     \item[\Kbd{aspublisher}] handle \Feld{type} like \Feld{publisher};
+%     \item[\Kbd{false}] omit \Feld{institution} field;
+%     \item[\Kbd{locationfirst}] like \Kbd{false}, but \Feld{type} after \Feld{location};
+%     \item[\Kbd{omitlocation}] omit \Feld{location};
+%     \item[\Kbd{omitlocatonifurl}] omit \Feld{institution} if URL available;
+%     \item[\Kbd{pluslocation}] print both \Feld{institution} and \Feld{location};
+% \end{optkeys}
 %    \begin{macrocode}
 \DeclareBibliographyOption[string]{useinstitution}[pluslocation]{%
     \ifcsdef{blxarch@opt@useinstitution@#1}
@@ -9586,8 +10063,10 @@
 % \begin{bibliographydriver}{thesis}
 % Disable the \Feld{type} field first (we reintroduce it later).
 %    \begin{macrocode}  
-\xpatchbibdriver{thesis}{\printfield {type}}{}{}{}
-\xpatchbibdriver{thesis}{\printlist {language}}{}{}{}
+\xpatchbibdriver{thesis}{\printfield {type}}{}
+  {}{Patching driver 'thesis' failed (1)}
+\xpatchbibdriver{thesis}{\printlist {language}}{}
+  {}{Patching driver 'thesis' failed (2)}
 %    \end{macrocode}
 % \end{bibliographydriver}
 %
@@ -9726,14 +10205,14 @@
 % \begin{macro}{\institutionlocationdelim}
 % Delimiter between \Feld{institution} and \Feld{location}.
 %    \begin{macrocode}
-\newcommand{\institutionlocationdelim}{\addcomma\space}
+\newcommand*{\institutionlocationdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\typeinstitutiondelim}
 % Delimiter between \Feld{institution} and \Feld{type}.
 %    \begin{macrocode}
-\newcommand{\typeinstitutiondelim}{\addspace}
+\newcommand*{\typeinstitutiondelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -9754,10 +10233,12 @@
 %
 % \begin{option}{positionlabeldate}
 % =\meta{expression}\\
-% Where to print the label date. The following expressions are allowed:\\
-% \Kbd{both} = date after label name and location;\\
-% \Kbd{label} = date after label name;\\
-% \Kbd{location} = date after location;\\
+% Where to print the label date. The following expressions are allowed:
+% \begin{optkeys}{3em}
+%     \item[\Kbd{both}] date after label name and location;
+%    \item[\Kbd{label}] date after label name;
+%     \item[\Kbd{location}] date after location;
+% \end{optkeys}
 %    \begin{macrocode}
 \DeclareBibliographyOption[string]{positionlabeldate}[both]{%
     \ifcsdef{blxarch@opt@positionlabeldate@#1}
@@ -9769,6 +10250,7 @@
 %
 % \begin{macro}{\ifnewspaper}
 % \marg{true}\marg{false}
+% \changes{1.1}{2017/05/23}{new Boolean test (see \ref{kap:bool})}
 % Wether an article must be cited with full year.
 %    \begin{macrocode}
 \newcommand{\ifnewspaper}[2]{%
@@ -9780,7 +10262,6 @@
        {#1}
        {#2}}
 %    \end{macrocode}
-% \changes{1.1}{2017/05/23}{new Boolean test (see \ref{kap:bool})}
 % \end{macro}
 %
 % \begin{bibmacro}{newsdate}
@@ -9798,47 +10279,98 @@
 %    \end{macrocode}
 % \end{bibmacro}
 %
-% \begin{format}{extrayear}
-% No parentheses around \Feld{extrayear} if date lacks.
+% \begin{format}{extradate}
+% \changes{2.0}{2018/05/20}{Format \Feld{extradate} field instead of \Feld{extrayear}}
+% No parentheses around \Feld{extradate} if date lacks.
 %    \begin{macrocode}
-\DeclareFieldFormat*{extrayear}{\mknumalph{#1}}%
+\DeclareFieldFormat*{extradate}{\mknumalph{#1}}%
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{macro}{\ifbibextrayear}
+% \changes{2.0}{2018/05/20}{Check for \Feld{extradate} field instead of \Feld{extrayear}}
 % \marg{true}\marg{false}
+% \changes{1.1}{2017/05/23}{new Boolean test (see \ref{kap:bool})}
 % Wether to print the extrayear field in the bibliography
 %    \begin{macrocode}
 \newcommand{\ifbibextrayear}[2]{%
      \ifboolexpr{
-        not test {\iffieldundef{extrayear}}
+        not test {\iffieldundef{extradate}}
         and
         test {\ifpositionlabeldate{location}}
         and
-        not test {\ifrepeatlabel}
+        test {\ifrepeatlabel{false}}
         and
         test {\ifbibliography}
     }
        {#1}
        {#2}}
 %    \end{macrocode}
-% \changes{1.1}{2017/05/23}{new Boolean test (see \ref{kap:bool})}
 % \end{macro}
 %
 % \begin{format}{newsparens}
-% Formatting of an \enquote{article dated \dots} expression.
+% Formatting of an \enquote{article dated \textellipsis} expression.
 %    \begin{macrocode}
 \DeclareFieldFormat*{newsparens}{\addcomma\space#1}
 %    \end{macrocode}
 % \end{format}
 %
+%
+% \begin{option}{minrealdatediff}
+%    \begin{macrocode}
+\blxarch@newcounter{minrealdatediff}{3}
+\blxarch@newcounter{currentrealdatediff}{0}
+\DeclareBibliographyOption[integer]{minrealdatediff}[3]{%
+    \setcounter{minrealdatediff}{#1}
+    \addtocounter{minrealdatediff}{-1}}
+\ExecuteBibliographyOptions{minrealdatediff}
+%    \end{macrocode}
+% \end{option}
+%
 % \begin{bibmacro}{extendeddate}
-% \marg{real$\|$origreal}
+% \marg{real$\|$origreal}\marg{datetype}
 %    \begin{macrocode}
-\newbibmacro*{extendeddate}[1]{%
-    \iffieldundef{#1year}
-        {}
-        {\printtext[#1dateparen]{\csuse{print#1date}}}%
+\newbibmacro*{extendeddate}[2]{%
+%    \end{macrocode}
+% We delete day and month since extended dates would print these.
+%    \begin{macrocode}
+    \clearfield{#1day}%
+    \clearfield{#1month}%
+    \clearfield{#1endday}%
+    \clearfield{#1endmonth}%
+%    \end{macrocode}
+% If both year arguments are integers, than check if they match or exceed the minimum difference:
+%    \begin{macrocode}
+    \iffieldint{#1year}
+        {\iffieldint{#2endyear}
+            {\ifnumcomp{\thefield{#1year}}{>}{\thefield{#2endyear}}
+                {\setcounter{currentrealdatediff}{\thefield{#1year}}%
+                 \addtocounter{currentrealdatediff}{-\thefield{#2endyear}}}
+                {\setcounter{currentrealdatediff}{\thefield{#2endyear}}%
+                 \addtocounter{currentrealdatediff}{-\thefield{#1year}}}
+             \ifnumcomp{\value{currentrealdatediff}}{>}{\value{minrealdatediff}}
+                 {\printtext[#1dateparen]{\csuse{print#1date}}}
+                 {}%
+            }
+            {\iffieldint{#2year}
+                {\ifnumcomp{\thefield{#1year}}{>}{\thefield{#2year}}
+                    {\setcounter{currentrealdatediff}{\thefield{#1year}}%
+                     \addtocounter{currentrealdatediff}{-\thefield{#2year}}}
+                    {\setcounter{currentrealdatediff}{\thefield{#2year}}%
+                     \addtocounter{currentrealdatediff}{-\thefield{#1year}}}
+                 \ifnumcomp{\value{currentrealdatediff}}{>}{\value{minrealdatediff}}
+                     {\printtext[#1dateparen]{\csuse{print#1date}}}
+                     {}%
+                }%
+                {}%
+            }%
+        }
+%    \end{macrocode}
+% If one of both year arguments is not an integer, than always print the \Feld{realdate}:
+%    \begin{macrocode}
+        {\iffieldundef{#1year}
+            {}
+            {\printtext[#1dateparen]{\csuse{print#1date}}}}%
 }
 %    \end{macrocode}
 % \end{bibmacro}
@@ -9846,14 +10378,15 @@
 % \begin{macro}{\daterealdatedelim}
 % Delimiter between \Feld{date} and \Feld{realdate}.
 %    \begin{macrocode}
-\newcommand{\daterealdatedelim}{\addspace}
+\newcommand*{\daterealdatedelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{bibmacro}{bibliographydate}
+% \changes{1.1}{2017/05/23}{Do not print \Feld{extrayear} field in verbose styles. (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/3}{issue \#3})}
+% \changes{2.0}{2018/05/20}{Print \Feld{extradate} field instead of \Feld{extrayear}}
 % We never have an empty date but a string like 'sine anno' or the \Feld{pubstate}.
 % The newsdate has always to be printed because the label contains the year only.
-% \changes{1.1}{2017/05/23}{Do not print \Feld{extrayear} field in verbose styles. (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/3}{issue \#3})}
 %    \begin{macrocode}
 \newbibmacro*{bibliographydate}{%
     \ifpositionlabeldate{label}
@@ -9873,21 +10406,21 @@
                         {\printtext[missingfield]{\midsentence\printfield{pubstate}}}}%
                     {\printdate}%
                  \ifbibextrayear
-                    {\printfield{extrayear}}
+                    {\printfield{extradate}}
                     {}%
                 }%
             \ifeditionsuperscript{postdate}
                 {\usebibmacro{editionsuperscript}}
                 {}%
             \setunit{\daterealdatedelim}%
-            \usebibmacro{extendeddate}{real}}}}
+            \usebibmacro{extendeddate}{real}{}}}}
 %    \end{macrocode}
 % \end{bibmacro}
 %
 % \begin{bibmacro}{origdate}
 % \begin{bibmacro}{addendum+pubstate}
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
 \newbibmacro*{origdate}{%
     \printtext{%        
@@ -9896,17 +10429,277 @@
             {\printtext[missingfield]{\bibstring{nodate}}}
             {\printorigdate}%
         \setunit*{\daterealdatedelim}
-        \usebibmacro{extendeddate}{origreal}%
+        \usebibmacro{extendeddate}{origreal}{orig}%
 }}
-\xpatchbibmacro{addendum+pubstate}{\printfield{pubstate}}{}{}{}
-\DeclareFieldFormat*{realdateparen}{\mkbibbrackets{#1}}
-\DeclareFieldFormat*{origrealdateparen}{\mkbibbrackets{#1}}
+\xpatchbibmacro{addendum+pubstate}{\printfield{pubstate}}{}
+  {}{Patching bibmacro 'addendum+pubstate' failed}
+\DeclareFieldFormat*{realdateparens}{\mkbibbrackets{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibbrackets{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
 % \end{bibmacro}
 % \end{bibmacro}
 %
+%
+% \subsubsubsection{Date ranges}
+%
+% \begin{macro}{\bibdaterangesep}
+% \begin{macro}{\bibdatesubseqesep}
+% \changes{2.0}{2018/04/01}{Added \Befehl{bibdatesubseqesep} as replacement for \Befehl{bibdaterangesep} if two years of a date range are consecutive (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/15}{issue \#15})}
+% Different \Befehl{bibrangedashe}s for subsequent years and longer periods:
+%    \begin{macrocode}
+\renewrobustcmd*{\bibdaterangesep}{\bibrangedash}
+\newrobustcmd*{\bibdatesubseqesep}{\slash}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+
+% \begin{macro}{\bibdaterangesepx}
+% \begin{macro}{\mkdaterangefull}
+% \begin{macro}{\mkdaterangetrunc}
+% \begin{macro}{\mkdaterangefullextra}
+% \begin{macro}{\mkdaterangetruncextra}
+% \begin{macro}{\mkdaterangeymd}
+% \begin{macro}{\mkdaterangeymdextra}
+% Reimplementation of some \blx macros for the above date range formatting commands.
+%    \begin{macrocode}
+\newrobustcmd*{\bibdaterangesepx}[1]{%
+  \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}} 
+    {\ifnumequal{\thefield{#1endyear}-\thefield{#1year}}{1}
+       {\bibdatesubseqesep}
+       {\bibdaterangesep}}
+    {\bibdaterangesep}}
+ \renewrobustcmd*{\mkdaterangefull}[2]{%
+ \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+%    \end{macrocode}
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+%    \begin{macrocode}
+         \iffieldundef{#2season}
+           {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+%    \end{macrocode}
+            % Optionally print the time after the date
+%    \begin{macrocode}
+            \blx@printtime{#2}{}}
+           {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+         \dateuncertainprint
+         \dateeraprint{#2year}%
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+                \enddatecircaprint
+                \iffieldundef{#2season}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+%    \end{macrocode}
+                   % Optionally print the time after the date
+%    \begin{macrocode}
+                   \blx@printtime{#2}{end}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+                \enddateuncertainprint
+              \dateeraprint{#2endyear}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangetrunc}[2]{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+%    \end{macrocode}
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+%    \begin{macrocode}
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+              {\iffieldsequal{#2month}{#2endmonth}
+                 {\csuse{mkbibdate#1}{}{}{#2day}}
+                 {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+              {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+               \iffieldsequal{#2dateera}{#2enddateera}{}
+                {\dateeraprint{#2year}}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+              \iffieldsequal{#2dateera}{#2enddateera}{}
+                {\dateeraprint{#2year}}}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+                \enddatecircaprint
+                \iffieldundef{#2season}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+                \enddateuncertainprint
+               \dateeraprint{#2endyear}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangefullextra}[2]{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \printtext{%
+%    \end{macrocode}
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+%    \begin{macrocode}
+         \iffieldundef{#2season}
+           {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+            % Optionally print the time after the date
+            \blx@printtime{#2}{}}
+           {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+         \dateuncertainprint
+         \dateeraprint{#2year}%
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \printtext{\mbox{\bibdaterangesep}}}
+              {\printtext{%
+                 \bibdaterangesepx{#2}%
+                 \enddatecircaprint
+                 \iffieldundef{#2season}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+%    \end{macrocode}
+                    % Optionally print the time after the date
+%    \begin{macrocode}
+                    \blx@printtime{#2}{end}}
+                   {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+                 \printfield{extradate}%
+                 \enddateuncertainprint
+                 \dateeraprint{#2endyear}}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangetruncextra}[2]{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \printtext{%
+%    \end{macrocode}
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+%    \begin{macrocode}
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+              {\iffieldsequal{#2month}{#2endmonth}
+                 {\csuse{mkbibdate#1}{}{}{#2day}}
+                 {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+              {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+               \iffieldsequal{#2dateera}{#2enddateera}{}
+                 {\dateeraprint{#2year}}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+               \iffieldsequal{#2dateera}{#2enddateera}{}
+                {\dateeraprint{#2year}}}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \printtext{\mbox{\bibdaterangesep}}}
+              {\printtext{%
+                 \bibdaterangesepx{#2}%
+                 \enddatecircaprint
+                 \iffieldundef{#2season}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                   {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+                \printfield{extradate}%
+                 \enddateuncertainprint
+                 \dateeraprint{#2endyear}}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangeymd}[1]{%
+  \begingroup
+    \blx@metadateinfo{#1}%
+    \iffieldundef{#1year}
+      {}
+      {\datecircaprint
+       \printtext[#1date]{%
+%    \end{macrocode}
+         % Such a season component can only come from an  ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+%    \begin{macrocode}
+         \iffieldundef{#1season}
+           {\blx@ymddate{#1}{}%
+            % Optionally print the time after the date
+            \blx@printtime{#1}{}}
+           {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
+         \dateuncertainprint
+         \dateeraprint{#1year}%
+         \iffieldundef{#1endyear}
+           {}
+           {\iffieldequalstr{#1endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#1}%
+                \enddatecircaprint
+                \iffieldundef{#1season}
+                  {\blx@ymddate{#1}{end}%
+%    \end{macrocode}
+                   % Optionally print the time after the date
+%    \begin{macrocode}
+                   \blx@printtime{#1}{end}}
+                 {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#1endyear}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangeymdextra}[1]{%
+  \begingroup
+    \blx@metadateinfo{#1}%
+    \iffieldundef{#1year}
+      {}
+      {\datecircaprint
+       \printtext[#1date]{%
+%    \end{macrocode}
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+%    \begin{macrocode}
+         \iffieldundef{#1season}
+           {\blx@ymddate[extradate]{#1}{}%
+            % Optionally print the time after the date
+            \blx@printtime{#1}{}}
+           {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
+         \dateuncertainprint
+         \dateeraprint{#1year}%
+         \iffieldundef{#1endyear}
+           {}
+           {\iffieldequalstr{#1endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\printtext{%
+                 \bibdaterangesepx{#1}%
+                 \enddatecircaprint
+                 \iffieldundef{#1season}
+                   {\blx@ymddate{#1}{end}%
+%    \endn{macrocode}
+                    % Optionally print the time after the date
+%    \begin{macrocode}
+                    \blx@printtime{#1}{end}}
+                   {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}%
+               \enddateuncertainprint
+               \dateeraprint{#1endyear}}}}}%
+  \endgroup}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \subsubsubsection{Basic name formats}
 %
 % \begin{option}{giveninitligatures}
@@ -10125,7 +10918,6 @@
 % \begin{option}{idemincitation}
 % =\meta{bool}\\
 % Wether to use \Kbd{idem} in full citations.
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:idemincitation}
 \DeclareBibliographyOption{idemincitation}[true]{%
@@ -10135,7 +10927,7 @@
 % \end{option}
 %
 % \begin{macro}{\seenotedelim}
-% Delimiter before bibstring \Kbd{seenote}
+% Delimiter before bibstring \Kbd{seenote}.
 %    \begin{macrocode}
 \newcommand*{\seenotedelim}{\addspace}
 %    \end{macrocode}
@@ -10145,7 +10937,6 @@
 % =\meta{bool}\\
 % If this option is enabled, a namelist longer than \Option{maxnames} is truncated
 % between $\Option{maxnames} - 1$ and the last author.
-% get added as addendum.
 %    \begin{macrocode}
 \newtoggle{archbool:preservelastauthor}
 \DeclareBibliographyOption{preservelastauthor}[true]{%
@@ -10154,31 +10945,64 @@
 %    \end{macrocode}
 % \end{option}
 %
+% \begin{macro}{\mkbibandothers}
+% \changes{2.0}{2018/05/16}{New formatting command \Befehl{mkbibandothers}}
+% The formatting of the \emph{et.\,al.} part;
+%    \begin{macrocode}
+\newcommand*{\mkbibandothers}[1]{#1}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{bibmacro}{name:andothers}
+% include \Befehl{mkbibandothers}
+%    \begin{macrocode}
+\renewbibmacro*{name:andothers}{%
+  \ifboolexpr{
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+    and
+    test \ifmorenames
+  }
+    {\ifnumgreater{\value{liststop}}{1}
+       {\finalandcomma}
+       {}%
+     \printdelim{andothersdelim}\bibstring[\mkbibandothers]{andothers}}%
+    {}}
+%    \end{macrocode}
+% \end{bibmacro}
+%
+% \begin{bibmacro}{name:andothersgenitive}
+% The genitive form for use in \Befehl{posscite} and friends.
+%    \begin{macrocode}
+\newbibmacro*{name:andothersgenitive}{%
+  \ifboolexpr{
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+    and
+    test \ifmorenames
+  }
+    {\ifnumgreater{\value{liststop}}{1}
+       {\finalandcomma}
+       {}%
+     \printdelim{andothersdelim}\bibstring[\mkbibandothers]{genitiveandothers}%
+     \let\blxarch@namepartfamily\@empty}
+    {}%
+}
+%    \end{macrocode}
+% \end{bibmacro}
+%
 % \subsubsubsection{Roles}
 %
 % \begin{format}{authortype}
 % \begin{format}{editortype}
+% \begin{format}{translatortype}
 % Roles enclosed in parentheses.
 %    \begin{macrocode}
-\DeclareFieldFormat*{authortype}{\mkbibparens{#1}}
+\DeclareFieldAlias{authortype}{editortype}
 \DeclareFieldFormat*{editortype}{\mkbibparens{#1}}
+\DeclareFieldAlias{translatortype}{editortype}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
-%
-% \begin{bibmacro}{translatorstrg}
-% use role parentheses
-%    \begin{macrocode}
-\renewbibmacro*{translator+othersstrg}{%
-    \ifboolexpr{
-        test {\ifnumgreater{\value{translator}}{1}}
-        or
-        test {\ifandothers{translator}}
-    }
-    {\printtext[editortype]{\bibstring{translators}}}
-    {\printtext[editortype]{\bibstring{translator}}}}
-%    \end{macrocode}
-% \end{bibmacro}
+% \end{format}
 %
 % \begin{bibmacro}{names:truncate}
 % Truncate name list bigger then \Kbd{maxnames}. Argument is the number of names in
@@ -10239,7 +11063,7 @@
                 {}%
             \ifpositionlabeldate{label}
                 {\setunit{\daterealdatedelim}%
-                 \usebibmacro{extendeddate}{real}}
+                 \usebibmacro{extendeddate}{real}{}}
                 {}}}}
 %    \end{macrocode}
 % \end{bibmacro}
@@ -10264,42 +11088,10 @@
 % \begin{macro}{\finalnameellipsis}
 % The ellipsis if \option{preservelastauthor} is enabled.
 %    \begin{macrocode}
-\newcommand{\finalnameellipsis}{\addspace\dots\space}
+\newcommand*{\finalnameellipsis}{\addspace\textellipsis\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{bibmacro}{author}
-% \begin{bibmacro}{editor}
-% \begin{bibmacro}{translator}
-% \begin{bibmacro}{bbx:editor}
-% \begin{bibmacro}{bbx:translator}
-% Allow dashed label names in citations and \Feld{edition} glued to label date.
-%    \begin{macrocode}
-\xpatchbibmacro{author}{\printnames{author}}{%
-    \ifidemincitation
-        {\printtext{%
-            \bibstring{idem\thefield{gender}}}}
-        {\usebibmacro{sortnamelist}{author}}}{}{}
-\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{}
-\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
-    \ifidemincitation
-        {\printtext{%
-            \bibstring{idem\thefield{gender}}}}
-        {\usebibmacro{sortnamelist}{editor}}}{}{}
-\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
-    \ifidemincitation
-        {\printtext{%
-            \bibstring{idem\thefield{gender}}}}
-        {\usebibmacro{sortnamelist}{translator}}}{}{}
-\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{}
-\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{}
-%    \end{macrocode}
-% \end{bibmacro}
-% \end{bibmacro}
-% \end{bibmacro}
-% \end{bibmacro}
-% \end{bibmacro}
-%
 % \begin{bibmacro}{editor+others}
 % \begin{bibmacro}{translator+others}
 % We dont't use complex roles in labels.
@@ -10314,6 +11106,127 @@
 % \end{bibmacro}
 % \end{bibmacro}
 %
+%
+%\subsubsubsection{Genitive forms}
+%
+% \begin{macro}{\DefineGenitiveApostropheChars}
+% \marg{language}\marg{csv}\\
+% \changes{2.0}{2018/05/15}{New command \Befehl{DefineGenitiveApostropheChars}}
+% Sets a set of tokens after which an alternate genitive form is needed. To be used in the document preamble.
+%    \begin{macrocode}
+\newrobustcmd*{\DefineGenitiveApostropheChars}[2]{%
+    \DefineBibliographyExtras{#1}{%
+        \let\blxarch@genitiveapostrophechars\@empty%
+        \forcsvlist{\listadd\blxarch@genitiveapostrophechars}{#2}%
+}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\DeclareGenitiveApostropheChars}
+% \marg{csv}\\
+% \changes{2.0}{2018/05/15}{New command \Befehl{DeclareGenitiveApostropheChars}}
+% Sets a set of tokens after which an alternate genitive form is needed. To be used in \Kbd{*.lbx} files.
+%    \begin{macrocode}
+\newrobustcmd*{\DeclareGenitiveApostropheChars}[1]{%
+    \DeclareBibliographyExtras{%
+        \let\blxarch@genitiveapostrophechars\@empty%
+        \forcsvlist{\listadd\blxarch@genitiveapostrophechars}{#1}%
+}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{bibmacro}{genitive}
+% \marg{command}\\
+% Prints the \Kbd{genitives} or \Kbd{genitiveapostrophe} bibstring respectively. The argument must be a command that
+% can be expanded to a string.
+%    \begin{macrocode}
+\newtoggle{archbool:genitiveapostrophe}
+\newbibmacro*{genitive}[1]{%
+    \ifdefvoid{#1}
+        {}
+        {\togglefalse{archbool:genitiveapostrophe}%
+         \fullexpandarg%
+         \StrRemoveBraces{#1}[\blxarch@nobraces]%
+         \renewcommand*{\do}[1]{%
+            \IfEndWith{\blxarch@nobraces}{##1}
+                {\toggletrue{archbool:genitiveapostrophe}\listbreak}
+                {}%
+         }%
+         \dolistloop{\blxarch@genitiveapostrophechars}%
+         \iftoggle{archbool:genitiveapostrophe}
+            {\bibstring{genitiveapostrophe}}
+            {\bibstring{genitives}}%
+        }%
+}
+%    \end{macrocode}
+% \end{bibmacro}
+%
+% \begin{format}{labelname:poss}
+%    \begin{macrocode}
+\DeclareNameFormat{labelname:poss}{% Based on labelname from biblatex.def
+    \let\blxarch@namepartfamily\namepartfamily%
+    \ifcase\value{uniquename}%
+        \usebibmacro{name:family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+    \or
+        \ifuseprefix
+            {\usebibmacro{name:given-family}{\namepartfamily}{\blxarch@ligatureinitchars{\namepartgiven}}{\namepartprefix}{\namepartsuffixi}}
+            {\usebibmacro{name:given-family}{\namepartfamily}{\blxarch@ligatureinitchars{\namepartgiven}}{\namepartprefixi}{\namepartsuffixi}}%
+    \or
+        \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+    \fi
+    \usebibmacro{name:andothersgenitive}%
+    \ifnumequal{\value{listcount}}{\value{liststop}}{\usebibmacro{genitive}{\blxarch@namepartfamily}}{}}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{format}{shorthand:poss}
+% \begin{format}{citetitle:poss}
+% \begin{format}{label:poss}
+% We must transform the fields into a macro in order to have the same \Befehl{ifdefvoid} check as with the \Befehl{namepartfamily} macro.
+%    \begin{macrocode}
+\DeclareFieldFormat{shorthand:poss}{%
+    \ifnameundef{labelname}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}{}}
+\DeclareFieldFormat{citetitle:poss}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}
+\DeclareFieldFormat{label:poss}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}
+%    \end{macrocode}
+% \end{format}
+% \end{format}
+% \end{format}
+%
+% \begin{macro}{\posscitealias}
+% Change formats to its genitive variants locally.
+%    \begin{macrocode}
+\newrobustcmd*{\posscitealias}{%
+    \AtNextCite{%
+        \DeclareNameAlias{labelname}{labelname:poss}%
+        \DeclareFieldAlias{shorthand}{shorthand:poss}%
+        \DeclareFieldAlias{citetitle}{citetitle:poss}%
+        \DeclareFieldAlias{label}{label:poss}}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\posscite}
+% \begin{macro}{\Posscite}
+% \begin{macro}{\posscites}
+% Possessive \Befehl{textcite}-like cite commands.
+% \changes{2.0}{2018/05/15}{New cite command \Befehl{posscite}}
+% \changes{2.0}{2018/05/15}{New cite command \Befehl{Posscite}}
+% \changes{2.0}{2018/05/15}{New cite command \Befehl{posscites}}
+% \changes{2.0}{2018/05/15}{New cite command \Befehl{Posscites}}
+%    \begin{macrocode}
+\newrobustcmd*{\posscite}{%
+    \posscitealias%
+    \textcite}
+\newrobustcmd*{\Posscite}{\bibsentence\posscite}
+\newrobustcmd*{\posscites}{%
+    \posscitealias%
+    \textcites}
+\newrobustcmd*{\Posscites}{\bibsentence\posscites}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 %\subsubsubsection{Formatting in citations}
 %
 % \begin{macro}{\multicitedelim}
@@ -10321,8 +11234,8 @@
 % Delimiter beween multiple citations. Some styles have a strong delimiter, mainly
 % to avoid paragraphs in footnotes.
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addspace\textendash\space}
-\newcommand\strongcitedelim{\addperiod\space\textendash\space}
+\renewcommand*{\multicitedelim}{\addspace\textendash\space}
+\newcommand*\strongcitedelim{\addperiod\space\textendash\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -10330,14 +11243,40 @@
 % \begin{macro}{\compcitedelim}
 % Delimiter in compressed citations.
 %    \begin{macrocode}
-\renewcommand{\compcitedelim}{\addsemicolon\space}
+\renewcommand*{\compcitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{option}{citeshortin}
+% \changes{2.0}{2018/10/06}{Added option \Option{citeshortin}}
+% short citations of \Typ{article} and friends in verbose styles with \Format{in:}
+%    \begin{macrocode}
+\newtoggle{archbool:citeshortin}
+\DeclareBibliographyOption[boolean]{citeshortin}[true]{%
+    \settoggle{archbool:citeshortin}{#1}%
+    \ifboolexpr{
+        togl {archbool:citeshortin}
+        and
+        not test {\ifcsdef{blxarch@fork@verbose}}
+    }
+		{\blxarch@errmsg{option 'citeshortin=true' only in verbose styles}}
+		{}%
+}
+\ExecuteBibliographyOptions{citeshortin=false}
+%    \end{macrocode}
+% \end{option}
+%
+% \begin{option}{citetitle}
+% Title labels in verbose styles:
+%    \begin{macrocode}
+\DeclareFieldFormat*{citetitle}{#1}
+%    \end{macrocode}
+% \end{option}
+%
 % \subsubsubsection{Label generation}
 %
 % \begin{format}{labeldate}
-% Changed. We only use date because it can happen that the \Feld{extrayear}
+% Changed. We only use date because it can happen that the \Feld{extradate}
 % has to be printed in the \Feld{location}/\Feld{date} block.
 %    \begin{macrocode}
 \DeclareLabeldate{%
@@ -10361,11 +11300,12 @@
 %
 % \begin{macro}{\labelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\unspace\addcolon\space}
+\renewcommand*{\labelnamepunct}{\unspace\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\labelnamepunct}
+% \begin{macro}{\ifseenote}
+% Only useful in \Stil{verbose-trad2note}-type styles. Therefore always \meta{false} elsewhere.
 %    \begin{macrocode}
 \newcommand{\ifseenote}[2]{#2}
 %    \end{macrocode}
@@ -10373,7 +11313,7 @@
 %
 % \begin{option}{uselabeltitle}
 % =\meta{bool}\\
-% In \Kbd{verbose-trad2note} this option enforces a labeltitle. It has no meaning
+% In \Kbd{verbose-trad2note}-like styles this option enforces a \Feld{labeltitle}. It has no meaning
 % in other styles.
 %    \begin{macrocode}
 \newtoggle{archbool:uselabeltitle}
@@ -10491,7 +11431,7 @@
 % \begin{macro}{\seriespunct}
 % Punctuation after series+number, defaults to \Befehl{addperiod}.
 %    \begin{macrocode}
-\newcommand{\seriespunct}{\addperiod\space}
+\newcommand*{\seriespunct}{\addperiod\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -10500,21 +11440,21 @@
 % having seen the \Format{series+number} macro. That is why we need a punctuation
 % command if there is no \Feld{series} field.
 %    \begin{macrocode}
-\newcommand{\noseriespunct}{\seriespunct}
+\newcommand*{\noseriespunct}{\seriespunct}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\seriesnumberdelim}
 % Delimiter between series and number, defaults to \Befehl{addspace}.
 %    \begin{macrocode}
-\newcommand{\seriesnumberdelim}{\addspace}
+\newcommand*{\seriesnumberdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\subnumberseriesdelim}
 % Delimiter between subnumber and series, defaults to \Befehl{addspace}=\Befehl{space}.
 %    \begin{macrocode}
-\newcommand{\subnumberseriesdelim}{\addspace=\space}
+\newcommand*{\subnumberseriesdelim}{\addspace=\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -10557,12 +11497,14 @@
 %
 % \begin{bibliographydriver}{book}
 % \begin{bibliographydriver}{inbook}
-% We are going to reimplement Feld{volume} formatting.
+% We are going to reimplement \Feld{volume} formatting.
 %    \begin{macrocode}
 \xpatchbibdriver{book}{usebibmacro {series+number}\newunit}
-    {usebibmacro{series+number}}{}{}
+    {usebibmacro{series+number}}
+	{}{Patching driver 'book' failed (5)}
 \xpatchbibdriver{inbook}{usebibmacro {series+number}\newunit}
-    {usebibmacro{series+number}}{}{}
+    {usebibmacro{series+number}}
+	{}{Patching driver 'inbook' failed (4)}
 %    \end{macrocode}
 % \end{bibliographydriver}
 % \end{bibliographydriver}
@@ -10577,10 +11519,8 @@
 % \end{format}
 %
 % \begin{macro}{\labelnamepunct}
-% We never have an empty date but a string like
-% 'sine anno' in authoryear styles.
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\adddot\space}
+\renewcommand*{\labelnamepunct}{\adddot\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -10596,7 +11536,7 @@
 % \begin{macro}{\finalnamedelim}
 % Delimiter between the last to names in a list.
 %    \begin{macrocode}
-\renewcommand{\finalnamedelim}{\addcomma\addspace}
+\renewcommand*{\finalnamedelim}{\addcomma\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -10607,38 +11547,127 @@
 %    \end{macrocode}
 % \end{format}
 %
-% \subsubsubsection{Citation formattings}
-%
-% \begin{format}{citetitle}
-% Title labels in verbose styles:
-%    \begin{macrocode}
-\DeclareFieldFormat*{citetitle}{#1}
-%    \end{macrocode}
-% \end{format}
-%
 % \subsubsubsection{Debugging helper macros}
 %
 % \begin{macro}{\printgiveninitligatureslist}
 % Prints the list from \Option{giveninitligatures}.
 %    \begin{macrocode}
 \newcommand{\printgiveninitligatureslist}{%
-    \renewcommand{\do}[1]{\space##1}
+    \renewcommand*{\do}[1]{\space##1}
         \dolistloop{\@blxarch@list@add@ligatures}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\blxarch@style@amit}
+% \begin{macro}{\printgiveninitligatureslist}
+% Prints the list from \Option{giveninitligatures}.
+%    \begin{macrocode}
+\newrobustcmd*{\SuppressAdditiveLbxSuffixes}{%
+    \let\blx@lng@suff\@empty}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\blxarch@style@ayc}
 % \begin{macro}{\blxarch@style@ayi}
 % \begin{macro}{\blxarch@style@ayic}
+% \begin{macro}{\blxarch@style@numc}
+% \begin{macro}{\blxarch@style@v}
+% \begin{macro}{\blxarch@style@vi}
+% \begin{macro}{\blxarch@style@vttwo}
+% Style titles for the example file.
+%    \begin{macrocode}
+\edef\blxarch@style@ay{authoryear-archaeology (generic)}
+\edef\blxarch@style@ayc{authoryear-comp-archaeology (generic)}
+\edef\blxarch@style@ayi{authoryear-ibid-archaeology (generic)}
+\edef\blxarch@style@ayic{authoryear-icomp-archaeology (generic)}
+\edef\blxarch@style@numc{numeric-comp-archaeology (generic)}
+\edef\blxarch@style@v{verbose-archaeology (generic)}
+\edef\blxarch@style@vi{verbose-ibid-archaeology (generic)}
+\edef\blxarch@style@vttwo{verbose-trad2note-archaeology (generic)}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\blxarch@style@dguf@info}
+% \begin{macro}{\blxarch@style@dguf}
+% \begin{macro}{\blxarch@style@dgufalt}
+% \begin{macro}{\blxarch@style@dgufapa}
+%    \begin{macrocode}
+\edef\blxarch@style@dguf@info{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}
+\edef\blxarch@style@dguf{\blxarch@style@dguf@info\space[obsolete \RN{2}]}
+\edef\blxarch@style@dgufalt{\blxarch@style@dguf@info\space[obsolete \RN{1}]}
+\edef\blxarch@style@dgufapa{\blxarch@style@dguf@info\space(APA)}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\blxarch@style@mpk@info}
+% \begin{macro}{\blxarch@style@mpk}
+% \begin{macro}{\blxarch@style@mpkoeaw}
+%    \begin{macrocode}
+\edef\blxarch@style@mpk@info{Mitteilungen der Pr\"ahistorischen Kommission der \"Osterreichischen Akadademie der Wissenschaften}
+\edef\blxarch@style@mpk{\blxarch@style@mpk@info\space[obsolete]}
+\edef\blxarch@style@mpkoeaw{\blxarch@style@mpk@info\space[current]}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\blxarch@style@rgk}
+% \begin{macro}{\blxarch@style@rgkinline}
+% \begin{macro}{\blxarch@style@rgknumeric}
+% \begin{macro}{\blxarch@style@rgkverbose}
+%    \begin{macrocode}
+\edef\blxarch@style@rgk{R\"omisch-Germanische Kommission}
+\edef\blxarch@style@rgkverbose{\blxarch@style@rgk\space(geisteswissenschaftlich)}
+\edef\blxarch@style@rgkinline{\blxarch@style@rgk\space(naturwissenschaftlich)}
+\edef\blxarch@style@rgknumeric{\blxarch@style@rgk\space(numerisch)}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\blxarch@style@rgzm}
+% \begin{macro}{\blxarch@style@rgzminline}
+% \begin{macro}{\blxarch@style@rgknumeric}
+% \begin{macro}{\blxarch@style@rgzmverbose}
+%    \begin{macrocode}
+\edef\blxarch@style@rgzm{R\"omisch-Germanisches Zentralmuseum Mainz}
+\edef\blxarch@style@rgzminline{\blxarch@style@rgzm\space(naturwissenschaftlich)}
+\edef\blxarch@style@rgzmnumeric{\blxarch@style@rgzm\space(numerisch)}
+\edef\blxarch@style@rgzmverbose{\blxarch@style@rgzm\space(geisteswissenschaftlich)}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\blxarch@style@muenster}
+% \begin{macro}{\blxarch@style@muensterinline}
+% \begin{macro}{\blxarch@style@muensternumeric}
+% \begin{macro}{\blxarch@style@muensterverbose}
+%    \begin{macrocode}
+\edef\blxarch@style@muenster{Ur- und Fr\"uhgeschichtliche Arch\"aologie M\"unster}
+\edef\blxarch@style@muensterverbose{\blxarch@style@muenster\space(geisteswissenschaftlich)}
+\edef\blxarch@style@muensternumeric{\blxarch@style@muenster\space(numerisch)}
+\edef\blxarch@style@muensterinline{\blxarch@style@muenster\space(naturwissenschaftlich)}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\blxarch@style@aefkw}
 % \begin{macro}{\blxarch@style@afwl}
 % \begin{macro}{\blxarch@style@amit}
 % \begin{macro}{\blxarch@style@archa}
-% \begin{macro}{\blxarch@style@dai}
-% \begin{macro}{\blxarch@style@dguf}
-% \begin{macro}{\blxarch@style@dgufalt}
-% \begin{macro}{\blxarch@style@dgufapa}
 % \begin{macro}{\blxarch@style@eaz}
 % \begin{macro}{\blxarch@style@eazalt}
 % \begin{macro}{\blxarch@style@foe}
@@ -10646,38 +11675,17 @@
 % \begin{macro}{\blxarch@style@jbkreisneuss}
 % \begin{macro}{\blxarch@style@karl}
 % \begin{macro}{\blxarch@style@maja}
-% \begin{macro}{\blxarch@style@mpk}
-% \begin{macro}{\blxarch@style@muenster}
-% \begin{macro}{\blxarch@style@muensterinline}
-% \begin{macro}{\blxarch@style@muensterverbose}
 % \begin{macro}{\blxarch@style@nnu}
 % \begin{macro}{\blxarch@style@offa}
-% \begin{macro}{\blxarch@style@rgk}
-% \begin{macro}{\blxarch@style@rgkinline}
-% \begin{macro}{\blxarch@style@rgkverbose}
-% \begin{macro}{\blxarch@style@rgzm}
-% \begin{macro}{\blxarch@style@rgzminline}
-% \begin{macro}{\blxarch@style@rgzmverbose}
 % \begin{macro}{\blxarch@style@sak}
 % \begin{macro}{\blxarch@style@volkskunde}
 % \begin{macro}{\blxarch@style@zaak}  
 % \begin{macro}{\blxarch@style@zaes}
-% Style titles for the example file.
 %    \begin{macrocode}
-\edef\blxarch@style@ay{authoryear-archaeology (generic)}
-\edef\blxarch@style@ayc{authoryear-comp-archaeology (generic)}
-\edef\blxarch@style@ayi{authoryear-ibid-archaeology (generic)}
-\edef\blxarch@style@ayic{authoryear-icomp-archaeology (generic)}
-\edef\blxarch@style@vi{verbose-ibid-archaeology (generic)}
-\edef\blxarch@style@vttwo{verbose-trad2note-archaeology (generic)}
 \edef\blxarch@style@aefkw{\"Agyptologische Forschungsst\"atte f\"ur Kulturwissenschaft (\"AFKW)}
 \edef\blxarch@style@afwl{Ausgrabungen und Funde in Westfalen-Lippe}
 \edef\blxarch@style@amit{Arch\"aologische Berichte aus Iran und Turan (AMIT)}
 \edef\blxarch@style@archa{Archaeologia Austriaca (ArchA)}
-\edef\blxarch@style@dai{Deutsches Arch\"aologisches Institut}
-\edef\blxarch@style@dguf{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}
-\edef\blxarch@style@dgufalt{\blxarch@style@dguf\space[obsolete]}
-\edef\blxarch@style@dgufapa{\blxarch@style@dguf\space(APA)}
 \edef\blxarch@style@eaz{Ethnographisch-Arch\"aologische Zeitschrift (EAZ)}
 \edef\blxarch@style@eazalt{\blxarch@style@eaz\space[obsolete]}
 \edef\blxarch@style@foe{Fundberichte aus \"Osterreich (F\"O)}
@@ -10685,18 +11693,8 @@
 \edef\blxarch@style@jbkrneuss{Jahrbuch f\"ur den Rhein-Kreis Neuss}
 \edef\blxarch@style@karl{Karl. Das kulturelle Schachmagazin}
 \edef\blxarch@style@maja{M\"unchner Arbeitskreis Junge Aegyptologie (MAJA)}
-\edef\blxarch@style@mpk{Mitteilung der Pr\"ahistorischen Kommission}
-\edef\blxarch@style@muenster{Ur- und Fr\"uhgeschichtliche Arch\"aologie M\"unster}
-\edef\blxarch@style@muensterverbose{\blxarch@style@muenster\space(geisteswissenschaftlich)}
-\edef\blxarch@style@muensterinline{\blxarch@style@muenster\space(naturwissenschaftlich)}
 \edef\blxarch@style@nnu{Nachrichten aus Niedersachsens Urgeschichte}
 \edef\blxarch@style@offa{Offa}
-\edef\blxarch@style@rgk{R\"omisch-Germanische Kommission}
-\edef\blxarch@style@rgkverbose{\blxarch@style@rgk\space(geisteswissenschaftlich)}
-\edef\blxarch@style@rgkinline{\blxarch@style@rgk\space(naturwissenschaftlich)}
-\edef\blxarch@style@rgzm{R\"omisch-Germanisches Zentralmuseum Mainz}
-\edef\blxarch@style@rgzminline{\blxarch@style@rgzm\space(naturwissenschaftlich)}
-\edef\blxarch@style@rgzmverbose{\blxarch@style@rgzm\space(geisteswissenschaftlich)}
 \edef\blxarch@style@sak{Studien zur Alt\"agyptischen Kultur}
 \edef\blxarch@style@volkskunde{Zeitschrift f\"ur Volkskunde}
 \edef\blxarch@style@zaak{Zeitschrift f\"ur Arch\"aologie au\ss ereurop\"aischer Kulturen (ZAAK)}
@@ -10719,25 +11717,6 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
 %</sty>
 %
 % \subsection{Bibliography style files}
@@ -10748,7 +11727,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeobibstyletitle}
@@ -10768,7 +11747,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-comp-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -10788,7 +11767,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-ibid-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -10809,7 +11788,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-icomp-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Datei{biblatex-archaeology.sty} always after a style.
@@ -10830,7 +11809,7 @@
 %<*authoryearsharedBBX>
 %
 % \begin{macro}{\blxarch@fork@authordate}
-% I'am an author date style.
+% I am an author date style.
 %    \begin{macrocode}
 \def\blxarch@fork@authordate{}
 %    \end{macrocode}
@@ -10840,6 +11819,8 @@
 \RequirePackage{biblatex-archaeology}
 %    \end{macrocode}
 %
+% \begin{option}{mergedate}
+% \begin{option}{labeldate}
 % \begin{option}{sorting}
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
@@ -10849,6 +11830,8 @@
 }
 %    \end{macrocode}
 % \end{option}
+% \end{option}
+% \end{option}
 %
 % \begin{bibliographydriver}{article}
 % \begin{bibliographydriver}{book}
@@ -10859,13 +11842,15 @@
 % \begin{bibliographydriver}{periodical}
 % \begin{bibliographydriver}{thesis}
 % \begin{bibliographydriver}{unpublished}
-% We are going to reimplement Feld{volume} formatting.
+% We are going to reimplement \Feld{volume} formatting.
 %    \begin{macrocode}
 \def\blxarch@settabbedlabeldate#1{%
     \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock}
         {\setunit{\printdelim{nametitledelim}}%
-            \iftabbedlabeldate{&}{\newblock}}{}{}
-    \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{}
+            \iftabbedlabeldate{&}{\newblock}}
+			{}{Patching driver '#1' failed (a)}
+    \xapptobibdriver{#1}{\end{tabbedlabeldate}}
+	{}{Patching driver '#1' failed (b)}
 }
 \blxarch@settabbedlabeldate{article}
 \blxarch@settabbedlabeldate{book}
@@ -10875,7 +11860,8 @@
 \blxarch@settabbedlabeldate{periodical}
 \blxarch@settabbedlabeldate{thesis}
 \blxarch@settabbedlabeldate{unpublished}
-\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{}
+\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}
+  {}{Patching driver 'inreference' failed (1)}
 %    \end{macrocode}
 % \end{bibliographydriver}
 % \end{bibliographydriver}
@@ -10893,14 +11879,116 @@
 %    \end{macrocode}
 % \end{format}
 %
+% \begin{bibmacro}{begentry}
+% \begin{bibmacro}{finentry}
+% \Format{issue+date} cannot be changed in author date label generation, but it must be available
+% in \Befehl{fullcite}-like commands.
+%    \begin{macrocode}
+\xpretobibmacro{begentry}{%
+    \csuse{blxarch@issuedate}%
+}{}{Patching bibmacro 'begentry' failed (1)}
+\xpretobibmacro{finentry}{%
+    \restorebibmacro{issue+date}%
+}{}{Patching bibmacro 'finentry' failed (2)}
+%    \end{macrocode}
+% \end{bibmacro}
+% \end{bibmacro}
+%
+% \begin{bibmacro}{author}
+% \begin{bibmacro}{editor}
+% \begin{bibmacro}{translator}
+% \begin{bibmacro}{bbx:editor}
+% \begin{bibmacro}{bbx:translator}
+% Allow dashed label names in citations and \Feld{edition} glued to label date.
+%    \begin{macrocode}
+\xpatchbibmacro{author}{\printnames{author}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{author}}}
+		{}{Patching bibmacro 'author' failed (1)}
+\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'author' failed (2)}
+\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{editor}}}
+		{}{Patching bibmacro 'bbx:editor' failed (1)}
+\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{translator}}}
+		{}{Patching bibmacro 'bbx:translator' failed}
+\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:editor' failed (2)}
+\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:translator' failed}
+%    \end{macrocode}
+% \end{bibmacro}
+% \end{bibmacro}
+% \end{bibmacro}
+% \end{bibmacro}
+% \end{bibmacro}
+%
 %</authoryearsharedBBX>
+%
+%<*numericcompBBX>
+%
+% \subsubsection{File \Datei{numeric-comp-archaeology.bbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{numeric-comp-archaeology.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+%    \end{macrocode}
+%
+% \begin{macro}{\blxarch@fork@numeric}
+% I am a numeric style.
+%    \begin{macrocode}
+\def\blxarch@fork@numeric{}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\archaeobibstyletitle}
+%    \begin{macrocode}
+\def\archaeobibstyletitle{\blxarch@style@numc}
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\RequireBibliographyStyle{numeric-comp}
+%    \end{macrocode}
+%
+%</numericcompBBX>
+%<*verboseBBX>
+%
+% \subsubsection{File \Datei{verbose-archaeology.bbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{verbose-archaeology.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] 
+%    \end{macrocode}
+%
+% Load \Paket{biblatex-archaeology} after a style.
+%    \begin{macrocode}
+\RequireBibliographyStyle{verbose}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeobibstyletitle}
+%    \begin{macrocode}
+\def\archaeobibstyletitle{\blxarch@style@v}
+%    \end{macrocode}
+% \end{macro}
+%
+%</verboseBBX>
 %<*verboseibidBBX>
 %
 % \subsubsection{File \Datei{verbose-ibid-archaeology.bbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{verbose-ibid-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] 
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] 
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -10921,7 +12009,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{verbose-trad2note-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] 
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] 
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -10940,24 +12028,31 @@
 %
 % \subsubsection{Shared code for generic verbose styles}
 %
-% \begin{macro}{\blxarch@fork@footnote}
-% I'am a footnote style.
+% \begin{macro}{\blxarch@fork@verbose}
+% I am a footnote style.
 %    \begin{macrocode}
 \def\blxarch@fork@verbose{}
 %    \end{macrocode}
 % \end{macro}
 %
+%</verbosesharedBBX>
+%<*nonauthoryearsharedBBX>
+%
+% \subsubsection{Shared code for generic verbose and numeric styles}
+%
 %    \begin{macrocode}
 \RequirePackage{biblatex-archaeology}
 %    \end{macrocode}
 %
 % \begin{option}{repeatlabel}
 % \begin{bibmacro}{repeatlabel }
-% \Option{repeatlabel} doesn't work in verbose styles.
+% \Option{repeatlabel} doesn't work in verbose and numeric styles.
 %    \begin{macrocode}
-\ExecuteBibliographyOptions{repeatlabel=false}
+\ExecuteBibliographyOptions{
+	repeatlabel=false
+}
 \renewbibmacro*{repeatlabel}{%
-    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose styles}}   
+    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}}   
 %    \end{macrocode}
 % \end{bibmacro}
 % \end{option}
@@ -10976,14 +12071,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%</verbosesharedBBX>
+%</nonauthoryearsharedBBX>
 %<*aefkwBBX>
 %
 % \subsubsection{File \Datei{aefkw.bbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{aefkw.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -11025,6 +12120,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=true,
     origfields=false,
@@ -11055,7 +12151,7 @@
 %
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11071,8 +12167,8 @@
 % \begin{macro}{\booklabelnamepunct}
 % \begin{macro}{\labelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11080,8 +12176,8 @@
 % \begin{macro}{\mkbiblistnamefamily}
 % \begin{macro}{\mkbiblistnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\ifcitation{\textsc{#1}}{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\ifcitation{\textsc{#1}}{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\ifcitation{\textsc{#1}}{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\ifcitation{\textsc{#1}}{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11089,15 +12185,15 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\bibnamedash}
 %    \begin{macrocode}
-\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11129,8 +12225,8 @@
 % \begin{macro}{\titleseriesdelim}
 % \begin{macro}{\seriespunct}
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\unspace\nopunct}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\titleseriesdelim}{\unspace\nopunct}
+\renewcommand*{\seriespunct}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11161,7 +12257,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{afwl.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -11204,6 +12300,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -11241,11 +12338,11 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\repeatlabelwrap}
+% \begin{format}{repeatlabel}
 %    \begin{macrocode}
-\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}}
+\DeclareFieldFormat*{repeatlabel}{\mkbibbold{#1}}
 %    \end{macrocode}
-% \end{macro}
+% \end{format}
 %
 % \begin{format}{bookauthor}
 % \begin{format}{sortname}
@@ -11259,8 +12356,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11268,8 +12365,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11285,7 +12382,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -11294,15 +12391,15 @@
 % \begin{macro}{\volumenumberdelim}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -11322,7 +12419,7 @@
 %    \end{macrocode}
 % \end{format}
 %
-% \begin{format}{locationdateparen}
+% \begin{format}{locationdateparens}
 % \begin{format}{thesis}
 %    \begin{macrocode}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
@@ -11340,23 +12437,23 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{macro}{\multicitedelim}
 % Delimiter beween multiple citations. Some styles have a strong delimiter.
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11366,7 +12463,7 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
 %    \end{macrocode}
 % \end{macro}
 % \end{format}
@@ -11378,7 +12475,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{amit.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -11421,6 +12518,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -11461,8 +12559,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11470,8 +12568,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11479,7 +12577,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -11488,7 +12586,7 @@
 % \begin{macro}{\volumenumberdelim}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11501,7 +12599,7 @@
 % \end{format}
 % \end{format}
 %
-% \begin{format}{locationdateparen}
+% \begin{format}{locationdateparens}
 % \begin{format}{thesis}
 %    \begin{macrocode}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
@@ -11518,22 +12616,22 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11543,14 +12641,14 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
 %    \end{macrocode}
 % \end{macro}
 % \end{format}
 %
 % \begin{macro}{\nameshortformdelim}
 %    \begin{macrocode}
-\renewcommand{\nameshortformdelim}{\addspace in\space}
+\renewcommand*{\nameshortformdelim}{\addspace in\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11561,7 +12659,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{archa.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -11609,6 +12707,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -11658,10 +12757,10 @@
 % \begin{macro}{\mkbibbooknamesuffix}
 % Different name formatting of \Feld{bookauthor}/\Feld{editor}.
 %    \begin{macrocode}
-\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11674,10 +12773,10 @@
 % \begin{macro}{\mkbibsourcenamesuffix}
 % Different name formatting of \Feld{bookauthor}/\Feld{editor}.
 %    \begin{macrocode}
-\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11690,10 +12789,10 @@
 % \begin{macro}{\mkbiblistnamesuffix}
 % Different name formatting of \Feld{author}/\Feld{editor}.
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11704,9 +12803,9 @@
 % \begin{macro}{\booklabelpunct}
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11714,20 +12813,20 @@
 %
 % \begin{macro}{\subtitlepunct}
 %    \begin{macrocode}
-\renewcommand{\subtitlepunct}{\addcolon\space}
+\renewcommand*{\subtitlepunct}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\titleseriesdelim}
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\addperiod\space}
+\renewcommand*{\titleseriesdelim}{\addperiod\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -11735,7 +12834,7 @@
 %
 % \begin{macro}{\subnumberseriesdelim}
 %    \begin{macrocode}
-\renewcommand{\subnumberseriesdelim}{\newunitpunct}
+\renewcommand*{\subnumberseriesdelim}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11751,11 +12850,11 @@
 % \end{format}
 % \end{format}
 %
-% \begin{format}{realdateparen}
-% \begin{format}{origrealdateparen}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdateparen}{\addcomma\space#1}
-\DeclareFieldFormat*{origrealdateparen}{\addcomma\space#1}
+\DeclareFieldFormat*{realdateparens}{\addcomma\space#1}
+\DeclareFieldFormat*{origrealdateparens}{\addcomma\space#1}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -11777,7 +12876,8 @@
 %
 % \begin{bibmacro}{thesistype}
 %    \begin{macrocode}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+  {}{Patching bibmacro 'thesistype' failed (1)}
 %    \end{macrocode}
 % \end{bibmacro}
 %
@@ -11788,7 +12888,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{dguf.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -11830,6 +12930,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=true,
     origfields=true,
@@ -11869,15 +12970,15 @@
 %
 % \begin{macro}{\multilistdelim}
 %    \begin{macrocode}
-\renewcommand{\multilistdelim}{\addspace-\space}
+\renewcommand*{\multilistdelim}{\addspace-\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -11885,19 +12986,19 @@
 % \begin{macro}{\mkbiblistnamefamily}
 % \begin{macro}{\mkbiblistnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
-% \begin{bibmacro}{name:andothers}
+% \begin{macro}{\mkbibandothers}
 %    \begin{macrocode}
-\xpatchbibmacro{name:andothers}{\bibstring{andothers}}{\bibstring[\mkbibnamefamily]{andothers}}{}{}
+\renewcommand*{\mkbibandothers}[1]{\mkbibnamefamily{\#1}}
 %    \end{macrocode}
-% \end{bibmacro}
+% \end{macro}
 %
-% \begin{format}{urldate}
+% \begin{format}{bookauthor}
 % \begin{format}{sortname}
 %    \begin{macrocode}
 \DeclareNameAlias{bookauthor}{given-family}
@@ -11918,7 +13019,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -11951,7 +13052,7 @@
 % \begin{macro}{\institutionlocationdelim}
 % Delimiter between \Feld{institution} and \Feld{location}.
 %    \begin{macrocode}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -11966,7 +13067,7 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\unspace\addcomma\space}}
@@ -11980,7 +13081,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{dguf-alt.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] 
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] 
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -12026,6 +13127,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -12066,8 +13168,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addspace}
-\renewcommand{\booklabelnamepunct}{\addspace}
+\renewcommand*{\labelnamepunct}{\addspace}
+\renewcommand*{\booklabelnamepunct}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12095,15 +13197,15 @@
 %
 % \begin{macro}{\multilistdelim}
 %    \begin{macrocode}
-\renewcommand{\multilistdelim}{\addslash}
+\renewcommand*{\multilistdelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addcomma\space}
-\renewcommand{\finalnamedelim}{\addspace\&\space}
+\renewcommand*{\multinamedelim}{\addcomma\space}
+\renewcommand*{\finalnamedelim}{\addspace\&\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12111,8 +13213,8 @@
 % \begin{macro}{\mkbibnamefamily}
 % \begin{macro}{\mkbibnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibnamefamily}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbibnameprefix}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibnamefamily}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\MakeUppercase{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12120,8 +13222,8 @@
 % \begin{macro}{\mkbibbooknamefamily}
 % \begin{macro}{\mkbibbooknameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibbooknamefamily}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\MakeUppercase{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12129,8 +13231,8 @@
 % \begin{macro}{\mkbiblistnamefamily}
 % \begin{macro}{\mkbiblistnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\MakeUppercase{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12138,6 +13240,7 @@
 % \begin{bibmacro}{in:}
 %    \begin{macrocode}
 \xpretobibmacro{in:}{\itshape}
+  {}{Patching bibmacro 'in:' failed}
 %    \end{macrocode}
 % \end{bibmacro}
 %
@@ -12163,9 +13266,9 @@
 % \end{format}
 % \end{format}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
@@ -12184,7 +13287,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{dguf-apa.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] 
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] 
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -12249,6 +13352,7 @@
     journallocation=false,
     maxbooknames=7,
     minbooknames=7,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -12286,15 +13390,15 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\finalcitedelim}
+% \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\nameyeardelim}
 %    \begin{macrocode}
-\renewcommand{\nameyeardelim}{\addcomma\space}
+\renewcommand*{\nameyeardelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -12302,8 +13406,8 @@
 % \begin{macro}{\finalnamedelim}
 % Different name formatting in the \texttt{by author/editor} block.
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addcomma\space}
-\renewcommand{\finalnamedelim}{\addspace\&\space}
+\renewcommand*{\multinamedelim}{\addcomma\space}
+\renewcommand*{\finalnamedelim}{\addspace\&\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12320,22 +13424,22 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addperiod\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addperiod\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\intitlepunct}
 %    \begin{macrocode}
-\renewcommand{\intitlepunct}{\printunit{\addspace}}
+\renewcommand*{\intitlepunct}{\printunit{\addspace}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\finentrypunct}
 % No period after bare electronic identifiers
 %    \begin{macrocode}
-\renewcommand{\finentrypunct}{%
+\renewcommand*{\finentrypunct}{%
     \iffieldundef{doi}
         {\ifboolexpr{
             not test {\iffieldundef{eprint}}
@@ -12385,12 +13489,12 @@
     \iffieldundef{maintitle}
         {\iffieldundef{subseries}
             {}
-            {\savefield{subseries}{\blxarch@field@subseries}%
+            {\savefield*{subseries}{\blxarch@field@subseries}%
              \restorefield{subtitle}{\blxarch@field@subseries}%
              \clearfield{volume}%
-             \savefield{subnumber}{\blxarch@field@subnumber}%
+             \savefield*{subnumber}{\blxarch@field@subnumber}%
              \restorefield{volume}{\blxarch@field@subnumber}}}
-        {\savefield{maintitle}{\blxarch@field@maintitle}%
+        {\savefield*{maintitle}{\blxarch@field@maintitle}%
          \restorefield{subtitle}{\blxarch@field@maintitle}}%
     \usebibmacro{title}%
     \newunit}
@@ -12403,12 +13507,12 @@
     \iffieldundef{maintitle}
         {\iffieldundef{subseries}
             {}
-            {\savefield{subseries}{\blxarch@field@subseries}%
+            {\savefield*{subseries}{\blxarch@field@subseries}%
              \restorefield{booksubtitle}{\blxarch@field@subseries}%
              \clearfield{volume}%
-             \savefield{subnumber}{\blxarch@field@subnumber}%
+             \savefield*{subnumber}{\blxarch@field@subnumber}%
              \restorefield{volume}{\blxarch@field@subnumber}}}
-        {\savefield{maintitle}{\blxarch@field@maintitle}%
+        {\savefield*{maintitle}{\blxarch@field@maintitle}%
          \restorefield{booksubtitle}{\blxarch@field@maintitle}}%
     \usebibmacro{booktitle}%
     \newunit}
@@ -12418,15 +13522,15 @@
 %
 % \begin{macro}{\subtitlepunct}
 %    \begin{macrocode}
-\renewcommand{\subtitlepunct}{\addcolon\space}
+\renewcommand*{\subtitlepunct}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\titleseriesdelim}
+% \changes{1.1}{2017/05/23}{Must be a space in \Stil{dguf-apa}. (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/1}{issue \#1})}
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
 %    \end{macrocode}
-% \changes{1.1}{2017/05/23}{Must be a space in \Stil{dguf-apa}. (\href{https://github.com/CarlOrff/biblatex-archaeology/issues/1}{issue \#1})}
 % \end{macro}
 %
 % \begin{format}{titlebrackets}
@@ -12463,8 +13567,8 @@
 % \begin{macro}{\volumenumberdelim}
 % \begin{macro}{\journalvolumedelim}
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{}
-\renewcommand{\journalvolumedelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{}
+\renewcommand*{\journalvolumedelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12507,7 +13611,7 @@
 \DeclareFieldFormat*{pages}{%
     \mkbibparens{\mkpageprefix[bookpagination]{#1}}}
 \DeclareFieldFormat[article,review,suppperiodical]{pages}{#1}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
@@ -12538,13 +13642,14 @@
 %
 % \begin{macro}{\typeinstitutiondelim}
 %    \begin{macrocode}
-\renewcommand{\typeinstitutiondelim}{\addcomma\space}
+\renewcommand*{\typeinstitutiondelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{bibmacro}{thesistype}
 %    \begin{macrocode}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+  {}{Patching driver 'thesistype' failed (2)}
 %    \end{macrocode}
 % \end{bibmacro}
 %
@@ -12556,7 +13661,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{eaz.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -12603,6 +13708,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -12643,8 +13749,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12657,22 +13763,22 @@
 %
 % \begin{macro}{\bibnamedash}
 %    \begin{macrocode}
-\renewcommand{\bibnamedash}{\printtext{\bibstring{idem\thefield{gender}}}}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring{idem\thefield{gender}}}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\multinamedelim}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\repeatlabeldelim}
 %    \begin{macrocode}
-\renewcommand{\repeatlabeldelim}{\addcolon\space}
+\renewcommand*{\repeatlabeldelim}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -12706,7 +13812,7 @@
 % \begin{macro}{\institutionlocationdelim}
 % Delimiter between \Feld{institution} and \Feld{location}.
 %    \begin{macrocode}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -12734,7 +13840,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{eaz-alt.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -12777,6 +13883,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -12839,10 +13946,10 @@
 % \begin{macro}{\mkbibbooknameprefix}
 % \begin{macro}{\mkbibbooknamesuffix}
 %    \begin{macrocode}
-\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12854,10 +13961,10 @@
 % \begin{macro}{\mkbibsourcenameprefix}
 % \begin{macro}{\mkbibsourcenamesuffix}
 %    \begin{macrocode}
-\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12869,10 +13976,10 @@
 % \begin{macro}{\mkbiblistnameprefix}
 % \begin{macro}{\mkbiblistnamesuffix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12888,22 +13995,24 @@
         {}%
     \addspace\&\space}
 \def\blxarch@finalnamedelim@default{\addspace\&\space}
-\xapptobibmacro{begentry}{\let\finalnamedelim\blxarch@finalnamedelim@sortname}{}{}
-\xapptobibmacro{title}{\let\finalnamedelim\blxarch@finalnamedelim@default}{}{}
+\xapptobibmacro{begentry}{\let\finalnamedelim\blxarch@finalnamedelim@sortname}
+  {}{Patching bibmacro 'begentry' failed (3)}
+\xapptobibmacro{title}{\let\finalnamedelim\blxarch@finalnamedelim@default}
+  {}{Patching bibmacro 'title' failed}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\bibnamedash}
 %    \begin{macrocode}
-\renewcommand{\bibnamedash}{\parbox{\bibhang}{\hfill\textendash\hspace*{0.4em}}}
+\renewcommand*{\bibnamedash}{\parbox{\bibhang}{\hfill\textendash\hspace*{0.4em}}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelpunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcolon\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -12917,7 +14026,7 @@
 %
 % \begin{macro}{\multilistdelim}
 %    \begin{macrocode}
-\renewcommand{\multilistdelim}{\addspace\textendash\space}
+\renewcommand*{\multilistdelim}{\addspace\textendash\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -12941,13 +14050,13 @@
 %
 % \begin{macro}{\seriespunct}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\noseriespunct}
 %    \begin{macrocode}
-\renewcommand{\noseriespunct}{\addperiod\space}
+\renewcommand*{\noseriespunct}{\addperiod\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -12974,7 +14083,7 @@
 %
 % \begin{macro}{\institutionlocationdelim}
 %    \begin{macrocode}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -12995,7 +14104,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{foe.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -13042,6 +14151,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=4,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -13080,12 +14190,12 @@
 % \end{macro}
 %
 % \begin{macro}{\repeatlabeldelim}
-% \begin{macro}{\repeatlabelwrap}
+% \begin{format}{repeatlabel}
 %    \begin{macrocode}
-\renewcommand{\repeatlabeldelim}{\mkbibbold{\addcolon\space}}
-\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}}
+\renewcommand*{\repeatlabeldelim}{\mkbibbold{\addcolon\space}}
+\DeclareFieldFormat*{repeatlabel}{\mkbibbold{#1}}
 %    \end{macrocode}
-% \end{macro}
+% \end{format}
 % \end{macro}
 %
 % \begin{format}{bookauthor}
@@ -13102,10 +14212,10 @@
 % \begin{macro}{\mkbibbooknameprefix}
 % \begin{macro}{\mkbibbooknamesuffix}
 %    \begin{macrocode}
-\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13117,10 +14227,10 @@
 % \begin{macro}{\mkbibsourcenameprefix}
 % \begin{macro}{\mkbibsourcenamesuffix}
 %    \begin{macrocode}
-\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13132,10 +14242,10 @@
 % \begin{macro}{\mkbiblistnameprefix}
 % \begin{macro}{\mkbiblistnamesuffix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13168,9 +14278,9 @@
 % \begin{macro}{\booklabelpunct}
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13179,20 +14289,20 @@
 % \begin{macro}{\inbookbookdelim}
 % Change \Befehl{newunit} ahead of \Format{in:}
 %    \begin{macrocode}
-\renewcommand{\inbookbookdelim}{\addperiod\space}
+\renewcommand*{\inbookbookdelim}{\addperiod\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\finalnamedelim}{\addspace\biblstring{and}\space}
+\renewcommand*{\finalnamedelim}{\addspace\biblstring{and}\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addcomma\addspace}
+\renewcommand*{\seriespunct}{\addcomma\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -13200,7 +14310,7 @@
 %
 % \begin{macro}{\subnumberseriesdelim}
 %    \begin{macrocode}
-\renewcommand{\subnumberseriesdelim}{\newunitpunct}
+\renewcommand*{\subnumberseriesdelim}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -13216,11 +14326,11 @@
 % \end{format}
 % \end{format}
 %
-% \begin{format}{realdateparen}
-% \begin{format}{origrealdateparen}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdateparen}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdateparen}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -13247,7 +14357,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{jb-halle.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -13290,6 +14400,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=false,
     origfields=true,
@@ -13333,17 +14444,17 @@
 % \end{format}
 % \end{format}
 %
-% \begin{macro}{\repeatlabelwrap}
+% \begin{format}{repeatlabel}
 %    \begin{macrocode}
-\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}}
+\DeclareFieldFormat{repeatlabel}{\mkbibbold{#1}}
 %    \end{macrocode}
-% \end{macro}
+% \end{format}
 %
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13351,8 +14462,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13367,7 +14478,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -13376,15 +14487,15 @@
 % \begin{macro}{\booklabelnamepunct}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -13415,7 +14526,7 @@
 %    \end{macrocode}
 % \end{format}
 %
-% \begin{format}{locationdateparen}
+% \begin{format}{locationdateparens}
 % \begin{format}{thesis}
 %    \begin{macrocode}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
@@ -13433,16 +14544,16 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
@@ -13458,7 +14569,7 @@
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -13468,14 +14579,14 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
 %    \end{macrocode}
 % \end{macro}
 % \end{format}
 %
 % \begin{macro}{\nameshortformdelim}
 %    \begin{macrocode}
-\renewcommand{\nameshortformdelim}{\addspace in\space}
+\renewcommand*{\nameshortformdelim}{\addspace in\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -13486,7 +14597,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{jb-kreis-neuss.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -13531,6 +14642,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -13569,15 +14681,15 @@
 % \begin{macro}{\newunitpunct}
 % The delimiter between volume and date.
 %    \begin{macrocode}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\booklabelnamepunct}
 % \begin{macro}{\labelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\booklabelnamepunct}{\addcolon\space}
-\renewcommand{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\booklabelnamepunct}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13585,28 +14697,28 @@
 % \begin{macro}{\volumedatedelim}
 % The delimiter between volume and date.
 %    \begin{macrocode}
-\renewcommand{\volumedatedelim}{\addspace}
+\renewcommand*{\volumedatedelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\volumedatedelim}
 % The delimiter between volume and date.
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multinamedelim}
 % Delimiter beween multiple citations.
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\finalnamedelim}
 % Delimiter beween multiple citations.
 %    \begin{macrocode}
-\renewcommand{\finalnamedelim}{\multinamedelim}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -13623,10 +14735,10 @@
 % \end{format}
 % \end{format}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 % Reprints in parentheses.
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\mkbibparens{#1}}
+\DeclareFieldFormat*{reprintparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 %
@@ -13659,7 +14771,7 @@
 %
 % \begin{macro}{\seriesnumberdelim}
 %    \begin{macrocode}
-\renewcommand{\seriesnumberdelim}{\newunitpunct}
+\renewcommand*{\seriesnumberdelim}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -13671,21 +14783,21 @@
 %
 % \begin{macro}{\noseriespunct}
 %    \begin{macrocode}
-\renewcommand{\noseriespunct}{\newunitpunct}
+\renewcommand*{\noseriespunct}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multilistdelim}
 % Delimiter beween multiple citations.
 %    \begin{macrocode}
-\renewcommand{\multilistdelim}{\addspace\addslash\space}
+\renewcommand*{\multilistdelim}{\addspace\addslash\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\sqspace}
 % Use string \Kbd{sequens} without space (only if two consecutive pages get cited!).
 %    \begin{macrocode}
-\renewcommand{\sqspace}{}
+\renewcommand*{\sqspace}{}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -13702,7 +14814,6 @@
         {#1}%
 }
 %    \end{macrocode}
-% \changes{1.3}{2017/08/15}{\Befehl{rangelen} error fixed}
 % \end{format}
 %
 %</jbkreisneussBBX>
@@ -13712,7 +14823,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{karl.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -13756,6 +14867,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     noseries=true,
     nothesistitlepunct=false,
     notitlepunct=false,
@@ -13765,8 +14877,8 @@
     preservelastauthor=false,
     repeatlabel=false,
     shortform=false,
-    shortjournal=true,
-    shortseries=true,
+    shortjournal=false,
+    shortseries=false,
     subseries=true,
     summarytitle=false,
     tabbedlabeldate=false,
@@ -13796,36 +14908,35 @@
 %
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\finalnamedelim}{\addspace\biblstring{and}\space}
+\renewcommand*{\finalnamedelim}{\addspace\biblstring{and}\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{format}{title}
 %    \begin{macrocode}
 \DeclareFieldFormat*{title}{\mkbibquote{#1}}
-\DeclareFieldFormat[inreference]{title}{\biblstring{subverbum}\addspace\mkbibquote{#1}}
 \DeclareFieldFormat[book,booklet,collection,manual,misc,proceedings,report,thesis,unpublished]
-{title}{\textit{#1}}
+{title}{\emph{#1}}
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{format}{booktitle}
 % \begin{format}{maintitle}
 %    \begin{macrocode}
-\DeclareFieldFormat*{booktitle}{\textit{#1}}
-\DeclareFieldFormat*{maintitle}{\textit{#1}}
+\DeclareFieldFormat*{booktitle}{\emph{#1}}
+\DeclareFieldFormat*{maintitle}{\emph{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -13839,7 +14950,7 @@
 %
 % \begin{format}{journaltitle}
 %    \begin{macrocode}
-\DeclareFieldFormat*{journaltitle}{\textit{#1}}
+\DeclareFieldFormat*{journaltitle}{\emph{#1}}
 %    \end{macrocode}
 % \end{format}
 %
@@ -13861,7 +14972,7 @@
 % \begin{format}{url}
 % \begin{format}{urldate}
 %    \begin{macrocode}
-\DeclareFieldFormat*{url}{\textit{\url{#1}}}
+\DeclareFieldFormat*{url}{\emph{\url{#1}}}
 \DeclareFieldFormat*{urldate}{}
 %    \end{macrocode}
 % \end{format}
@@ -13874,11 +14985,11 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{maja.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\RequireBibliographyStyle{verbose-ibid-archaeology}
+\RequireBibliographyStyle{verbose-archaeology}
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeobibstyletitle}
@@ -13912,11 +15023,12 @@
 %    \begin{macrocode}
     editionsuperscript=predate,
     giveninitligatures={},
-    idemincitation=true,
+    idemincitation=false,
     injournal=true,
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=true,
     origfields=false,
@@ -13925,8 +15037,8 @@
     preservelastauthor=false,
     repeatlabel=false,
     shortform=title,
-    shortjournal=false,
-    shortseries=false,
+    shortjournal=true,
+    shortseries=true,
     subseries=false,
     summarytitle=false,
     tabbedlabeldate=false,
@@ -13947,21 +15059,24 @@
 %
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{format}{sortname}
+% \begin{format}{labelnames}
 %    \begin{macrocode}
 \DeclareNameAlias{sortname}{family-given}
+\DeclareNameAlias{labelnames}{sortname}
 %    \end{macrocode}
 % \end{format}
+% \end{format}
 %
 % \begin{macro}{\booklabelnamepunct}
 % \begin{macro}{\labelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13969,8 +15084,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addspace\slash\space}
-\renewcommand{\finalnamedelim}{\addspace\slash\space}
+\renewcommand*{\multinamedelim}{\addspace\slash\space}
+\renewcommand*{\finalnamedelim}{\addspace\slash\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -13980,19 +15095,47 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
+\DeclareFieldFormat[inreference]{volume}{\addspace\RN{#1}}
+%    \end{macrocode}
+% \end{format}
+% \end{format}
+%
+% \begin{format}{edition}
+% \begin{format}{usere}
+%    \begin{macrocode}
+\DeclareFieldFormat*{edition}{}
+\DeclareFieldFormat*{usere}{}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
 %
+% \begin{format}{titleaddon}
+% \begin{format}{booktitleaddon}
+% \begin{format}{maintitleaddon}
+%    \begin{macrocode}
+\DeclareFieldFormat*{titleaddon}{}
+\DeclareFieldFormat*{booktitleaddon}{}
+\DeclareFieldFormat*{maintitleaddon}{}
+%    \end{macrocode}
+% \end{format}
+% \end{format}
+% \end{format}
+%
 % \begin{macro}{\titleseriesdelim}
 % \begin{macro}{\seriespunct}
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\newunitpunct}
-\renewcommand{\seriespunct}{\newunitpunct}
+\renewcommand*{\titleseriesdelim}{\newunitpunct}
+\renewcommand*{\seriespunct}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
+% \begin{format}{location}
+%    \begin{macrocode}
+\DeclareListFormat[inreference]{location}{}
+%    \end{macrocode}
+% \end{format}
+%
 % \begin{format}{locationdateparens}
 %    \begin{macrocode}
 \DeclareFieldFormat*{locationdateparens}{#1}
@@ -14019,33 +15162,34 @@
 %
 % \begin{format}{title}
 %    \begin{macrocode}
-\DeclareFieldFormat[inreference]{title}{#1}
+\DeclareFieldFormat[inreference]{dictionary}{#1}
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{bibliographydriver}{inreference}
 % no serieses
 %    \begin{macrocode}
-\xpatchbibdriver{inreference}{location+date}{bibliographydate}{}{}
-\xpatchbibdriver{inreference}{titlepunct}{nopunct}{}{}
+\xpatchbibdriver{inreference}{location+date}{bibliographydate}
+  {}{Patching driver 'inreference' failed (2)}
 %    \end{macrocode}
 % \end{bibliographydriver}
 %
 % \begin{bibmacro}{thesistype}
 %    \begin{macrocode}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+  {}{Patching bibmacro 'thesistype' failed (3)}
 %    \end{macrocode}
 % \end{bibmacro}
 %
 % \begin{macro}{\volumenumberdelim}
 %    \begin{macrocode}
-\renewcommand{\volumedatedelim}{\addspace}
+\renewcommand*{\volumedatedelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multilistdelim}
 %    \begin{macrocode}
-\renewcommand{\multilistdelim}{\addspace\slash\space}
+\renewcommand*{\multilistdelim}{\addspace\slash\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14070,7 +15214,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{mpk.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -14119,6 +15263,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -14166,8 +15311,8 @@
 % \begin{macro}{\mkbibbooknameprefix}
 % Different name formatting of \Feld{bookauthor}/\Feld{editor}.
 %    \begin{macrocode}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14176,8 +15321,8 @@
 % \begin{macro}{\mkbibsourcenameprefix}
 % Different name formatting of \Feld{bookauthor}/\Feld{editor}.
 %    \begin{macrocode}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14186,8 +15331,8 @@
 % \begin{macro}{\mkbiblistnameprefix}
 % Different name formatting of \Feld{author}/\Feld{editor}.
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14196,9 +15341,9 @@
 % \begin{macro}{\booklabelpunct}
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14206,14 +15351,14 @@
 %
 % \begin{macro}{\titleseriesdelim}
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\addperiod\space}
+\renewcommand*{\titleseriesdelim}{\addperiod\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\newunitpunct}
+\renewcommand*{\seriespunct}{\newunitpunct}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -14221,7 +15366,7 @@
 %
 % \begin{macro}{\subnumberseriesdelim}
 %    \begin{macrocode}
-\renewcommand{\subnumberseriesdelim}{\newunitpunct}
+\renewcommand*{\subnumberseriesdelim}{\newunitpunct}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14237,11 +15382,11 @@
 % \end{format}
 % \end{format}
 %
-% \begin{format}{realdateparen}
-% \begin{format}{origrealdateparen}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdateparen}{\addcomma\space#1}
-\DeclareFieldFormat*{origrealdateparen}{\addcomma\space#1}
+\DeclareFieldFormat*{realdateparens}{\addcomma\space#1}
+\DeclareFieldFormat*{origrealdateparens}{\addcomma\space#1}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -14269,14 +15414,15 @@
 %
 % \begin{bibmacro}{thesistype}
 %    \begin{macrocode}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+ {}{Patching bibmacro 'thesistype' failed (4)}
 %    \end{macrocode}
 % \end{bibmacro}
 %
 % \begin{macro}{\finentrypunct}
 %    \begin{macrocode}
 \let\blxarch@buffer@finentrypunct\finentrypunct
-\renewcommand{\finentrypunct}{%
+\renewcommand*{\finentrypunct}{%
     \ifboolexpr{
         test {\ifentrytype{online}}
         or
@@ -14291,13 +15437,297 @@
 % \end{macro}
 %
 %</mpkBBX>
+%<*mpkoeawBBX>
+%
+% \subsubsection{File \Datei{mpkoeaw.bbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{mpkoeaw.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+%    \end{macrocode}
+%
+% Load \Paket{biblatex-archaeology} after a style.
+%    \begin{macrocode}
+\RequireBibliographyStyle{authoryear-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeobibstyletitle}
+%    \begin{macrocode}
+\def\archaeobibstyletitle{\blxarch@style@mpkoeaw}
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\DeclareLanguageMappingSuffix{-mpkoeaw}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{
+%    \end{macrocode}
+% \blx options:
+%    \begin{macrocode}
+    dashed=false,
+    datezeros=true,
+    doi=true,       
+    giveninits=true,    
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+    maxcitenames=3,
+    maxitems=3,
+    mergedate=true,
+    mincitenames=3,         
+    minitems=3,
+    notetype=foot+end,
+    sortcites=true,
+    sorting=lnyvt,
+%    \end{macrocode}
+% \archbib options:
+%    \begin{macrocode}
+    editionsuperscript=predate, % ??, not in guidelines
+    giveninitligatures={},
+    idemincitation=true,
+    injournal=false,
+    journallocation=false,
+    maxbooknames=500,
+    minbooknames=3,
+    minrealdatediff=1,
+    nothesistitlepunct=false,
+    notitlepunct=false,
+    origfields=true,
+    pagesfirst=false,
+    positionlabeldate=location,
+    preservelastauthor=false,
+    repeatlabel=true,
+    shortform=false,
+    shortjournal=false,
+    shortseries=false,
+    subseries=true,
+    summarytitle=false,
+    tabbedlabeldate=false,
+    titlebrackets=false,
+    titlenote=false,
+    useeventdate=true,
+    useeventnumber=false,
+    usefestschriftaddon=false,
+    useinstitution=omitlocation,
+    uselocation=true,
+    usemultivenue=false,
+    usepublisher=false,
+    useunpublishedthesis=true,
+    usesourceeditor=true,
+    volumeafterseries=false,
+}
+%    \end{macrocode}
+%
+% Set \Option{titlenote to \meta{true}} if exhibition detected;
+% \begin{format}{bibtex}
+%    \begin{macrocode}
+\DeclareStyleSourcemap{
+    \maps[datatype=bibtex]{
+        \map[
+            overwrite=true,
+        ]{
+             \step[
+                fieldsource=eventtype,
+                match=\regexp{exhib},
+                fieldset=options,
+                fieldvalue={titlenote=true,titlebrackets=true},
+                append=true,
+                notfield=options,
+            ]
+        }
+        \map[
+            overwrite=true,
+        ]{
+            \step[
+                fieldsource=options,
+                notmatch=\regexp{\btitlenote\b},
+                final,
+            ]
+            \step[
+                fieldsource=eventtype,
+                match=\regexp{exhib},
+                fieldset=options,
+                fieldvalue={,titlenote=true,titlebrackets=true},
+                append=true,
+            ]
+        }
+    }
+}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{macro}{\bibhang}
+% \begin{macro}{\bibitemsep}
+%    \begin{macrocode}
+\setlength{\bibhang}{0em}
+\setlength{\bibitemsep}{\baselineskip}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{format}{sortname}
+%    \begin{macrocode}
+\DeclareNameAlias{sortname}{given-family}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{macro}{\mkbibbooknamefamily}
+% \begin{macro}{\mkbibbooknameprefix}
+%    \begin{macrocode}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\mkbibsourcenamefamily}
+% \begin{macro}{\mkbibsourcenameprefix}
+%    \begin{macrocode}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\mkbiblistnamefamily}
+% \begin{macro}{\mkbiblistnameprefix}
+%    \begin{macrocode}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\labelnamepunct}
+%    \begin{macrocode}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\subtitlepunct}
+%    \begin{macrocode}
+\renewcommand*{\subtitlepunct}{\addcolon\space\midsentence}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\articletitlepunct}
+%    \begin{macrocode}
+\renewcommand*{\articletitlepunct}{\addcomma\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{format}{titlenote}
+% \begin{format}{booktitlenote}
+% \begin{format}{maintitlenote}
+%    \begin{macrocode}
+\DeclareFieldFormat*{titlenote}{\mkbibparens{#1}}
+\DeclareFieldAlias{booktitlenote}{titlenote}
+\DeclareFieldAlias{maintitlenote}{titlenote}
+%    \end{macrocode}
+% \end{format}
+% \end{format}
+% \end{format}
+%
+% \begin{format}{dictionary}
+%    \begin{macrocode}
+\DeclareFieldFormat*{dictionary}{#1}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{format}{volume}
+%    \begin{macrocode}
+\DeclareFieldFormat*{volume}{\addspace#1}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{macro}{\bibdatesubseqesep}
+%    \begin{macrocode}
+\renewrobustcmd*{\bibdatesubseqesep}{\bibdaterangesep}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\volumedatedelim}
+%    \begin{macrocode}
+\renewcommand*{\volumedatedelim}{\addslash}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\subnumberseriesdelim}
+%    \begin{macrocode}
+\renewcommand*{\subnumberseriesdelim}{\addcomma\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{format}{journaldateparens}
+%    \begin{macrocode}
+\DeclareFieldFormat*{journaldateparens}{#1}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{format}{locationdateparens}
+%    \begin{macrocode}
+\DeclareFieldFormat*{locationdateparens}{#1}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
+%    \begin{macrocode}
+\DeclareFieldFormat*{realdateparens}{#1}
+\DeclareFieldFormat*{origrealdateparens}{#1}
+%    \end{macrocode}
+% \end{format}
+% \end{format}
+%
+% \begin{macro}{\typeinstitutiondelim}
+%    \begin{macrocode}
+\renewcommand*{\typeinstitutiondelim}{\addcomma\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\daterealdatedelim}
+%    \begin{macrocode}
+\renewcommand*{\daterealdatedelim}{\addcomma\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{format}{reprintparens}
+%    \begin{macrocode}
+\DeclareFieldFormat*{reprintparens}{\addcomma\space#1}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{macro}{\multilistdelim}
+%    \begin{macrocode}
+\renewcommand*{\multilistdelim}{\addspace\textendash\space}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{format}{pages}
+%    \begin{macrocode}
+\DeclareFieldFormat*{pages}{#1}
+%    \end{macrocode}
+% \end{format}
+%
+% \begin{format}{url}
+% and  \Typ{thesis} have an URL.
+%    \begin{macrocode}
+\urlstyle{same}
+\DeclareFieldFormat*{url}{\url{#1}}
+%    \end{macrocode}
+% \end{format}
+%
+%</mpkoeawBBX>
 %<*nnuBBX>
 %
 % \subsubsection{File \Datei{nnu.bbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{nnu.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -14340,6 +15770,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -14386,8 +15817,8 @@
 % \begin{macro}{\mkbiblistnamefamily}
 % \begin{macro}{\mkbiblistnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14395,8 +15826,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14404,8 +15835,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14421,7 +15852,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -14430,15 +15861,15 @@
 % \begin{macro}{\booklabelnamepunct}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -14458,7 +15889,7 @@
 %    \end{macrocode}
 % \end{format}
 %
-% \begin{format}{locationdateparen}
+% \begin{format}{locationdateparens}
 % \begin{format}{thesis}
 %    \begin{macrocode}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
@@ -14476,16 +15907,16 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
@@ -14501,7 +15932,7 @@
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14510,14 +15941,14 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
 %    \end{macrocode}
 % \end{macro}
 % \end{format}
 %
 % \begin{macro}{\nameshortformdelim}
 %    \begin{macrocode}
-\renewcommand{\nameshortformdelim}{\addspace in\space}
+\renewcommand*{\nameshortformdelim}{\addspace in\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14528,7 +15959,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{offa.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -14574,6 +16005,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=3,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -14614,51 +16046,51 @@
 % \begin{macro}{\mkbibrepeatfamily}
 % \begin{macro}{\mkbibrepeatprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\multilistdelim}
 %    \begin{macrocode}
-\renewcommand{\multilistdelim}{\addslash}
+\renewcommand*{\multilistdelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\repeatlabeldelim}
 %    \begin{macrocode}
-\renewcommand{\repeatlabeldelim}{\addcolon\space}
+\renewcommand*{\repeatlabeldelim}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\booklabelnamepunct}
 % \begin{macro}{\labelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\seriespunct}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14694,7 +16126,7 @@
 %
 % \begin{macro}{\institutionlocationdelim}
 %    \begin{macrocode}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14714,7 +16146,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{rgk-verbose.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -14729,6 +16161,7 @@
 %
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
+    dashed=true,
     ibidtracker=true,
     idemtracker=false,
     loccittracker=true,
@@ -14738,13 +16171,43 @@
 %    \end{macrocode}
 %
 %</rgkverboseBBX>
+%<*rgknumericBBX>
+%
+% \subsubsection{File \Datei{rgk-numeric.bbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{rgk-verbose.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireBibliographyStyle{numeric-comp-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeobibstyletitle}
+%    \begin{macrocode}
+\def\archaeobibstyletitle{\blxarch@style@rgknumeric}
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+    maxcitenames=500,
+}
+%    \end{macrocode}
+%
+%</rgknumericBBX>
 %<*rgkinlineBBX>
 %
 % \subsubsection{File \Datei{rgk-inline.bbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{rgk-inline.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -14759,6 +16222,7 @@
 %
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
+    dashed=true,
     ibidtracker=false,
     idemtracker=false,
     loccittracker=false,
@@ -14779,15 +16243,15 @@
 %
 % \begin{macro}{\bibnamedash}
 %    \begin{macrocode}
-\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mkbibrepeatfamily}
 % \begin{macro}{\mkbibrepeatprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14795,14 +16259,13 @@
 %</rgkinlineBBX>
 %<*rgksharedBBX>
 %
-% \subsubsection{Shared by \Datei{rgk-inline.bbx} and \Datei{rgk-verbose.bbx}}
+% \subsubsection{Shared by \Datei{rgk-*.bbx}}
 %
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
 %    \end{macrocode}
 % \blx options:
 %    \begin{macrocode}
-    dashed=true,
     doi=false,       
     eprint=false,
     giveninits=true,    
@@ -14823,6 +16286,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -14862,8 +16326,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14871,8 +16335,8 @@
 % \begin{macro}{\mkbiblistnamefamily}
 % \begin{macro}{\mkbiblistnamefamily}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14880,8 +16344,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14897,7 +16361,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -14905,15 +16369,15 @@
 %
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -14951,22 +16415,22 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -14975,7 +16439,7 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
 %    \end{macrocode}
 % \end{macro}
 % \end{format}
@@ -14987,7 +16451,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{rgzm-verbose.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -15002,6 +16466,7 @@
 %
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
+    dashed=false,
     ibidtracker=true,
     idemtracker=false,
     loccittracker=false,
@@ -15011,13 +16476,42 @@
 %    \end{macrocode}
 %
 %</rgzmverboseBBX>
+%<*rgzmnumericBBX>
+%
+% \subsubsection{File \Datei{rgzm-numeric.bbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{rgzm-inline.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireBibliographyStyle{numeric-comp-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeobibstyletitle}
+%    \begin{macrocode}
+\def\archaeobibstyletitle{\blxarch@style@rgzmnumeric}
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+}
+%    \end{macrocode}
+%
+%</rgzmnumericBBX>
 %<*rgzminlineBBX>
 %
 % \subsubsection{File \Datei{rgzm-inline.bbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{rgzm-inline.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -15032,10 +16526,11 @@
 %
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
+    dashed=false,
     ibidtracker=false,
     idemtracker=false,
     loccittracker=false,
-    repeatlabel=true,
+    repeatlabel=dashed,
     mergedate=false,
     maxbibnames=500,
     maxcitenames=2,
@@ -15050,18 +16545,25 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\repeatlabeldash}
+% \Befehl{hspace*} must be starred in order to work after line breaks.
+%    \begin{macrocode}
+\renewcommand*{\repeatlabeldash}{\hspace*{\bibhang}}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\mkbibrepeatfamily}
 % \begin{macro}{\mkbibrepeatprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\repeatlabeldelim}
 %    \begin{macrocode}
-\renewcommand{\repeatlabeldelim}{\addcolon\space}
+\renewcommand*{\repeatlabeldelim}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -15079,7 +16581,6 @@
 %    \end{macrocode}
 % \blx options:
 %    \begin{macrocode}
-    dashed=false,
     doi=false,       
     eprint=false,
     giveninits=true,    
@@ -15101,6 +16602,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=1,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -15140,8 +16642,8 @@
 % \begin{macro}{\mkbibrepeatfamily}
 % \begin{macro}{\mkbibrepeatprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15149,8 +16651,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
-\renewcommand{\finalnamedelim}{\addspace\addslash\space}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\addspace\addslash\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15158,8 +16660,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15175,7 +16677,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -15184,15 +16686,15 @@
 % \begin{macro}{\booklabelnamepunct}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -15212,7 +16714,7 @@
 %    \end{macrocode}
 % \end{format}
 %
-% \begin{format}{locationdateparen}
+% \begin{format}{locationdateparens}
 % \begin{format}{thesis}
 %    \begin{macrocode}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}}
@@ -15223,22 +16725,22 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addcomma\space#1}
+\DeclareFieldFormat*{reprintparens}{\addcomma\space#1}
 %    \end{macrocode}
 % \end{format}
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -15258,7 +16760,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{ufg-muenster-verbose.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -15282,13 +16784,42 @@
 %    \end{macrocode}
 %
 %</ufgmuensterverboseBBX>
+%<*ufgmuensternumericBBX>
+%
+% \subsubsection{File \Datei{ufg-muenster-numeric.bbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{ufg-muenster-numeric.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireBibliographyStyle{numeric-comp-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeobibstyletitle}
+%    \begin{macrocode}
+\def\archaeobibstyletitle{\blxarch@style@muensternumeric}
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+}
+%    \end{macrocode}
+%
+%</ufgmuensternumericBBX>
 %<*ufgmuensterinlineBBX>
 %
 % \subsubsection{File \Datei{ufg-muenster-inline.bbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{ufg-muenster-inline.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -15303,6 +16834,7 @@
 %
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{
+    dashed=false,
     ibidtracker=false,
     idemtracker=true,
     loccittracker=false,
@@ -15334,7 +16866,6 @@
 %    \end{macrocode}
 % \blx options:
 %    \begin{macrocode}
-    dashed=false,
     doi=false,       
     eprint=false,
     giveninits=true,    
@@ -15355,12 +16886,14 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
     pagesfirst=false,
     positionlabeldate=location,
     preservelastauthor=false,
+    repeatlabel=false,
     shortform=title,
     shortjournal=true,
     shortseries=true,
@@ -15397,8 +16930,8 @@
 % \begin{macro}{\mkbibrepeatfamily}
 % \begin{macro}{\mkbibrepeatprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15406,8 +16939,8 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15415,8 +16948,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15432,7 +16965,7 @@
 % \begin{macro}{\seriespunct}
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 %    \end{macrocode}
 % \end{format}
@@ -15441,15 +16974,15 @@
 % \begin{macro}{\booklabelnamepunct}
 % The punctuation between volume and number in journals.
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{realdate}
-% \begin{format}{origrealdate}
+% \begin{format}{realdateparens}
+% \begin{format}{origrealdateparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
@@ -15466,7 +16999,7 @@
 %    \end{macrocode}
 % \end{format}
 %
-% \begin{format}{locationdateparen}
+% \begin{format}{locationdateparens}
 % \begin{format}{thesis}
 %    \begin{macrocode}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
@@ -15484,16 +17017,16 @@
 %
 % \begin{macro}{\bibpagespunct}
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{format}{reprintbrackets}
+% \begin{format}{reprintparens}
 %    \begin{macrocode}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 %    \end{macrocode}
 % \end{format}
 %
@@ -15508,14 +17041,14 @@
 %    \begin{macrocode}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
 %    \end{macrocode}
 % \end{macro}
 % \end{format}
 %
 % \begin{macro}{\typeinstitutiondelim}
 %    \begin{macrocode}
-\renewcommand{\typeinstitutiondelim}{\addcolon\space\midsentence}
+\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -15526,7 +17059,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{volkskunde.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % Load \Paket{biblatex-archaeology} after a style.
@@ -15585,6 +17118,7 @@
     journallocation=false,
     maxbooknames=3,
     minbooknames=1,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -15621,7 +17155,7 @@
 %
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -15636,7 +17170,7 @@
 %
 % \begin{macro}{\bibnamedash}
 %    \begin{macrocode}
-\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}\space}}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}\space}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -15649,14 +17183,14 @@
 % \begin{macro}{\titleseriesdelim}
 % The delimiter after an repeated label
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\institutionlocationdelim}
 % Delimiter between \Feld{institution} and \Feld{location}.
 %    \begin{macrocode}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -15695,7 +17229,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{zaak.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 % \begin{format}{bibtex}
@@ -15758,6 +17292,7 @@
     journallocation=true,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -15804,15 +17339,15 @@
 % \begin{macro}{\multinamedelim}
 % \begin{macro}{\finalnamedelim}
 %    \begin{macrocode}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
-\renewcommand{\finalnamedelim}{\multinamedelim}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{nameyeardelim}
 %    \begin{macrocode}
-\renewcommand{\nameyeardelim}{%
+\renewcommand*{\nameyeardelim}{%
     \iftabbedlabeldate
         {}
         {\addspace}}
@@ -15832,8 +17367,8 @@
 % \begin{format}{seriesparens}
 %    \begin{macrocode}
 \DeclareFieldFormat*{seriesparens}{\mkbibparens{=#1}}
-\renewcommand{\seriespunct}{\addspace}
-\renewcommand{\titleseriesdelim}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
 %    \end{macrocode}
 % \end{format}
 % \end{macro}
@@ -15842,8 +17377,8 @@
 % \begin{macro}{\labelnamepunct}
 % \begin{macro}{\booklabelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\labelnamepunct}{\addspace}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addspace}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -15858,7 +17393,7 @@
 % \begin{macro}{\volumenumberdelim}
 % \begin{format}{number}
 %    \begin{macrocode}
-\renewcommand{\volumenumberdelim}{\addspace}
+\renewcommand*{\volumenumberdelim}{\addspace}
 \DeclareFieldFormat[article]{number}{\mkbibparens{#1}}
 %    \end{macrocode}
 % \end{format}
@@ -15885,14 +17420,14 @@
 %
 % \begin{macro}{\volumedatedelim}
 %    \begin{macrocode}
-\renewcommand{\volumedatedelim}{}
+\renewcommand*{\volumedatedelim}{}
 %    \end{macrocode} 
 % \end{macro}
 %
 % \begin{macro}{\bibpagespunct}
 % Colon ahead of \Feld{volume} groups.
 %    \begin{macrocode}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \ifboolexpr{
         not test {\iffieldundef{usera}}
         and
@@ -15919,7 +17454,7 @@
 %
 % \begin{macro}{\daterealdatedelim}
 %    \begin{macrocode}
-\renewcommand{\daterealdatedelim}{%
+\renewcommand*{\daterealdatedelim}{%
     \iftabbedlabeldate
         {\newline}
         {\addspace}}
@@ -15933,7 +17468,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{zaes.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -15996,6 +17531,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -16026,15 +17562,15 @@
 %
 % \begin{macro}{\newunitpunct}
 %    \begin{macrocode}
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\booklabelnamepunct}
 % \begin{macro}{\labelnamepunct}
 %    \begin{macrocode}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -16051,8 +17587,8 @@
 % \begin{macro}{\mkbibnamefamily}
 % \begin{macro}{\mkbibnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibnamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibnameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibnamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\mkbibletterspacing{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -16060,8 +17596,8 @@
 % \begin{macro}{\mkbiblistnamefamily}
 % \begin{macro}{\mkbiblistnameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbiblistnamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\mkbibletterspacing{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -16069,8 +17605,8 @@
 % \begin{macro}{\mkbooknamefamily}
 % \begin{macro}{\mkbooknameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibbooknamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\mkbibletterspacing{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -16078,8 +17614,8 @@
 % \begin{macro}{\mksourcenamefamily}
 % \begin{macro}{\mksourcenameprefix}
 %    \begin{macrocode}
-\renewcommand{\mkbibsourcenamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\mkbibletterspacing{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -16096,8 +17632,8 @@
 % \begin{macro}{\titleseriesdelim}
 % \begin{macro}{\seriespunct}
 %    \begin{macrocode}
-\renewcommand{\titleseriesdelim}{\addcomma\space}
-\renewcommand{\seriespunct}{\iffieldundef{pages}{\finentrypunct}{\bibpagespunct}}
+\renewcommand*{\titleseriesdelim}{\addcomma\space}
+\renewcommand*{\seriespunct}{\iffieldundef{pages}{\finentrypunct}{\bibpagespunct}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -16131,19 +17667,20 @@
 %
 % \begin{bibliographydriver}{inreference}
 %    \begin{macrocode}
-\xpatchbibdriver{inreference}{\usebibmacro{location+date}}{}{}{}
+\xpatchbibdriver{inreference}{\usebibmacro{location+date}}{}
+  {}{Patching driver 'inreference' failed (4)}
 %    \end{macrocode}
 % \end{bibliographydriver}
 %
 % \begin{macro}{\mkbibnameprefix}
 %    \begin{macrocode}
-\renewcommand{\nameshortformdelim}{\addcomma\space}
+\renewcommand*{\nameshortformdelim}{\addcomma\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mkbibnameprefix}
 %    \begin{macrocode}
-\renewcommand{\noseriespunct}{\addcomma\addspace}
+\renewcommand*{\noseriespunct}{\addcomma\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -16157,7 +17694,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeocitestyletitle}
@@ -16177,7 +17714,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-comp-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeocitestyletitle}
@@ -16217,7 +17754,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{authoryear-icomp-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeocitestyletitle}
@@ -16231,11 +17768,63 @@
 %    \end{macrocode}
 %
 %</authoryearicompCBX>
+%<*numericcompCBX>
+%
+% \subsubsection{File \Datei{numeric-archaeology.cbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{numeric-comp-archaeology.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeocitestyletitle}
+%    \begin{macrocode}
+\def\archaeocitestyletitle{\blxarch@style@numc}
+%    \end{macrocode}
+% \end{macro} 
+%
+%    \begin{macrocode}
+\RequireCitationStyle{numeric-comp}
+%    \end{macrocode}
+%
+%  \begin{format}{prenote}
+%  \begin{format}{postnote}
+% \Feld{prenote}s and \Feld{postnote}s do not make much sense in numeric styles.
+%    \begin{macrocode}
+\DeclareFieldFormat*{postnote}{}
+\DeclareFieldFormat*{prenote}{}
+%    \end{macrocode}
+% \end{format}
+% \end{format}
+%
+%</numericcompCBX>
+%<*verboseCBX>
+%
+% \subsubsection{File \Datei{verbose-archaeology.cbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{verbose-archaeology.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeocitestyletitle}
+%    \begin{macrocode}
+\def\archaeocitestyletitle{\blxarch@style@v}
+%    \end{macrocode}
+% \end{macro} 
+%
+%    \begin{macrocode}
+\RequireCitationStyle{verbose}
+%    \end{macrocode}
+%
+%</verboseCBX>
 %<*verboseibidCBX>
 %
+% \subsubsection{File \Datei{verbose-ibid-archaeology.cbx}}
+%
 %    \begin{macrocode}
 \ProvidesFile{verbose-ibid-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeocitestyletitle}
@@ -16255,7 +17844,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{verbose-trad2note-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeocitestyletitle}
@@ -16269,13 +17858,8 @@
 %    \end{macrocode}
 %
 % The following code is copied from \Kbd{verbose-note.cbx}. Only \Befehl{iffootnote} is replaced
-% by \Befehl{ifseenote}, \Befehl{seenotedelim}, Option{uselabeltitle} option and format \Format{seenote} added.
+% by \Befehl{ifseenote}, \Befehl{seenotedelim}, \Option{uselabeltitle} option and format \Format{seenote} added.
 % \begin{macrocode}
-\newbibmacro*{cite:short}{%
-  \printnames{labelname}%
-  \setunit*{\printdelim{labelnamepunct}}%
-  \printtext[bibhyperlink]{%
-    \printfield[citetitle]{labeltitle}}}
 
 \newbibmacro*{footcite}{%
   \usebibmacro{cite:citepages}%
@@ -16312,8 +17896,8 @@
       {\ifsamepage{\the\value{instcount}}
                   {\csuse{cbx@f@\thefield{entrykey}}}
          {}
-	 {\addcomma\space\bibstring{page}\addnbspace
-	  \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
+     {\addcomma\space\bibstring{page}\addnbspace
+      \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
       {}}}
 
 \newbibmacro*{footcite:shorthand}{%
@@ -16382,8 +17966,8 @@
 % \end{bibmacro}
 %    
 % \begin{macro}{\ifseenote}
-% If we are in the same footnote as a former occurrence, we do \textit{loc.~cit.}, in another footnote we set
-% a back reference to the first if it is not \textit{ibidem}.
+% If we are in the same footnote as a former occurrence, we do \Latein{loc.\,cit.}, in another footnote we set
+% a back reference to the first if it is not \Latein{ibidem}.
 %    \begin{macrocode}
 \renewcommand{\ifseenote}[2]{%
     \ifboolexpr{
@@ -16407,16 +17991,79 @@
         {#2}%
 }
 %    \end{macrocode}
-% \end{macro} 
+% \end{macro}
+%
+% \begin{format}{options}
+% Entry option \Option{uselabeltitle} should not be inherited.
+%    \begin{macrocode}
+\DeclareDataInheritance
+{mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference}
+{inbook,bookinbook,suppbook,incollection,suppcollection,inproceedings,inreference}{%
+  \noinherit{options}
+}
+%    \end{macrocode}
+% \end{format}
 %
 %</verbosetrad2noteCBX>
+%<*verbosesharedCBX>
+%
+% \subsubsection{Shared code for verbose styles}
+%
+% \begin{bibmacro}{cite:short}
+%    \begin{macrocode}
+\providebibmacro*{cite:short}{}
+\renewbibmacro*{cite:short}{%
+    \printnames{labelname}%
+    \setunit*{\printdelim{nametitledelim}}%
+    \printtext[bibhyperlink]{%
+    \iftoggle{archbool:citeshortin}
+        {\ifboolexpr{
+            not test {\iffieldundef{journaltitle}}
+			or
+			( not test {\ifshortform{false}}
+			  and
+			  not test {\iffieldundef{shortform}}
+			)
+		 }
+		 {\usebibmacro{cite:short:in}}
+		 {\printfield[citetitle]{labeltitle}}%
+        }
+        {\printfield[citetitle]{labeltitle}}}%
+}
+%    \end{macrocode}
+% \end{bibmacro}
+%
+% \begin{bibmacro}{cite:short:in}
+% It should be certain here that not a usual \Format{cite:short} applies here.
+%    \begin{macrocode}
+\newbibmacro*{cite:short:in}{%
+	\savebibmacro{extendeddate}%
+	\renewbibmacro*{extendeddate}[2]{}%
+	\iffieldundef{journaltitle}
+		{\iffieldundef{shortform}
+			{\printfield[citetitle]{labeltitle}}
+			{\usebibmacro{in:}%
+			 \printfield{shortform}%
+             \setunit{\addspace}%
+             \printfield[shortformvolume]{volume}%
+			 \setunit{\addspace}%
+			 \usebibmacro{bibliographydate}%
+			}
+		}
+		{\usebibmacro{journal+issuetitle}}%
+	\restorebibmacro{extendeddate}%
+}
+%    \end{macrocode}
+% \end{bibmacro}
+%
+%</verbosesharedCBX>
 %<*aefkwCBX>
 %
 % \subsubsection{File \Datei{aefkw.cbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{aefkw.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16436,7 +18083,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{afwl.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16460,7 +18107,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{amit.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16479,7 +18126,7 @@
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -16490,7 +18137,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{archa.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16520,7 +18167,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{dguf.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16540,7 +18187,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{dguf-alt.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16559,7 +18206,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{dguf-apa.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16584,7 +18231,7 @@
     }
         {\printnames[][-\value{listtotal}]{labelname}}
         {\printnames{labelname}}%
-}{}{}
+}{}{Patching bibmacro 'cite' failed}
 \xpatchbibmacro{textcite}{\printnames{labelname}}{%
     \ifboolexpr{
         not test {\ifciteseen}
@@ -16593,7 +18240,7 @@
     }
         {\printnames[][-\value{listtotal}]{labelname}}
         {\printnames{labelname}}%
-}{}{}
+}{}{Patching bibmacro 'textcite' failed}
 %    \end{macrocode}
 % \end{bibmacro}
 % \end{bibmacro} 
@@ -16605,7 +18252,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{eaz.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16620,7 +18267,7 @@
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -16631,7 +18278,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{eaz-alt.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16651,7 +18298,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{foe.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16675,7 +18322,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{jb-halle.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16695,7 +18342,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{jb-kreis-neuss.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16715,7 +18362,7 @@
 % \begin{macro}{\multicitedelim}
 % Delimiter beween multiple citations.
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -16726,7 +18373,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{karl.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16740,7 +18387,7 @@
 % \end{macro}
 %
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 %
 %</karlCBX>
@@ -16750,11 +18397,11 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{maja.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\RequireCitationStyle{verbose-ibid-archaeology}
+\RequireCitationStyle{verbose-archaeology}
 %    \end{macrocode}
 %
 % \begin{macro}{\archaeocitestyletitle}
@@ -16763,6 +18410,12 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{
+	citeshortin=true,
+}
+%    \end{macrocode}
+%
 %</majaCBX>
 %<*mpkCBX>
 %
@@ -16770,7 +18423,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{mpk.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16789,26 +18442,56 @@
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addperiod\space\textendash\space}
+\renewcommand*{\multicitedelim}{\addperiod\space\textendash\space}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\multicitedelim}
+% \begin{macro}{\compcitedelim}
 %    \begin{macrocode}
-\renewcommand{\compcitedelim}{%
+\renewcommand*{\compcitedelim}{%
     \multicitedelim\bibsentence%
     \bibstring[\mkbibnamefamily]{idem\thefield{gender}}\addspace}
 %    \end{macrocode}
 % \end{macro}
 %
 %</mpkCBX>
+%<*mpkoeawCBX>
+%
+% \subsubsection{File \Datei{mpkoeaw.cbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{mpk.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireCitationStyle{authoryear-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeocitestyletitle}
+%    \begin{macrocode}
+\def\archaeocitestyletitle{\blxarch@style@mpkoeaw}
+%    \end{macrocode}
+% \end{macro}
+%
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{autocite=footnote}
+%    \end{macrocode}
+%
+% \begin{macro}{\multicitedelim}
+%    \begin{macrocode}
+\renewcommand*{\multicitedelim}{\addperiod\space\textendash\space}
+%    \end{macrocode}
+% \end{macro}
+%
+%</mpkoeawCBX>
 %<*nnuCBX>
 %
 % \subsubsection{File \Datei{nnu.cbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{nnu.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16828,7 +18511,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{offa.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16848,7 +18531,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{rgk-inline.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16862,13 +18545,33 @@
 % \end{macro}
 %
 %</rgkinlineCBX>
+%<*rgknumericCBX>
+%
+% \subsubsection{File \Datei{rgk-numeric.cbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{rgk-numeric.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireCitationStyle{numeric-comp-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeocitestyletitle}
+%    \begin{macrocode}
+\def\archaeocitestyletitle{\blxarch@style@rgknumeric}
+%    \end{macrocode}
+% \end{macro}
+%
+%</rgknumericCBX>
 %<*rgkverboseCBX>
 %
 % \subsubsection{File \Datei{rgk-verbose.cbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{rgk-verbose.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16895,7 +18598,7 @@
 %
 % \begin{macro}{\postnotedelim}
 %    \begin{macrocode}
-\renewcommand{\postnotedelim}{%
+\renewcommand*{\postnotedelim}{%
     \ifboolexpr{
         test {\ifentrytype{article}}
         or
@@ -16915,13 +18618,33 @@
 % \end{macro}
 %
 %</rgkverboseCBX>
+%<*rgzmnumericCBX>
+%
+% \subsubsection{File \Datei{rgzm-numeric.cbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{rgzm-numeric.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireCitationStyle{numeric-comp-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeocitestyletitle}
+%    \begin{macrocode}
+\def\archaeocitestyletitle{\blxarch@style@rgzmnumeric}
+%    \end{macrocode}
+% \end{macro}
+%
+%</rgzmnumericCBX>
 %<*rgzminlineCBX>
 %
 % \subsubsection{File \Datei{rgzm-inline.cbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{rgzm-inline.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16941,7 +18664,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{rgzm-verbose.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16967,7 +18690,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{ufg-muenster-verbose.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -16987,13 +18710,33 @@
 %    \end{macrocode}
 %
 %</ufgmuensterverboseCBX>
+%<*ufgmuensternumericCBX>
+%
+% \subsubsection{File \Datei{ufg-muenster-numeric.cbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{ufg-muenster-inline.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequireCitationStyle{numeric-comp-archaeology}
+%    \end{macrocode}
+%
+% \begin{macro}{\archaeocitestyletitle}
+%    \begin{macrocode}
+\def\archaeocitestyletitle{\blxarch@style@muensternumeric}
+%    \end{macrocode}
+% \end{macro}
+%
+%</ufgmuensternumericCBX>
 %<*ufgmuensterinlineCBX>
 %
 % \subsubsection{File \Datei{ufg-muenster-inline.cbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{ufg-muenster-inline.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -17013,7 +18756,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{volkskunde.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -17028,14 +18771,14 @@
 %
 % \begin{macro}{\multicitedelim}
 %    \begin{macrocode}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\postnotedelim}
 %    \begin{macrocode}
-\renewcommand{\postnotedelim}{\addcolon\space}
-\renewcommand{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\postnotedelim}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -17046,7 +18789,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{zaak.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -17066,7 +18809,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{zaes.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -17091,7 +18834,7 @@
 %
 % \begin{macro}{\shortformcite}
 % \begin{macro}{\shortformcites}
-% \Befehl{shortformcite} doesn't make sense in author year styles.
+% \Befehl{shortformcite} doesn't make sense in author date and numeric styles.
 %    \begin{macrocode}
 \let\shortformcite\autocite
 \let\shortformcites\autocites
@@ -17105,17 +18848,20 @@
 %<*barecitations>
 %
 % \begin{format}{postnote}
+% \begin{format}{multipostnote}
 % \begin{format}{volcitevolume}
 % \begin{format}{volcitepages}
 % no \enquote{pp.} or \enquote{vol.} in cite commands
 %    \begin{macrocode}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 %    \end{macrocode}
 % \end{format}
 % \end{format}
 % \end{format}
+% \end{format}
 %
 %</barecitations>
 %<*nosmallcaps>
@@ -17123,28 +18869,28 @@
 % \begin{macro}{\mkbibnamefamily}
 % no small caps in label family names
 %    \begin{macrocode}
-\renewcommand{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mkbibnameprefix}
 % no small caps in label name prefixes
 %    \begin{macrocode}
-\renewcommand{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mkbibrepeatfamily}
 % no small caps in repeated label family names
 %    \begin{macrocode}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mkbibrepeatprefix}
 % no small caps in repeatedlabel name prefixes
 %    \begin{macrocode}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -17164,7 +18910,7 @@
 % \begin{macro}{\articlesubtitlepunct}
 % No special \Befehl{subtitlepunct} in \Typ{article} etc.
 %    \begin{macrocode}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 %    \end{macrocode}
 % \end{macro} 
 %
@@ -17172,6 +18918,7 @@
 %<*sequentes>
 %
 % \begin{format}{pages}
+% \changes{1.3}{2017/08/15}{\Befehl{rangelen} error fixed}
 % Must direct the \Latein{sequentes} in field format since \Befehl{ifpages}\Kbd{\{}\Befehl{thefield}\Kbd{\{pages\}\}}.
 %    \begin{macrocode}
 \DeclareFieldFormat*{pages}{%
@@ -17185,7 +18932,6 @@
         {#1}%
 }
 %    \end{macrocode}
-% \changes{1.3}{2017/08/15}{\Befehl{rangelen} error fixed}
 % \end{format}
 %
 %</sequentes>
@@ -17852,6 +19598,66 @@
 \ProvidesFile{USenglish-mpk.lbx}
 %    \end{macrocode}
 %</FUSenglishmpkLBX>
+%<*FaustrianmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{austrian-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FaustrianmpkoeawLBX>
+%<*FnaustrianmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{naustrian-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FnaustrianmpkoeawLBX>
+%<*FngermanmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{ngerman-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FngermanmpkoeawLBX>
+%<*FnswissgermanmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{nswissgerman-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FnswissgermanmpkoeawLBX>
+%<*FswissgermanmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{swissgerman-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FswissgermanmpkoeawLBX>
+%<*FamericanmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{american-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FamericanmpkoeawLBX>
+%<*FaustralianmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{australian-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FaustralianmpkoeawLBX>
+%<*FbritishmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{british-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FbritishmpkoeawLBX>
+%<*FcanadianmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{canadian-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FcanadianmpkoeawLBX>
+%<*FnewzealandmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{newzealand-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FnewzealandmpkoeawLBX>
+%<*FUKenglishmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{UKenglish-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FUKenglishmpkoeawLBX>
+%<*FUSenglishmpkoeawLBX>
+%    \begin{macrocode}
+\ProvidesFile{USenglish-mpkoeaw.lbx}
+%    \end{macrocode}
+%</FUSenglishmpkoeawLBX>
 %<*FaustrianoffaLBX>
 %    \begin{macrocode}
 \ProvidesFile{austrian-offa.lbx}
@@ -17957,6 +19763,11 @@
 \ProvidesFile{canadian-rgzm.lbx}
 %    \end{macrocode}
 %</FcanadianrgzmLBX>
+%<*FenglishrgzmLBX>
+%    \begin{macrocode}
+\ProvidesFile{english-rgzm.lbx}
+%    \end{macrocode}
+%</FenglishrgzmLBX>
 %<*FnewzealandrgzmLBX>
 %    \begin{macrocode}
 \ProvidesFile{newzealand-rgzm.lbx}
@@ -18161,9 +19972,22 @@
 \NewBibliographyString{festschrift}
 %    \end{macrocode}
 % \end{localization}
-% \begin{localization}{postdocthesis}
+% \begin{localization}{genitiveandothers}
+% \changes{2.0}{2018/05/16}{New bibstring \Kbd{genitiveandothers}}
 %    \begin{macrocode}
-\NewBibliographyString{postdocthesis}
+\NewBibliographyString{genitiveandothers}
+%    \end{macrocode}
+% \end{localization}
+% \begin{localization}{genitiveapostrophe}
+% \changes{2.0}{2018/05/13}{New bibstring \Kbd{genitiveapostrophe}}
+%    \begin{macrocode}
+\NewBibliographyString{genitiveapostrophe}
+%    \end{macrocode}
+% \end{localization}
+% \begin{localization}{genitives}
+% \changes{2.0}{2018/05/13}{New bibstring \Kbd{genitives}}
+%    \begin{macrocode}
+\NewBibliographyString{genitives}
 %    \end{macrocode}
 % \end{localization}
 % \begin{localization}{magisterthesis}
@@ -18186,6 +20010,11 @@
 \NewBibliographyString{plate}
 %    \end{macrocode}
 % \end{localization}
+% \begin{localization}{postdocthesis}
+%    \begin{macrocode}
+\NewBibliographyString{postdocthesis}
+%    \end{macrocode}
+% \end{localization}
 % \begin{localization}{specialauction}
 %    \begin{macrocode}
 \NewBibliographyString{specialauction}
@@ -18245,18 +20074,21 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 %    \end{macrocode}
 %
 % Use this file for all English spellings
 %    \begin{macrocode}
 \InheritBibliographyExtras{british}
-\InheritBibliographyStrings{british}
-\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
+\DeclareRedundantLanguages{english}
+  {english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
 %    \end{macrocode}
 %
 % Define new localizazion strings
 % \begin{localization}{articledated}
+% \begin{localization}{genitiveandothers}
+% \begin{localization}{genitiveapostrophe}
+% \begin{localization}{genitives}
 % \begin{localization}{auction}
 % \begin{localization}{auctions}
 % \begin{localization}{bathesis}
@@ -18288,6 +20120,9 @@
 \DeclareBibliographyStrings{%
     inherit                   = {english},
     articledated              = {{article dated}{article dated}},
+    genitiveandothers         = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{'s}{'s}},
     auction                   = {{auction}{auktion}},
     auctions                  = {{auktions}{auctions}},
     bathesis                  = {{Bachelor thesis}{BA\addabbrvspace thesis}},
@@ -18295,30 +20130,31 @@
     colloquium                = {{symposium}{symposium\adddot}},
     conference                = {{symposium}{symposium\adddot}},
     convention                = {{symposium}{symposium\adddot}},
+    diplomathesis             = {{Master's thesis}{MA\addabbrvspace thesis}},
     dvd                       = {{DVD}{DVD}},
     exhibcat                  = {{exhibition catalogue}{exhibition catalogue}},
     exhibition                = {{exhibition catalogue}{exhibition catalogue}},
     festschrift               = {{Festschrift}{Festschr\adddot}},
-    magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
+    magisterthesis            = {{Master's thesis}{MA\addabbrvspace thesis}},
     nodate                    = {{no\space date}{n.\addabbrvspace d\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
 %    \end{macrocode}
 % \enquote{no place}: \url{http://www.chicagomanualofstyle.org/qanda/data/faq/topics/Abbreviations/faq0007.html}
 %    \begin{macrocode}
     noplace                   = {{no\space place}{n.\space p\adddot}},
-    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}},
+    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}},
     plate                     = {{plate}{pl\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     specialauction            = {{special auction}{special auction}},
     specialauctions           = {{special auctions}{special auctions}},
     subverbum                 = {{sub verbum}{\autocap{s}.~v\adddot}},
     symposium                 = {{symposium}{symposium\adddot}},
-    unpublishedbathesis       = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}},
-    unpublisheddiplomathesis  = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}},
-    unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedmathesis       = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedpostdocthesis  = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{ungedruckte Dissertation}{ungedr. Diss\adddot}},
+    unpublishedbathesis       = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}},
+    unpublisheddiplomathesis  = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmathesis       = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}},
+    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},,
 %    \end{macrocode}
 % \end{localization}
 % \end{localization}
@@ -18348,6 +20184,10 @@
 % \end{localization}
 % \end{localization}
 % \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+%
 % \begin{localization}{urlfrom}
 %    \begin{macrocode}
     urlfrom  = {{Online}{Online}},
@@ -18355,13 +20195,161 @@
 %    \end{macrocode}
 % \end{localization}
 %
+% \begin{macro}{\lbx@us@mkdaterangetrunc@long}
+% \begin{macro}{\lbx@us@mkdaterangetrunc@short}
+% \begin{macro}{\lbx@us@mkdaterangetruncextra@long}
+% \begin{macro}{\lbx@us@mkdaterangetruncextra@short}
+% Adjust date formats because date range separators differ.
+%    \begin{macrocode}
+\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+             {\mbox{\bibdaterangesep}}
+             {\bibdaterangesepx{#2}%
+              \enddatecircaprint
+              \iffieldundef{#2season}
+                {\iffieldsequal{#2year}{#2endyear}
+                  {\iffieldsequal{#2month}{#2endmonth}
+                    {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+              \enddateuncertainprint
+              \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% No alternate genitive in English (\enquote{Smith'} book is possible but considered bad style).
+%    \begin{macrocode}
+\DeclareGenitiveApostropheChars{}
+%    \end{macrocode}
+%
 %</englishLBX>
 %<*PenglishLBX>
 %
 % \subsubsection{Pointer to \Datei{english-archaeology.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 %    \end{macrocode}
@@ -18373,19 +20361,21 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 %    \end{macrocode}
 %
 % Use this file for all German spellings
 %    \begin{macrocode}
 \InheritBibliographyExtras{german}
-\InheritBibliographyStrings{german}
 \DeclareRedundantLanguages{german}
-{german,ngerman,austrian,naustrian,swissgerman,nswissgerman}
+  {german,ngerman,austrian,naustrian,swissgerman,nswissgerman}
 %    \end{macrocode}
 %
 % Define new localizazion strings:
 % \begin{localization}{articledated}
+% \begin{localization}{genitiveandothers}
+% \begin{localization}{genitiveapostrophe}
+% \begin{localization}{genitives}
 % \begin{localization}{auction}
 % \begin{localization}{auctions}
 % \begin{localization}{bathesis}
@@ -18414,6 +20404,9 @@
 \DeclareBibliographyStrings{%
     inherit                   = {german},
     articledated              = {{Artikel vom}{Artikel vom}},
+    genitiveandothers         = {{u.\,a\adddot s}{u.\,a\adddot s}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{s}{s}},
     auction                   = {{Auktion}{Auktion}},
     auctions                  = {{Auktionen}{Auktionen}},
     catalogue                 = {{Katalog}{Kat\adddot}},
@@ -18428,7 +20421,7 @@
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
     noplace                   = {{ohne\space Ort}{o.\,O\adddot}},
-    noplacenodate             = {{ohne Ort und Jahr}{o.\addabbrvspace O\adddot u.\addabbrvspace J\adddot}},
+    noplacenodate             = {{ohne Ort und Jahr}{o.\addabbrvspace O.\addabbrvspace u.\addabbrvspace J\adddot}},
     plate                     = {{Tafel}{Taf.}},
     specialauction            = {{Sonderauktion}{Sonderauktion}},
     specialauctions           = {{Sonderauktionen}{Sonderauktionen}},
@@ -18466,6 +20459,9 @@
 % \end{localization}
 % \end{localization}
 % \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
 %
 % \begin{localization}{compiler}
 % \begin{localization}{compilers}
@@ -18497,13 +20493,20 @@
 % \end{localization}
 % \end{localization}
 %
+% Unfortunately we must use a literal \ss{} here. \Paket{xstring} tests on identy of \Befehl{ss} and \ss{} are
+% not reliable. cf. \href{https://www.duden.de/sprachwissen/rechtschreibregeln/apostroph}{Duden} on the ruleset.
+%    \begin{macrocode}
+\DeclareGenitiveApostropheChars{ce,s,x,z,ß,\ss}
+%    \end{macrocode}
+%
 %</germanLBX>
 %<*PgermanLBX>
 %
 % \subsubsection{Pointer to \Datei{german-archaeology.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 %    \end{macrocode}
@@ -18515,13 +20518,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{nodate}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     nodate   = {{no date}{n.d\adddot}},
@@ -18536,7 +20539,7 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{zaas-german.lbx}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 %    \end{macrocode}
 %
 % \begin{localization}{byeditor}
@@ -18569,61 +20572,60 @@
 % \begin{localization}{nodate}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit = {german-archaeology},
-    byeditor         = {{herausgegeben von}{hg\adddotspace von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    byeditorco       = {{herausgegeben und kommentiert von}%
-                      {hg\adddotspace und komm\adddot\ von}},
-    byeditoran       = {{herausgegeben und erl\"autert von}%
-                        {hg\adddotspace und erl\"aut\adddot\ von}},
-    byeditorin       = {{herausgegeben und mit einer Einleitung versehen von}%
-                        {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
-    byeditorfo       = {{herausgegeben und mit einem Vorwort versehen von}%
-                        {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
-    byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
-                        {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
-    byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-    byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
-    byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
-    byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
-    byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., komm\adddot\ und Einl\adddot\ von}},
-    byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., komm\adddot\ und Vorw\adddot\ von}},
-    byeditorcoaf     = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditoranin     = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditoranfo     = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
-    byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
-    byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
-    byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    editor = {{Herausgeber}{Hg\adddot}},
-    editors = {{Herausgeber}{Hgg\adddot}},
-    nodate = {{ohne Jahr}{o.J\adddot}},
+  inherit = {german-archaeology},
+  byeditor       = {{herausgegeben von}{hg\adddotspace von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                  {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  byeditorco     = {{herausgegeben und kommentiert von}%
+                  {hg\adddotspace und komm\adddot\ von}},
+  byeditoran     = {{herausgegeben und erl\"autert von}%
+                    {hg\adddotspace und erl\"aut\adddot\ von}},
+  byeditorin     = {{herausgegeben und mit einer Einleitung versehen von}%
+                    {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditorfo     = {{herausgegeben und mit einem Vorwort versehen von}%
+                    {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditoraf     = {{herausgegeben und mit einem Nachwort versehen von}%
+                    {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
+  byeditortrfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
+  byeditortraf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
+  byeditorcoin   = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., komm\adddot\ und Einl\adddot\ von}},
+  byeditorcofo   = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., komm\adddot\ und Vorw\adddot\ von}},
+  byeditorcoaf   = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditoranin   = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditoranfo   = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditoranaf   = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
+  byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
+  byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
+  byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                    {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  editor = {{Herausgeber}{Hg\adddot}},
+  editors = {{Herausgeber}{Hgg\adddot}},
+  nodate = {{ohne Jahr}{o.J\adddot}},
 }
 %    \end{macrocode}
 % \end{localization}
@@ -18661,7 +20663,8 @@
 % \subsubsection{Pointer to \Datei{english-aefkw.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 %    \end{macrocode}
@@ -18672,7 +20675,8 @@
 % \subsubsection{Pointer to \Datei{german-aefkw.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-aefkw}
 \InheritBibliographyStrings{german-aefkw}
 %    \end{macrocode}
@@ -18684,13 +20688,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{urlseen}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlseen  = {{last access}{last access}},
@@ -18705,22 +20709,24 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 %    \end{macrocode}
 %
 % \begin{localization}{andothers}
+% \begin{localization}{genitiveandothers}
 % \begin{localization}{urlseen}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+    genitiveandothers = {{et\addabbrvspace al\adddot s}{et\addabbrvspace al\adddot s}},
     urlseen  = {{letzter Zugriff}{letzter Zugriff}},
 }
 %    \end{macrocode}
 % \end{localization}
 % \end{localization}
+% \end{localization}
 %
 %</archagermanLBX>
 %<*PenglisharchaLBX>
@@ -18728,7 +20734,8 @@
 % \subsubsection{Pointer to \Datei{english-archa.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 %    \end{macrocode}
@@ -18739,7 +20746,8 @@
 % \subsubsection{Pointer to \Datei{german-archa.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archa}
 \InheritBibliographyStrings{german-archa}
 %    \end{macrocode}
@@ -18751,22 +20759,24 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{andothers}
 % \begin{localization}{bathesis}
 % \begin{localization}{diplomathesis}
+% \begin{localization}{genitiveandothers}
 % \begin{localization}{magisterthesis}
 % \begin{localization}{mathesis}
 % \begin{localization}{phdthesis}
 % \begin{localization}{postdocthesis}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit        = {german-archaeology},
-    andothers      = {{et\space al\adddot}{et\space al\adddot}},
+    andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+    genitiveandothers = {{et\addabbrvspace al\adddot s}{et\addabbrvspace al\adddot s}},
     bathesis       = {{Bachelorarbeit}{Bachelorarbeit}},
     diplomathesis  = {{Diplomarbeit}{Diplomarbeit}},
     magisterthesis = {{Magisterarbeit}{Magisterarbeit}},
@@ -18782,6 +20792,7 @@
 % \end{localization}
 % \end{localization}
 % \end{localization}
+% \end{localization}
 %
 %</dgufaltgermanLBX>
 %<*PgermandgufaltLBX>
@@ -18789,7 +20800,8 @@
 % \subsubsection{Pointer to \Datei{german-dguf-alt.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-dguf-alt}
 \InheritBibliographyStrings{german-dguf-alt}
 %    \end{macrocode}
@@ -18801,7 +20813,8 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -18834,7 +20847,8 @@
 % \subsubsection{Pointer to \Datei{english-dguf-apa.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 %    \end{macrocode}
@@ -18846,13 +20860,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{subverbum}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {english-archaeology},
     subverbum  = {{keyword}{keyword}},
@@ -18867,13 +20881,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{subverbum}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {german-archaeology},
     subverbum  = {{Stichwort}{Stichwort}},
@@ -18887,7 +20901,8 @@
 % \subsubsection{Pointer to \Datei{english-eaz.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 %    \end{macrocode}
@@ -18898,7 +20913,8 @@
 % \subsubsection{Pointer to \Datei{german-eaz.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-eaz}
 \InheritBibliographyStrings{german-eaz}
 %    \end{macrocode}
@@ -18910,13 +20926,12 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 %    \end{macrocode}
 %
 % \begin{localization}{urlseen}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlseen  = {{accessed}{accessed}},
@@ -18939,13 +20954,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{urlseen}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     urlseen  = {{Zugriff}{Zugriff}},
@@ -18967,7 +20982,8 @@
 % \subsubsection{Pointer to \Datei{english-foe.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 %    \end{macrocode}
@@ -18978,7 +20994,8 @@
 % \subsubsection{Pointer to \Datei{german-foe.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-foe}
 \InheritBibliographyStrings{german-foe}
 %    \end{macrocode}
@@ -18990,14 +21007,14 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{ibidem}
 % \begin{localization}{volume}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit = {english-archaeology},
     ibidem  = {{ibidem}{ibidem}},
@@ -19014,14 +21031,14 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{ibidem}
 % \begin{localization}{volume}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit = {german-archaeology},
     ibidem  = {{ebenda}{ebenda}},
@@ -19037,7 +21054,8 @@
 % \subsubsection{Pointer to \Datei{english-jb-kreis-neuss.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 %    \end{macrocode}
@@ -19048,7 +21066,8 @@
 % \subsubsection{Pointer to \Datei{german-jb-kreis-neuss.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-jb-kreis-neuss}
 \InheritBibliographyStrings{german-jb-kreis-neuss}
 %    \end{macrocode}
@@ -19060,14 +21079,14 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{reprint}
 % \begin{localization}{urlfrom}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     seenote  = {{wie Fu\ss{}note}{wie Fn.}},
@@ -19083,7 +21102,8 @@
 % \subsubsection{Pointer to \Datei{german-karl.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-karl}
 \InheritBibliographyStrings{german-karl}
 %    \end{macrocode}
@@ -19095,7 +21115,8 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{byeditor}
@@ -19127,60 +21148,59 @@
 % \begin{localization}{editors}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit = {german-archaeology},
-    byeditor         = {{herausgegeben von}{hg\adddotspace von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    byeditorco       = {{herausgegeben und kommentiert von}%
-                      {hg\adddotspace und komm\adddot\ von}},
-    byeditoran       = {{herausgegeben und erl\"autert von}%
-                        {hg\adddotspace und erl\"aut\adddot\ von}},
-    byeditorin       = {{herausgegeben und mit einer Einleitung versehen von}%
-                        {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
-    byeditorfo       = {{herausgegeben und mit einem Vorwort versehen von}%
-                        {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
-    byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
-                        {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
-    byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-    byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
-    byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
-    byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
-    byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., komm\adddot\ und Einl\adddot\ von}},
-    byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., komm\adddot\ und Vorw\adddot\ von}},
-    byeditorcoaf     = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditoranin     = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditoranfo     = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
-    byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
-    byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
-    byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+  inherit        = {german-archaeology},
+  byeditor       = {{herausgegeben von}{hg\adddotspace von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                  {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  byeditorco     = {{herausgegeben und kommentiert von}%
+                  {hg\adddotspace und komm\adddot\ von}},
+  byeditoran     = {{herausgegeben und erl\"autert von}%
+                    {hg\adddotspace und erl\"aut\adddot\ von}},
+  byeditorin     = {{herausgegeben und mit einer Einleitung versehen von}%
+                    {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditorfo     = {{herausgegeben und mit einem Vorwort versehen von}%
+                    {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditoraf     = {{herausgegeben und mit einem Nachwort versehen von}%
+                    {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
+  byeditortrfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
+  byeditortraf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
+  byeditorcoin   = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., komm\adddot\ und Einl\adddot\ von}},
+  byeditorcofo   = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., komm\adddot\ und Vorw\adddot\ von}},
+  byeditorcoaf   = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditoranin   = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditoranfo   = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditoranaf   = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
+  byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
+  byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
+  byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
                       {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    editor = {{Herausgeber}{Hg\adddot}},
-    editors = {{Herausgeber}{Hgg\adddot}},
+  editor         = {{Herausgeber}{Hg\adddot}},
+  editors        = {{Herausgeber}{Hgg\adddot}},
 }
 %    \end{macrocode}
 % \end{localization}
@@ -19217,7 +21237,8 @@
 % \subsubsection{Pointer to \Datei{german-maja.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-maja}
 \InheritBibliographyStrings{german-maja}
 %    \end{macrocode}
@@ -19229,13 +21250,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{urlseen}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlseen  = {{last access}{last access}},
@@ -19250,22 +21271,27 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-archaeology}
 %    \end{macrocode}
 %
 % \begin{localization}{andothers}
+% \begin{localization}{genitiveandothers}
 % \begin{localization}{urlseen}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit  = {german-archaeology},
-    andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
-    urlseen  = {{letzter Zugriff}{letzter Zugriff}},
+  inherit  = {german-archaeology},
+  andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  genitiveandothers = {{et\addabbrvspace al\adddot s}
+                       {et\addabbrvspace al\adddot s}},
+  urlseen  = {{letzter Zugriff}{letzter Zugriff}},
 }
 %    \end{macrocode}
 % \end{localization}
 % \end{localization}
+% \end{localization}
 %
 %</mpkgermanLBX>
 %<*PenglishmpkLBX>
@@ -19273,36 +21299,239 @@
 % \subsubsection{Pointer to \Datei{english-mpk.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
 %    \end{macrocode}
 %
+% \begin{localization}{unpublishedbathesis}
+% \begin{localization}{unpublisheddiplomathesis}
+% \begin{localization}{unpublishedmagisterthesis}
+% \begin{localization}{unpublishedmathesis}
+% \begin{localization}{unpublishedpostdocthesis}
+% \begin{localization}{unpublishedphdthesis}
+% \begin{localization}{urlseen}
+%    \begin{macrocode}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
+%    \end{macrocode}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+%
 %</PenglishmpkLBX>
 %<*PgermanmpkLBX>
 %
 % \subsubsection{Pointer to \Datei{german-mpk.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-mpk}
 \InheritBibliographyStrings{german-mpk}
 %    \end{macrocode}
 %
 %</PgermanmpkLBX>
+%<*mpkoeawenglishLBX>
+%
+% \subsubsection{File \Datei{english-mpkoeaw.lbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{english-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-archaeology}
+%    \end{macrocode}
+%
+% \begin{localization}{exhibcat}
+% \begin{localization}{exhibition}
+% \begin{localization}{in}
+% \begin{localization}{postdocthesis}
+% \begin{localization}{phdthesis}
+% \begin{localization}{unpublishedbathesis}
+% \begin{localization}{unpublisheddiplomathesis}
+% \begin{localization}{unpublishedmagisterthesis}
+% \begin{localization}{unpublishedmathesis}
+% \begin{localization}{unpublishedpostdocthesis}
+% \begin{localization}{unpublishedphdthesis}
+% \begin{localization}{urlseen}
+%    \begin{macrocode}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit                   = {english-archaeology},
+  exhibcat                  = {{Exhibition catalogue}{Exhibition catalogue}},
+  exhibition                = {{Exhibition catalogue}{Exhibition catalogue}},
+  in                        = {{In}{In}},
+  phdthesis                 = {{PhD Dissertation}
+                               {PhD Dissertation}},
+  postdocthesis             = {{Habilitationsschrift}
+                               {Habilitationsschrift}},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen                   = {{last access}{last access}},
+}
+%    \end{macrocode}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+%
+%</mpkoeawenglishLBX>
+%<*mpkoeawgermanLBX>
+%
+% \subsubsection{File \Datei{german-mpkoeaw.lbx}}
+%
+%    \begin{macrocode}
+\ProvidesFile{german-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-archaeology}
+%    \end{macrocode}
+%
+% \begin{localization}{andothers}
+% \begin{localization}{genitiveandothers}
+% \begin{localization}{exhibcat}
+% \begin{localization}{exhibition}
+% \begin{localization}{in}
+% \begin{localization}{bathesis}
+% \begin{localization}{diplomathesis}
+% \begin{localization}{magisterthesis}
+% \begin{localization}{mathesis}
+% \begin{localization}{postdocthesis}
+% \begin{localization}{phdthesis}
+% \begin{localization}{unpublishedbathesis}
+% \begin{localization}{unpublisheddiplomathesis}
+% \begin{localization}{unpublishedmagisterthesis}
+% \begin{localization}{unpublishedmathesis}
+% \begin{localization}{unpublishedpostdocthesis}
+% \begin{localization}{unpublishedphdthesis}
+% \begin{localization}{urlseen}
+%    \begin{macrocode}
+\DeclareBibliographyStrings{%
+  inherit                   = {german-archaeology},
+  andothers                 = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  genitiveandothers         = {{et\addabbrvspace al\adddot s}
+                               {et\addabbrvspace al\adddot s}},
+  exhibcat                  = {{Austellungskatalog}{Austellungskatalog}},
+  exhibition                = {{Austellungskatalog}{Austellungskatalog}},
+  in                        = {{In}{In}},
+  reprint                   = {{Nachdruck}{Nachdruck}},
+  bathesis                  = {{Bachelorarbeit}{Bachelorarbeit}},
+  diplomathesis             = {{Diplomarbeit}{Diplomarbeit}},
+  magisterthesis            = {{Magisterarbeit}{Magisterarbeit}},
+  mathesis                  = {{Masterarbeit}{Masterarbeit}},
+  phdthesis                 = {{Dissertation}{Dissertation}},
+  postdocthesis             = {{Habilitationsschrift}
+                               {Habilitationsschrift}},
+  unpublishedbathesis       = {{unver\"offentlichte Bachelorarbeit}
+                               {unver\"offentlichte Bachelorarbeit}},
+  unpublisheddiplomathesis  = {{unver\"offentlichte Diplomarbeit}
+                               {unver\"offentlichte Diplomarbeit}},
+  unpublishedmagisterthesis = {{unver\"offentlichte Magisterarbeit}
+                               {unver\"offentlichte Magisterarbeit}},
+  unpublishedmathesis       = {{unver\"offentlichte Masterarbeit}
+                               {unver\"offentlichte Masterarbeit}},
+  unpublishedphdthesis      = {{unver\"offentlichte Dissertation}
+                               {unver\"offentlichte Dissertation}},
+  unpublishedpostdocthesis  = {{unver\"offentlichte Habilitationsschrift}
+                               {unver\"offentlichte Habilitationsschrift}},
+  urlseen                   = {{letzter Zugriff}{letzter Zugriff}},
+}
+%    \end{macrocode}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+% \end{localization}
+%
+%</mpkoeawgermanLBX>
+%<*PenglishmpkoeawLBX>
+%
+% \subsubsection{Pointer to \Datei{english-mpkoeaw.lbx}}
+%
+%    \begin{macrocode}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+%    \end{macrocode}
+%
+%</PenglishmpkoeawLBX>
+%<*PgermanmpkoeawLBX>
+%
+% \subsubsection{Pointer to \Datei{german-mpkoeaw.lbx}}
+%
+%    \begin{macrocode}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-mpkoeaw}
+%    \end{macrocode}
+%
+
+%</PgermanmpkoeawLBX>
 %<*offaenglishLBX>
 %
 % \subsubsection{File \Datei{english-offa.lbx}}
 %
 %    \begin{macrocode}
 \ProvidesFile{english-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{urlfrom}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {english-archaeology},
     nodate     = {{no date}{n.d\adddot}},
@@ -19319,7 +21548,8 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{page}
@@ -19327,7 +21557,6 @@
 % \begin{localization}{urlfrom}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {german-archaeology},
     nodate     = {{ohne Jahr}{o.J\adddot}},
@@ -19345,7 +21574,8 @@
 % \subsubsection{Pointer to \Datei{english-offa.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 %    \end{macrocode}
@@ -19356,7 +21586,8 @@
 % \subsubsection{Pointer to \Datei{german-offa.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-offa}
 \InheritBibliographyStrings{german-offa}
 %    \end{macrocode}
@@ -19368,7 +21599,8 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{ibidem}
@@ -19381,17 +21613,16 @@
 % \begin{localization}{phdthesis}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit        = {german-archaeology},
-    ibidem         = {{ebenda}{ebenda}},
-    reprint        = {{Nachdruck}{Nachdruck}},
-    bathesis       = {{Bachelorarbeit}{Bachelorarbeit}},
-    diplomathesis  = {{Diplomarbeit}{Diplomarbeit}},
-    magisterthesis = {{Magisterarbeit}{Magisterarbeit}},
-    mathesis       = {{Masterarbeit}{Masterarbeit}},
-    phdthesis      = {{Dissertation}{unpubl. Diss\adddot}},
-    postdocthesis  = {{Habilitationsschrift}{unpubl. Habilitationsschr\adddot}},
+  inherit        = {german-archaeology},
+  ibidem         = {{ebenda}{ebenda}},
+  reprint        = {{Nachdruck}{Nachdruck}},
+  bathesis       = {{Bachelorarbeit}{Bachelorarbeit}},
+  diplomathesis  = {{Diplomarbeit}{Diplomarbeit}},
+  magisterthesis = {{Magisterarbeit}{Magisterarbeit}},
+  mathesis       = {{Masterarbeit}{Masterarbeit}},
+  phdthesis      = {{Dissertation}{unpubl. Diss\adddot}},
+  postdocthesis  = {{Habilitationsschrift}{unpubl. Habilitationsschr\adddot}},
 }
 %    \end{macrocode}
 % \end{localization}
@@ -19409,7 +21640,8 @@
 % \subsubsection{Pointer to \Datei{german-rgzm.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-rgzm}
 \InheritBibliographyStrings{german-rgzm}
 %    \end{macrocode}
@@ -19421,13 +21653,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{urlfrom}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlfrom  = {{In}{In}},
@@ -19442,7 +21674,8 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{page}
@@ -19450,7 +21683,6 @@
 % \begin{localization}{urlfrom}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     page     = {{Seite}{p\adddot}},
@@ -19468,7 +21700,8 @@
 % \subsubsection{Pointer to \Datei{english-zaak.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 %    \end{macrocode}
@@ -19479,7 +21712,8 @@
 % \subsubsection{Pointer to \Datei{german-zaak.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaak}
 \InheritBibliographyStrings{german-zaak}
 %    \end{macrocode}
@@ -19491,13 +21725,13 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{english-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{ibidem}
 %    \begin{macrocode}
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     ibidem   = {{l.\,c\adddot}{l.\,c\adddot}},
@@ -19512,7 +21746,8 @@
 %
 %    \begin{macrocode}
 \ProvidesFile{german-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 %    \end{macrocode}
 %
 % \begin{localization}{byeditor}
@@ -19545,61 +21780,60 @@
 % \begin{localization}{ibidem}
 %    \begin{macrocode}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit = {german-archaeology},
-    byeditor         = {{herausgegeben von}{hg\adddotspace von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    byeditorco       = {{herausgegeben und kommentiert von}%
-                      {hg\adddotspace und komm\adddot\ von}},
-    byeditoran       = {{herausgegeben und erl\"autert von}%
-                        {hg\adddotspace und erl\"aut\adddot\ von}},
-    byeditorin       = {{herausgegeben und mit einer Einleitung versehen von}%
-                        {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
-    byeditorfo       = {{herausgegeben und mit einem Vorwort versehen von}%
-                        {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
-    byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
-                        {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
-    byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-    byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
-    byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
-    byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
-    byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., komm\adddot\ und Einl\adddot\ von}},
-    byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., komm\adddot\ und Vorw\adddot\ von}},
-    byeditorcoaf     = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditoranin     = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditoranfo     = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
-    byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
-    byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
-    byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    editor = {{Herausgeber}{Hg\adddot}},
-    editors = {{Herausgeber}{Hgg\adddot}},
-    ibidem = {{\midsentence l.\,c\adddot}{l.\,c\adddot}},
+  inherit = {german-archaeology},
+  byeditor       = {{herausgegeben von}{hg\adddotspace von}},
+   byeditortr    = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                    {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  byeditorco     = {{herausgegeben und kommentiert von}%
+                    {hg\adddotspace und komm\adddot\ von}},
+  byeditoran     = {{herausgegeben und erl\"autert von}%
+                    {hg\adddotspace und erl\"aut\adddot\ von}},
+  byeditorin     = {{herausgegeben und mit einer Einleitung versehen von}%
+                    {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditorfo     = {{herausgegeben und mit einem Vorwort versehen von}%
+                    {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditoraf     = {{herausgegeben und mit einem Nachwort versehen von}%
+                    {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
+  byeditortrfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
+  byeditortraf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
+  byeditorcoin   = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., komm\adddot\ und Einl\adddot\ von}},
+  byeditorcofo   = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., komm\adddot\ und Vorw\adddot\ von}},
+  byeditorcoaf   = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditoranin   = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditoranfo   = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditoranaf   = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
+  byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
+  byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
+  byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                    {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  editor = {{Herausgeber}{Hg\adddot}},
+  editors = {{Herausgeber}{Hgg\adddot}},
+  ibidem = {{\midsentence l.\,c\adddot}{l.\,c\adddot}},
 }
 %    \end{macrocode}
 % \end{localization}
@@ -19637,7 +21871,8 @@
 % \subsubsection{Pointer to \Datei{english-zaes.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 %    \end{macrocode}
@@ -19648,7 +21883,8 @@
 % \subsubsection{Pointer to \Datei{german-zaes.lbx}}
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaes}
 \InheritBibliographyStrings{german-zaes}
 %    \end{macrocode}
@@ -19687,6 +21923,20 @@
 %    \end{macrocode}
 %
 %</authoryearicompDBX>
+%<*numericcompDBX>
+%
+%    \begin{macrocode}
+\ProvidesFile{numeric-comp-archaeology.dbx}
+%    \end{macrocode}
+%
+%</numericcompDBX>
+%<*verboseDBX>
+%
+%    \begin{macrocode}
+\ProvidesFile{verbose-archaeology.dbx}
+%    \end{macrocode}
+%
+%</verboseDBX>
 %<*verboseibidDBX>
 %
 %    \begin{macrocode}
@@ -19806,6 +22056,13 @@
 %    \end{macrocode}
 %
 %</mpkDBX>
+%<*mpkoeawDBX>
+%
+%    \begin{macrocode}
+\ProvidesFile{mpkoeaw.dbx}
+%    \end{macrocode}
+%
+%</mpkoeawDBX>
 %<*nnuDBX>
 %
 %    \begin{macrocode}
@@ -19827,6 +22084,13 @@
 %    \end{macrocode}
 %
 %</rgkinlineDBX>
+%<*rgknumericDBX>
+%
+%    \begin{macrocode}
+\ProvidesFile{rgk-numeric.dbx}
+%    \end{macrocode}
+%
+%</rgknumericDBX>
 %<*rgkverboseDBX>
 %
 %    \begin{macrocode}
@@ -19841,6 +22105,13 @@
 %    \end{macrocode}
 %
 %</rgzminlineDBX>
+%<*rgzmnumericDBX>
+%
+%    \begin{macrocode}
+\ProvidesFile{rgzm-numeric.dbx}
+%    \end{macrocode}
+%
+%</rgzmnumericDBX>
 %<*rgzmverboseDBX>
 %
 %    \begin{macrocode}
@@ -19855,6 +22126,13 @@
 %    \end{macrocode}
 %
 %</ufgmuensterinlineDBX>
+%<*ufgmuensternumericDBX>
+%
+%    \begin{macrocode}
+\ProvidesFile{ufg-muenster-numeric.dbx}
+%    \end{macrocode}
+%
+%</ufgmuensternumericDBX>
 %<*ufgmuensterverboseDBX>
 %
 %    \begin{macrocode}
@@ -19889,7 +22167,7 @@
 %<*DBX>
 %
 %    \begin{macrocode}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 %    \end{macrocode}
 %
 % \subsubsubsection{Subserieses}
@@ -19991,9 +22269,1482 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 %    \end{macrocode}
 % \end{format}
 %
+% \subsubsubsection{annotation fields}
+%
+% Field annotation consist of csv list with a leading equation mark in \Kbd{<field>+an} fields. It
+% appears that they cannot reached via source map steps and are only available, if \Biber
+% was called with \Option{--output-annotation-marker}. There we define those we want to evaluate
+% in source maps as lateral fields. No need to show them up in the \Kbd{*.bbl} file.
+%
+% \begin{format}{date+an}
+%    \begin{macrocode}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+%    \end{macrocode}
+% \end{format}
+%
 %</DBX>
 %
+% \subsubsection{Data model for \Biber's tool mode}\label{kap:biberconf}
+%
+% See explanation in \ref{kap:bibertool}.
+%<*BiberCONF>
+%    \begin{macrocode}
+<!-- REPLACE THE <DATAMODEL> GROUP IN THE BIBER *.CONF FILE WITH THE GROUP BELOW -->
+  <datamodel>
+    <constants>
+      <constant name="gender" type="list">sf,sm,sn,pf,pm,pn,pp</constant>
+      <constant name="nameparts" type="list">family,given,prefix,suffix</constant>
+      <constant name="optiondatatypes" type="list">boolean,integer,string,xml</constant>
+    </constants>
+    <entrytypes>
+      <entrytype>article</entrytype>
+      <entrytype>artwork</entrytype>
+      <entrytype>audio</entrytype>
+      <entrytype>bibnote</entrytype>
+      <entrytype>book</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>booklet</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>commentary</entrytype>
+      <entrytype>customa</entrytype>
+      <entrytype>customb</entrytype>
+      <entrytype>customc</entrytype>
+      <entrytype>customd</entrytype>
+      <entrytype>custome</entrytype>
+      <entrytype>customf</entrytype>
+      <entrytype>inbook</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>image</entrytype>
+      <entrytype>jurisdiction</entrytype>
+      <entrytype>legal</entrytype>
+      <entrytype>legislation</entrytype>
+      <entrytype>letter</entrytype>
+      <entrytype>manual</entrytype>
+      <entrytype>misc</entrytype>
+      <entrytype>movie</entrytype>
+      <entrytype>music</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>online</entrytype>
+      <entrytype>patent</entrytype>
+      <entrytype>performance</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>report</entrytype>
+      <entrytype>review</entrytype>
+      <entrytype>set</entrytype>
+      <entrytype>software</entrytype>
+      <entrytype>standard</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <entrytype>thesis</entrytype>
+      <entrytype>unpublished</entrytype>
+      <entrytype>video</entrytype>
+      <entrytype skip_output="true">xdata</entrytype>
+    </entrytypes>
+    <fields>
+      <field datatype="integer" fieldtype="field">number</field>
+      <field datatype="integer" fieldtype="field">volume</field>
+      <field datatype="integer" fieldtype="field">volumes</field>
+      <field datatype="literal" fieldtype="field">abstract</field>
+      <field datatype="literal" fieldtype="field">addendum</field>
+      <field datatype="literal" fieldtype="field">annotation</field>
+      <field datatype="literal" fieldtype="field">booksubtitle</field>
+      <field datatype="literal" fieldtype="field">booktitle</field>
+      <field datatype="literal" fieldtype="field">booktitleaddon</field>
+      <field datatype="literal" fieldtype="field">chapter</field>
+      <field datatype="literal" fieldtype="field">edition</field>
+      <field datatype="literal" fieldtype="field">eid</field>
+      <field datatype="literal" fieldtype="field">entrysubtype</field>
+      <field datatype="literal" fieldtype="field">eprintclass</field>
+      <field datatype="literal" fieldtype="field">eprinttype</field>
+      <field datatype="literal" fieldtype="field">eventtitle</field>
+      <field datatype="literal" fieldtype="field">eventtitleaddon</field>
+      <field datatype="literal" fieldtype="field">gender</field>
+      <field datatype="literal" fieldtype="field">howpublished</field>
+      <field datatype="literal" fieldtype="field">indexsorttitle</field>
+      <field datatype="literal" fieldtype="field">indextitle</field>
+      <field datatype="literal" fieldtype="field">isan</field>
+      <field datatype="literal" fieldtype="field">isbn</field>
+      <field datatype="literal" fieldtype="field">ismn</field>
+      <field datatype="literal" fieldtype="field">isrn</field>
+      <field datatype="literal" fieldtype="field">issn</field>
+      <field datatype="literal" fieldtype="field">issue</field>
+      <field datatype="literal" fieldtype="field">issuesubtitle</field>
+      <field datatype="literal" fieldtype="field">issuetitle</field>
+      <field datatype="literal" fieldtype="field">iswc</field>
+      <field datatype="literal" fieldtype="field">journalsubtitle</field>
+      <field datatype="literal" fieldtype="field">journaltitle</field>
+      <field datatype="literal" fieldtype="field">label</field>
+      <field datatype="literal" fieldtype="field">langid</field>
+      <field datatype="literal" fieldtype="field">langidopts</field>
+      <field datatype="literal" fieldtype="field">library</field>
+      <field datatype="literal" fieldtype="field">mainsubtitle</field>
+      <field datatype="literal" fieldtype="field">maintitle</field>
+      <field datatype="literal" fieldtype="field">maintitleaddon</field>
+      <field datatype="literal" fieldtype="field">nameaddon</field>
+      <field datatype="literal" fieldtype="field">note</field>
+      <field datatype="literal" fieldtype="field">origtitle</field>
+      <field datatype="literal" fieldtype="field">pagetotal</field>
+      <field datatype="literal" fieldtype="field">part</field>
+      <field datatype="literal" fieldtype="field">relatedstring</field>
+      <field datatype="literal" fieldtype="field">relatedtype</field>
+      <field datatype="literal" fieldtype="field">reprinttitle</field>
+      <field datatype="literal" fieldtype="field">series</field>
+      <field datatype="literal" fieldtype="field">shorthandintro</field>
+      <field datatype="literal" fieldtype="field">subtitle</field>
+      <field datatype="literal" fieldtype="field">title</field>
+      <field datatype="literal" fieldtype="field">titleaddon</field>
+      <field datatype="literal" fieldtype="field">usera</field>
+      <field datatype="literal" fieldtype="field">userb</field>
+      <field datatype="literal" fieldtype="field">userc</field>
+      <field datatype="literal" fieldtype="field">userd</field>
+      <field datatype="literal" fieldtype="field">usere</field>
+      <field datatype="literal" fieldtype="field">userf</field>
+      <field datatype="literal" fieldtype="field">venue</field>
+      <field datatype="literal" fieldtype="field">version</field>
+      <field datatype="literal" fieldtype="field" label="true">shorthand</field>
+      <field datatype="literal" fieldtype="field" label="true">shortjournal</field>
+      <field datatype="literal" fieldtype="field" label="true">shortseries</field>
+      <field datatype="literal" fieldtype="field" label="true">shorttitle</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sortyear</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sorttitle</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sortshorthand</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">sortkey</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">presort</field>
+      <field datatype="literal" fieldtype="list">institution</field>
+      <field datatype="literal" fieldtype="list">lista</field>
+      <field datatype="literal" fieldtype="list">listb</field>
+      <field datatype="literal" fieldtype="list">listc</field>
+      <field datatype="literal" fieldtype="list">listd</field>
+      <field datatype="literal" fieldtype="list">liste</field>
+      <field datatype="literal" fieldtype="list">listf</field>
+      <field datatype="literal" fieldtype="list">location</field>
+      <field datatype="literal" fieldtype="list">organization</field>
+      <field datatype="literal" fieldtype="list">origlocation</field>
+      <field datatype="literal" fieldtype="list">origpublisher</field>
+      <field datatype="literal" fieldtype="list">publisher</field>
+      <field datatype="name" fieldtype="list">afterword</field>
+      <field datatype="name" fieldtype="list">annotator</field>
+      <field datatype="name" fieldtype="list">author</field>
+      <field datatype="name" fieldtype="list">bookauthor</field>
+      <field datatype="name" fieldtype="list">commentator</field>
+      <field datatype="name" fieldtype="list">editor</field>
+      <field datatype="name" fieldtype="list">editora</field>
+      <field datatype="name" fieldtype="list">editorb</field>
+      <field datatype="name" fieldtype="list">editorc</field>
+      <field datatype="name" fieldtype="list">foreword</field>
+      <field datatype="name" fieldtype="list">holder</field>
+      <field datatype="name" fieldtype="list">introduction</field>
+      <field datatype="name" fieldtype="list">namea</field>
+      <field datatype="name" fieldtype="list">nameb</field>
+      <field datatype="name" fieldtype="list">namec</field>
+      <field datatype="name" fieldtype="list">translator</field>
+      <field datatype="name" fieldtype="list" label="true">shortauthor</field>
+      <field datatype="name" fieldtype="list" label="true">shorteditor</field>
+      <field datatype="name" fieldtype="list" skip_output="true">sortname</field>
+      <field datatype="key" fieldtype="field">authortype</field>
+      <field datatype="key" fieldtype="field">editoratype</field>
+      <field datatype="key" fieldtype="field">editorbtype</field>
+      <field datatype="key" fieldtype="field">editorctype</field>
+      <field datatype="key" fieldtype="field">editortype</field>
+      <field datatype="key" fieldtype="field">bookpagination</field>
+      <field datatype="key" fieldtype="field">nameatype</field>
+      <field datatype="key" fieldtype="field">namebtype</field>
+      <field datatype="key" fieldtype="field">namectype</field>
+      <field datatype="key" fieldtype="field">pagination</field>
+      <field datatype="key" fieldtype="field">pubstate</field>
+      <field datatype="key" fieldtype="field">type</field>
+      <field datatype="key" fieldtype="list">language</field>
+      <field datatype="key" fieldtype="list">origlanguage</field>
+      <field datatype="entrykey" fieldtype="field">crossref</field>
+      <field datatype="entrykey" fieldtype="field">xref</field>
+      <field datatype="date" fieldtype="field" skip_output="true">date</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">endyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">year</field>
+      <field datatype="datepart" fieldtype="field">month</field>
+      <field datatype="datepart" fieldtype="field">day</field>
+      <field datatype="datepart" fieldtype="field">hour</field>
+      <field datatype="datepart" fieldtype="field">minute</field>
+      <field datatype="datepart" fieldtype="field">second</field>
+      <field datatype="datepart" fieldtype="field">timezone</field>
+      <field datatype="datepart" fieldtype="field">season</field>
+      <field datatype="datepart" fieldtype="field">endmonth</field>
+      <field datatype="datepart" fieldtype="field">endday</field>
+      <field datatype="datepart" fieldtype="field">endhour</field>
+      <field datatype="datepart" fieldtype="field">endminute</field>
+      <field datatype="datepart" fieldtype="field">endsecond</field>
+      <field datatype="datepart" fieldtype="field">endtimezone</field>
+      <field datatype="datepart" fieldtype="field">endseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">eventdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">eventendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">eventyear</field>
+      <field datatype="datepart" fieldtype="field">eventmonth</field>
+      <field datatype="datepart" fieldtype="field">eventday</field>
+      <field datatype="datepart" fieldtype="field">eventhour</field>
+      <field datatype="datepart" fieldtype="field">eventminute</field>
+      <field datatype="datepart" fieldtype="field">eventsecond</field>
+      <field datatype="datepart" fieldtype="field">eventtimezone</field>
+      <field datatype="datepart" fieldtype="field">eventseason</field>
+      <field datatype="datepart" fieldtype="field">eventendmonth</field>
+      <field datatype="datepart" fieldtype="field">eventendday</field>
+      <field datatype="datepart" fieldtype="field">eventendhour</field>
+      <field datatype="datepart" fieldtype="field">eventendminute</field>
+      <field datatype="datepart" fieldtype="field">eventendsecond</field>
+      <field datatype="datepart" fieldtype="field">eventendtimezone</field>
+      <field datatype="datepart" fieldtype="field">eventendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">origdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origyear</field>
+      <field datatype="datepart" fieldtype="field">origmonth</field>
+      <field datatype="datepart" fieldtype="field">origday</field>
+      <field datatype="datepart" fieldtype="field">orighour</field>
+      <field datatype="datepart" fieldtype="field">origminute</field>
+      <field datatype="datepart" fieldtype="field">origsecond</field>
+      <field datatype="datepart" fieldtype="field">origtimezone</field>
+      <field datatype="datepart" fieldtype="field">origseason</field>
+      <field datatype="datepart" fieldtype="field">origendmonth</field>
+      <field datatype="datepart" fieldtype="field">origendday</field>
+      <field datatype="datepart" fieldtype="field">origendhour</field>
+      <field datatype="datepart" fieldtype="field">origendminute</field>
+      <field datatype="datepart" fieldtype="field">origendsecond</field>
+      <field datatype="datepart" fieldtype="field">origendtimezone</field>
+      <field datatype="datepart" fieldtype="field">origendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">urldate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">urlendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">urlyear</field>
+      <field datatype="datepart" fieldtype="field">urlmonth</field>
+      <field datatype="datepart" fieldtype="field">urlday</field>
+      <field datatype="datepart" fieldtype="field">urlhour</field>
+      <field datatype="datepart" fieldtype="field">urlminute</field>
+      <field datatype="datepart" fieldtype="field">urlsecond</field>
+      <field datatype="datepart" fieldtype="field">urltimezone</field>
+      <field datatype="datepart" fieldtype="field">urlseason</field>
+      <field datatype="datepart" fieldtype="field">urlendmonth</field>
+      <field datatype="datepart" fieldtype="field">urlendday</field>
+      <field datatype="datepart" fieldtype="field">urlendhour</field>
+      <field datatype="datepart" fieldtype="field">urlendminute</field>
+      <field datatype="datepart" fieldtype="field">urlendsecond</field>
+      <field datatype="datepart" fieldtype="field">urlendtimezone</field>
+      <field datatype="datepart" fieldtype="field">urlendseason</field>
+      <field datatype="verbatim" fieldtype="field">doi</field>
+      <field datatype="verbatim" fieldtype="field">eprint</field>
+      <field datatype="verbatim" fieldtype="field">file</field>
+      <field datatype="verbatim" fieldtype="field">verba</field>
+      <field datatype="verbatim" fieldtype="field">verbb</field>
+      <field datatype="verbatim" fieldtype="field">verbc</field>
+      <field datatype="uri" fieldtype="field">url</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv" skip_output="true">xdata</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv" skip_output="true">ids</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv" skip_output="true">entryset</field>
+      <field datatype="entrykey" fieldtype="field" format="xsv">related</field>
+      <field datatype="keyword" fieldtype="field" format="xsv">keywords</field>
+      <field datatype="option" fieldtype="field" format="xsv" skip_output="true">options</field>
+      <field datatype="option" fieldtype="field" format="xsv" skip_output="true">relatedoptions</field>
+      <field datatype="range" fieldtype="field">pages</field>
+      <field datatype="code" fieldtype="field">execute</field>
+      <field datatype="literal" fieldtype="field">shortsubseries</field>
+      <field datatype="literal" fieldtype="field">subseries</field>
+      <field datatype="integer" fieldtype="field">subnumber</field>
+      <field datatype="literal" fieldtype="field">titlenote</field>
+      <field datatype="literal" fieldtype="field">maintitlenote</field>
+      <field datatype="literal" fieldtype="field">booktitlenote</field>
+      <field datatype="literal" fieldtype="field">summarytitle</field>
+      <field datatype="literal" fieldtype="field">shortform</field>
+      <field datatype="name" fieldtype="list">festschrift</field>
+      <field datatype="literal" fieldtype="field">festschriftaddon</field>
+      <field datatype="integer" fieldtype="field">eventnumber</field>
+      <field datatype="literal" fieldtype="field">eventtype</field>
+      <field datatype="literal" fieldtype="list">multieventdate</field>
+      <field datatype="literal" fieldtype="list">multivenue</field>
+      <field datatype="date" fieldtype="field" skip_output="true">realdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realyear</field>
+      <field datatype="datepart" fieldtype="field">realmonth</field>
+      <field datatype="datepart" fieldtype="field">realday</field>
+      <field datatype="datepart" fieldtype="field">realhour</field>
+      <field datatype="datepart" fieldtype="field">realminute</field>
+      <field datatype="datepart" fieldtype="field">realsecond</field>
+      <field datatype="datepart" fieldtype="field">realtimezone</field>
+      <field datatype="datepart" fieldtype="field">realseason</field>
+      <field datatype="datepart" fieldtype="field">realendmonth</field>
+      <field datatype="datepart" fieldtype="field">realendday</field>
+      <field datatype="datepart" fieldtype="field">realendhour</field>
+      <field datatype="datepart" fieldtype="field">realendminute</field>
+      <field datatype="datepart" fieldtype="field">realendsecond</field>
+      <field datatype="datepart" fieldtype="field">realendtimezone</field>
+      <field datatype="datepart" fieldtype="field">realendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">origrealdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealyear</field>
+      <field datatype="datepart" fieldtype="field">origrealmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealday</field>
+      <field datatype="datepart" fieldtype="field">origrealhour</field>
+      <field datatype="datepart" fieldtype="field">origrealminute</field>
+      <field datatype="datepart" fieldtype="field">origrealsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealseason</field>
+      <field datatype="datepart" fieldtype="field">origrealendmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealendday</field>
+      <field datatype="datepart" fieldtype="field">origrealendhour</field>
+      <field datatype="datepart" fieldtype="field">origrealendminute</field>
+      <field datatype="datepart" fieldtype="field">origrealendsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealendtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">fulleventdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">fulleventendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">fulleventyear</field>
+      <field datatype="datepart" fieldtype="field">fulleventmonth</field>
+      <field datatype="datepart" fieldtype="field">fulleventday</field>
+      <field datatype="datepart" fieldtype="field">fulleventhour</field>
+      <field datatype="datepart" fieldtype="field">fulleventminute</field>
+      <field datatype="datepart" fieldtype="field">fulleventsecond</field>
+      <field datatype="datepart" fieldtype="field">fulleventtimezone</field>
+      <field datatype="datepart" fieldtype="field">fulleventseason</field>
+      <field datatype="datepart" fieldtype="field">fulleventendmonth</field>
+      <field datatype="datepart" fieldtype="field">fulleventendday</field>
+      <field datatype="datepart" fieldtype="field">fulleventendhour</field>
+      <field datatype="datepart" fieldtype="field">fulleventendminute</field>
+      <field datatype="datepart" fieldtype="field">fulleventendsecond</field>
+      <field datatype="datepart" fieldtype="field">fulleventendtimezone</field>
+      <field datatype="datepart" fieldtype="field">fulleventendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">newsdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">newsendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">newsyear</field>
+      <field datatype="datepart" fieldtype="field">newsmonth</field>
+      <field datatype="datepart" fieldtype="field">newsday</field>
+      <field datatype="datepart" fieldtype="field">newshour</field>
+      <field datatype="datepart" fieldtype="field">newsminute</field>
+      <field datatype="datepart" fieldtype="field">newssecond</field>
+      <field datatype="datepart" fieldtype="field">newstimezone</field>
+      <field datatype="datepart" fieldtype="field">newsseason</field>
+      <field datatype="datepart" fieldtype="field">newsendmonth</field>
+      <field datatype="datepart" fieldtype="field">newsendday</field>
+      <field datatype="datepart" fieldtype="field">newsendhour</field>
+      <field datatype="datepart" fieldtype="field">newsendminute</field>
+      <field datatype="datepart" fieldtype="field">newsendsecond</field>
+      <field datatype="datepart" fieldtype="field">newsendtimezone</field>
+      <field datatype="datepart" fieldtype="field">newsendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">realdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">realyear</field>
+      <field datatype="datepart" fieldtype="field">realmonth</field>
+      <field datatype="datepart" fieldtype="field">realday</field>
+      <field datatype="datepart" fieldtype="field">realhour</field>
+      <field datatype="datepart" fieldtype="field">realminute</field>
+      <field datatype="datepart" fieldtype="field">realsecond</field>
+      <field datatype="datepart" fieldtype="field">realtimezone</field>
+      <field datatype="datepart" fieldtype="field">realseason</field>
+      <field datatype="datepart" fieldtype="field">realendmonth</field>
+      <field datatype="datepart" fieldtype="field">realendday</field>
+      <field datatype="datepart" fieldtype="field">realendhour</field>
+      <field datatype="datepart" fieldtype="field">realendminute</field>
+      <field datatype="datepart" fieldtype="field">realendsecond</field>
+      <field datatype="datepart" fieldtype="field">realendtimezone</field>
+      <field datatype="datepart" fieldtype="field">realendseason</field>
+      <field datatype="date" fieldtype="field" skip_output="true">origrealdate</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealendyear</field>
+      <field datatype="datepart" fieldtype="field" nullok="true">origrealyear</field>
+      <field datatype="datepart" fieldtype="field">origrealmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealday</field>
+      <field datatype="datepart" fieldtype="field">origrealhour</field>
+      <field datatype="datepart" fieldtype="field">origrealminute</field>
+      <field datatype="datepart" fieldtype="field">origrealsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealseason</field>
+      <field datatype="datepart" fieldtype="field">origrealendmonth</field>
+      <field datatype="datepart" fieldtype="field">origrealendday</field>
+      <field datatype="datepart" fieldtype="field">origrealendhour</field>
+      <field datatype="datepart" fieldtype="field">origrealendminute</field>
+      <field datatype="datepart" fieldtype="field">origrealendsecond</field>
+      <field datatype="datepart" fieldtype="field">origrealendtimezone</field>
+      <field datatype="datepart" fieldtype="field">origrealendseason</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">date+an</field>
+      <field datatype="literal" fieldtype="field" skip_output="true">origdate+an</field>
+    </fields>
+    <entryfields>
+      <field>abstract</field>
+      <field>annotation</field>
+      <field>authortype</field>
+      <field>bookpagination</field>
+      <field>crossref</field>
+      <field>day</field>
+      <field>endday</field>
+      <field>endhour</field>
+      <field>endminute</field>
+      <field>endmonth</field>
+      <field>endseason</field>
+      <field>endsecond</field>
+      <field>endtimezone</field>
+      <field>endyear</field>
+      <field>entryset</field>
+      <field>entrysubtype</field>
+      <field>execute</field>
+      <field>file</field>
+      <field>gender</field>
+      <field>hour</field>
+      <field>ids</field>
+      <field>indextitle</field>
+      <field>indexsorttitle</field>
+      <field>isan</field>
+      <field>ismn</field>
+      <field>iswc</field>
+      <field>keywords</field>
+      <field>label</field>
+      <field>langid</field>
+      <field>langidopts</field>
+      <field>library</field>
+      <field>lista</field>
+      <field>listb</field>
+      <field>listc</field>
+      <field>listd</field>
+      <field>liste</field>
+      <field>listf</field>
+      <field>minute</field>
+      <field>month</field>
+      <field>nameaddon</field>
+      <field>options</field>
+      <field>origday</field>
+      <field>origendday</field>
+      <field>origendhour</field>
+      <field>origendminute</field>
+      <field>origendmonth</field>
+      <field>origendseason</field>
+      <field>origendsecond</field>
+      <field>origendtimezone</field>
+      <field>origendyear</field>
+      <field>orighour</field>
+      <field>origminute</field>
+      <field>origmonth</field>
+      <field>origseason</field>
+      <field>origsecond</field>
+      <field>origtimezone</field>
+      <field>origyear</field>
+      <field>origlocation</field>
+      <field>origpublisher</field>
+      <field>origtitle</field>
+      <field>pagination</field>
+      <field>presort</field>
+      <field>related</field>
+      <field>relatedoptions</field>
+      <field>relatedstring</field>
+      <field>relatedtype</field>
+      <field>season</field>
+      <field>second</field>
+      <field>shortauthor</field>
+      <field>shorteditor</field>
+      <field>shorthand</field>
+      <field>shorthandintro</field>
+      <field>shortjournal</field>
+      <field>shortseries</field>
+      <field>shorttitle</field>
+      <field>sortkey</field>
+      <field>sortname</field>
+      <field>sortshorthand</field>
+      <field>sorttitle</field>
+      <field>sortyear</field>
+      <field>timezone</field>
+      <field>url</field>
+      <field>urlday</field>
+      <field>urlendday</field>
+      <field>urlendhour</field>
+      <field>urlendminute</field>
+      <field>urlendmonth</field>
+      <field>urlendsecond</field>
+      <field>urlendtimezone</field>
+      <field>urlendyear</field>
+      <field>urlhour</field>
+      <field>urlminute</field>
+      <field>urlmonth</field>
+      <field>urlsecond</field>
+      <field>urltimezone</field>
+      <field>urlyear</field>
+      <field>usera</field>
+      <field>userb</field>
+      <field>userc</field>
+      <field>userd</field>
+      <field>usere</field>
+      <field>userf</field>
+      <field>verba</field>
+      <field>verbb</field>
+      <field>verbc</field>
+      <field>xdata</field>
+      <field>xref</field>
+      <field>year</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>set</entrytype>
+      <field>entryset</field>
+      <field>crossref</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>article</entrytype>
+      <field>addendum</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eid</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>issn</field>
+      <field>issue</field>
+      <field>issuetitle</field>
+      <field>issuesubtitle</field>
+      <field>journalsubtitle</field>
+      <field>journaltitle</field>
+      <field>language</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>version</field>
+      <field>volume</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>bibnote</entrytype>
+      <field>note</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>book</entrytype>
+      <field>author</field>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>mainsubtitle</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>mvbook</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pagetotal</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>suppbook</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>booktitle</field>
+      <field>bookauthor</field>
+      <field>booksubtitle</field>
+      <field>booktitleaddon</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pages</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>booklet</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>howpublished</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>collection</entrytype>
+      <entrytype>reference</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvreference</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>incollection</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>inreference</entrytype>
+      <field>addendum</field>
+      <field>afterword</field>
+      <field>annotator</field>
+      <field>author</field>
+      <field>booksubtitle</field>
+      <field>booktitle</field>
+      <field>booktitleaddon</field>
+      <field>chapter</field>
+      <field>commentator</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>foreword</field>
+      <field>introduction</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>origlanguage</field>
+      <field>pages</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>translator</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>manual</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>edition</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>misc</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>howpublished</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>organization</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>online</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>language</field>
+      <field>note</field>
+      <field>organization</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>patent</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>doi</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>holder</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>periodical</entrytype>
+      <field>addendum</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editora</field>
+      <field>editorb</field>
+      <field>editorc</field>
+      <field>editortype</field>
+      <field>editoratype</field>
+      <field>editorbtype</field>
+      <field>editorctype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>issn</field>
+      <field>issue</field>
+      <field>issuesubtitle</field>
+      <field>issuetitle</field>
+      <field>language</field>
+      <field>note</field>
+      <field>number</field>
+      <field>pubstate</field>
+      <field>season</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>volume</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>mvproceedings</entrytype>
+      <field>addendum</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pagetotal</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>venue</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>proceedings</entrytype>
+      <field>addendum</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>venue</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inproceedings</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>booksubtitle</field>
+      <field>booktitle</field>
+      <field>booktitleaddon</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>editor</field>
+      <field>editortype</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>isbn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>mainsubtitle</field>
+      <field>maintitle</field>
+      <field>maintitleaddon</field>
+      <field>note</field>
+      <field>number</field>
+      <field>organization</field>
+      <field>pages</field>
+      <field>part</field>
+      <field>publisher</field>
+      <field>pubstate</field>
+      <field>series</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>venue</field>
+      <field>volume</field>
+      <field>volumes</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>report</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>institution</field>
+      <field>isrn</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>number</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>version</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>thesis</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>chapter</field>
+      <field>doi</field>
+      <field>eprint</field>
+      <field>eprintclass</field>
+      <field>eprinttype</field>
+      <field>institution</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>pages</field>
+      <field>pagetotal</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>unpublished</entrytype>
+      <field>addendum</field>
+      <field>author</field>
+      <field>eventday</field>
+      <field>eventendday</field>
+      <field>eventendhour</field>
+      <field>eventendminute</field>
+      <field>eventendmonth</field>
+      <field>eventendseason</field>
+      <field>eventendsecond</field>
+      <field>eventendtimezone</field>
+      <field>eventendyear</field>
+      <field>eventhour</field>
+      <field>eventminute</field>
+      <field>eventmonth</field>
+      <field>eventseason</field>
+      <field>eventsecond</field>
+      <field>eventtimezone</field>
+      <field>eventyear</field>
+      <field>eventtitle</field>
+      <field>eventtitleaddon</field>
+      <field>howpublished</field>
+      <field>language</field>
+      <field>location</field>
+      <field>note</field>
+      <field>pubstate</field>
+      <field>subtitle</field>
+      <field>title</field>
+      <field>titleaddon</field>
+      <field>type</field>
+      <field>venue</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>book</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>inbook</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>shortsubseries</field>
+      <field>subnumber</field>
+      <field>subseries</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>shortform</field>
+      <field>festschrift</field>
+      <field>festschriftaddon</field>
+      <field>eventnumber</field>
+      <field>eventtype </field>
+      <field>eventdate</field>
+      <field>venue</field>
+      <field>multieventdate</field>
+      <field>multivenue</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>booktitlenote</field>
+    </entryfields>
+    <entryfields>
+      <field>summarytitle</field>
+      <field>titlenote</field>
+    </entryfields>
+    <entryfields>
+      <field>realdate</field>
+      <field>origrealdate</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>mvreference</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <field>fulleventdate</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>article</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <entrytype>review</entrytype>
+      <field>newsdate</field>
+    </entryfields>
+    <entryfields>
+      <entrytype>article</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>review</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <field>location</field>
+    </entryfields>
+    <constraints>
+      <entrytype>article</entrytype>
+      <entrytype>book</entrytype>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>suppbook</entrytype>
+      <entrytype>booklet</entrytype>
+      <entrytype>collection</entrytype>
+      <entrytype>incollection</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>manual</entrytype>
+      <entrytype>misc</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>online</entrytype>
+      <entrytype>patent</entrytype>
+      <entrytype>periodical</entrytype>
+      <entrytype>suppperiodical</entrytype>
+      <entrytype>proceedings</entrytype>
+      <entrytype>inproceedings</entrytype>
+      <entrytype>reference</entrytype>
+      <entrytype>inreference</entrytype>
+      <entrytype>report</entrytype>
+      <entrytype>set</entrytype>
+      <entrytype>thesis</entrytype>
+      <entrytype>unpublished</entrytype>
+      <constraint type="mandatory">
+        <fieldxor>
+          <field>date</field>
+          <field>year</field>
+        </fieldxor>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>set</entrytype>
+      <constraint type="mandatory">
+        <field>entryset</field>
+        <field>crossref</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>article</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>journaltitle</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>book</entrytype>
+      <entrytype>mvbook</entrytype>
+      <entrytype>mvcollection</entrytype>
+      <entrytype>mvreference</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>inbook</entrytype>
+      <entrytype>bookinbook</entrytype>
+      <entrytype>suppbook</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>booktitle</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>booklet</entrytype>
+      <constraint type="mandatory">
+        <fieldor>
+          <field>author</field>
+          <field>editor</field>
+        </fieldor>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>collection</entrytype>
+      <entrytype>reference</entrytype>
+      <constraint type="mandatory">
+        <field>editor</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>incollection</entrytype>
+      <entrytype>suppcollection</entrytype>
+      <entrytype>inreference</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>editor</field>
+        <field>title</field>
+        <field>booktitle</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>manual</entrytype>
+      <constraint type="mandatory">
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>misc</entrytype>
+      <constraint type="mandatory">
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>online</entrytype>
+      <constraint type="mandatory">
+        <field>title</field>
+        <field>url</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>patent</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>number</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>periodical</entrytype>
+      <constraint type="mandatory">
+        <field>editor</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>proceedings</entrytype>
+      <entrytype>mvproceedings</entrytype>
+      <constraint type="mandatory">
+        <field>editor</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>inproceedings</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>booktitle</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>report</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>type</field>
+        <field>institution</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>thesis</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+        <field>type</field>
+        <field>institution</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <entrytype>unpublished</entrytype>
+      <constraint type="mandatory">
+        <field>author</field>
+        <field>title</field>
+      </constraint>
+    </constraints>
+    <constraints>
+      <constraint datatype="isbn" type="data">
+        <field>isbn</field>
+      </constraint>
+      <constraint datatype="issn" type="data">
+        <field>issn</field>
+      </constraint>
+      <constraint datatype="ismn" type="data">
+        <field>ismn</field>
+      </constraint>
+      <constraint datatype="date" type="data">
+        <field>date</field>
+        <field>eventdate</field>
+        <field>origdate</field>
+        <field>urldate</field>
+      </constraint>
+      <constraint datatype="pattern" pattern="(?:sf|sm|sn|pf|pm|pn|pp)" type="data">
+        <field>gender</field>
+      </constraint>
+    </constraints>
+  </datamodel>
+%    \end{macrocode}
+%</BiberCONF>
+%
 % \end{appendices}
 % \Finale
 %
-\endinput  
-\ No newline at end of file
+\endinput    
+\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.ins b/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.ins
index 6c939acdd2a..38b063f4353 100644
--- a/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.ins
+++ b/Master/texmf-dist/source/latex/biblatex-archaeology/biblatex-archaeology.ins
@@ -1,3 +1,4 @@
+%% biblatex-archaeology install file
 %%
 %% USAGE:
 %%
@@ -11,7 +12,7 @@
 %% $ pdftex -8bit biblatex-archaeology.ins
 %%
 %%
-%% Copyright (C) 2005-2017 by Ingram Braun (https://ingram-braun.net/)
+%% Copyright (C) 2005-2018 by Ingram Braun (https://ingram-braun.net/)
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -62,11 +63,17 @@
 \generate{\file{authoryear-icomp-archaeology.bbx}{\from{biblatex-archaeology.dtx}{authoryearicompBBX,authoryearsharedBBX}}}
 \generate{\file{authoryear-icomp-archaeology.cbx}{\from{biblatex-archaeology.dtx}{authoryearicompCBX,noshortform}}}
 \generate{\file{authoryear-icomp-archaeology.dbx}{\from{biblatex-archaeology.dtx}{authoryearicompDBX,DBX}}}
-\generate{\file{verbose-ibid-archaeology.bbx}{\from{biblatex-archaeology.dtx}{verboseibidBBX,verbosesharedBBX}}} 
-\generate{\file{verbose-ibid-archaeology.cbx}{\from{biblatex-archaeology.dtx}{verboseibidCBX}}}
+\generate{\file{numeric-comp-archaeology.bbx}{\from{biblatex-archaeology.dtx}{numericcompBBX,nonauthoryearsharedBBX}}}
+\generate{\file{numeric-comp-archaeology.cbx}{\from{biblatex-archaeology.dtx}{numericcompCBX,noshortform}}}
+\generate{\file{numeric-comp-archaeology.dbx}{\from{biblatex-archaeology.dtx}{numericcompDBX,DBX}}}
+\generate{\file{verbose-archaeology.bbx}{\from{biblatex-archaeology.dtx}{verboseBBX,verbosesharedBBX,nonauthoryearsharedBBX}}} 
+\generate{\file{verbose-archaeology.cbx}{\from{biblatex-archaeology.dtx}{verboseCBX,verbosesharedCBX}}}
+\generate{\file{verbose-archaeology.dbx}{\from{biblatex-archaeology.dtx}{verboseDBX,DBX}}}
+\generate{\file{verbose-ibid-archaeology.bbx}{\from{biblatex-archaeology.dtx}{verboseibidBBX,verbosesharedBBX,nonauthoryearsharedBBX}}} 
+\generate{\file{verbose-ibid-archaeology.cbx}{\from{biblatex-archaeology.dtx}{verboseibidCBX,verbosesharedCBX}}}
 \generate{\file{verbose-ibid-archaeology.dbx}{\from{biblatex-archaeology.dtx}{verboseibidDBX,DBX}}}
-\generate{\file{verbose-trad2note-archaeology.bbx}{\from{biblatex-archaeology.dtx}{verbosetrad2noteBBX,verbosesharedBBX}}}
-\generate{\file{verbose-trad2note-archaeology.cbx}{\from{biblatex-archaeology.dtx}{verbosetrad2noteCBX}}}
+\generate{\file{verbose-trad2note-archaeology.bbx}{\from{biblatex-archaeology.dtx}{verbosetrad2noteBBX,verbosesharedBBX,nonauthoryearsharedBBX}}}
+\generate{\file{verbose-trad2note-archaeology.cbx}{\from{biblatex-archaeology.dtx}{verbosetrad2noteCBX,verbosesharedCBX}}}
 \generate{\file{verbose-trad2note-archaeology.dbx}{\from{biblatex-archaeology.dtx}{verbosetrad2noteDBX,DBX}}}
 \generate{\file{aefkw.bbx}{\from{biblatex-archaeology.dtx}{aefkwBBX,noarticlesubtitlepunct}}}
 \generate{\file{aefkw.cbx}{\from{biblatex-archaeology.dtx}{aefkwCBX,barecitations}}}
@@ -253,6 +260,23 @@
 \generate{\file{naustrian-mpk.lbx}{\from{biblatex-archaeology.dtx}{FnaustrianmpkLBX,PgermanmpkLBX}}}
 \generate{\file{swissgerman-mpk.lbx}{\from{biblatex-archaeology.dtx}{FswissgermanmpkLBX,PgermanmpkLBX}}}
 \generate{\file{nswissgerman-mpk.lbx}{\from{biblatex-archaeology.dtx}{FnswissgermanmpkLBX,PgermanmpkLBX}}}
+\generate{\file{mpkoeaw.bbx}{\from{biblatex-archaeology.dtx}{mpkoeawBBX,noarticlesubtitlepunct}}}
+\generate{\file{mpkoeaw.cbx}{\from{biblatex-archaeology.dtx}{mpkoeawCBX,barecitations}}}
+\generate{\file{mpkoeaw.dbx}{\from{biblatex-archaeology.dtx}{mpkoeawDBX,DBX}}}
+\generate{\file{english-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{mpkoeawenglishLBX}}}
+\generate{\file{american-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FamericanmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{australian-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FaustralianmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{british-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FbritishmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{canadian-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FcanadianmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{newzealand-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FnewzealandmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{UKenglish-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FUKenglishmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{USenglish-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FUSenglishmpkoeawLBX,PenglishmpkoeawLBX}}}
+\generate{\file{german-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{mpkoeawgermanLBX}}}
+\generate{\file{ngerman-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FngermanmpkoeawLBX,PgermanmpkoeawLBX}}}
+\generate{\file{austrian-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FaustrianmpkoeawLBX,PgermanmpkoeawLBX}}}
+\generate{\file{naustrian-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FnaustrianmpkoeawLBX,PgermanmpkoeawLBX}}}
+\generate{\file{swissgerman-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FswissgermanmpkoeawLBX,PgermanmpkoeawLBX}}}
+\generate{\file{nswissgerman-mpkoeaw.lbx}{\from{biblatex-archaeology.dtx}{FnswissgermanmpkoeawLBX,PgermanmpkoeawLBX}}}
 \generate{\file{nnu.bbx}{\from{biblatex-archaeology.dtx}{nnuBBX,noarticlesubtitlepunct}}}
 \generate{\file{nnu.cbx}{\from{biblatex-archaeology.dtx}{nnuCBX,barecitations}}}
 \generate{\file{nnu.dbx}{\from{biblatex-archaeology.dtx}{nnuDBX,DBX}}}
@@ -276,12 +300,18 @@
 \generate{\file{rgk-inline.bbx}{\from{biblatex-archaeology.dtx}{rgkinlineBBX,rgksharedBBX,noarticlesubtitlepunct}}}
 \generate{\file{rgk-inline.cbx}{\from{biblatex-archaeology.dtx}{rgkinlineCBX,barecitations}}}
 \generate{\file{rgk-inline.dbx}{\from{biblatex-archaeology.dtx}{rgkinlineDBX,DBX}}}
+\generate{\file{rgk-numeric.bbx}{\from{biblatex-archaeology.dtx}{rgknumericBBX,rgksharedBBX,noarticlesubtitlepunct}}}
+\generate{\file{rgk-numeric.cbx}{\from{biblatex-archaeology.dtx}{rgknumericCBX,barecitations}}}
+\generate{\file{rgk-numeric.dbx}{\from{biblatex-archaeology.dtx}{rgknumericDBX,DBX}}}
 \generate{\file{rgk-verbose.bbx}{\from{biblatex-archaeology.dtx}{rgkverboseBBX,rgksharedBBX,noarticlesubtitlepunct}}}
 \generate{\file{rgk-verbose.cbx}{\from{biblatex-archaeology.dtx}{rgkverboseCBX,barecitations}}}
 \generate{\file{rgk-verbose.dbx}{\from{biblatex-archaeology.dtx}{rgkverboseDBX,DBX}}}
 \generate{\file{rgzm-inline.bbx}{\from{biblatex-archaeology.dtx}{rgzminlineBBX,rgzmsharedBBX,noarticlesubtitlepunct,nosmallcaps}}}
 \generate{\file{rgzm-inline.cbx}{\from{biblatex-archaeology.dtx}{rgzminlineCBX,barecitations}}}
 \generate{\file{rgzm-inline.dbx}{\from{biblatex-archaeology.dtx}{rgzminlineDBX,DBX}}}
+\generate{\file{rgzm-numeric.bbx}{\from{biblatex-archaeology.dtx}{rgzmnumericBBX,rgzmsharedBBX,noarticlesubtitlepunct}}}
+\generate{\file{rgzm-numeric.cbx}{\from{biblatex-archaeology.dtx}{rgzmnumericCBX,barecitations}}}
+\generate{\file{rgzm-numeric.dbx}{\from{biblatex-archaeology.dtx}{rgzmnumericDBX,DBX}}}
 \generate{\file{rgzm-verbose.bbx}{\from{biblatex-archaeology.dtx}{rgzmverboseBBX,rgzmsharedBBX,noarticlesubtitlepunct,nosmallcaps}}}
 \generate{\file{rgzm-verbose.cbx}{\from{biblatex-archaeology.dtx}{rgzmverboseCBX,barecitations}}}
 \generate{\file{rgzm-verbose.dbx}{\from{biblatex-archaeology.dtx}{rgzmverboseDBX,DBX}}}
@@ -291,17 +321,20 @@
 \generate{\file{naustrian-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FnaustrianrgzmLBX,PgermanrgzmLBX}}}
 \generate{\file{swissgerman-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FswissgermanrgzmLBX,PgermanrgzmLBX}}}
 \generate{\file{nswissgerman-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FnswissgermanrgzmLBX,PgermanrgzmLBX}}}
-\generate{\file{english-rgzm.lbx}{\from{biblatex-archaeology.dtx}{newbibstrings,englishLBX}}}
 \generate{\file{american-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FamericanrgzmLBX,PenglishLBX}}}
 \generate{\file{australian-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FaustralianrgzmLBX,PenglishLBX}}}
 \generate{\file{british-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FbritishrgzmLBX,PenglishLBX}}}
 \generate{\file{canadian-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FcanadianrgzmLBX,PenglishLBX}}}
+\generate{\file{english-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FenglishrgzmLBX,PenglishLBX}}}
 \generate{\file{newzealand-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FnewzealandrgzmLBX,PenglishLBX}}}
 \generate{\file{UKenglish-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FUKenglishrgzmLBX,PenglishLBX}}}
 \generate{\file{USenglish-rgzm.lbx}{\from{biblatex-archaeology.dtx}{FUSenglishrgzmLBX,PenglishLBX}}}
 \generate{\file{ufg-muenster-inline.bbx}{\from{biblatex-archaeology.dtx}{ufgmuensterinlineBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct}}}
 \generate{\file{ufg-muenster-inline.cbx}{\from{biblatex-archaeology.dtx}{ufgmuensterinlineCBX,barecitations}}}
 \generate{\file{ufg-muenster-inline.dbx}{\from{biblatex-archaeology.dtx}{ufgmuensterinlineDBX,DBX}}}
+\generate{\file{ufg-muenster-numeric.bbx}{\from{biblatex-archaeology.dtx}{ufgmuensternumericBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct}}}
+\generate{\file{ufg-muenster-numeric.cbx}{\from{biblatex-archaeology.dtx}{ufgmuensternumericCBX,barecitations}}}
+\generate{\file{ufg-muenster-numeric.dbx}{\from{biblatex-archaeology.dtx}{ufgmuensternumericDBX,DBX}}}
 \generate{\file{ufg-muenster-verbose.bbx}{\from{biblatex-archaeology.dtx}{ufgmuensterverboseBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct}}}
 \generate{\file{ufg-muenster-verbose.cbx}{\from{biblatex-archaeology.dtx}{ufgmuensterverboseCBX,barecitations,noshortform}}}
 \generate{\file{ufg-muenster-verbose.dbx}{\from{biblatex-archaeology.dtx}{ufgmuensterverboseDBX,DBX}}}
@@ -343,11 +376,15 @@
 \generate{\file{swissgerman-zaes.lbx}{\from{biblatex-archaeology.dtx}{FswissgermanzaesLBX,PgermanzaesLBX}}}
 \generate{\file{nswissgerman-zaes.lbx}{\from{biblatex-archaeology.dtx}{FnswissgermanzaesLBX,PgermanzaesLBX}}}
 
-\usedir{bibtex/bib/biblatex-archaeology}
+\usedir{doc/latex/biblatex-archaeology}
 
 \nopreamble
 \nopostamble
 
+\generate{\file{biblatex-archaeology.conf}{\from{biblatex-archaeology.dtx}{BiberCONF}}}
+
+\usedir{bibtex/bib/biblatex-archaeology}
+
 \generate{\file{biblatex-archaeology-example.bib}{\from{biblatex-archaeology.dtx}{exampleBIB}}}
 \generate{\file{biblatex-archaeology-manual.bib}{\from{biblatex-archaeology-nodoc.dtx}{manualBIB}}}
 \generate{\file{biblatex-archaeology-strings-full.bib}{\from{biblatex-archaeology-nodoc.dtx}{fullBIB}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx
index 68933f29cc4..eb56433f9ef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{UKenglish-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx
index 21616db636c..ed67d0bb25a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglisharchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{UKenglish-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx
index 8e94778cb45..f08a366363d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishLBX,PenglishLBX')
 %% 
 \ProvidesFile{UKenglish-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx
index 55a6877a72d..0c6ff8c82aa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishdgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{UKenglish-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx
index 86a311ab3ba..aaaa2b92145 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishdgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{UKenglish-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx
index c21738fce82..b830fef83d3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglisheazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{UKenglish-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx
index 4169c6fc05a..6137656e591 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{UKenglish-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx
index 6202d248224..addf41c8610 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishjbkreisneussLBX,PenglishjbkreisneussLBX')
 %% 
 \ProvidesFile{UKenglish-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx
index b3b3b4a1747..30bf0cc3ba8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishkarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{UKenglish-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx
index ad965030784..6591a18b682 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{UKenglish-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx
index 40c8377072f..f74bb64bc2b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{UKenglish-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `UKenglish-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpkoeaw.lbx
new file mode 100644
index 00000000000..70f30d55225
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `UKenglish-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FUKenglishmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{UKenglish-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `UKenglish-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx
index 71c9caba686..62b380d8501 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{UKenglish-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx
index d8d8b49b8de..0231c6b7fd3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{UKenglish-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx
index c63d6597492..e2ca71024ea 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{UKenglish-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx
index fbe6783ecea..aa78daf0952 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUKenglishzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{UKenglish-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx
index 9e5cf3bcb6e..ab1f5ca8844 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{USenglish-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx
index 2ad872c141b..5b49583ecab 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglisharchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{USenglish-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx
index 026b4792ca3..681b8fa7a5b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishLBX,PenglishLBX')
 %% 
 \ProvidesFile{USenglish-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx
index 3dd074adabe..0c732ce1181 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishdgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{USenglish-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx
index 1f41a9c0831..a103c230301 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishdgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{USenglish-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx
index 4ae001aae00..d6f43e0d9e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglisheazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{USenglish-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx
index 1daeaf3b54c..ddde66b5253 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{USenglish-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx
index 42476b9f040..f52dc250921 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishjbkreisneussLBX,PenglishjbkreisneussLBX')
 %% 
 \ProvidesFile{USenglish-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx
index 31b3ba9a412..fb1ac68d530 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishkarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{USenglish-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx
index 12c06097a70..85b63893cfc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{USenglish-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx
index 064c26d230a..73612d91bf0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{USenglish-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `USenglish-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpkoeaw.lbx
new file mode 100644
index 00000000000..cf87949f4e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `USenglish-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FUSenglishmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{USenglish-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `USenglish-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx
index ca3dcf19c44..7fa400c72cf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{USenglish-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx
index 2ab1156ac3c..c7042743d72 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{USenglish-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx
index e82006b89a1..b6ba16fc0bc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{USenglish-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx
index e2a6a197130..2bd5e7ddcde 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FUSenglishzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{USenglish-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx
index c8386c21cc9..0a93eabdb21 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `aefkwBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{aefkw.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-ibid-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@aefkw}
 \DeclareLanguageMappingSuffix{-aefkw}
@@ -29,6 +29,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=true,
     origfields=false,
@@ -55,16 +56,16 @@
     useunpublishedthesis=false,
     volumeafterseries=false,
 }
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 \DeclareNameAlias{sortname}{family-given}
 \DeclareNameAlias{bookauthor}{given-family}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\mkbiblistnamefamily}[1]{\ifcitation{\textsc{#1}}{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\ifcitation{\textsc{#1}}{#1}}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbiblistnamefamily}[1]{\ifcitation{\textsc{#1}}{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\ifcitation{\textsc{#1}}{#1}}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace\ifinteger{#1}{\RN{#1}}{#1}}
 \DeclareFieldFormat[article,review,suppperiodical]{volume}{\addspace#1}
@@ -74,12 +75,12 @@
 {title}{#1}
 \DeclareFieldFormat*{booktitle}{\mkbibitalic{#1}}
 \DeclareFieldFormat*{maintitle}{\mkbibitalic{#1}}
-\renewcommand{\titleseriesdelim}{\unspace\nopunct}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\titleseriesdelim}{\unspace\nopunct}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{journaltitle}{\mkbibitalic{#1}}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `aefkw.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx
index bf0d15be698..0ca25872119 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `aefkwCBX,barecitations')
 %% 
 \ProvidesFile{aefkw.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{verbose-ibid-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@aefkw}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `aefkw.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx
index 992574bbe97..038f4efb707 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `aefkwDBX,DBX')
 %% 
 \ProvidesFile{aefkw.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `aefkw.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx
index 536e2ef86c5..432bd87b911 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `afwlBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{afwl.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@afwl}
 \ExecuteBibliographyOptions{
@@ -32,6 +32,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -60,35 +61,35 @@
 }
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}}
+\DeclareFieldFormat*{repeatlabel}{\mkbibbold{#1}}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `afwl.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx
index 68665cb217a..2fad1e132fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx
@@ -7,13 +7,14 @@
 %% biblatex-archaeology.dtx  (with options: `afwlCBX,barecitations')
 %% 
 \ProvidesFile{afwl.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-comp-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@afwl}
 \ExecuteBibliographyOptions{autocite=footnote}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `afwl.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx
index 115704108aa..10cbe3e1fd8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `afwlDBX,DBX')
 %% 
 \ProvidesFile{afwl.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `afwl.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx
index 2756bb9f4f3..2624716ed5e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{american-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx
index 6dc3423ee05..7fe2ba0a036 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanarchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{american-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx
index ffa9fa3cc7c..9144dd854bc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanLBX,PenglishLBX')
 %% 
 \ProvidesFile{american-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx
index 466026b1507..2b4aade4d64 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericandgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{american-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx
index c1961343893..129754407ca 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericandgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{american-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx
index 487dde43d77..0e30eac1091 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericaneazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{american-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx
index 88769ba3150..e45315fc95b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{american-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx
index acc3fb28d80..f60a576235d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx
@@ -6,7 +6,8 @@
 %%
 %% biblatex-archaeology.dtx  (with options: `FamericanjbkreisneusseLBX,PenglishjbkreisneussLBX')
 %% 
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx
index f6f464c5ff5..83904a232b8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericankarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{american-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx
index 1c1ce83d25b..08005434f88 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{american-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx
index 959924ce07b..2c356f36c2a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{american-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `american-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpkoeaw.lbx
new file mode 100644
index 00000000000..c5e00e50fcd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `american-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FamericanmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{american-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `american-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx
index 0b7e94796dc..a0c6f0eceb6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{american-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx
index a0402755b0c..a9cf0bb1242 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{american-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx
index e0d974db71d..7f4ee0536f1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{american-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx
index b40af03d01a..9d2c4748e45 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FamericanzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{american-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx
index eb17a49b3d7..8da087ab14e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `amitBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{amit.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@amit}
 \ExecuteBibliographyOptions{
@@ -32,6 +32,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -60,33 +61,33 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\nameshortformdelim}{\addspace in\space}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\nameshortformdelim}{\addspace in\space}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `amit.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx
index 337f6c8b32a..bce865aee57 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx
@@ -7,14 +7,15 @@
 %% biblatex-archaeology.dtx  (with options: `amitCBX,barecitations')
 %% 
 \ProvidesFile{amit.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@amit}
 \ExecuteBibliographyOptions{autocite=footnote}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
-\DeclareFieldFormat*{postnote}{#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `amit.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx
index 2211109db59..0c30514542d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `amitDBX,DBX')
 %% 
 \ProvidesFile{amit.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `amit.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx
index dc21f78b5c2..4925225e047 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `archaBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{archa.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@archa}
 \DeclareLanguageMappingSuffix{-archa}
@@ -34,6 +34,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -63,36 +64,37 @@
 \setlength{\bibhang}{0em}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
-\renewcommand{\subtitlepunct}{\addcolon\space}
-\renewcommand{\titleseriesdelim}{\addperiod\space}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\subtitlepunct}{\addcolon\space}
+\renewcommand*{\titleseriesdelim}{\addperiod\space}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\subnumberseriesdelim}{\newunitpunct}
+\renewcommand*{\subnumberseriesdelim}{\newunitpunct}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{reprintparens}{\newunitpunct#1}
-\DeclareFieldFormat*{realdateparen}{\addcomma\space#1}
-\DeclareFieldFormat*{origrealdateparen}{\addcomma\space#1}
+\DeclareFieldFormat*{realdateparens}{\addcomma\space#1}
+\DeclareFieldFormat*{origrealdateparens}{\addcomma\space#1}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{url}{#1}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+  {}{Patching bibmacro 'thesistype' failed (1)}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `archa.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx
index 26cdc92ccd5..c0fce4f7ea7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx
@@ -7,14 +7,15 @@
 %% biblatex-archaeology.dtx  (with options: `archaCBX,barecitations')
 %% 
 \ProvidesFile{archa.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@archa}
 \renewcommand{\multicitedelim}{\addperiod\space\textendash\space}
 \ExecuteBibliographyOptions{autocite=footnote}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `archa.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx
index fa3267242e5..5c92b88250d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `archaDBX,DBX')
 %% 
 \ProvidesFile{archa.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `archa.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx
index 86aebe56934..95436d411dd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{australian-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx
index ea4d0184c42..484828b5015 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianarchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{australian-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx
index 23a4e78311c..e3fb9df6f32 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianLBX,PenglishLBX')
 %% 
 \ProvidesFile{australian-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx
index 8b79399df0a..09f444e5f10 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustraliandgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{australian-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx
index 155b802e6a0..b063524e84a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustraliandgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{australian-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx
index 19369a50542..f6da9218179 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianeazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{australian-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx
index e231460a9c1..6d27569db8b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{australian-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx
index 13bad2e2eb1..bc4dbdb63ff 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianjbkreisneussLBX,PenglishjbkreisneussLBX')
 %% 
 \ProvidesFile{australian-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx
index ce397513486..64490502527 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustraliankarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{australian-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx
index a80e36ce553..888b4add715 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{australian-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx
index 95f57b66540..cc35d123b35 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{australian-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `australian-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpkoeaw.lbx
new file mode 100644
index 00000000000..79b88b5556a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `australian-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FaustralianmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{australian-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `australian-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx
index 24cc30b9fa7..832e517469f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{australian-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx
index 5fdbfa15492..0b3ca1b8aa5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{australian-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx
index e63c7ccbb02..5031c396f43 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{australian-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx
index 9409ba03f8b..274c9027a72 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustralianzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{australian-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx
index 81c9c4f49f8..7e48d41d09e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianaefkwLBX,PgermanaefkwLBX')
 %% 
 \ProvidesFile{austrian-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-aefkw}
 \InheritBibliographyStrings{german-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx
index d140e99f08c..de0067e80f8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianarchaLBX,PgermanarchaLBX')
 %% 
 \ProvidesFile{austrian-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archa}
 \InheritBibliographyStrings{german-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx
index 22651f96277..5d36d09c81c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianLBX,PgermanLBX')
 %% 
 \ProvidesFile{austrian-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx
index 88350e7c8a1..951034ebe15 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustriandgufaltLBX,PgermandgufaltLBX')
 %% 
 \ProvidesFile{austrian-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-dguf-alt}
 \InheritBibliographyStrings{german-dguf-alt}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx
index 6b9edc8eb94..fca4d9724c8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustriandgufapaLBX,PgermanLBX')
 %% 
 \ProvidesFile{austrian-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx
index 954b81c749a..f3cf7f63942 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianeazLBX,PgermaneazLBX')
 %% 
 \ProvidesFile{austrian-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-eaz}
 \InheritBibliographyStrings{german-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx
index 3a79edd25d4..575a36fe8dd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianfoeLBX,PgermanfoeLBX')
 %% 
 \ProvidesFile{austrian-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-foe}
 \InheritBibliographyStrings{german-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx
index 0fcab7d9e4b..85f57d74c92 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianjbkreisneussLBX,PgermanjbkreisneussLBX')
 %% 
 \ProvidesFile{austrian-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-jb-kreis-neuss}
 \InheritBibliographyStrings{german-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx
index 3b63bb42f1e..10c00bafd79 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustriankarlLBX,PgermankarlLBX')
 %% 
 \ProvidesFile{austrian-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-karl}
 \InheritBibliographyStrings{german-karl}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx
index 1d2502e22d2..6121d6ce1dc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianmajaLBX,PgermanmajaLBX')
 %% 
 \ProvidesFile{austrian-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-maja}
 \InheritBibliographyStrings{german-maja}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx
index 44cb53dc71e..cc72ca15180 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianmpkLBX,PgermanmpkLBX')
 %% 
 \ProvidesFile{austrian-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-mpk}
 \InheritBibliographyStrings{german-mpk}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpkoeaw.lbx
new file mode 100644
index 00000000000..eb31d20b92c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `austrian-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FaustrianmpkoeawLBX,PgermanmpkoeawLBX')
+%% 
+\ProvidesFile{austrian-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-mpkoeaw}
+
+\endinput
+%%
+%% End of file `austrian-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx
index 5eeb841ce00..088bbbf8608 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianoffaLBX,PgermanoffaLBX')
 %% 
 \ProvidesFile{austrian-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-offa}
 \InheritBibliographyStrings{german-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx
index 277e032aeba..5963f44351e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianrgzmLBX,PgermanrgzmLBX')
 %% 
 \ProvidesFile{austrian-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-rgzm}
 \InheritBibliographyStrings{german-rgzm}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx
index 86db0e11807..105e8c0a596 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianzaakLBX,PgermanzaakLBX')
 %% 
 \ProvidesFile{austrian-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaak}
 \InheritBibliographyStrings{german-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx
index 18efd824523..d5b0f825fe5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FaustrianzaesLBX,PgermanzaesLBX')
 %% 
 \ProvidesFile{austrian-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaes}
 \InheritBibliographyStrings{german-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx
index 5408f731391..b8b0c610ff5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearBBX,authoryearsharedBBX')
 %% 
 \ProvidesFile{authoryear-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \def\archaeobibstyletitle{\blxarch@style@ay}
 \RequireBibliographyStyle{authoryear}
 \def\blxarch@fork@authordate{}
@@ -20,8 +20,10 @@
 \def\blxarch@settabbedlabeldate#1{%
     \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock}
         {\setunit{\printdelim{nametitledelim}}%
-            \iftabbedlabeldate{&}{\newblock}}{}{}
-    \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{}
+            \iftabbedlabeldate{&}{\newblock}}
+{}{Patching driver '#1' failed (a)}
+    \xapptobibdriver{#1}{\end{tabbedlabeldate}}
+{}{Patching driver '#1' failed (b)}
 }
 \blxarch@settabbedlabeldate{article}
 \blxarch@settabbedlabeldate{book}
@@ -31,8 +33,39 @@
 \blxarch@settabbedlabeldate{periodical}
 \blxarch@settabbedlabeldate{thesis}
 \blxarch@settabbedlabeldate{unpublished}
-\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{}
+\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}
+  {}{Patching driver 'inreference' failed (1)}
 \DeclareNameAlias{sortname}{family-given/given-family}
+\xpretobibmacro{begentry}{%
+    \csuse{blxarch@issuedate}%
+}{}{Patching bibmacro 'begentry' failed (1)}
+\xpretobibmacro{finentry}{%
+    \restorebibmacro{issue+date}%
+}{}{Patching bibmacro 'finentry' failed (2)}
+\xpatchbibmacro{author}{\printnames{author}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{author}}}
+{}{Patching bibmacro 'author' failed (1)}
+\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'author' failed (2)}
+\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{editor}}}
+{}{Patching bibmacro 'bbx:editor' failed (1)}
+\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{translator}}}
+{}{Patching bibmacro 'bbx:translator' failed}
+\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:editor' failed (2)}
+\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:translator' failed}
 \endinput
 %%
 %% End of file `authoryear-archaeology.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx
index da66608e602..4bc09912fb9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearCBX,noshortform')
 %% 
 \ProvidesFile{authoryear-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \def\archaeocitestyletitle{\blxarch@style@ay}
 \RequireCitationStyle{authoryear}
 \let\shortformcite\autocite
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx
index db7cc5db8e4..f5c7280a98f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearDBX,DBX')
 %% 
 \ProvidesFile{authoryear-archaeology.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `authoryear-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx
index 589f561cd30..6dbfbd2804f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearcompBBX,authoryearsharedBBX')
 %% 
 \ProvidesFile{authoryear-comp-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-comp}
 \def\archaeobibstyletitle{\blxarch@style@ayc}
 \def\blxarch@fork@authordate{}
@@ -20,8 +20,10 @@
 \def\blxarch@settabbedlabeldate#1{%
     \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock}
         {\setunit{\printdelim{nametitledelim}}%
-            \iftabbedlabeldate{&}{\newblock}}{}{}
-    \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{}
+            \iftabbedlabeldate{&}{\newblock}}
+{}{Patching driver '#1' failed (a)}
+    \xapptobibdriver{#1}{\end{tabbedlabeldate}}
+{}{Patching driver '#1' failed (b)}
 }
 \blxarch@settabbedlabeldate{article}
 \blxarch@settabbedlabeldate{book}
@@ -31,8 +33,39 @@
 \blxarch@settabbedlabeldate{periodical}
 \blxarch@settabbedlabeldate{thesis}
 \blxarch@settabbedlabeldate{unpublished}
-\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{}
+\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}
+  {}{Patching driver 'inreference' failed (1)}
 \DeclareNameAlias{sortname}{family-given/given-family}
+\xpretobibmacro{begentry}{%
+    \csuse{blxarch@issuedate}%
+}{}{Patching bibmacro 'begentry' failed (1)}
+\xpretobibmacro{finentry}{%
+    \restorebibmacro{issue+date}%
+}{}{Patching bibmacro 'finentry' failed (2)}
+\xpatchbibmacro{author}{\printnames{author}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{author}}}
+{}{Patching bibmacro 'author' failed (1)}
+\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'author' failed (2)}
+\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{editor}}}
+{}{Patching bibmacro 'bbx:editor' failed (1)}
+\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{translator}}}
+{}{Patching bibmacro 'bbx:translator' failed}
+\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:editor' failed (2)}
+\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:translator' failed}
 \endinput
 %%
 %% End of file `authoryear-comp-archaeology.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx
index 973a65f0a39..e805b3d40fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearcompCBX,noshortform')
 %% 
 \ProvidesFile{authoryear-comp-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \def\archaeocitestyletitle{\blxarch@style@ayc}
 \RequireCitationStyle{authoryear-comp}
 \let\shortformcite\autocite
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx
index bb03a0702b8..cc4afc33629 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearcompDBX,DBX')
 %% 
 \ProvidesFile{authoryear-comp-archaeology.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `authoryear-comp-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx
index 33406678898..6d2660bc0d8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearibidBBX,authoryearsharedBBX')
 %% 
 \ProvidesFile{authoryear-ibid-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-ibid}
 \def\archaeobibstyletitle{\blxarch@style@ayi}
 \def\blxarch@fork@authordate{}
@@ -20,8 +20,10 @@
 \def\blxarch@settabbedlabeldate#1{%
     \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock}
         {\setunit{\printdelim{nametitledelim}}%
-            \iftabbedlabeldate{&}{\newblock}}{}{}
-    \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{}
+            \iftabbedlabeldate{&}{\newblock}}
+{}{Patching driver '#1' failed (a)}
+    \xapptobibdriver{#1}{\end{tabbedlabeldate}}
+{}{Patching driver '#1' failed (b)}
 }
 \blxarch@settabbedlabeldate{article}
 \blxarch@settabbedlabeldate{book}
@@ -31,8 +33,39 @@
 \blxarch@settabbedlabeldate{periodical}
 \blxarch@settabbedlabeldate{thesis}
 \blxarch@settabbedlabeldate{unpublished}
-\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{}
+\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}
+  {}{Patching driver 'inreference' failed (1)}
 \DeclareNameAlias{sortname}{family-given/given-family}
+\xpretobibmacro{begentry}{%
+    \csuse{blxarch@issuedate}%
+}{}{Patching bibmacro 'begentry' failed (1)}
+\xpretobibmacro{finentry}{%
+    \restorebibmacro{issue+date}%
+}{}{Patching bibmacro 'finentry' failed (2)}
+\xpatchbibmacro{author}{\printnames{author}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{author}}}
+{}{Patching bibmacro 'author' failed (1)}
+\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'author' failed (2)}
+\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{editor}}}
+{}{Patching bibmacro 'bbx:editor' failed (1)}
+\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{translator}}}
+{}{Patching bibmacro 'bbx:translator' failed}
+\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:editor' failed (2)}
+\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:translator' failed}
 \endinput
 %%
 %% End of file `authoryear-ibid-archaeology.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx
index 60aceb7ea33..bef469b15a0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearibidDBX,DBX')
 %% 
 \ProvidesFile{authoryear-ibid-archaeology.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `authoryear-ibid-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx
index fe25c6f6480..701b92c46f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearicompBBX,authoryearsharedBBX')
 %% 
 \ProvidesFile{authoryear-icomp-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-icomp}
 \def\archaeobibstyletitle{\blxarch@style@ayic}
 \def\blxarch@fork@authordate{}
@@ -20,8 +20,10 @@
 \def\blxarch@settabbedlabeldate#1{%
     \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock}
         {\setunit{\printdelim{nametitledelim}}%
-            \iftabbedlabeldate{&}{\newblock}}{}{}
-    \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{}
+            \iftabbedlabeldate{&}{\newblock}}
+{}{Patching driver '#1' failed (a)}
+    \xapptobibdriver{#1}{\end{tabbedlabeldate}}
+{}{Patching driver '#1' failed (b)}
 }
 \blxarch@settabbedlabeldate{article}
 \blxarch@settabbedlabeldate{book}
@@ -31,8 +33,39 @@
 \blxarch@settabbedlabeldate{periodical}
 \blxarch@settabbedlabeldate{thesis}
 \blxarch@settabbedlabeldate{unpublished}
-\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{}
+\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}
+  {}{Patching driver 'inreference' failed (1)}
 \DeclareNameAlias{sortname}{family-given/given-family}
+\xpretobibmacro{begentry}{%
+    \csuse{blxarch@issuedate}%
+}{}{Patching bibmacro 'begentry' failed (1)}
+\xpretobibmacro{finentry}{%
+    \restorebibmacro{issue+date}%
+}{}{Patching bibmacro 'finentry' failed (2)}
+\xpatchbibmacro{author}{\printnames{author}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{author}}}
+{}{Patching bibmacro 'author' failed (1)}
+\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'author' failed (2)}
+\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{editor}}}
+{}{Patching bibmacro 'bbx:editor' failed (1)}
+\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
+    \ifidemincitation
+        {\printtext{%
+            \bibstring{idem\thefield{gender}}}}
+        {\usebibmacro{sortnamelist}{translator}}}
+{}{Patching bibmacro 'bbx:translator' failed}
+\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:editor' failed (2)}
+\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}
+  {}{Patching bibmacro 'bbx:translator' failed}
 \endinput
 %%
 %% End of file `authoryear-icomp-archaeology.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx
index ff4a3e96dd0..1ee7642ae07 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearicompCBX,noshortform')
 %% 
 \ProvidesFile{authoryear-icomp-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \def\archaeocitestyletitle{\blxarch@style@ayic}
 \RequireCitationStyle{authoryear-icomp}
 \let\shortformcite\autocite
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx
index 9cfc0448cc6..4a3febc5840 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `authoryearicompDBX,DBX')
 %% 
 \ProvidesFile{authoryear-icomp-archaeology.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `authoryear-icomp-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty b/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty
index d16c94d8d8d..0b5cf70a461 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty
@@ -46,6 +46,14 @@
     \edef\blxarch@shortform@value{true}}
 \def\blxarch@shortform@errstr#1{%
     Invalid value of #1}
+\def\blxarch@opt@repeatlabel@dashed{%
+    \edef\blxarch@repeatlabel@value{dashed}}
+\def\blxarch@opt@repeatlabel@false{%
+    \edef\blxarch@repeatlabel@value{false}}
+\def\blxarch@opt@repeatlabel@true{%
+    \edef\blxarch@repeatlabel@value{true}}
+\def\blxarch@repeatlabel@errstr#1{%
+    Invalid value of #1}
 \def\blxarch@opt@editionsuperscript@none{%
     \edef\blxarch@editionsuperscript@value{none}}
 \def\blxarch@opt@editionsuperscript@predate{%
@@ -94,7 +102,7 @@
 \def\blxarch@giveninitialletters#1{%
     \fullexpandarg%
     \StrLeft{#1}{1}[\blxarch@str]%
-    \renewcommand{\do}[1]{%
+    \renewcommand*{\do}[1]{%
         \IfBeginWith{#1}{##1}
             {\def\blxarch@str{##1}\listbreak}
             {}%
@@ -139,22 +147,23 @@
     {}
     {\ifthenelse{\blxarch@posbuffer<\blxarch@namefirstsepposition}{%
             \let\blxarch@namefirstsepposition\blxarch@posbuffer%
-            \renewcommand{\blxarch@namefirstsep}{#1}}
+            \renewcommand*{\blxarch@namefirstsep}{#1}}
         {}}%
 }
 \def\blxarch@namefirstsep{}
 \def\blxarch@namefirstdelim{\bibinitperiod\bibinitdelim}
 \ProvidesPackage{biblatex-archaeology}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 \RequirePackage{xpatch}
 \RequireBiber[3]
-\@ifpackagelater{biblatex}{2017/11/05}
+\@ifpackagelater{biblatex}{2018/03/04}
     {}
     {\blxarch@errmsg{too old\MessageBreak biblatex version - update required}}
 \DeclareLanguageMappingSuffix{-archaeology}
 \ExecuteBibliographyOptions{
     abbreviate=true,      % abbreviates bibstrings
     arxiv=pdf,            % although I've never seen an arXiv link we point them to PDFs.
+    autopunct=true,       % wether cite commands should scan ahead for punctuation
     autolang=hyphen,      % language-dependent hyphenation rules
     backref=false,        % wether to print back references in the bilbiography
     block=none,           % no extra spacing between blocks
@@ -210,7 +219,9 @@
     realdate=ymd,
 }
     \DeclareDriverSourcemap[datatype=bibtex]{
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \pertype{thesis}
             \step[
                 fieldsource=type,
@@ -219,7 +230,44 @@
                 fieldvalue=phdthesis,
             ]
         }
-        \map[overwrite]{
+        \map[
+            overwrite=true,
+            foreach={titleaddon,booktitleaddon,maintitleaddon},
+        ]{
+\pernottype{article}
+            \pernottype{review}
+            \pernottype{reference}
+            \pernottype{inreference}
+            \pernottype{mvreference}
+            \pernottype{thesis}
+             \step[
+                fieldsource=\regexp{$MAPLOOP},
+                match=\regexp{[Ee]xhibi[ct]|[Aa]usstellung|[Uu][dt]st[iä]ll[n]ing|[Tt]entoonstelling|[Ee][xs]posi[cçtz]},
+                fieldset=eventtype,
+                fieldvalue=exhibition,
+                append=true,
+                notfield=eventtype,
+            ]
+             \step[
+                fieldsource=\regexp{$MAPLOOP},
+                match=\regexp{[KkCc]onf[eé]ren[cstz]|[Ss]ymposi|[KkCc]ol{1,2}[oó]qu|[KkCc]onvent|[Mm]eeting|},
+                fieldset=eventtype,
+                fieldvalue=conference,
+                append=true,
+                notfield=eventtype,
+            ]
+             \step[
+                fieldsource=\regexp{$MAPLOOP},
+                match=\regexp{[Aa]u[ck]tion|Versteigerung|\b[Ee]nchère|[Vv]eiling|[Ss]ubasta|[Ll]eil(ões|ão)},
+                fieldset=eventtype,
+                fieldvalue=auction,
+                append=true,
+                notfield=eventtype,
+            ]
+        }
+        \map[
+            overwrite
+        ]{
             \step[
                 fieldsource=eventtype,
                 match=\regexp{[Aa]u[ck]tion},
@@ -231,7 +279,43 @@
                 origfieldval=true,
             ]
         }
+        \map[
+            overwrite
+        ]{
+            \step[
+                fieldsource=date+an,
+                match=\regexp{\battributed\b}, % find all date+an field that match "attributed" (<field>+an are csv)
+                final=true, % do not add entries in further steps
+            ]
+            \step[
+                fieldsource=date,
+                fieldtarget=realdate,
+            ]
+        }
+        \map[
+            overwrite
+        ]{
+            \step[
+                fieldsource=year,
+                match=\regexp{\A\[.+\]\Z},
+                fieldtarget=realdate,
+            ]
+            \step[
+                fieldsource=date,
+                match=\regexp{\A\[.+\]\Z},
+                fieldtarget=realdate,
+            ]
+        }
         \map[overwrite]{
+            \step[
+                fieldsource=realdate,
+                match=\regexp{\A\[(.+)\]\Z},
+                replace={$1},
+            ]
+        }
+        \map[
+            overwrite
+        ]{
             \pertype{article}
             \pertype{periodical}
             \pertype{suppperiodical}
@@ -247,21 +331,28 @@
                 origfieldval=true,
             ]
         }
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \step[
                 fieldsource=edition,
                 match=\regexp{(\d+)},
                 replace={$1},
             ]
         }
-        \map[overwrite, foreach={location, multivenue}]{
+        \map[
+            overwrite,
+            foreach={location, multivenue}
+        ]{
             \step[
                 fieldsource=\regexp{$MAPLOOP},
                 match={\blxarch@regex@location@match},
                 replace={\blxarch@regex@location@replace},
             ]
         }
-        \map[overwrite]{
+        \map[
+            overwrite
+        ]{
             \step[
                 fieldsource=venue,
                 match={\blxarch@regex@location@match},
@@ -379,34 +470,35 @@
 \DeclareBibliographyAlias{reference}{book}
 \DeclareBibliographyAlias{report}{book}
 \DeclareBibliographyAlias{patent}{book}
-\renewcommand{\mkbibacro}[1]{\MakeLowercase{#1}}
+\renewcommand*{\mkbibacro}[1]{\MakeLowercase{#1}}
 \renewbibmacro*{doi+eprint+url}{%
   \printfield{doi}%
   \newunit\newblock%
   \usebibmacro{eprint}%
   \newunit\newblock%
   \usebibmacro{url+urldate}}
-\newcommand{\mkbibletterspacing}[1]{\ifcsdef{textls}{\textls{#1}}{#1}}
-\renewcommand{\mkbibnamegiven}[1]{#1}
-\renewcommand{\mkbibnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibnamesuffix}[1]{#1}
-\newcommand{\mkbibrepeatgiven}[1]{#1}
-\newcommand{\mkbibrepeatfamily}[1]{\textsc{#1}}
-\newcommand{\mkbibrepeatprefix}[1]{\textsc{#1}}
-\newcommand{\mkbibrepeatsuffix}[1]{#1}
-\newcommand{\mkbibbooknamegiven}[1]{#1}
-\newcommand{\mkbibbooknamefamily}[1]{#1}
-\newcommand{\mkbibbooknameprefix}[1]{#1}
-\newcommand{\mkbibbooknamesuffix}[1]{#1}
-\newcommand{\mkbibsourcenamegiven}[1]{#1}
-\newcommand{\mkbibsourcenamefamily}[1]{#1}
-\newcommand{\mkbibsourcenameprefix}[1]{#1}
-\newcommand{\mkbibsourcenamesuffix}[1]{#1}
-\newcommand{\mkbiblistnamegiven}[1]{#1}
-\newcommand{\mkbiblistnamefamily}[1]{#1}
-\newcommand{\mkbiblistnameprefix}[1]{#1}
-\newcommand{\mkbiblistnamesuffix}[1]{#1}
+\newcommand*{\mkbibletterspacing}[1]{\textls{#1}}
+\providecommand*{\textls}[1]{\textsc{#1}}
+\renewcommand*{\mkbibnamegiven}[1]{#1}
+\renewcommand*{\mkbibnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibnamesuffix}[1]{#1}
+\newcommand*{\mkbibrepeatgiven}[1]{#1}
+\newcommand*{\mkbibrepeatfamily}[1]{\textsc{#1}}
+\newcommand*{\mkbibrepeatprefix}[1]{\textsc{#1}}
+\newcommand*{\mkbibrepeatsuffix}[1]{#1}
+\newcommand*{\mkbibbooknamegiven}[1]{#1}
+\newcommand*{\mkbibbooknamefamily}[1]{#1}
+\newcommand*{\mkbibbooknameprefix}[1]{#1}
+\newcommand*{\mkbibbooknamesuffix}[1]{#1}
+\newcommand*{\mkbibsourcenamegiven}[1]{#1}
+\newcommand*{\mkbibsourcenamefamily}[1]{#1}
+\newcommand*{\mkbibsourcenameprefix}[1]{#1}
+\newcommand*{\mkbibsourcenamesuffix}[1]{#1}
+\newcommand*{\mkbiblistnamegiven}[1]{#1}
+\newcommand*{\mkbiblistnamefamily}[1]{#1}
+\newcommand*{\mkbiblistnameprefix}[1]{#1}
+\newcommand*{\mkbiblistnamesuffix}[1]{#1}
 \newcommand{\ifshortform}[3]{%
     \ifdefstring{\blxarch@shortform@value}{#1}
         {#2}
@@ -452,7 +544,7 @@
 }
 \DeclareMultiCiteCommand{\shortformcites}[\mkbibfootnote]
 {\shortformcite}{\multicitedelim}
-\newcommand{\nameshortformdelim}{\usebibmacro{in:}}
+\newcommand*{\nameshortformdelim}{\usebibmacro{in:}}
 \DeclareBibliographyDriver{inreference}{%
     \ifshortform{true}
         {\usebibmacro{bibindex}%
@@ -488,55 +580,73 @@
          \usebibmacro{finentry}}
         {\usedriver{}{inbook}\usebibmacro{finentry}}%
 }
-\newtoggle{archbool:repeatlabel}
-\DeclareBibliographyOption{repeatlabel}[true]{%
-    \settoggle{archbool:repeatlabel}{#1}}
+\newcommand{\ifrepeatlabel}[3]{%
+    \ifbibliography
+        {\ifdefstring{\blxarch@repeatlabel@value}{#1}
+            {#2}
+            {\ifcsdef{blxarch@opt@repeatlabel@#1}
+                {#3}
+                {\blxarch@errmsg{\blxarch@repeatlabel@errstr{\unexpanded{\ifrepeatlabel}}}}}}%
+        {\ifstrequal{false}{#1}
+            {#2}
+            {\ifcsdef{blxarch@opt@repeatlabel@#1}
+                {#3}
+                {\blxarch@errmsg{\blxarch@repeatlabel@errstr{\unexpanded{\ifrepeatlabel}}}}}}%
+}
+\DeclareBibliographyOption[string]{repeatlabel}[true]{%
+    \ifcsdef{blxarch@opt@repeatlabel@#1}
+        {\csuse{blxarch@opt@repeatlabel@#1}}%
+        {\blxarch@errmsg{\blxarch@repeatlabel@errstr{option 'repeatlabel'}}}}
 \ExecuteBibliographyOptions{repeatlabel}
-\newcommand{\ifrepeatlabel}[2]{%
-    \ifboolexpr{
-        togl {archbool:repeatlabel}
-        and
-        test {\ifbibliography}
-    }
-        {#1}
-        {#2}}
-\newcommand{\repeatlabelwrap}[1]{#1}
-\newcommand{\repeatlabeldelim}{\newline}
+\newcommand*{\repeatlabeldash}{--\addspace}
+\DeclareFieldFormat*{repeatlabel}{#1}
+\newcommand*{\repeatlabeldelim}{\newline}
 \newbibmacro*{repeatlabel}{%
-    \repeatlabelwrap{%
-        \let\blxarch@buffer@repeatfamily\mkbibnamefamily
-        \let\blxarch@buffer@repeatprefix\mkbibnameprefix
-        \let\blxarch@buffer@repeatgiven\mkbibnamegiven
-        \let\blxarch@buffer@repeatsuffix\mkbibnamesuffix
-        \let\mkbibnamefamily\mkbibrepeatfamily
-        \let\mkbibnameprefix\mkbibrepeatprefix
-        \let\mkbibnamegiven\mkbibrepeatgiven
-        \let\mkbibnamesuffix\mkbibrepeatsuffix
-        \let\blxarch@buffer@repeatnames\c@minnames
-        \let\blxarch@buffer@maxnames\c@maxnames
-        \let\blxarch@buffer@minnames\c@minnames
-        \let\c@maxnames\blx@maxcitenames
-        \let\c@minnames\blx@mincitenames
-        \ifhyperref
-            {\let\bibhyperref\@empty}
-            {}%
+    \let\blxarch@buffer@repeatfamily\mkbibnamefamily%
+    \let\blxarch@buffer@repeatprefix\mkbibnameprefix%
+    \let\blxarch@buffer@repeatgiven\mkbibnamegiven%
+    \let\blxarch@buffer@repeatsuffix\mkbibnamesuffix%
+    \let\mkbibnamefamily\mkbibrepeatfamily%
+    \let\mkbibnameprefix\mkbibrepeatprefix%
+    \let\mkbibnamegiven\mkbibrepeatgiven%
+    \let\mkbibnamesuffix\mkbibrepeatsuffix%
+    \let\blxarch@buffer@repeatnames\c@minnames%
+    \let\blxarch@buffer@maxnames\c@maxnames%
+    \let\blxarch@buffer@minnames\c@minnames%
+    \let\c@maxnames\blx@maxcitenames%
+    \let\c@minnames\blx@mincitenames%
+    \ifhyperref
+        {\let\bibhyperref\@empty}
+        {}%
+    \printtext[repeatlabel]{%
         \iffieldundef{shorthand}
-            {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
-                {\usebibmacro{cite:label}%
-                \setunit{\printdelim{nonameyeardelim}}}
-                {\printnames{labelname}%
-                \setunit{\printdelim{nameyeardelim}}}%
-             \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}%
-             \usebibmacro{cite:labeldate+extradate}%
-             \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}}%
+            {\ifboolexpr{
+                test {\ifrepeatlabel{dashed}}
+                and
+                test {\iffieldequalcs{namehash}{blxarch@field@namehash}}}
+                {\printtext{\repeatlabeldash}%
+                 \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}%
+                 \usebibmacro{cite:labeldate+extradate}%
+                 \ifeditionsuperscript{postlabel}{\usebibmacro{editionsuperscript}}{}}
+                {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+                    {\usebibmacro{cite:label}%
+                     \setunit{\printdelim{nonameyeardelim}}}
+                    {\printnames{labelname}%
+                     \setunit{\printdelim{nameyeardelim}}}%
+                 \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}%
+                 \usebibmacro{cite:labeldate+extradate}%
+                 \ifeditionsuperscript{postlabel}{\usebibmacro{editionsuperscript}}{}}}%
             {\usebibmacro{cite:shorthand}}%
-        \ifhyperref{\let\bibhyperref\blxarch@buffer@hyperref}{}%
-        \let\c@maxnames\blxarch@buffer@maxnames
-        \let\c@minnames\blxarch@buffer@minnames
-        \let\mkbibnamefamily\blxarch@buffer@repeatfamily
-        \let\mkbibnameprefix\blxarch@buffer@repeatprefix
-        \let\mkbibnamegiven\blxarch@buffer@repeatgiven
-        \let\mkbibnamesuffix\blxarch@buffer@repeatsuffix}}%
+    }%
+    \ifhyperref{\let\bibhyperref\blxarch@buffer@hyperref}{}%
+    \let\c@maxnames\blxarch@buffer@maxnames%
+    \let\c@minnames\blxarch@buffer@minnames%
+    \let\mkbibnamefamily\blxarch@buffer@repeatfamily%
+    \let\mkbibnameprefix\blxarch@buffer@repeatprefix%
+    \let\mkbibnamegiven\blxarch@buffer@repeatgiven%
+    \let\mkbibnamesuffix\blxarch@buffer@repeatsuffix%
+    \savefield{namehash}{\blxarch@field@namehash}%
+}
 \renewbibmacro*{begentry}{%
     \ifboolexpr{
         togl {archbool:noseries}
@@ -553,14 +663,14 @@
         and
         not test {\iffieldundef{shortform}}
     }
-        {\savefield{shortform}{\blxarch@field@shortform}%
+        {\savefield*{shortform}{\blxarch@field@shortform}%
          \restorefield{booktitle}{\blxarch@field@shortform}%
          \clearfield{booksubtitle}%
          \clearfield{booktitleaddon}}
         {}%
     \iffieldundef{volume}
         {}
-        {\savefield{volume}{\blxarch@field@volume}%
+        {\savefield*{volume}{\blxarch@field@volume}%
          \restorefield{usera}{\blxarch@field@volume}}%
     \ifboolexpr{
         test {\iffieldequalstr{entrysubtype}{digital}}
@@ -598,7 +708,7 @@
          \clearlist{origpublisher}}%
     \ifeditionsuperscript{none}
         {\clearfield{usere}}
-        {\savefield{edition}{\blxarch@field@edition}%
+        {\savefield*{edition}{\blxarch@field@edition}%
         \clearfield{edition}%
         \restorefield{usere}{\blxarch@field@edition}}%
     \ifboolexpr{
@@ -608,10 +718,10 @@
         and
         not test {\ifselfcontained}
     }
-        {\savefield{maintitle}{\blxarch@field@maintitle}%
-         \savefield{mainsubtitle}{\blxarch@field@mainsubtitle}%
-         \savefield{maintitleaddon}{\blxarch@field@maintitleaddon}%
-         \savefield{maintitlenote}{\blxarch@field@maintitlenote}%
+        {\savefield*{maintitle}{\blxarch@field@maintitle}%
+         \savefield*{mainsubtitle}{\blxarch@field@mainsubtitle}%
+         \savefield*{maintitleaddon}{\blxarch@field@maintitleaddon}%
+         \savefield*{maintitlenote}{\blxarch@field@maintitlenote}%
          \restorefield{booktitle}{\blxarch@field@maintitle}%
          \restorefield{booksubtitle}{\blxarch@field@mainsubtitle}%
          \restorefield{booktitleaddon}{\blxarch@field@maintitleaddon}%
@@ -627,7 +737,7 @@
         and
         not test {\iffieldundef{shortjournal}}
     }
-        {\savefield{shortjournal}{\blxarch@field@shortjournal}%
+        {\savefield*{shortjournal}{\blxarch@field@shortjournal}%
          \restorefield{journaltitle}{\blxarch@field@shortjournal}%
          \clearfield{journalsubtitle}}
         {}%
@@ -641,17 +751,17 @@
         and
         not test {\iffieldundef{shortseries}}
     }
-        {\savefield{shortseries}{\blxarch@field@shortseries}%
-         \savefield{shortsubseries}{\blxarch@field@shortsubseries}%
+        {\savefield*{shortseries}{\blxarch@field@shortseries}%
+         \savefield*{shortsubseries}{\blxarch@field@shortsubseries}%
          \iffieldundef{shortsubseries}
             {}
             {\restorefield{series}{\blxarch@field@shortseries}%
             \restorefield{subseries}{\blxarch@field@shortsubseries}}%
         }
         {}%
-    \ifrepeatlabel
-        {\usebibmacro{repeatlabel}\repeatlabeldelim}
-        {}%
+    \ifrepeatlabel{false}
+        {}
+        {\usebibmacro{repeatlabel}\repeatlabeldelim}%
     \let\blxarch@buffer@list@namegiven\mkbibnamegiven%
     \let\blxarch@buffer@list@namefamily\mkbibnamefamily%
     \let\blxarch@buffer@list@nameprefix\mkbibnameprefix%
@@ -678,10 +788,10 @@
     \settoggle{archbool:usefestschriftaddon}{#1}}
 \ExecuteBibliographyOptions{usefestschriftaddon}
 \DeclareNameAlias{festschrift}{g-family}
-\newcommand{\mkbibfestschriftnamegiven}[1]{#1}
-\newcommand{\mkbibfestschriftnamefamily}[1]{#1}
-\newcommand{\mkbibfestschriftnameprefix}[1]{#1}
-\newcommand{\mkbibfestschriftnamesuffix}[1]{#1}
+\newcommand*{\mkbibfestschriftnamegiven}[1]{#1}
+\newcommand*{\mkbibfestschriftnamefamily}[1]{#1}
+\newcommand*{\mkbibfestschriftnameprefix}[1]{#1}
+\newcommand*{\mkbibfestschriftnamesuffix}[1]{#1}
 \newbibmacro*{festschrift}[1]{%
     \printtext[#1note]{%
         \let\blxarch@buffer@festschrift@namegiven\mkbibnamegiven%
@@ -771,8 +881,8 @@
             \setcounter{multivenueloop}{1}%
         }%
 }
-\newcommand{\multivenuedelim}{\addcomma\space}
-\newcommand{\eventtypepunct}{\addspace}
+\newcommand*{\multivenuedelim}{\addcomma\space}
+\newcommand*{\eventtypepunct}{\addspace}
 \DeclareListFormat*{notruncation}{#1}
 \newbibmacro*{titlenote}[1]{%
     \iftoggle{archbool:titlenote}
@@ -813,37 +923,48 @@
         \clearlist{multivenue}%
         \clearlist{multieventdate}%
 }
-\renewcommand{\bibsetup}{%
+\xpretocmd{\bibsetup}{%
     \def\blxarch@buffer@hyperref{\bibhyperref}%
-    \ifcsdef{blxarch@fork@authordate}
-        {\csuse{blxarch@issuedate}}
-        {}
-}
-\xpretobibmacro*{finentry}{%
+    \let\blxarch@field@namehash\undefined%
+}{}{Patching macro '\bibsetup' failed}
+\xpretobibmacro{finentry}{%
    \let\mkbibnamegiven\blxarch@buffer@list@namegiven%
    \let\mkbibnamefamily\blxarch@buffer@list@nameprefix%
    \let\mkbibnameprefix\blxarch@buffer@list@namefamily%
    \let\mkbibnamesuffix\blxarch@buffer@list@namesuffix%
-}
-\xpatchbibdriver{book}{\printfield {volume}}{}{}{}
-\xpatchbibdriver{book}{\printfield {part}}{}{}{}
-\xpatchbibdriver{inbook}{\printfield {volume}}{}{}{}
-\xpatchbibdriver{inbook}{\printfield {part}}{}{}{}
-\xpatchbibdriver{book}{\iffieldundef {maintitle} {} {}\newunit}{}{}{}
-\xpatchbibdriver{inbook}{\iffieldundef {maintitle} {} {}\newunit}{}{}{}
-\xpatchbibdriver{article}{\usebibmacro{byeditor+others}}{}{}{}
-\newcommand{\titleseriesdelim}{\addperiod\space}
-\xpatchbibdriver{inbook}{newunit \newblock \usebibmacro {in:}}{printunit{\inbookbookdelim}\newblock\usebibmacro{in:}}{}{}
+}{}{Patching 'finentry' failed (1)}
+\xpatchbibdriver{book}{\printfield {volume}}{}
+  {}{Patching driver 'book' failed (1)}
+\xpatchbibdriver{book}{\printfield {part}}{}
+  {}{Patching driver 'book' failed (2)}
+\xpatchbibdriver{inbook}{\printfield {volume}}{}
+  {}{blxarch@warning{patching driver 'inbook' failed (1)}
+\xpatchbibdriver{inbook}{\printfield {part}}{}
+  {}{Patching driver 'inbook' failed  (2)}
+\xpatchbibdriver{book}{\iffieldundef {maintitle} {} {}\newunit}{}
+  {}{Patching driver 'book' failed (3)}
+\xpatchbibdriver{inbook}{\iffieldundef {maintitle} {} {}\newunit}{}
+  {}{Patching driver 'inbook' failed (3)}}
+\xpatchbibdriver{article}{\usebibmacro{byeditor+others}}{}
+  {}{Patching driver 'book' failed (4)}
+\newcommand*{\titleseriesdelim}{\addperiod\space}
+\newcommand*{\articletitlepunct}{\newunitpunct}
+\xpatchbibdriver{inbook}{newunit \newblock \usebibmacro {in:}}{printunit{\inbookbookdelim}\newblock\usebibmacro{in:}}
+  {}{Patching driver 'inbook' failed (4)}
 \newcommand{\inbookbookdelim}{\newunitpunct}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space\mkbibquote{#1\isdot}}
 \newtoggle{archbool:titlebrackets}
 \DeclareBibliographyOption{titlebrackets}[true]{%
     \settoggle{archbool:titlebrackets}{#1}}
 \ExecuteBibliographyOptions{titlebrackets}
+\DeclareEntryOption{titlebrackets}[true]{%
+    \settoggle{archbool:titlebrackets}{#1}}
 \newtoggle{archbool:titlenote}
 \DeclareBibliographyOption{titlenote}[true]{%
     \settoggle{archbool:titlenote}{#1}}
 \ExecuteBibliographyOptions{titlenote}
+\DeclareEntryOption{titlenote}[true]{%
+    \settoggle{archbool:titlenote}{#1}}
 \newtoggle{archbool:summarytitle}
 \DeclareBibliographyOption{summarytitle}[true]{%
     \settoggle{archbool:summarytitle}{#1}}
@@ -865,7 +986,7 @@
         {#1}
         {#2}
 }
-\renewcommand{\subtitlepunct}{\addperiod\space}
+\renewcommand*{\subtitlepunct}{\addperiod\space}
 \DeclareDataInheritance
 {mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference}
 {inbook,bookinbook,suppbook,incollection,suppcollection,inproceedings,inreference}{%
@@ -880,6 +1001,7 @@
   \inherit[override=true]{venue}{venue}
   \inherit[override=true]{multivenue}{multivenue}
   \inherit[override=true]{multieventdate}{multieventdate}
+  \inherit[override=true]{options}{options}
   \noinherit{summarytitle}
 }
 \renewbibmacro*{maintitle+title}{%
@@ -958,7 +1080,9 @@
                     {\usebibmacro{titlenote}{title}}
                     {\printfield[titlenote]{titleaddon}}}%
                 {}%
-            \newunit}}%
+            \iffieldundef{journaltitle}
+                {\newunit}
+                {\printunit{\articletitlepunct}}}}%
         \iftoggle{archbool:titlebrackets}
             {}
             {\ifselfcontained
@@ -1066,11 +1190,14 @@
 \DeclareBibliographyOption{volumeafterseries}[false]{%
     \settoggle{archbool:volumeafterseries}{#1}}
 \ExecuteBibliographyOptions{volumeafterseries}
-\newcommand{\articlesubtitlepunct}{\addcolon\space\midsentence}
+\newcommand*{\articlesubtitlepunct}{\addcolon\space\midsentence}
+\renewbibmacro*{bytranslator+others}{}
 \newtoggle{archbool:usesourceeditor}
 \DeclareBibliographyOption{usesourceeditor}[true]{%
     \settoggle{archbool:usesourceeditor}{#1}}
 \ExecuteBibliographyOptions{usesourceeditor}
+\DeclareEntryOption{usesourceeditor}[true]{%
+    \settoggle{archbool:usesourceeditor}{#1}}
 \newcommand{\ifsourceeditor}[2]{%
     \ifboolexpr{
         togl {archbool:usesourceeditor}
@@ -1080,21 +1207,21 @@
         {#1}
         {#2}%
 }
-\newcommand{\multisourceeditordelim}{\addcomma\space}
-\newcommand{\finalsourceeditordelim}{\addspace\bibstring{and}\space}
+\newcommand*{\multisourceeditordelim}{\addcomma\space}
+\newcommand*{\finalsourceeditordelim}{\addspace\bibstring{and}\space}
 \DeclareNameAlias{byeditor}{given-family}
 \xpretobibmacro{byeditor}{%
     \usebibmacro{byeditor:start}
-}{}{}
+}{}{Patching bibmacro 'byeditor' failed (1)}
 \xpretobibmacro{byeditor+others}{%
     \usebibmacro{byeditor:start}
-}{}{}
+}{}{Patching bibmacro 'byeditor:others' failed (1)}
 \xapptobibmacro{byeditor}{%
     \usebibmacro{byeditor:end}
-}{}{}
+}{}{Patching bibmacro 'byeditor:' failed (2)}
 \xapptobibmacro{byeditor+others}{%
     \usebibmacro{byeditor:end}
-}{}{}
+}{}{Patching bibmacro 'byeditor:others' failed (2)}
 \newbibmacro*{byeditor:start}{%
     \ifsourceeditor
         {\let\blxarch@buffer@multinamedelim\multinamedelim%
@@ -1167,8 +1294,9 @@
     \let\c@minnames\blxarch@buffer@minbooknames%
 }
 \DeclareDelimFormat{booknametitledelim}{\booklabelnamepunct}
-\newcommand{\booklabelnamepunct}{\addcomma\space}
+\newcommand*{\booklabelnamepunct}{\addcomma\space}
 \def\blxarch@issuedate{%
+    \savebibmacro{issue+date}%
     \renewbibmacro*{issue+date}{%
       \printtext[journaldateparens]{%
         \printfield{issue}%
@@ -1180,9 +1308,9 @@
 \DeclareBibliographyOption{shortjournal}[true]{%
     \settoggle{archbool:shortjournal}{#1}}
 \ExecuteBibliographyOptions{shortjournal}
-\newcommand{\volumedatedelim}{\addcomma\space}
-\newcommand{\journalvolumedelim}{\addspace}
-\newcommand{\volumenumberdelim}{\addslash}
+\newcommand*{\volumedatedelim}{\addcomma\space}
+\newcommand*{\journalvolumedelim}{\addspace}
+\newcommand*{\volumenumberdelim}{\addslash}
 \renewbibmacro*{volume+number+eid}{%
     \printfield{volume}%
     \setunit*{\volumenumberdelim}%
@@ -1195,7 +1323,7 @@
         {\newunit%
          \usebibmacro{location}{location}}
         {}%
-}
+}{}{Patching bibmacro 'note+pages' failed}
 \renewbibmacro*{journal+issuetitle}{%
     \printtext[journalvolumeblock]{%
         \usebibmacro{journal}%
@@ -1258,8 +1386,8 @@
         \clearfield{usere}%
         }%
 }
-\newcommand{\mkbiblocationaddon}[1]{}
-\renewcommand{\finallistdelim}{\multilistdelim}
+\newcommand*{\mkbiblocationaddon}[1]{}
+\renewcommand*{\finallistdelim}{\multilistdelim}
 \newcommand{\ifuselocation}[3]{%
     \ifdefstring{\blxarch@uselocation@value}{#1}
         {#2}
@@ -1275,7 +1403,7 @@
 \DeclareBibliographyOption{pagesfirst}[true]{%
     \settoggle{archbool:pagesfirst}{#1}}
 \ExecuteBibliographyOptions{pagesfirst}
-\newcommand{\ifpagesfirst}[2]{%
+\newcommand*{\ifpagesfirst}[2]{%
     \iftoggle{archbool:pagesfirst}
         {#1}
         {#2}}%
@@ -1287,7 +1415,7 @@
 \DeclareBibliographyOption{usepublisher}[true]{%
     \settoggle{archbool:usepublisher}{#1}}
 \ExecuteBibliographyOptions{usepublisher}
-\newcommand{\locationpublisherdelim}{\addcolon\space}
+\newcommand*{\locationpublisherdelim}{\addcolon\space}
 \newcommand{\iforigfields}[2]{%
     \iftoggle{archbool:origfields}
         {\iffieldundef{origyear}
@@ -1332,7 +1460,7 @@
         \setunit{\addspace}%
         \usebibmacro{bibliographydate}}%
         \newunit}%
-\DeclareFieldFormat*{reprintbrackets}{\mkbibbrackets{#1}}
+\DeclareFieldFormat*{reprintparens}{\mkbibbrackets{#1}}
 \newbibmacro*{origfields+reprint}{%
     \printtext[locationdateparens]{%
         \ifeditionsuperscript{preloc}
@@ -1351,7 +1479,7 @@
         \usebibmacro{origdate}
         \usebibmacro{editionsuperscript}%
         \setunit{\addspace}%
-        \printtext[reprintbrackets]{%
+        \printtext[reprintparens]{%
             \bibstring{reprint}\addspace%
             \printtext{\usebibmacro{location}{location}}%
             \setunit{\locationpublisherdelim}%
@@ -1370,8 +1498,10 @@
         {\ifcsdef{blxarch@opt@useinstitution@#1}
             {#3}
             {\blxarch@errmsg{\blxarch@useinstitution@errstr{\unexpanded{\ifuseinstitution}}}}}}%
-\xpatchbibdriver{thesis}{\printfield {type}}{}{}{}
-\xpatchbibdriver{thesis}{\printlist {language}}{}{}{}
+\xpatchbibdriver{thesis}{\printfield {type}}{}
+  {}{Patching driver 'thesis' failed (1)}
+\xpatchbibdriver{thesis}{\printlist {language}}{}
+  {}{Patching driver 'thesis' failed (2)}
 \newtoggle{archbool:useunpublishedthesis}
 \DeclareBibliographyOption{useunpublishedthesis}[true]{%
     \settoggle{archbool:useunpublishedthesis}{#1}}
@@ -1459,8 +1589,8 @@
         {\printtext[type]{\bibstring{unpublished\thefield{type}}}}
         {\printfield{type}}
 }
-\newcommand{\institutionlocationdelim}{\addcomma\space}
-\newcommand{\typeinstitutiondelim}{\addspace}
+\newcommand*{\institutionlocationdelim}{\addcomma\space}
+\newcommand*{\typeinstitutiondelim}{\addspace}
 \newcommand{\ifpositionlabeldate}[3]{%
     \ifdefstring{\blxarch@positionlabeldate@value}{#1}
         {#2}
@@ -1488,26 +1618,60 @@
         \ifbibextrayear
             {\printfield{extrayear}}
             {}}}
-\DeclareFieldFormat*{extrayear}{\mknumalph{#1}}%
+\DeclareFieldFormat*{extradate}{\mknumalph{#1}}%
 \newcommand{\ifbibextrayear}[2]{%
      \ifboolexpr{
-        not test {\iffieldundef{extrayear}}
+        not test {\iffieldundef{extradate}}
         and
         test {\ifpositionlabeldate{location}}
         and
-        not test {\ifrepeatlabel}
+        test {\ifrepeatlabel{false}}
         and
         test {\ifbibliography}
     }
        {#1}
        {#2}}
 \DeclareFieldFormat*{newsparens}{\addcomma\space#1}
-\newbibmacro*{extendeddate}[1]{%
-    \iffieldundef{#1year}
-        {}
-        {\printtext[#1dateparen]{\csuse{print#1date}}}%
+\blxarch@newcounter{minrealdatediff}{3}
+\blxarch@newcounter{currentrealdatediff}{0}
+\DeclareBibliographyOption[integer]{minrealdatediff}[3]{%
+    \setcounter{minrealdatediff}{#1}
+    \addtocounter{minrealdatediff}{-1}}
+\ExecuteBibliographyOptions{minrealdatediff}
+\newbibmacro*{extendeddate}[2]{%
+    \clearfield{#1day}%
+    \clearfield{#1month}%
+    \clearfield{#1endday}%
+    \clearfield{#1endmonth}%
+    \iffieldint{#1year}
+        {\iffieldint{#2endyear}
+            {\ifnumcomp{\thefield{#1year}}{>}{\thefield{#2endyear}}
+                {\setcounter{currentrealdatediff}{\thefield{#1year}}%
+                 \addtocounter{currentrealdatediff}{-\thefield{#2endyear}}}
+                {\setcounter{currentrealdatediff}{\thefield{#2endyear}}%
+                 \addtocounter{currentrealdatediff}{-\thefield{#1year}}}
+             \ifnumcomp{\value{currentrealdatediff}}{>}{\value{minrealdatediff}}
+                 {\printtext[#1dateparen]{\csuse{print#1date}}}
+                 {}%
+            }
+            {\iffieldint{#2year}
+                {\ifnumcomp{\thefield{#1year}}{>}{\thefield{#2year}}
+                    {\setcounter{currentrealdatediff}{\thefield{#1year}}%
+                     \addtocounter{currentrealdatediff}{-\thefield{#2year}}}
+                    {\setcounter{currentrealdatediff}{\thefield{#2year}}%
+                     \addtocounter{currentrealdatediff}{-\thefield{#1year}}}
+                 \ifnumcomp{\value{currentrealdatediff}}{>}{\value{minrealdatediff}}
+                     {\printtext[#1dateparen]{\csuse{print#1date}}}
+                     {}%
+                }%
+                {}%
+            }%
+        }
+        {\iffieldundef{#1year}
+            {}
+            {\printtext[#1dateparen]{\csuse{print#1date}}}}%
 }
-\newcommand{\daterealdatedelim}{\addspace}
+\newcommand*{\daterealdatedelim}{\addspace}
 \newbibmacro*{bibliographydate}{%
     \ifpositionlabeldate{label}
         {\ifnewspaper
@@ -1526,14 +1690,14 @@
                         {\printtext[missingfield]{\midsentence\printfield{pubstate}}}}%
                     {\printdate}%
                  \ifbibextrayear
-                    {\printfield{extrayear}}
+                    {\printfield{extradate}}
                     {}%
                 }%
             \ifeditionsuperscript{postdate}
                 {\usebibmacro{editionsuperscript}}
                 {}%
             \setunit{\daterealdatedelim}%
-            \usebibmacro{extendeddate}{real}}}}
+            \usebibmacro{extendeddate}{real}{}}}}
 \newbibmacro*{origdate}{%
     \printtext{%
         \midsentence%
@@ -1541,11 +1705,220 @@
             {\printtext[missingfield]{\bibstring{nodate}}}
             {\printorigdate}%
         \setunit*{\daterealdatedelim}
-        \usebibmacro{extendeddate}{origreal}%
+        \usebibmacro{extendeddate}{origreal}{orig}%
 }}
-\xpatchbibmacro{addendum+pubstate}{\printfield{pubstate}}{}{}{}
-\DeclareFieldFormat*{realdateparen}{\mkbibbrackets{#1}}
-\DeclareFieldFormat*{origrealdateparen}{\mkbibbrackets{#1}}
+\xpatchbibmacro{addendum+pubstate}{\printfield{pubstate}}{}
+  {}{Patching bibmacro 'addendum+pubstate' failed}
+\DeclareFieldFormat*{realdateparens}{\mkbibbrackets{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibbrackets{#1}}
+\renewrobustcmd*{\bibdaterangesep}{\bibrangedash}
+\newrobustcmd*{\bibdatesubseqesep}{\slash}
+
+\newrobustcmd*{\bibdaterangesepx}[1]{%
+  \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}}
+    {\ifnumequal{\thefield{#1endyear}-\thefield{#1year}}{1}
+       {\bibdatesubseqesep}
+       {\bibdaterangesep}}
+    {\bibdaterangesep}}
+ \renewrobustcmd*{\mkdaterangefull}[2]{%
+ \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+         \iffieldundef{#2season}
+           {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+            % Optionally print the time after the date
+            \blx@printtime{#2}{}}
+           {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+         \dateuncertainprint
+         \dateeraprint{#2year}%
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+                \enddatecircaprint
+                \iffieldundef{#2season}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+                   % Optionally print the time after the date
+                   \blx@printtime{#2}{end}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+                \enddateuncertainprint
+              \dateeraprint{#2endyear}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangetrunc}[2]{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+              {\iffieldsequal{#2month}{#2endmonth}
+                 {\csuse{mkbibdate#1}{}{}{#2day}}
+                 {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+              {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+               \iffieldsequal{#2dateera}{#2enddateera}{}
+                {\dateeraprint{#2year}}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+              \iffieldsequal{#2dateera}{#2enddateera}{}
+                {\dateeraprint{#2year}}}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+                \enddatecircaprint
+                \iffieldundef{#2season}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+                \enddateuncertainprint
+               \dateeraprint{#2endyear}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangefullextra}[2]{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \printtext{%
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+         \iffieldundef{#2season}
+           {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+            % Optionally print the time after the date
+            \blx@printtime{#2}{}}
+           {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+         \dateuncertainprint
+         \dateeraprint{#2year}%
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \printtext{\mbox{\bibdaterangesep}}}
+              {\printtext{%
+                 \bibdaterangesepx{#2}%
+                 \enddatecircaprint
+                 \iffieldundef{#2season}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+                    % Optionally print the time after the date
+                    \blx@printtime{#2}{end}}
+                   {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+                 \printfield{extradate}%
+                 \enddateuncertainprint
+                 \dateeraprint{#2endyear}}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangetruncextra}[2]{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \printtext{%
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+              {\iffieldsequal{#2month}{#2endmonth}
+                 {\csuse{mkbibdate#1}{}{}{#2day}}
+                 {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+              {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+               \iffieldsequal{#2dateera}{#2enddateera}{}
+                 {\dateeraprint{#2year}}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+               \iffieldsequal{#2dateera}{#2enddateera}{}
+                {\dateeraprint{#2year}}}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \printtext{\mbox{\bibdaterangesep}}}
+              {\printtext{%
+                 \bibdaterangesepx{#2}%
+                 \enddatecircaprint
+                 \iffieldundef{#2season}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                   {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+                \printfield{extradate}%
+                 \enddateuncertainprint
+                 \dateeraprint{#2endyear}}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangeymd}[1]{%
+  \begingroup
+    \blx@metadateinfo{#1}%
+    \iffieldundef{#1year}
+      {}
+      {\datecircaprint
+       \printtext[#1date]{%
+         % Such a season component can only come from an  ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+         \iffieldundef{#1season}
+           {\blx@ymddate{#1}{}%
+            % Optionally print the time after the date
+            \blx@printtime{#1}{}}
+           {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
+         \dateuncertainprint
+         \dateeraprint{#1year}%
+         \iffieldundef{#1endyear}
+           {}
+           {\iffieldequalstr{#1endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#1}%
+                \enddatecircaprint
+                \iffieldundef{#1season}
+                  {\blx@ymddate{#1}{end}%
+                   % Optionally print the time after the date
+                   \blx@printtime{#1}{end}}
+                 {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#1endyear}}}}}%
+  \endgroup}
+\renewrobustcmd*{\mkdaterangeymdextra}[1]{%
+  \begingroup
+    \blx@metadateinfo{#1}%
+    \iffieldundef{#1year}
+      {}
+      {\datecircaprint
+       \printtext[#1date]{%
+         % Such a season component can only come from an ISO8601 season which replaces
+         % a normal month so if it exists, we know that a normal date print is ruled out
+         \iffieldundef{#1season}
+           {\blx@ymddate[extradate]{#1}{}%
+            % Optionally print the time after the date
+            \blx@printtime{#1}{}}
+           {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
+         \dateuncertainprint
+         \dateeraprint{#1year}%
+         \iffieldundef{#1endyear}
+           {}
+           {\iffieldequalstr{#1endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\printtext{%
+                 \bibdaterangesepx{#1}%
+                 \enddatecircaprint
+                 \iffieldundef{#1season}
+                   {\blx@ymddate{#1}{end}%
+                    % Optionally print the time after the date
+                    \blx@printtime{#1}{end}}
+                   {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}%
+               \enddateuncertainprint
+               \dateeraprint{#1endyear}}}}}%
+  \endgroup}
 \DeclareBibliographyOption{giveninitligatures}[{Chr, Ch, Fr, IJ, Ll, Ph, Sch, St, Th}]{%
     \let\blxarch@giveninitligatures\@empty%
     \forcsvlist{\listadd\blxarch@giveninitligatures}{#1}%
@@ -1709,16 +2082,34 @@
 \DeclareBibliographyOption{preservelastauthor}[true]{%
     \settoggle{archbool:preservelastauthor}{#1}}
 \ExecuteBibliographyOptions{preservelastauthor}
-\DeclareFieldFormat*{authortype}{\mkbibparens{#1}}
+\newcommand*{\mkbibandothers}[1]{#1}
+\renewbibmacro*{name:andothers}{%
+  \ifboolexpr{
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+    and
+    test \ifmorenames
+  }
+    {\ifnumgreater{\value{liststop}}{1}
+       {\finalandcomma}
+       {}%
+     \printdelim{andothersdelim}\bibstring[\mkbibandothers]{andothers}}%
+    {}}
+\newbibmacro*{name:andothersgenitive}{%
+  \ifboolexpr{
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}
+    and
+    test \ifmorenames
+  }
+    {\ifnumgreater{\value{liststop}}{1}
+       {\finalandcomma}
+       {}%
+     \printdelim{andothersdelim}\bibstring[\mkbibandothers]{genitiveandothers}%
+     \let\blxarch@namepartfamily\@empty}
+    {}%
+}
+\DeclareFieldAlias{authortype}{editortype}
 \DeclareFieldFormat*{editortype}{\mkbibparens{#1}}
-\renewbibmacro*{translator+othersstrg}{%
-    \ifboolexpr{
-        test {\ifnumgreater{\value{translator}}{1}}
-        or
-        test {\ifandothers{translator}}
-    }
-    {\printtext[editortype]{\bibstring{translators}}}
-    {\printtext[editortype]{\bibstring{translator}}}}
+\DeclareFieldAlias{translatortype}{editortype}
 \blxarch@newcounter{preservelastauthorloop}{1}
 \newbibmacro*{names:truncate}[1]{%
     \ifboolexpr{
@@ -1761,38 +2152,92 @@
                 {}%
             \ifpositionlabeldate{label}
                 {\setunit{\daterealdatedelim}%
-                 \usebibmacro{extendeddate}{real}}
+                 \usebibmacro{extendeddate}{real}{}}
                 {}}}}
 \DeclareListFormat*{labeldateparens}{#1}
 \DeclareDelimFormat{authortypedelim,editortypedelim,translatortypedelim}{\addspace}
-\newcommand{\finalnameellipsis}{\addspace\dots\space}
-\xpatchbibmacro{author}{\printnames{author}}{%
-    \ifidemincitation
-        {\printtext{%
-            \bibstring{idem\thefield{gender}}}}
-        {\usebibmacro{sortnamelist}{author}}}{}{}
-\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{}
-\xpatchbibmacro{bbx:editor}{\printnames{editor}}{%
-    \ifidemincitation
-        {\printtext{%
-            \bibstring{idem\thefield{gender}}}}
-        {\usebibmacro{sortnamelist}{editor}}}{}{}
-\xpatchbibmacro{bbx:translator}{\printnames{translator}}{%
-    \ifidemincitation
-        {\printtext{%
-            \bibstring{idem\thefield{gender}}}}
-        {\usebibmacro{sortnamelist}{translator}}}{}{}
-\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{}
-\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{}
+\newcommand*{\finalnameellipsis}{\addspace\textellipsis\space}
 \renewbibmacro*{editor+others}{%
     \usebibmacro{editor}%
 }
 \renewbibmacro*{translator+others}{%
     \usebibmacro{translator}%
 }
-\renewcommand{\multicitedelim}{\addspace\textendash\space}
-\newcommand\strongcitedelim{\addperiod\space\textendash\space}
-\renewcommand{\compcitedelim}{\addsemicolon\space}
+\newrobustcmd*{\DefineGenitiveApostropheChars}[2]{%
+    \DefineBibliographyExtras{#1}{%
+        \let\blxarch@genitiveapostrophechars\@empty%
+        \forcsvlist{\listadd\blxarch@genitiveapostrophechars}{#2}%
+}}
+\newrobustcmd*{\DeclareGenitiveApostropheChars}[1]{%
+    \DeclareBibliographyExtras{%
+        \let\blxarch@genitiveapostrophechars\@empty%
+        \forcsvlist{\listadd\blxarch@genitiveapostrophechars}{#1}%
+}}
+\newtoggle{archbool:genitiveapostrophe}
+\newbibmacro*{genitive}[1]{%
+    \ifdefvoid{#1}
+        {}
+        {\togglefalse{archbool:genitiveapostrophe}%
+         \fullexpandarg%
+         \StrRemoveBraces{#1}[\blxarch@nobraces]%
+         \renewcommand*{\do}[1]{%
+            \IfEndWith{\blxarch@nobraces}{##1}
+                {\toggletrue{archbool:genitiveapostrophe}\listbreak}
+                {}%
+         }%
+         \dolistloop{\blxarch@genitiveapostrophechars}%
+         \iftoggle{archbool:genitiveapostrophe}
+            {\bibstring{genitiveapostrophe}}
+            {\bibstring{genitives}}%
+        }%
+}
+\DeclareNameFormat{labelname:poss}{% Based on labelname from biblatex.def
+    \let\blxarch@namepartfamily\namepartfamily%
+    \ifcase\value{uniquename}%
+        \usebibmacro{name:family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+    \or
+        \ifuseprefix
+            {\usebibmacro{name:given-family}{\namepartfamily}{\blxarch@ligatureinitchars{\namepartgiven}}{\namepartprefix}{\namepartsuffixi}}
+            {\usebibmacro{name:given-family}{\namepartfamily}{\blxarch@ligatureinitchars{\namepartgiven}}{\namepartprefixi}{\namepartsuffixi}}%
+    \or
+        \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+    \fi
+    \usebibmacro{name:andothersgenitive}%
+    \ifnumequal{\value{listcount}}{\value{liststop}}{\usebibmacro{genitive}{\blxarch@namepartfamily}}{}}
+\DeclareFieldFormat{shorthand:poss}{%
+    \ifnameundef{labelname}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}{}}
+\DeclareFieldFormat{citetitle:poss}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}
+\DeclareFieldFormat{label:poss}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}
+\newrobustcmd*{\posscitealias}{%
+    \AtNextCite{%
+        \DeclareNameAlias{labelname}{labelname:poss}%
+        \DeclareFieldAlias{shorthand}{shorthand:poss}%
+        \DeclareFieldAlias{citetitle}{citetitle:poss}%
+        \DeclareFieldAlias{label}{label:poss}}}
+\newrobustcmd*{\posscite}{%
+    \posscitealias%
+    \textcite}
+\newrobustcmd*{\Posscite}{\bibsentence\posscite}
+\newrobustcmd*{\posscites}{%
+    \posscitealias%
+    \textcites}
+\newrobustcmd*{\Posscites}{\bibsentence\posscites}
+\renewcommand*{\multicitedelim}{\addspace\textendash\space}
+\newcommand*\strongcitedelim{\addperiod\space\textendash\space}
+\renewcommand*{\compcitedelim}{\addsemicolon\space}
+\newtoggle{archbool:citeshortin}
+\DeclareBibliographyOption[boolean]{citeshortin}[true]{%
+    \settoggle{archbool:citeshortin}{#1}%
+    \ifboolexpr{
+        togl {archbool:citeshortin}
+        and
+        not test {\ifcsdef{blxarch@fork@verbose}}
+    }
+{\blxarch@errmsg{option 'citeshortin=true' only in verbose styles}}
+{}%
+}
+\ExecuteBibliographyOptions{citeshortin=false}
+\DeclareFieldFormat*{citetitle}{#1}
 \DeclareLabeldate{%
     \field{date}
     \field{pubstate}
@@ -1804,7 +2249,7 @@
     \field{editor}
     \field{translator}
 }
-\renewcommand{\labelnamepunct}{\unspace\addcolon\space}
+\renewcommand*{\labelnamepunct}{\unspace\addcolon\space}
 \newcommand{\ifseenote}[2]{#2}
 \newtoggle{archbool:uselabeltitle}
 \DeclareEntryOption{uselabeltitle}[false]{%
@@ -1853,10 +2298,10 @@
 \DeclareBibliographyOption{noseries}[false]{%
     \settoggle{archbool:noseries}{#1}}
 \ExecuteBibliographyOptions{noseries}
-\newcommand{\seriespunct}{\addperiod\space}
-\newcommand{\noseriespunct}{\seriespunct}
-\newcommand{\seriesnumberdelim}{\addspace}
-\newcommand{\subnumberseriesdelim}{\addspace=\space}
+\newcommand*{\seriespunct}{\addperiod\space}
+\newcommand*{\noseriespunct}{\seriespunct}
+\newcommand*{\seriesnumberdelim}{\addspace}
+\newcommand*{\subnumberseriesdelim}{\addspace=\space}
 \renewbibmacro*{series+number}{%
     \iffieldundef{series}
         {}
@@ -1888,33 +2333,53 @@
             }%
 }%
 \xpatchbibdriver{book}{usebibmacro {series+number}\newunit}
-    {usebibmacro{series+number}}{}{}
+    {usebibmacro{series+number}}
+{}{Patching driver 'book' failed (5)}
 \xpatchbibdriver{inbook}{usebibmacro {series+number}\newunit}
-    {usebibmacro{series+number}}{}{}
+    {usebibmacro{series+number}}
+{}{Patching driver 'inbook' failed (4)}
 \DeclareFieldFormat[book,inbook]{volume}{\addspace#1}
-\renewcommand{\labelnamepunct}{\adddot\space}
+\renewcommand*{\labelnamepunct}{\adddot\space}
 \urlstyle{same}
 \DeclareFieldFormat*{url}{\bibstring{urlfrom}\addcolon\space\url{#1}}
-\renewcommand{\finalnamedelim}{\addcomma\addspace}
+\renewcommand*{\finalnamedelim}{\addcomma\addspace}
 \DeclareListFormat*{language}{}
-\DeclareFieldFormat*{citetitle}{#1}
 \newcommand{\printgiveninitligatureslist}{%
-    \renewcommand{\do}[1]{\space##1}
+    \renewcommand*{\do}[1]{\space##1}
         \dolistloop{\@blxarch@list@add@ligatures}}
+\newrobustcmd*{\SuppressAdditiveLbxSuffixes}{%
+    \let\blx@lng@suff\@empty}
 \edef\blxarch@style@ay{authoryear-archaeology (generic)}
 \edef\blxarch@style@ayc{authoryear-comp-archaeology (generic)}
 \edef\blxarch@style@ayi{authoryear-ibid-archaeology (generic)}
 \edef\blxarch@style@ayic{authoryear-icomp-archaeology (generic)}
+\edef\blxarch@style@numc{numeric-comp-archaeology (generic)}
+\edef\blxarch@style@v{verbose-archaeology (generic)}
 \edef\blxarch@style@vi{verbose-ibid-archaeology (generic)}
 \edef\blxarch@style@vttwo{verbose-trad2note-archaeology (generic)}
+\edef\blxarch@style@dguf@info{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}
+\edef\blxarch@style@dguf{\blxarch@style@dguf@info\space[obsolete \RN{2}]}
+\edef\blxarch@style@dgufalt{\blxarch@style@dguf@info\space[obsolete \RN{1}]}
+\edef\blxarch@style@dgufapa{\blxarch@style@dguf@info\space(APA)}
+\edef\blxarch@style@mpk@info{Mitteilungen der Pr\"ahistorischen Kommission der \"Osterreichischen Akadademie der Wissenschaften}
+\edef\blxarch@style@mpk{\blxarch@style@mpk@info\space[obsolete]}
+\edef\blxarch@style@mpkoeaw{\blxarch@style@mpk@info\space[current]}
+\edef\blxarch@style@rgk{R\"omisch-Germanische Kommission}
+\edef\blxarch@style@rgkverbose{\blxarch@style@rgk\space(geisteswissenschaftlich)}
+\edef\blxarch@style@rgkinline{\blxarch@style@rgk\space(naturwissenschaftlich)}
+\edef\blxarch@style@rgknumeric{\blxarch@style@rgk\space(numerisch)}
+\edef\blxarch@style@rgzm{R\"omisch-Germanisches Zentralmuseum Mainz}
+\edef\blxarch@style@rgzminline{\blxarch@style@rgzm\space(naturwissenschaftlich)}
+\edef\blxarch@style@rgzmnumeric{\blxarch@style@rgzm\space(numerisch)}
+\edef\blxarch@style@rgzmverbose{\blxarch@style@rgzm\space(geisteswissenschaftlich)}
+\edef\blxarch@style@muenster{Ur- und Fr\"uhgeschichtliche Arch\"aologie M\"unster}
+\edef\blxarch@style@muensterverbose{\blxarch@style@muenster\space(geisteswissenschaftlich)}
+\edef\blxarch@style@muensternumeric{\blxarch@style@muenster\space(numerisch)}
+\edef\blxarch@style@muensterinline{\blxarch@style@muenster\space(naturwissenschaftlich)}
 \edef\blxarch@style@aefkw{\"Agyptologische Forschungsst\"atte f\"ur Kulturwissenschaft (\"AFKW)}
 \edef\blxarch@style@afwl{Ausgrabungen und Funde in Westfalen-Lippe}
 \edef\blxarch@style@amit{Arch\"aologische Berichte aus Iran und Turan (AMIT)}
 \edef\blxarch@style@archa{Archaeologia Austriaca (ArchA)}
-\edef\blxarch@style@dai{Deutsches Arch\"aologisches Institut}
-\edef\blxarch@style@dguf{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte}
-\edef\blxarch@style@dgufalt{\blxarch@style@dguf\space[obsolete]}
-\edef\blxarch@style@dgufapa{\blxarch@style@dguf\space(APA)}
 \edef\blxarch@style@eaz{Ethnographisch-Arch\"aologische Zeitschrift (EAZ)}
 \edef\blxarch@style@eazalt{\blxarch@style@eaz\space[obsolete]}
 \edef\blxarch@style@foe{Fundberichte aus \"Osterreich (F\"O)}
@@ -1922,18 +2387,8 @@
 \edef\blxarch@style@jbkrneuss{Jahrbuch f\"ur den Rhein-Kreis Neuss}
 \edef\blxarch@style@karl{Karl. Das kulturelle Schachmagazin}
 \edef\blxarch@style@maja{M\"unchner Arbeitskreis Junge Aegyptologie (MAJA)}
-\edef\blxarch@style@mpk{Mitteilung der Pr\"ahistorischen Kommission}
-\edef\blxarch@style@muenster{Ur- und Fr\"uhgeschichtliche Arch\"aologie M\"unster}
-\edef\blxarch@style@muensterverbose{\blxarch@style@muenster\space(geisteswissenschaftlich)}
-\edef\blxarch@style@muensterinline{\blxarch@style@muenster\space(naturwissenschaftlich)}
 \edef\blxarch@style@nnu{Nachrichten aus Niedersachsens Urgeschichte}
 \edef\blxarch@style@offa{Offa}
-\edef\blxarch@style@rgk{R\"omisch-Germanische Kommission}
-\edef\blxarch@style@rgkverbose{\blxarch@style@rgk\space(geisteswissenschaftlich)}
-\edef\blxarch@style@rgkinline{\blxarch@style@rgk\space(naturwissenschaftlich)}
-\edef\blxarch@style@rgzm{R\"omisch-Germanisches Zentralmuseum Mainz}
-\edef\blxarch@style@rgzminline{\blxarch@style@rgzm\space(naturwissenschaftlich)}
-\edef\blxarch@style@rgzmverbose{\blxarch@style@rgzm\space(geisteswissenschaftlich)}
 \edef\blxarch@style@sak{Studien zur Alt\"agyptischen Kultur}
 \edef\blxarch@style@volkskunde{Zeitschrift f\"ur Volkskunde}
 \edef\blxarch@style@zaak{Zeitschrift f\"ur Arch\"aologie au\ss ereurop\"aischer Kulturen (ZAAK)}
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx
index f8118d51aaf..e3be2a469cb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{british-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx
index 00c28a439e5..3b859f61df0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritisharchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{british-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx
index d80c53a0776..8dc13f827ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishLBX,PenglishLBX')
 %% 
 \ProvidesFile{british-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx
index 1584aee8883..a74dece4f59 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishdgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{british-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx
index 7cb77741be5..5f220afd127 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishdgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{british-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx
index 6c6e2ef1ba0..6807b52d720 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritisheazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{british-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx
index 4cf91b01341..35ce8946fec 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{british-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx
index 15ffedb49a8..c4fc83fadd1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishjbkreisneussLBX,PenglishjbkreisneussLBX')
 %% 
 \ProvidesFile{british-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx
index 3c612280127..640f83805bd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishkarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{british-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx
index 53d24a585f1..698b4cbe97f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{british-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx
index f465441b134..f4f4e5f11b6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{british-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `british-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpkoeaw.lbx
new file mode 100644
index 00000000000..5724a0bd03d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `british-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FbritishmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{british-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `british-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx
index 8aecd9d6269..57a4051c835 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{british-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx
index f3882ac8388..637392193b2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{british-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx
index 04ac061a51a..4a40567760d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{british-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx
index 4a6acbd21a5..56bab6e7349 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FbritishzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{british-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx
index b062c6d3a6f..8eaa4ba48fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{canadian-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx
index 872601b81cf..5070bb08874 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianarchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{canadian-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx
index 46acc3eea76..e4b87fb2099 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianLBX,PenglishLBX')
 %% 
 \ProvidesFile{canadian-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx
index cc1e4b0527f..7a0c5312f46 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadiandgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{canadian-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx
index 6cef8d8b374..2a556ec666e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadiandgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{canadian-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx
index eed0eea5ca5..906b7cf6730 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianeazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{canadian-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx
index 0d649d3bb4d..65dc702f533 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{canadian-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx
index 8eb4240bd90..822b8e60d23 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianjbkreisneussLBX,PenglishjbkreisneussLBX')
 %% 
 \ProvidesFile{canadian-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx
index ef37f5de4a5..8d76b1ffb2a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadiankarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{canadian-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx
index 3e8678a3641..50b20e953ad 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{canadian-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx
index 82b869cf916..3c675dca49b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{canadian-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `canadian-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpkoeaw.lbx
new file mode 100644
index 00000000000..e0ff9872b6d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `canadian-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FcanadianmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{canadian-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `canadian-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx
index ceeca3135ef..167a7d57562 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{canadian-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx
index d87970cf6fa..d7aeffa10ec 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{canadian-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx
index 36e736f305f..793cb85a200 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{canadian-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx
index 7ef4156e874..7bb44fb855e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FcanadianzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{canadian-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx
index 4900203448b..ffdfda7f6b3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufaltBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{dguf-alt.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@dgufalt}
 \DeclareLanguageMappingSuffix{-dguf-alt}
@@ -32,6 +32,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -60,31 +61,32 @@
 }
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\labelnamepunct}{\addspace}
-\renewcommand{\booklabelnamepunct}{\addspace}
+\renewcommand*{\labelnamepunct}{\addspace}
+\renewcommand*{\booklabelnamepunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{\mkbibitalic{#1}}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibbrackets{#1}}
-\renewcommand{\multilistdelim}{\addslash}
-\renewcommand{\multinamedelim}{\addcomma\space}
-\renewcommand{\finalnamedelim}{\addspace\&\space}
-\renewcommand{\mkbibnamefamily}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbibnameprefix}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\MakeUppercase{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\MakeUppercase{#1}}
+\renewcommand*{\multilistdelim}{\addslash}
+\renewcommand*{\multinamedelim}{\addcomma\space}
+\renewcommand*{\finalnamedelim}{\addspace\&\space}
+\renewcommand*{\mkbibnamefamily}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\MakeUppercase{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\MakeUppercase{#1}}
 \xpretobibmacro{in:}{\itshape}
+  {}{Patching bibmacro 'in:' failed}
 \DeclareFieldFormat*{locationdateparens}{\textup{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{seriesparens}{\mkbibitalic{#1}}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibitalic{#1}}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{pages}{#1}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `dguf-alt.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx
index a429b7358a5..fa356fea1e1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `dgufaltCBX,barecitations')
 %% 
 \ProvidesFile{dguf-alt.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@dgufalt}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `dguf-alt.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx
index 8b7734b3935..47d27641d30 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufaltDBX,DBX')
 %% 
 \ProvidesFile{dguf-alt.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `dguf-alt.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx
index 0d937023e2e..863080621cf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufapaBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{dguf-apa.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@dgufapa}
 \DeclareLanguageMappingSuffix{-dguf-apa}
@@ -43,6 +43,7 @@
     journallocation=false,
     maxbooknames=7,
     minbooknames=7,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -71,16 +72,16 @@
 }
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
-\renewcommand{\nameyeardelim}{\addcomma\space}
-\renewcommand{\multinamedelim}{\addcomma\space}
-\renewcommand{\finalnamedelim}{\addspace\&\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\nameyeardelim}{\addcomma\space}
+\renewcommand*{\multinamedelim}{\addcomma\space}
+\renewcommand*{\finalnamedelim}{\addspace\&\space}
 \DeclareNameAlias{sortname}{family-given}
 \DeclareNameAlias{bookauthor}{given-family}
-\renewcommand{\labelnamepunct}{\addperiod\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\intitlepunct}{\printunit{\addspace}}
-\renewcommand{\finentrypunct}{%
+\renewcommand*{\labelnamepunct}{\addperiod\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\intitlepunct}{\printunit{\addspace}}
+\renewcommand*{\finentrypunct}{%
     \iffieldundef{doi}
         {\ifboolexpr{
             not test {\iffieldundef{eprint}}
@@ -113,12 +114,12 @@
     \iffieldundef{maintitle}
         {\iffieldundef{subseries}
             {}
-            {\savefield{subseries}{\blxarch@field@subseries}%
+            {\savefield*{subseries}{\blxarch@field@subseries}%
              \restorefield{subtitle}{\blxarch@field@subseries}%
              \clearfield{volume}%
-             \savefield{subnumber}{\blxarch@field@subnumber}%
+             \savefield*{subnumber}{\blxarch@field@subnumber}%
              \restorefield{volume}{\blxarch@field@subnumber}}}
-        {\savefield{maintitle}{\blxarch@field@maintitle}%
+        {\savefield*{maintitle}{\blxarch@field@maintitle}%
          \restorefield{subtitle}{\blxarch@field@maintitle}}%
     \usebibmacro{title}%
     \newunit}
@@ -131,17 +132,17 @@
     \iffieldundef{maintitle}
         {\iffieldundef{subseries}
             {}
-            {\savefield{subseries}{\blxarch@field@subseries}%
+            {\savefield*{subseries}{\blxarch@field@subseries}%
              \restorefield{booksubtitle}{\blxarch@field@subseries}%
              \clearfield{volume}%
-             \savefield{subnumber}{\blxarch@field@subnumber}%
+             \savefield*{subnumber}{\blxarch@field@subnumber}%
              \restorefield{volume}{\blxarch@field@subnumber}}}
-        {\savefield{maintitle}{\blxarch@field@maintitle}%
+        {\savefield*{maintitle}{\blxarch@field@maintitle}%
          \restorefield{booksubtitle}{\blxarch@field@maintitle}}%
     \usebibmacro{booktitle}%
     \newunit}
-\renewcommand{\subtitlepunct}{\addcolon\space}
-\renewcommand{\titleseriesdelim}{\addspace}
+\renewcommand*{\subtitlepunct}{\addcolon\space}
+\renewcommand*{\titleseriesdelim}{\addspace}
 \DeclareFieldFormat*{titlebrackets}{\textup{\mkbibparens{#1}}}
 \DeclareFieldFormat*{usere}{%
     \addspace%
@@ -153,8 +154,8 @@
 }
 \DeclareFieldFormat*{locationdateparens}{\addperiod\space#1}
 \DeclareFieldFormat[article,review,suppperiodical]{number}{\mkbibparens{#1}}
-\renewcommand{\volumenumberdelim}{}
-\renewcommand{\journalvolumedelim}{\addcomma\space}
+\renewcommand*{\volumenumberdelim}{}
+\renewcommand*{\journalvolumedelim}{\addcomma\space}
 \DeclareFieldFormat*{journalvolumeblock}{\mkbibitalic{#1}}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{volume}{%
@@ -170,7 +171,7 @@
 \DeclareFieldFormat*{pages}{%
     \mkbibparens{\mkpageprefix[bookpagination]{#1}}}
 \DeclareFieldFormat[article,review,suppperiodical]{pages}{#1}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
@@ -180,9 +181,10 @@
   \ifhyperref
     {\href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}}
     {\nolinkurl{doi:#1}}}
-\renewcommand{\typeinstitutiondelim}{\addcomma\space}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\typeinstitutiondelim}{\addcomma\space}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+  {}{Patching driver 'thesistype' failed (2)}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `dguf-apa.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx
index 470024b16fa..311ab7e91b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufapaCBX,barecitations')
 %% 
 \ProvidesFile{dguf-apa.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@dgufapa}
 \xpatchbibmacro{cite}{\printnames{labelname}}{%
@@ -18,7 +18,7 @@
     }
         {\printnames[][-\value{listtotal}]{labelname}}
         {\printnames{labelname}}%
-}{}{}
+}{}{Patching bibmacro 'cite' failed}
 \xpatchbibmacro{textcite}{\printnames{labelname}}{%
     \ifboolexpr{
         not test {\ifciteseen}
@@ -27,10 +27,11 @@
     }
         {\printnames[][-\value{listtotal}]{labelname}}
         {\printnames{labelname}}%
-}{}{}
-\DeclareFieldFormat*{postnote}{#1}
+}{}{Patching bibmacro 'textcite' failed}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `dguf-apa.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx
index ace100eb905..4c8dae3ad28 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufapaDBX,DBX')
 %% 
 \ProvidesFile{dguf-apa.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `dguf-apa.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx
index e6026e90122..9d37715462f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{dguf.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@dguf}
 \ExecuteBibliographyOptions{
@@ -31,6 +31,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=true,
     origfields=true,
@@ -59,17 +60,17 @@
 }
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\multilistdelim}{\addspace-\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\xpatchbibmacro{name:andothers}{\bibstring{andothers}}{\bibstring[\mkbibnamefamily]{andothers}}{}{}
+\renewcommand*{\multilistdelim}{\addspace-\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibandothers}[1]{\mkbibnamefamily{\#1}}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{family-given}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibbrackets{#1}}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
 \DeclareFieldFormat[thesis]{locationdateparens}{%
@@ -83,14 +84,14 @@
         {\mkbibparens{#1}}
         {#1}%
 }
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{pages}{#1}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\unspace\addcomma\space}}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `dguf.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx
index a4c52258730..8e1556d3692 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `dgufCBX,barecitations')
 %% 
 \ProvidesFile{dguf.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@dguf}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `dguf.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx
index 2cdbb8be06a..76577a0addb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `dgufDBX,DBX')
 %% 
 \ProvidesFile{dguf.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `dguf.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx
index 6ab6abc2fa7..0deba384035 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `eazaltBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{eaz-alt.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-comp-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@eazalt}
 \ExecuteBibliographyOptions{
@@ -32,6 +32,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -69,44 +70,46 @@
 }
 \setlength{\bibhang}{2.5em}
 \DeclareNameAlias{bookauthor}{given-family}
-\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}}
 \def\blxarch@finalnamedelim@sortname{%
     \ifnumequal{\value{listtotal}}{2}
         {\addcomma}
         {}%
     \addspace\&\space}
 \def\blxarch@finalnamedelim@default{\addspace\&\space}
-\xapptobibmacro{begentry}{\let\finalnamedelim\blxarch@finalnamedelim@sortname}{}{}
-\xapptobibmacro{title}{\let\finalnamedelim\blxarch@finalnamedelim@default}{}{}
-\renewcommand{\bibnamedash}{\parbox{\bibhang}{\hfill\textendash\hspace*{0.4em}}}
-\renewcommand{\labelnamepunct}{\addcolon\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\xapptobibmacro{begentry}{\let\finalnamedelim\blxarch@finalnamedelim@sortname}
+  {}{Patching bibmacro 'begentry' failed (3)}
+\xapptobibmacro{title}{\let\finalnamedelim\blxarch@finalnamedelim@default}
+  {}{Patching bibmacro 'title' failed}
+\renewcommand*{\bibnamedash}{\parbox{\bibhang}{\hfill\textendash\hspace*{0.4em}}}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat*{parens}{#1}
-\renewcommand{\multilistdelim}{\addspace\textendash\space}
+\renewcommand*{\multilistdelim}{\addspace\textendash\space}
 \DeclareFieldFormat[inreference]{dictionary}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{seriesparens}{\mkbibparens{#1\addperiod}}
-\renewcommand{\seriespunct}{\addspace}
-\renewcommand{\noseriespunct}{\addperiod\space}
+\renewcommand*{\seriespunct}{\addspace}
+\renewcommand*{\noseriespunct}{\addperiod\space}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{typeinstitution}{\mkbibparens{#1\addperiod}}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `eaz-alt.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx
index 592298b0cd8..a1894da68b5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `eazaltCBX,barecitations')
 %% 
 \ProvidesFile{eaz-alt.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-comp-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@eazalt}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `eaz-alt.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx
index 3c9eb4c4405..7968d5f1a1c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `eazaltDBX,DBX')
 %% 
 \ProvidesFile{eaz-alt.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `eaz-alt.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx
index ba62c1519aa..dc807a4c3ba 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `eazBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{eaz.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@eaz}
 \DeclareLanguageMappingSuffix{-eaz}
@@ -33,6 +33,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -61,29 +62,29 @@
 }
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\bibnamedash}{\printtext{\bibstring{idem\thefield{gender}}}}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\multinamedelim}
-\renewcommand{\repeatlabeldelim}{\addcolon\space}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring{idem\thefield{gender}}}}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
+\renewcommand*{\repeatlabeldelim}{\addcolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibbrackets{#1}}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{seriesparens}{#1}
 \DeclareFieldFormat*{locationdateparens}{#1}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{booktitleaddon}{\mkbibbrackets{#1}}
 \DeclareFieldFormat*{titleaddon}{\mkbibbrackets{#1}}
 \DeclareFieldFormat*{maintitleaddon}{\mkbibbrackets{#1}}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `eaz.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx
index ed8df9a382a..c313d627c59 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx
@@ -7,13 +7,14 @@
 %% biblatex-archaeology.dtx  (with options: `eazCBX,barecitations')
 %% 
 \ProvidesFile{eaz.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@eaz}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
-\DeclareFieldFormat*{postnote}{#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `eaz.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx
index 9b4bb9926a2..2c8b45ce99e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `eazDBX,DBX')
 %% 
 \ProvidesFile{eaz.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `eaz.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx
index 6a074d3e40b..f185e2e2c01 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `aefkwenglishLBX')
 %% 
 \ProvidesFile{english-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     nodate   = {{no date}{n.d\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx
index e825558c353..bb3ac1ca14a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `archaenglishLBX')
 %% 
 \ProvidesFile{english-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlseen  = {{last access}{last access}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx
index 1b11fc5dc3c..779bb79bb74 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx
@@ -19,11 +19,14 @@
 \NewBibliographyString{exhibition}
 \NewBibliographyString{exhibcat}
 \NewBibliographyString{festschrift}
-\NewBibliographyString{postdocthesis}
+\NewBibliographyString{genitiveandothers}
+\NewBibliographyString{genitiveapostrophe}
+\NewBibliographyString{genitives}
 \NewBibliographyString{magisterthesis}
 \NewBibliographyString{noplacenodate}
 \NewBibliographyString{noplace}
 \NewBibliographyString{plate}
+\NewBibliographyString{postdocthesis}
 \NewBibliographyString{specialauction}
 \NewBibliographyString{specialauctions}
 \NewBibliographyString{subverbum}
@@ -35,13 +38,16 @@
 \NewBibliographyString{unpublishedmathesis}
 \NewBibliographyString{unpublishedmagisterthesis}
 \ProvidesFile{english-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 \InheritBibliographyExtras{british}
-\InheritBibliographyStrings{british}
-\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
+\DeclareRedundantLanguages{english}
+  {english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
 \DeclareBibliographyStrings{%
     inherit                   = {english},
     articledated              = {{article dated}{article dated}},
+    genitiveandothers         = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{'s}{'s}},
     auction                   = {{auction}{auktion}},
     auctions                  = {{auktions}{auctions}},
     bathesis                  = {{Bachelor thesis}{BA\addabbrvspace thesis}},
@@ -49,29 +55,161 @@
     colloquium                = {{symposium}{symposium\adddot}},
     conference                = {{symposium}{symposium\adddot}},
     convention                = {{symposium}{symposium\adddot}},
+    diplomathesis             = {{Master's thesis}{MA\addabbrvspace thesis}},
     dvd                       = {{DVD}{DVD}},
     exhibcat                  = {{exhibition catalogue}{exhibition catalogue}},
     exhibition                = {{exhibition catalogue}{exhibition catalogue}},
     festschrift               = {{Festschrift}{Festschr\adddot}},
-    magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
+    magisterthesis            = {{Master's thesis}{MA\addabbrvspace thesis}},
     nodate                    = {{no\space date}{n.\addabbrvspace d\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     noplace                   = {{no\space place}{n.\space p\adddot}},
-    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}},
+    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}},
     plate                     = {{plate}{pl\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     specialauction            = {{special auction}{special auction}},
     specialauctions           = {{special auctions}{special auctions}},
     subverbum                 = {{sub verbum}{\autocap{s}.~v\adddot}},
     symposium                 = {{symposium}{symposium\adddot}},
-    unpublishedbathesis       = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}},
-    unpublisheddiplomathesis  = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}},
-    unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedmathesis       = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedpostdocthesis  = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{ungedruckte Dissertation}{ungedr. Diss\adddot}},
+    unpublishedbathesis       = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}},
+    unpublisheddiplomathesis  = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmathesis       = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}},
+    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},,
     urlfrom  = {{Online}{Online}},
 }
+\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+             {\mbox{\bibdaterangesep}}
+             {\bibdaterangesepx{#2}%
+              \enddatecircaprint
+              \iffieldundef{#2season}
+                {\iffieldsequal{#2year}{#2endyear}
+                  {\iffieldsequal{#2month}{#2endmonth}
+                    {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+              \enddateuncertainprint
+              \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\DeclareGenitiveApostropheChars{}
 \endinput
 %%
 %% End of file `english-archaeology.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx
index 7875875aca4..37b37359167 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx
@@ -19,11 +19,14 @@
 \NewBibliographyString{exhibition}
 \NewBibliographyString{exhibcat}
 \NewBibliographyString{festschrift}
-\NewBibliographyString{postdocthesis}
+\NewBibliographyString{genitiveandothers}
+\NewBibliographyString{genitiveapostrophe}
+\NewBibliographyString{genitives}
 \NewBibliographyString{magisterthesis}
 \NewBibliographyString{noplacenodate}
 \NewBibliographyString{noplace}
 \NewBibliographyString{plate}
+\NewBibliographyString{postdocthesis}
 \NewBibliographyString{specialauction}
 \NewBibliographyString{specialauctions}
 \NewBibliographyString{subverbum}
@@ -35,13 +38,16 @@
 \NewBibliographyString{unpublishedmathesis}
 \NewBibliographyString{unpublishedmagisterthesis}
 \ProvidesFile{english-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 \InheritBibliographyExtras{british}
-\InheritBibliographyStrings{british}
-\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
+\DeclareRedundantLanguages{english}
+  {english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
 \DeclareBibliographyStrings{%
     inherit                   = {english},
     articledated              = {{article dated}{article dated}},
+    genitiveandothers         = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{'s}{'s}},
     auction                   = {{auction}{auktion}},
     auctions                  = {{auktions}{auctions}},
     bathesis                  = {{Bachelor thesis}{BA\addabbrvspace thesis}},
@@ -49,29 +55,161 @@
     colloquium                = {{symposium}{symposium\adddot}},
     conference                = {{symposium}{symposium\adddot}},
     convention                = {{symposium}{symposium\adddot}},
+    diplomathesis             = {{Master's thesis}{MA\addabbrvspace thesis}},
     dvd                       = {{DVD}{DVD}},
     exhibcat                  = {{exhibition catalogue}{exhibition catalogue}},
     exhibition                = {{exhibition catalogue}{exhibition catalogue}},
     festschrift               = {{Festschrift}{Festschr\adddot}},
-    magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
+    magisterthesis            = {{Master's thesis}{MA\addabbrvspace thesis}},
     nodate                    = {{no\space date}{n.\addabbrvspace d\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     noplace                   = {{no\space place}{n.\space p\adddot}},
-    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}},
+    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}},
     plate                     = {{plate}{pl\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     specialauction            = {{special auction}{special auction}},
     specialauctions           = {{special auctions}{special auctions}},
     subverbum                 = {{sub verbum}{\autocap{s}.~v\adddot}},
     symposium                 = {{symposium}{symposium\adddot}},
-    unpublishedbathesis       = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}},
-    unpublisheddiplomathesis  = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}},
-    unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedmathesis       = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedpostdocthesis  = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{ungedruckte Dissertation}{ungedr. Diss\adddot}},
+    unpublishedbathesis       = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}},
+    unpublisheddiplomathesis  = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmathesis       = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}},
+    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},,
     urlfrom  = {{Online}{Online}},
 }
+\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+             {\mbox{\bibdaterangesep}}
+             {\bibdaterangesepx{#2}%
+              \enddatecircaprint
+              \iffieldundef{#2season}
+                {\iffieldsequal{#2year}{#2endyear}
+                  {\iffieldsequal{#2month}{#2endmonth}
+                    {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+              \enddateuncertainprint
+              \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\DeclareGenitiveApostropheChars{}
 \endinput
 %%
 %% End of file `english-dguf-alt.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx
index 395f2c60fbf..088ef2f1d4b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `dgufapaenglishLBX')
 %% 
 \ProvidesFile{english-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyExtras{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx
index 6107e03166c..faed44c5a0a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `eazenglishLBX')
 %% 
 \ProvidesFile{english-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {english-archaeology},
     subverbum  = {{keyword}{keyword}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx
index bfd30ed639b..d0ea7e7bd18 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx
@@ -7,9 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `foeenglishLBX')
 %% 
 \ProvidesFile{english-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlseen  = {{accessed}{accessed}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx
index 7690c584172..310b23dcaf0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `jbkreisneussenglishLBX')
 %% 
 \ProvidesFile{english-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit = {english-archaeology},
     ibidem  = {{ibidem}{ibidem}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx
index 4a58ecf8de7..c5523de2f77 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx
@@ -19,11 +19,14 @@
 \NewBibliographyString{exhibition}
 \NewBibliographyString{exhibcat}
 \NewBibliographyString{festschrift}
-\NewBibliographyString{postdocthesis}
+\NewBibliographyString{genitiveandothers}
+\NewBibliographyString{genitiveapostrophe}
+\NewBibliographyString{genitives}
 \NewBibliographyString{magisterthesis}
 \NewBibliographyString{noplacenodate}
 \NewBibliographyString{noplace}
 \NewBibliographyString{plate}
+\NewBibliographyString{postdocthesis}
 \NewBibliographyString{specialauction}
 \NewBibliographyString{specialauctions}
 \NewBibliographyString{subverbum}
@@ -35,13 +38,16 @@
 \NewBibliographyString{unpublishedmathesis}
 \NewBibliographyString{unpublishedmagisterthesis}
 \ProvidesFile{english-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 \InheritBibliographyExtras{british}
-\InheritBibliographyStrings{british}
-\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
+\DeclareRedundantLanguages{english}
+  {english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
 \DeclareBibliographyStrings{%
     inherit                   = {english},
     articledated              = {{article dated}{article dated}},
+    genitiveandothers         = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{'s}{'s}},
     auction                   = {{auction}{auktion}},
     auctions                  = {{auktions}{auctions}},
     bathesis                  = {{Bachelor thesis}{BA\addabbrvspace thesis}},
@@ -49,29 +55,161 @@
     colloquium                = {{symposium}{symposium\adddot}},
     conference                = {{symposium}{symposium\adddot}},
     convention                = {{symposium}{symposium\adddot}},
+    diplomathesis             = {{Master's thesis}{MA\addabbrvspace thesis}},
     dvd                       = {{DVD}{DVD}},
     exhibcat                  = {{exhibition catalogue}{exhibition catalogue}},
     exhibition                = {{exhibition catalogue}{exhibition catalogue}},
     festschrift               = {{Festschrift}{Festschr\adddot}},
-    magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
+    magisterthesis            = {{Master's thesis}{MA\addabbrvspace thesis}},
     nodate                    = {{no\space date}{n.\addabbrvspace d\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     noplace                   = {{no\space place}{n.\space p\adddot}},
-    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}},
+    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}},
     plate                     = {{plate}{pl\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     specialauction            = {{special auction}{special auction}},
     specialauctions           = {{special auctions}{special auctions}},
     subverbum                 = {{sub verbum}{\autocap{s}.~v\adddot}},
     symposium                 = {{symposium}{symposium\adddot}},
-    unpublishedbathesis       = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}},
-    unpublisheddiplomathesis  = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}},
-    unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedmathesis       = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedpostdocthesis  = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{ungedruckte Dissertation}{ungedr. Diss\adddot}},
+    unpublishedbathesis       = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}},
+    unpublisheddiplomathesis  = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmathesis       = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}},
+    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},,
     urlfrom  = {{Online}{Online}},
 }
+\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+             {\mbox{\bibdaterangesep}}
+             {\bibdaterangesepx{#2}%
+              \enddatecircaprint
+              \iffieldundef{#2season}
+                {\iffieldsequal{#2year}{#2endyear}
+                  {\iffieldsequal{#2month}{#2endmonth}
+                    {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+              \enddateuncertainprint
+              \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\DeclareGenitiveApostropheChars{}
 \endinput
 %%
 %% End of file `english-karl.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx
index e153230ef84..d8b51b78806 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx
@@ -19,11 +19,14 @@
 \NewBibliographyString{exhibition}
 \NewBibliographyString{exhibcat}
 \NewBibliographyString{festschrift}
-\NewBibliographyString{postdocthesis}
+\NewBibliographyString{genitiveandothers}
+\NewBibliographyString{genitiveapostrophe}
+\NewBibliographyString{genitives}
 \NewBibliographyString{magisterthesis}
 \NewBibliographyString{noplacenodate}
 \NewBibliographyString{noplace}
 \NewBibliographyString{plate}
+\NewBibliographyString{postdocthesis}
 \NewBibliographyString{specialauction}
 \NewBibliographyString{specialauctions}
 \NewBibliographyString{subverbum}
@@ -35,13 +38,16 @@
 \NewBibliographyString{unpublishedmathesis}
 \NewBibliographyString{unpublishedmagisterthesis}
 \ProvidesFile{english-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 \InheritBibliographyExtras{british}
-\InheritBibliographyStrings{british}
-\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
+\DeclareRedundantLanguages{english}
+  {english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
 \DeclareBibliographyStrings{%
     inherit                   = {english},
     articledated              = {{article dated}{article dated}},
+    genitiveandothers         = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{'s}{'s}},
     auction                   = {{auction}{auktion}},
     auctions                  = {{auktions}{auctions}},
     bathesis                  = {{Bachelor thesis}{BA\addabbrvspace thesis}},
@@ -49,29 +55,161 @@
     colloquium                = {{symposium}{symposium\adddot}},
     conference                = {{symposium}{symposium\adddot}},
     convention                = {{symposium}{symposium\adddot}},
+    diplomathesis             = {{Master's thesis}{MA\addabbrvspace thesis}},
     dvd                       = {{DVD}{DVD}},
     exhibcat                  = {{exhibition catalogue}{exhibition catalogue}},
     exhibition                = {{exhibition catalogue}{exhibition catalogue}},
     festschrift               = {{Festschrift}{Festschr\adddot}},
-    magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
+    magisterthesis            = {{Master's thesis}{MA\addabbrvspace thesis}},
     nodate                    = {{no\space date}{n.\addabbrvspace d\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     noplace                   = {{no\space place}{n.\space p\adddot}},
-    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}},
+    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}},
     plate                     = {{plate}{pl\adddot}},
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     specialauction            = {{special auction}{special auction}},
     specialauctions           = {{special auctions}{special auctions}},
     subverbum                 = {{sub verbum}{\autocap{s}.~v\adddot}},
     symposium                 = {{symposium}{symposium\adddot}},
-    unpublishedbathesis       = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}},
-    unpublisheddiplomathesis  = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}},
-    unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedmathesis       = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedpostdocthesis  = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{ungedruckte Dissertation}{ungedr. Diss\adddot}},
+    unpublishedbathesis       = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}},
+    unpublisheddiplomathesis  = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedmathesis       = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}},
+    unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}},
+    unpublishedphdthesis      = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},,
     urlfrom  = {{Online}{Online}},
 }
+\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+             {\mbox{\bibdaterangesep}}
+             {\bibdaterangesepx{#2}%
+              \enddatecircaprint
+              \iffieldundef{#2season}
+                {\iffieldsequal{#2year}{#2endyear}
+                  {\iffieldsequal{#2month}{#2endmonth}
+                    {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                    {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+              \enddateuncertainprint
+              \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}
+              \dateeraprint{#2}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {}
+           {\iffieldequalstr{#2endyear}{}
+              {\mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
+  \begingroup
+    \blx@metadateinfo{#2}%
+    \iffieldundef{#2year}
+      {}
+      {\datecircaprint
+       \printtext[#2date]{%
+         \iffieldundef{#2season}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+             {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}
+           {\iffieldsequal{#2year}{#2endyear}
+             {\csuse{mkbibseasondate#1}{}{#2season}}
+             {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+              \dateeraprint{#2}}%
+         \dateuncertainprint
+         \iffieldundef{#2endyear}
+           {\printfield{extradate}}
+           {\iffieldequalstr{#2endyear}{}
+              {\printfield{extradate}%
+               \mbox{\bibdaterangesep}}
+              {\bibdaterangesepx{#2}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\iffieldsequal{#2year}{#2endyear}
+                   {\iffieldsequal{#2month}{#2endmonth}
+                      {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                      {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                   {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2}}}}}%
+  \endgroup}
+\DeclareGenitiveApostropheChars{}
 \endinput
 %%
 %% End of file `english-maja.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx
index b8c4faeb45b..bbd8d6b8bdd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `mpkenglishLBX')
 %% 
 \ProvidesFile{english-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlseen  = {{last access}{last access}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpkoeaw.lbx
new file mode 100644
index 00000000000..d864aa90f83
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpkoeaw.lbx
@@ -0,0 +1,39 @@
+%%
+%% This is file `english-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `mpkoeawenglishLBX')
+%% 
+\ProvidesFile{english-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-archaeology}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit                   = {english-archaeology},
+  exhibcat                  = {{Exhibition catalogue}{Exhibition catalogue}},
+  exhibition                = {{Exhibition catalogue}{Exhibition catalogue}},
+  in                        = {{In}{In}},
+  phdthesis                 = {{PhD Dissertation}
+                               {PhD Dissertation}},
+  postdocthesis             = {{Habilitationsschrift}
+                               {Habilitationsschrift}},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen                   = {{last access}{last access}},
+}
+\endinput
+%%
+%% End of file `english-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx
index 3ab54c87ad9..41334c6994e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `offaenglishLBX')
 %% 
 \ProvidesFile{english-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {english-archaeology},
     nodate     = {{no date}{n.d\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx
index 8fd6b0003e5..7ff5ddd3d9a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx
@@ -4,74 +4,13 @@
 %%
 %% The original source files were:
 %%
-%% biblatex-archaeology.dtx  (with options: `newbibstrings,englishLBX')
+%% biblatex-archaeology.dtx  (with options: `FenglishrgzmLBX,PenglishLBX')
 %% 
-\NewBibliographyString{articledated}
-\NewBibliographyString{auction}
-\NewBibliographyString{auctions}
-\NewBibliographyString{bathesis}
-\NewBibliographyString{catalogue}
-\NewBibliographyString{colloquium}
-\NewBibliographyString{conference}
-\NewBibliographyString{convention}
-\NewBibliographyString{diplomathesis}
-\NewBibliographyString{dvd}
-\NewBibliographyString{exhibition}
-\NewBibliographyString{exhibcat}
-\NewBibliographyString{festschrift}
-\NewBibliographyString{postdocthesis}
-\NewBibliographyString{magisterthesis}
-\NewBibliographyString{noplacenodate}
-\NewBibliographyString{noplace}
-\NewBibliographyString{plate}
-\NewBibliographyString{specialauction}
-\NewBibliographyString{specialauctions}
-\NewBibliographyString{subverbum}
-\NewBibliographyString{symposium}
-\NewBibliographyString{unpublishedbathesis}
-\NewBibliographyString{unpublishedpostdocthesis}
-\NewBibliographyString{unpublisheddiplomathesis}
-\NewBibliographyString{unpublishedphdthesis}
-\NewBibliographyString{unpublishedmathesis}
-\NewBibliographyString{unpublishedmagisterthesis}
-\ProvidesFile{english-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
-\InheritBibliographyExtras{british}
-\InheritBibliographyStrings{british}
-\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish}
-\DeclareBibliographyStrings{%
-    inherit                   = {english},
-    articledated              = {{article dated}{article dated}},
-    auction                   = {{auction}{auktion}},
-    auctions                  = {{auktions}{auctions}},
-    bathesis                  = {{Bachelor thesis}{BA\addabbrvspace thesis}},
-    catalogue                 = {{catalogue}{catalogue}},
-    colloquium                = {{symposium}{symposium\adddot}},
-    conference                = {{symposium}{symposium\adddot}},
-    convention                = {{symposium}{symposium\adddot}},
-    dvd                       = {{DVD}{DVD}},
-    exhibcat                  = {{exhibition catalogue}{exhibition catalogue}},
-    exhibition                = {{exhibition catalogue}{exhibition catalogue}},
-    festschrift               = {{Festschrift}{Festschr\adddot}},
-    magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
-    nodate                    = {{no\space date}{n.\addabbrvspace d\adddot}},
-    postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
-    noplace                   = {{no\space place}{n.\space p\adddot}},
-    noplacenodate             = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}},
-    plate                     = {{plate}{pl\adddot}},
-    postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
-    specialauction            = {{special auction}{special auction}},
-    specialauctions           = {{special auctions}{special auctions}},
-    subverbum                 = {{sub verbum}{\autocap{s}.~v\adddot}},
-    symposium                 = {{symposium}{symposium\adddot}},
-    unpublishedbathesis       = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}},
-    unpublisheddiplomathesis  = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}},
-    unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedmathesis       = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}},
-    unpublishedpostdocthesis  = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}},
-    unpublishedphdthesis      = {{ungedruckte Dissertation}{ungedr. Diss\adddot}},
-    urlfrom  = {{Online}{Online}},
-}
+\ProvidesFile{english-rgzm.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-archaeology}
+\InheritBibliographyStrings{english-archaeology}
 \endinput
 %%
 %% End of file `english-rgzm.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx
index 4617415fdf8..4e96c25536a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `zaakenglishLBX')
 %% 
 \ProvidesFile{english-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     urlfrom  = {{In}{In}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx
index 01e125b412f..7a6f7636e99 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `zaesenglishLBX')
 %% 
 \ProvidesFile{english-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
-\InheritBibliographyStrings{english-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {english-archaeology},
     ibidem   = {{l.\,c\adddot}{l.\,c\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx
index 74474397788..7057a7cc8ce 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `foeBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{foe.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@foe}
 \DeclareLanguageMappingSuffix{-foe}
@@ -33,6 +33,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=4,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -62,22 +63,22 @@
 
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\repeatlabeldelim}{\mkbibbold{\addcolon\space}}
-\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}}
+\renewcommand*{\repeatlabeldelim}{\mkbibbold{\addcolon\space}}
+\DeclareFieldFormat*{repeatlabel}{\mkbibbold{#1}}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}}
 \DeclareFieldFormat*{title}{\mkbibitalic{#1}}
 \DeclareFieldFormat[book,collection,manual,proceedings,reference,report,thesis,unpublished]{title}{%
     \iffieldundef{series}
@@ -91,23 +92,23 @@
     \iffieldundef{series}
         {#1}
         {\mkbibitalic{#1}}}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
-\renewcommand{\inbookbookdelim}{\addperiod\space}
-\renewcommand{\finalnamedelim}{\addspace\biblstring{and}\space}
-\renewcommand{\seriespunct}{\addcomma\addspace}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\inbookbookdelim}{\addperiod\space}
+\renewcommand*{\finalnamedelim}{\addspace\biblstring{and}\space}
+\renewcommand*{\seriespunct}{\addcomma\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\subnumberseriesdelim}{\newunitpunct}
+\renewcommand*{\subnumberseriesdelim}{\newunitpunct}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{reprintparens}{\newunitpunct#1}
-\DeclareFieldFormat*{realdateparen}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdateparen}{\mkbibparens{#1}}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{url}{\url{#1}}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `foe.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx
index c0fbb7ad66e..9b2bf01f063 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx
@@ -7,13 +7,14 @@
 %% biblatex-archaeology.dtx  (with options: `foeCBX,barecitations')
 %% 
 \ProvidesFile{foe.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@foe}
 \ExecuteBibliographyOptions{autocite=footnote}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `foe.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx
index dae5773c548..eb0dd4fe889 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `foeDBX,DBX')
 %% 
 \ProvidesFile{foe.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `foe.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx
index 3a76e73ff1b..91782009da1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx
@@ -7,63 +7,62 @@
 %% biblatex-archaeology.dtx  (with options: `aefkwgermanLBX')
 %% 
 \ProvidesFile{zaas-german.lbx}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit = {german-archaeology},
-    byeditor         = {{herausgegeben von}{hg\adddotspace von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    byeditorco       = {{herausgegeben und kommentiert von}%
-                      {hg\adddotspace und komm\adddot\ von}},
-    byeditoran       = {{herausgegeben und erl\"autert von}%
-                        {hg\adddotspace und erl\"aut\adddot\ von}},
-    byeditorin       = {{herausgegeben und mit einer Einleitung versehen von}%
-                        {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
-    byeditorfo       = {{herausgegeben und mit einem Vorwort versehen von}%
-                        {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
-    byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
-                        {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
-    byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-    byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
-    byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
-    byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
-    byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., komm\adddot\ und Einl\adddot\ von}},
-    byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., komm\adddot\ und Vorw\adddot\ von}},
-    byeditorcoaf     = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditoranin     = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditoranfo     = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
-    byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
-    byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
-    byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    editor = {{Herausgeber}{Hg\adddot}},
-    editors = {{Herausgeber}{Hgg\adddot}},
-    nodate = {{ohne Jahr}{o.J\adddot}},
+  inherit = {german-archaeology},
+  byeditor       = {{herausgegeben von}{hg\adddotspace von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                  {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  byeditorco     = {{herausgegeben und kommentiert von}%
+                  {hg\adddotspace und komm\adddot\ von}},
+  byeditoran     = {{herausgegeben und erl\"autert von}%
+                    {hg\adddotspace und erl\"aut\adddot\ von}},
+  byeditorin     = {{herausgegeben und mit einer Einleitung versehen von}%
+                    {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditorfo     = {{herausgegeben und mit einem Vorwort versehen von}%
+                    {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditoraf     = {{herausgegeben und mit einem Nachwort versehen von}%
+                    {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
+  byeditortrfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
+  byeditortraf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
+  byeditorcoin   = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., komm\adddot\ und Einl\adddot\ von}},
+  byeditorcofo   = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., komm\adddot\ und Vorw\adddot\ von}},
+  byeditorcoaf   = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditoranin   = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditoranfo   = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditoranaf   = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
+  byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
+  byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
+  byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                    {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  editor = {{Herausgeber}{Hg\adddot}},
+  editors = {{Herausgeber}{Hgg\adddot}},
+  nodate = {{ohne Jahr}{o.J\adddot}},
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx
index bed83391d84..2959ee22304 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx
@@ -7,12 +7,12 @@
 %% biblatex-archaeology.dtx  (with options: `archagermanLBX')
 %% 
 \ProvidesFile{german-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex]
+[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex]
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+    genitiveandothers = {{et\addabbrvspace al\adddot s}{et\addabbrvspace al\adddot s}},
     urlseen  = {{letzter Zugriff}{letzter Zugriff}},
 }
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx
index 70b34c88686..5ace99992ee 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx
@@ -19,11 +19,14 @@
 \NewBibliographyString{exhibition}
 \NewBibliographyString{exhibcat}
 \NewBibliographyString{festschrift}
-\NewBibliographyString{postdocthesis}
+\NewBibliographyString{genitiveandothers}
+\NewBibliographyString{genitiveapostrophe}
+\NewBibliographyString{genitives}
 \NewBibliographyString{magisterthesis}
 \NewBibliographyString{noplacenodate}
 \NewBibliographyString{noplace}
 \NewBibliographyString{plate}
+\NewBibliographyString{postdocthesis}
 \NewBibliographyString{specialauction}
 \NewBibliographyString{specialauctions}
 \NewBibliographyString{subverbum}
@@ -35,14 +38,16 @@
 \NewBibliographyString{unpublishedmathesis}
 \NewBibliographyString{unpublishedmagisterthesis}
 \ProvidesFile{german-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
 \InheritBibliographyExtras{german}
-\InheritBibliographyStrings{german}
 \DeclareRedundantLanguages{german}
-{german,ngerman,austrian,naustrian,swissgerman,nswissgerman}
+  {german,ngerman,austrian,naustrian,swissgerman,nswissgerman}
 \DeclareBibliographyStrings{%
     inherit                   = {german},
     articledated              = {{Artikel vom}{Artikel vom}},
+    genitiveandothers         = {{u.\,a\adddot s}{u.\,a\adddot s}},
+    genitiveapostrophe        = {{'}{'}},
+    genitives                 = {{s}{s}},
     auction                   = {{Auktion}{Auktion}},
     auctions                  = {{Auktionen}{Auktionen}},
     catalogue                 = {{Katalog}{Kat\adddot}},
@@ -57,7 +62,7 @@
     postdocthesis             = {{Habilitationsschrift}{Habil.-Schr\adddot}},
     magisterthesis            = {{Magisterarbeit}{MA.-Arb\adddot}},
     noplace                   = {{ohne\space Ort}{o.\,O\adddot}},
-    noplacenodate             = {{ohne Ort und Jahr}{o.\addabbrvspace O\adddot u.\addabbrvspace J\adddot}},
+    noplacenodate             = {{ohne Ort und Jahr}{o.\addabbrvspace O.\addabbrvspace u.\addabbrvspace J\adddot}},
     plate                     = {{Tafel}{Taf.}},
     specialauction            = {{Sonderauktion}{Sonderauktion}},
     specialauctions           = {{Sonderauktionen}{Sonderauktionen}},
@@ -80,6 +85,7 @@
     seenote          = {{Anmerkung}{Anm.}},
     urlfrom          = {{Online}{Online}},
 }
+\DeclareGenitiveApostropheChars{ce,s,x,z,ß,\ss}
 \endinput
 %%
 %% End of file `german-archaeology.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx
index b0ef0c466a8..8bf24b1e871 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `dgufaltgermanLBX')
 %% 
 \ProvidesFile{german-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit        = {german-archaeology},
-    andothers      = {{et\space al\adddot}{et\space al\adddot}},
+    andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+    genitiveandothers = {{et\addabbrvspace al\adddot s}{et\addabbrvspace al\adddot s}},
     bathesis       = {{Bachelorarbeit}{Bachelorarbeit}},
     diplomathesis  = {{Diplomarbeit}{Diplomarbeit}},
     magisterthesis = {{Magisterarbeit}{Magisterarbeit}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx
index 67a69a70a27..007a858e440 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanaefkwLBX,PgermanLBX')
 %% 
 \ProvidesFile{ngerman-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx
index 1798db08979..6ad1a9989ed 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `eazgermanLBX')
 %% 
 \ProvidesFile{german-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {german-archaeology},
     subverbum  = {{Stichwort}{Stichwort}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx
index 5ca059e6384..f4ac4e0c33a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `foegermanLBX')
 %% 
 \ProvidesFile{german-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     urlseen  = {{Zugriff}{Zugriff}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx
index 711d7e54367..66fdcb3eb17 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `jbkreisneussgermanLBX')
 %% 
 \ProvidesFile{german-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit = {german-archaeology},
     ibidem  = {{ebenda}{ebenda}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx
index 41d27205dbf..c2796a5a9e1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `karlgermanLBX')
 %% 
 \ProvidesFile{german-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     seenote  = {{wie Fu\ss{}note}{wie Fn.}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx
index 1d891310e9d..f439e8017d7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx
@@ -7,62 +7,62 @@
 %% biblatex-archaeology.dtx  (with options: `majagermanLBX')
 %% 
 \ProvidesFile{german-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit = {german-archaeology},
-    byeditor         = {{herausgegeben von}{hg\adddotspace von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+  inherit        = {german-archaeology},
+  byeditor       = {{herausgegeben von}{hg\adddotspace von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                  {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  byeditorco     = {{herausgegeben und kommentiert von}%
+                  {hg\adddotspace und komm\adddot\ von}},
+  byeditoran     = {{herausgegeben und erl\"autert von}%
+                    {hg\adddotspace und erl\"aut\adddot\ von}},
+  byeditorin     = {{herausgegeben und mit einer Einleitung versehen von}%
+                    {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditorfo     = {{herausgegeben und mit einem Vorwort versehen von}%
+                    {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditoraf     = {{herausgegeben und mit einem Nachwort versehen von}%
+                    {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
+  byeditortrfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
+  byeditortraf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
+  byeditorcoin   = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., komm\adddot\ und Einl\adddot\ von}},
+  byeditorcofo   = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., komm\adddot\ und Vorw\adddot\ von}},
+  byeditorcoaf   = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditoranin   = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditoranfo   = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditoranaf   = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
+  byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
+  byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
+  byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
                       {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    byeditorco       = {{herausgegeben und kommentiert von}%
-                      {hg\adddotspace und komm\adddot\ von}},
-    byeditoran       = {{herausgegeben und erl\"autert von}%
-                        {hg\adddotspace und erl\"aut\adddot\ von}},
-    byeditorin       = {{herausgegeben und mit einer Einleitung versehen von}%
-                        {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
-    byeditorfo       = {{herausgegeben und mit einem Vorwort versehen von}%
-                        {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
-    byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
-                        {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
-    byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-    byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
-    byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
-    byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
-    byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., komm\adddot\ und Einl\adddot\ von}},
-    byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., komm\adddot\ und Vorw\adddot\ von}},
-    byeditorcoaf     = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditoranin     = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditoranfo     = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
-    byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
-    byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
-    byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    editor = {{Herausgeber}{Hg\adddot}},
-    editors = {{Herausgeber}{Hgg\adddot}},
+  editor         = {{Herausgeber}{Hg\adddot}},
+  editors        = {{Herausgeber}{Hgg\adddot}},
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx
index 38c969929df..211df853aed 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx
@@ -7,13 +7,16 @@
 %% biblatex-archaeology.dtx  (with options: `mpkgermanLBX')
 %% 
 \ProvidesFile{german-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit  = {german-archaeology},
-    andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
-    urlseen  = {{letzter Zugriff}{letzter Zugriff}},
+  inherit  = {german-archaeology},
+  andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  genitiveandothers = {{et\addabbrvspace al\adddot s}
+                       {et\addabbrvspace al\adddot s}},
+  urlseen  = {{letzter Zugriff}{letzter Zugriff}},
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpkoeaw.lbx
new file mode 100644
index 00000000000..7a2c4fbd44e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpkoeaw.lbx
@@ -0,0 +1,45 @@
+%%
+%% This is file `german-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `mpkoeawgermanLBX')
+%% 
+\ProvidesFile{german-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-archaeology}
+\DeclareBibliographyStrings{%
+  inherit                   = {german-archaeology},
+  andothers                 = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  genitiveandothers         = {{et\addabbrvspace al\adddot s}
+                               {et\addabbrvspace al\adddot s}},
+  exhibcat                  = {{Austellungskatalog}{Austellungskatalog}},
+  exhibition                = {{Austellungskatalog}{Austellungskatalog}},
+  in                        = {{In}{In}},
+  reprint                   = {{Nachdruck}{Nachdruck}},
+  bathesis                  = {{Bachelorarbeit}{Bachelorarbeit}},
+  diplomathesis             = {{Diplomarbeit}{Diplomarbeit}},
+  magisterthesis            = {{Magisterarbeit}{Magisterarbeit}},
+  mathesis                  = {{Masterarbeit}{Masterarbeit}},
+  phdthesis                 = {{Dissertation}{Dissertation}},
+  postdocthesis             = {{Habilitationsschrift}
+                               {Habilitationsschrift}},
+  unpublishedbathesis       = {{unver\"offentlichte Bachelorarbeit}
+                               {unver\"offentlichte Bachelorarbeit}},
+  unpublisheddiplomathesis  = {{unver\"offentlichte Diplomarbeit}
+                               {unver\"offentlichte Diplomarbeit}},
+  unpublishedmagisterthesis = {{unver\"offentlichte Magisterarbeit}
+                               {unver\"offentlichte Magisterarbeit}},
+  unpublishedmathesis       = {{unver\"offentlichte Masterarbeit}
+                               {unver\"offentlichte Masterarbeit}},
+  unpublishedphdthesis      = {{unver\"offentlichte Dissertation}
+                               {unver\"offentlichte Dissertation}},
+  unpublishedpostdocthesis  = {{unver\"offentlichte Habilitationsschrift}
+                               {unver\"offentlichte Habilitationsschrift}},
+  urlseen                   = {{letzter Zugriff}{letzter Zugriff}},
+}
+\endinput
+%%
+%% End of file `german-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx
index 3b014202d75..653c9a0eff2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `offagermanLBX')
 %% 
 \ProvidesFile{german-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit    = {german-archaeology},
     nodate     = {{ohne Jahr}{o.J\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx
index cd0f6b76399..56aa3a3b7b6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx
@@ -7,19 +7,19 @@
 %% biblatex-archaeology.dtx  (with options: `rgzmgermanLBX')
 %% 
 \ProvidesFile{german-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit        = {german-archaeology},
-    ibidem         = {{ebenda}{ebenda}},
-    reprint        = {{Nachdruck}{Nachdruck}},
-    bathesis       = {{Bachelorarbeit}{Bachelorarbeit}},
-    diplomathesis  = {{Diplomarbeit}{Diplomarbeit}},
-    magisterthesis = {{Magisterarbeit}{Magisterarbeit}},
-    mathesis       = {{Masterarbeit}{Masterarbeit}},
-    phdthesis      = {{Dissertation}{unpubl. Diss\adddot}},
-    postdocthesis  = {{Habilitationsschrift}{unpubl. Habilitationsschr\adddot}},
+  inherit        = {german-archaeology},
+  ibidem         = {{ebenda}{ebenda}},
+  reprint        = {{Nachdruck}{Nachdruck}},
+  bathesis       = {{Bachelorarbeit}{Bachelorarbeit}},
+  diplomathesis  = {{Diplomarbeit}{Diplomarbeit}},
+  magisterthesis = {{Magisterarbeit}{Magisterarbeit}},
+  mathesis       = {{Masterarbeit}{Masterarbeit}},
+  phdthesis      = {{Dissertation}{unpubl. Diss\adddot}},
+  postdocthesis  = {{Habilitationsschrift}{unpubl. Habilitationsschr\adddot}},
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx
index 461b3730bdd..9dcf1ff85b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx
@@ -7,9 +7,9 @@
 %% biblatex-archaeology.dtx  (with options: `zaakgermanLBX')
 %% 
 \ProvidesFile{german-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
     inherit  = {german-archaeology},
     page     = {{Seite}{p\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx
index f98fb73a5da..d3aad02c223 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx
@@ -7,63 +7,63 @@
 %% biblatex-archaeology.dtx  (with options: `zaesgermanLBX')
 %% 
 \ProvidesFile{german-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
-\InheritBibliographyStrings{german-archaeology}
 \DeclareBibliographyStrings{%
-    inherit = {german-archaeology},
-    byeditor         = {{herausgegeben von}{hg\adddotspace von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    byeditorco       = {{herausgegeben und kommentiert von}%
-                      {hg\adddotspace und komm\adddot\ von}},
-    byeditoran       = {{herausgegeben und erl\"autert von}%
-                        {hg\adddotspace und erl\"aut\adddot\ von}},
-    byeditorin       = {{herausgegeben und mit einer Einleitung versehen von}%
-                        {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
-    byeditorfo       = {{herausgegeben und mit einem Vorwort versehen von}%
-                        {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
-    byeditoraf       = {{herausgegeben und mit einem Nachwort versehen von}%
-                        {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditortrco     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
-    byeditortran     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
-    byeditortrin     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
-    byeditortrfo     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
-    byeditortraf     = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
-    byeditorcoin     = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., komm\adddot\ und Einl\adddot\ von}},
-    byeditorcofo     = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., komm\adddot\ und Vorw\adddot\ von}},
-    byeditorcoaf     = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
-    byeditoranin     = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditoranfo     = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditoranaf     = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
-                        {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortrcoin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
-    byeditortrcofo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
-    byeditortrcoaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
-    byeditortranin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
-    byeditortranfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
-                        {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
-    byeditortranaf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
-                      {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
-    byeditortr       = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
-                      {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
-    editor = {{Herausgeber}{Hg\adddot}},
-    editors = {{Herausgeber}{Hgg\adddot}},
-    ibidem = {{\midsentence l.\,c\adddot}{l.\,c\adddot}},
+  inherit = {german-archaeology},
+  byeditor       = {{herausgegeben von}{hg\adddotspace von}},
+   byeditortr    = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                    {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  byeditorco     = {{herausgegeben und kommentiert von}%
+                    {hg\adddotspace und komm\adddot\ von}},
+  byeditoran     = {{herausgegeben und erl\"autert von}%
+                    {hg\adddotspace und erl\"aut\adddot\ von}},
+  byeditorin     = {{herausgegeben und mit einer Einleitung versehen von}%
+                    {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}},
+  byeditorfo     = {{herausgegeben und mit einem Vorwort versehen von}%
+                    {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}},
+  byeditoraf     = {{herausgegeben und mit einem Nachwort versehen von}%
+                    {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditortrco   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}},
+  byeditortran   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}},
+  byeditortrin   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}},
+  byeditortrfo   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}},
+  byeditortraf   = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}},
+  byeditorcoin   = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., komm\adddot\ und Einl\adddot\ von}},
+  byeditorcofo   = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., komm\adddot\ und Vorw\adddot\ von}},
+  byeditorcoaf   = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}},
+  byeditoranin   = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditoranfo   = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditoranaf   = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}},
+  byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}},
+  byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}},
+  byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}},
+  byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}},
+  byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}%
+                    {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}},
+  byeditortr     = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}%
+                    {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}},
+  editor = {{Herausgeber}{Hg\adddot}},
+  editors = {{Herausgeber}{Hgg\adddot}},
+  ibidem = {{\midsentence l.\,c\adddot}{l.\,c\adddot}},
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx
index 507ed6ca439..bf0c3dc520a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `jbhalleBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{jb-halle.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@jbhalle}
 \ExecuteBibliographyOptions{
@@ -32,6 +32,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=false,
     origfields=true,
@@ -61,17 +62,17 @@
 \setlength{\bibhang}{1.2em}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\DeclareFieldFormat{repeatlabel}{\mkbibbold{#1}}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
@@ -84,26 +85,26 @@
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 \DeclareFieldFormat*{usere}{%
     \ifinteger{#1}
         {\mkbibordinal{#1}\space\bibstring{edition},\space}
         {#1}%
 }
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\nameshortformdelim}{\addspace in\space}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\nameshortformdelim}{\addspace in\space}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `jb-halle.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx
index c82112f5ed9..7396d9a54c5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `jbhalleCBX,barecitations')
 %% 
 \ProvidesFile{jb-halle.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@jbhalle}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `jb-halle.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx
index 8a847f4a476..907c0968e6d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `jbhalleDBX,DBX')
 %% 
 \ProvidesFile{jb-halle.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `jb-halle.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx
index 6cb13853674..282bd90c958 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `jbkreisneussBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{jb-kreis-neuss.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-ibid-archaeology}
 \DeclareLanguageMappingSuffix{-jb-kreis-neuss}
 \def\archaeobibstyletitle{\blxarch@style@jbkrneuss}
@@ -31,6 +31,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -58,17 +59,17 @@
     volumeafterseries=false,
 }
 \DeclareNameAlias{default}{family-given}
-\renewcommand{\newunitpunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcolon\space}
-\renewcommand{\labelnamepunct}{\addcolon\space}
-\renewcommand{\volumedatedelim}{\addspace}
-\renewcommand{\titleseriesdelim}{\addspace}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
-\renewcommand{\finalnamedelim}{\multinamedelim}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\volumedatedelim}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
 \DeclareFieldFormat*{title}{#1}
 \DeclareFieldFormat*{booktitle}{#1}
 \DeclareFieldFormat*{maintitle}{#1}
-\DeclareFieldFormat*{reprintbrackets}{\mkbibparens{#1}}
+\DeclareFieldFormat*{reprintparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{seriesparens}{\mkbibparens{= #1}}
 \DeclareFieldFormat*{volume}{\addcomma\addspace\bibstring{volume}\addspace#1}
@@ -76,11 +77,11 @@
 \DeclareFieldFormat*{number}{\bibstring{volume}\addspace#1}
 \DeclareFieldFormat*{subnumber}{\bibstring{volume}\addspace#1}
 \DeclareFieldFormat[article,periodical,review,suppperiodical]{number}{#1}
-\renewcommand{\seriesnumberdelim}{\newunitpunct}
+\renewcommand*{\seriesnumberdelim}{\newunitpunct}
 \renewcommand{\seriespunct}{\newunitpunct}
-\renewcommand{\noseriespunct}{\newunitpunct}
-\renewcommand{\multilistdelim}{\addspace\addslash\space}
-\renewcommand{\sqspace}{}
+\renewcommand*{\noseriespunct}{\newunitpunct}
+\renewcommand*{\multilistdelim}{\addspace\addslash\space}
+\renewcommand*{\sqspace}{}
 \DeclareFieldFormat*{pages}{%
     \ifpages{#1}
         {\ifnumequal{1}{\rangelen{pages}}
@@ -91,11 +92,11 @@
             }}
         {#1}%
 }
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `jb-kreis-neuss.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx
index f9dd4a76964..96ecc72d587 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx
@@ -7,11 +7,11 @@
 %% biblatex-archaeology.dtx  (with options: `jbkreisneussCBX,noshortform')
 %% 
 \ProvidesFile{jb-kreis-neuss.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{verbose-ibid-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@jbkrneuss}
 \ExecuteBibliographyOptions{citepages=separate}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \let\shortformcite\autocite
 \let\shortformcites\autocites
 \let\sfcite\cite
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx
index a3a9abb9a78..f77aa27140f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `jbkreisneussDBX,DBX')
 %% 
 \ProvidesFile{jb-kreis-neuss.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `jb-kreis-neuss.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx
index 42d82d7bf97..adbf8a2fc0d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `karlBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{karl.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-trad2note-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@karl}
 \DeclareLanguageMappingSuffix{-karl}
@@ -31,6 +31,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     noseries=true,
     nothesistitlepunct=false,
     notitlepunct=false,
@@ -40,8 +41,8 @@
     preservelastauthor=false,
     repeatlabel=false,
     shortform=false,
-    shortjournal=true,
-    shortseries=true,
+    shortjournal=false,
+    shortseries=false,
     subseries=true,
     summarytitle=false,
     tabbedlabeldate=false,
@@ -60,28 +61,27 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\finalnamedelim}{\addspace\biblstring{and}\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\finalnamedelim}{\addspace\biblstring{and}\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
 \DeclareFieldFormat*{title}{\mkbibquote{#1}}
-\DeclareFieldFormat[inreference]{title}{\biblstring{subverbum}\addspace\mkbibquote{#1}}
 \DeclareFieldFormat[book,booklet,collection,manual,misc,proceedings,report,thesis,unpublished]
-{title}{\textit{#1}}
-\DeclareFieldFormat*{booktitle}{\textit{#1}}
-\DeclareFieldFormat*{maintitle}{\textit{#1}}
+{title}{\emph{#1}}
+\DeclareFieldFormat*{booktitle}{\emph{#1}}
+\DeclareFieldFormat*{maintitle}{\emph{#1}}
 \DeclareFieldFormat*{volume}{\addspace\bibstring{volume}\space#1}
 \DeclareFieldFormat[article,review,suppperiodical]{title}{#1}
-\DeclareFieldFormat*{journaltitle}{\textit{#1}}
+\DeclareFieldFormat*{journaltitle}{\emph{#1}}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{seenote}{\mkbibparens{#1}}
-\DeclareFieldFormat*{url}{\textit{\url{#1}}}
+\DeclareFieldFormat*{url}{\emph{\url{#1}}}
 \DeclareFieldFormat*{urldate}{}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `karl.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx
index 058698c1ce1..bf98939a32f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx
@@ -7,10 +7,10 @@
 %% biblatex-archaeology.dtx  (with options: `karlCBX')
 %% 
 \ProvidesFile{karl.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{verbose-trad2note-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@karl}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \endinput
 %%
 %% End of file `karl.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx
index d7375a3ebec..743731dfb82 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `karlDBX,DBX')
 %% 
 \ProvidesFile{karl.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `karl.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx
index 5bb0d779f56..d167081dfe1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx
@@ -7,8 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `majaBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{maja.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
-\RequireBibliographyStyle{verbose-ibid-archaeology}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\RequireBibliographyStyle{verbose-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@maja}
 \DeclareLanguageMappingSuffix{-maja}
 \ExecuteBibliographyOptions{
@@ -25,11 +25,12 @@
     notetype=foot+end,
     editionsuperscript=predate,
     giveninitligatures={},
-    idemincitation=true,
+    idemincitation=false,
     injournal=true,
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=true,
     origfields=false,
@@ -38,8 +39,8 @@
     preservelastauthor=false,
     repeatlabel=false,
     shortform=title,
-    shortjournal=false,
-    shortseries=false,
+    shortjournal=true,
+    shortseries=true,
     subseries=false,
     summarytitle=false,
     tabbedlabeldate=false,
@@ -56,33 +57,42 @@
     useunpublishedthesis=true,
     volumeafterseries=false,
 }
-\renewcommand{\newunitpunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
 \DeclareNameAlias{sortname}{family-given}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\multinamedelim}{\addspace\slash\space}
-\renewcommand{\finalnamedelim}{\addspace\slash\space}
+\DeclareNameAlias{labelnames}{sortname}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\multinamedelim}{\addspace\slash\space}
+\renewcommand*{\finalnamedelim}{\addspace\slash\space}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
-\renewcommand{\titleseriesdelim}{\newunitpunct}
-\renewcommand{\seriespunct}{\newunitpunct}
+\DeclareFieldFormat[inreference]{volume}{\addspace\RN{#1}}
+\DeclareFieldFormat*{edition}{}
+\DeclareFieldFormat*{usere}{}
+\DeclareFieldFormat*{titleaddon}{}
+\DeclareFieldFormat*{booktitleaddon}{}
+\DeclareFieldFormat*{maintitleaddon}{}
+\renewcommand*{\titleseriesdelim}{\newunitpunct}
+\renewcommand*{\seriespunct}{\newunitpunct}
+\DeclareListFormat[inreference]{location}{}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{seriesparens}{#1}
 \DeclareFieldFormat*{newsparens}{#1}
 \DeclareFieldFormat[inreference]{date}{\iffieldundef{shortform}{#1}{\mkbibparens{#1}}}
-\DeclareFieldFormat[inreference]{title}{#1}
-\xpatchbibdriver{inreference}{location+date}{bibliographydate}{}{}
-\xpatchbibdriver{inreference}{titlepunct}{nopunct}{}{}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
-\renewcommand{\volumedatedelim}{\addspace}
-\renewcommand{\multilistdelim}{\addspace\slash\space}
+\DeclareFieldFormat[inreference]{dictionary}{#1}
+\xpatchbibdriver{inreference}{location+date}{bibliographydate}
+  {}{Patching driver 'inreference' failed (2)}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+  {}{Patching bibmacro 'thesistype' failed (3)}
+\renewcommand*{\volumedatedelim}{\addspace}
+\renewcommand*{\multilistdelim}{\addspace\slash\space}
 \DeclareFieldFormat*{url}{\mkbibparens{\url{#1}}}
 \DeclareFieldFormat*{urldate}{\addcomma\space#1}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `maja.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx
index 3eb402999d5..1f40f545c4d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx
@@ -7,16 +7,20 @@
 %% biblatex-archaeology.dtx  (with options: `majaCBX,barecitations,noshortform')
 %% 
 \ProvidesFile{maja.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
-\RequireCitationStyle{verbose-ibid-archaeology}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\RequireCitationStyle{verbose-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@maja}
+\ExecuteBibliographyOptions{
+citeshortin=true,
+}
 \let\shortformcite\autocite
 \let\shortformcites\autocites
 \let\sfcite\cite
 \let\sfcites\cites
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `maja.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx
index 5830bb3604b..a5f75e0402b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `majaDBX,DBX')
 %% 
 \ProvidesFile{maja.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `maja.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx
index fd4db02196a..612802c1ede 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `mpkBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{mpk.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-icomp-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@mpk}
 \DeclareLanguageMappingSuffix{-mpk}
@@ -35,6 +35,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=true,
@@ -64,31 +65,32 @@
 \setlength{\bibhang}{0em}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\newunitpunct}{\addcomma\space}
-\renewcommand{\titleseriesdelim}{\addperiod\space}
-\renewcommand{\seriespunct}{\newunitpunct}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\titleseriesdelim}{\addperiod\space}
+\renewcommand*{\seriespunct}{\newunitpunct}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\subnumberseriesdelim}{\newunitpunct}
+\renewcommand*{\subnumberseriesdelim}{\newunitpunct}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{reprintparens}{\newunitpunct#1}
-\DeclareFieldFormat*{realdateparen}{\addcomma\space#1}
-\DeclareFieldFormat*{origrealdateparen}{\addcomma\space#1}
+\DeclareFieldFormat*{realdateparens}{\addcomma\space#1}
+\DeclareFieldFormat*{origrealdateparens}{\addcomma\space#1}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{url}{#1}
 \DeclareFieldFormat*{urldate}{\newunitpunct\biblstring{urlseen}\addcolon\space#1}
-\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{}
+\xpatchbibmacro{thesistype}{bibstring}{biblstring}
+ {}{Patching bibmacro 'thesistype' failed (4)}
 \let\blxarch@buffer@finentrypunct\finentrypunct
-\renewcommand{\finentrypunct}{%
+\renewcommand*{\finentrypunct}{%
     \ifboolexpr{
         test {\ifentrytype{online}}
         or
@@ -99,7 +101,7 @@
         {}
         {\blxarch@buffer@finentrypunct}
 }
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `mpk.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx
index 8450edcebad..88349fba72d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx
@@ -7,17 +7,18 @@
 %% biblatex-archaeology.dtx  (with options: `mpkCBX,barecitations')
 %% 
 \ProvidesFile{mpk.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-icomp-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@mpk}
 \ExecuteBibliographyOptions{autocite=footnote}
-\renewcommand{\multicitedelim}{\addperiod\space\textendash\space}
-\renewcommand{\compcitedelim}{%
+\renewcommand*{\multicitedelim}{\addperiod\space\textendash\space}
+\renewcommand*{\compcitedelim}{%
     \multicitedelim\bibsentence%
     \bibstring[\mkbibnamefamily]{idem\thefield{gender}}\addspace}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `mpk.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx
index d3d6da99917..bf5b1c6479a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `mpkDBX,DBX')
 %% 
 \ProvidesFile{mpk.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `mpk.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.bbx
new file mode 100644
index 00000000000..65e02c4ab95
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.bbx
@@ -0,0 +1,131 @@
+%%
+%% This is file `mpkoeaw.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `mpkoeawBBX,noarticlesubtitlepunct')
+%% 
+\ProvidesFile{mpkoeaw.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\RequireBibliographyStyle{authoryear-archaeology}
+\def\archaeobibstyletitle{\blxarch@style@mpkoeaw}
+\DeclareLanguageMappingSuffix{-mpkoeaw}
+\ExecuteBibliographyOptions{
+    dashed=false,
+    datezeros=true,
+    doi=true,
+    giveninits=true,
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+    maxcitenames=3,
+    maxitems=3,
+    mergedate=true,
+    mincitenames=3,
+    minitems=3,
+    notetype=foot+end,
+    sortcites=true,
+    sorting=lnyvt,
+    editionsuperscript=predate, % ??, not in guidelines
+    giveninitligatures={},
+    idemincitation=true,
+    injournal=false,
+    journallocation=false,
+    maxbooknames=500,
+    minbooknames=3,
+    minrealdatediff=1,
+    nothesistitlepunct=false,
+    notitlepunct=false,
+    origfields=true,
+    pagesfirst=false,
+    positionlabeldate=location,
+    preservelastauthor=false,
+    repeatlabel=true,
+    shortform=false,
+    shortjournal=false,
+    shortseries=false,
+    subseries=true,
+    summarytitle=false,
+    tabbedlabeldate=false,
+    titlebrackets=false,
+    titlenote=false,
+    useeventdate=true,
+    useeventnumber=false,
+    usefestschriftaddon=false,
+    useinstitution=omitlocation,
+    uselocation=true,
+    usemultivenue=false,
+    usepublisher=false,
+    useunpublishedthesis=true,
+    usesourceeditor=true,
+    volumeafterseries=false,
+}
+\DeclareStyleSourcemap{
+    \maps[datatype=bibtex]{
+        \map[
+            overwrite=true,
+        ]{
+             \step[
+                fieldsource=eventtype,
+                match=\regexp{exhib},
+                fieldset=options,
+                fieldvalue={titlenote=true,titlebrackets=true},
+                append=true,
+                notfield=options,
+            ]
+        }
+        \map[
+            overwrite=true,
+        ]{
+            \step[
+                fieldsource=options,
+                notmatch=\regexp{\btitlenote\b},
+                final,
+            ]
+            \step[
+                fieldsource=eventtype,
+                match=\regexp{exhib},
+                fieldset=options,
+                fieldvalue={,titlenote=true,titlebrackets=true},
+                append=true,
+            ]
+        }
+    }
+}
+\setlength{\bibhang}{0em}
+\setlength{\bibitemsep}{\baselineskip}
+\DeclareNameAlias{sortname}{given-family}
+\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\subtitlepunct}{\addcolon\space\midsentence}
+\renewcommand*{\articletitlepunct}{\addcomma\space}
+\DeclareFieldFormat*{titlenote}{\mkbibparens{#1}}
+\DeclareFieldAlias{booktitlenote}{titlenote}
+\DeclareFieldAlias{maintitlenote}{titlenote}
+\DeclareFieldFormat*{dictionary}{#1}
+\DeclareFieldFormat*{volume}{\addspace#1}
+\renewrobustcmd*{\bibdatesubseqesep}{\bibdaterangesep}
+\renewcommand*{\volumedatedelim}{\addslash}
+\renewcommand*{\subnumberseriesdelim}{\addcomma\space}
+\DeclareFieldFormat*{journaldateparens}{#1}
+\DeclareFieldFormat*{locationdateparens}{#1}
+\DeclareFieldFormat*{realdateparens}{#1}
+\DeclareFieldFormat*{origrealdateparens}{#1}
+\renewcommand*{\typeinstitutiondelim}{\addcomma\space}
+\renewcommand*{\daterealdatedelim}{\addcomma\space}
+\DeclareFieldFormat*{reprintparens}{\addcomma\space#1}
+\renewcommand*{\multilistdelim}{\addspace\textendash\space}
+\DeclareFieldFormat*{pages}{#1}
+\urlstyle{same}
+\DeclareFieldFormat*{url}{\url{#1}}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
+\endinput
+%%
+%% End of file `mpkoeaw.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.cbx
new file mode 100644
index 00000000000..384d7945e9b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.cbx
@@ -0,0 +1,21 @@
+%%
+%% This is file `mpkoeaw.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `mpkoeawCBX,barecitations')
+%% 
+\ProvidesFile{mpk.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\RequireCitationStyle{authoryear-archaeology}
+\def\archaeocitestyletitle{\blxarch@style@mpkoeaw}
+\ExecuteBibliographyOptions{autocite=footnote}
+\renewcommand*{\multicitedelim}{\addperiod\space\textendash\space}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{volcitevolume}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
+\endinput
+%%
+%% End of file `mpkoeaw.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.dbx
new file mode 100644
index 00000000000..5a08138a7ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.dbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `mpkoeaw.dbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `mpkoeawDBX,DBX')
+%% 
+\ProvidesFile{mpkoeaw.dbx}
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
+\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
+\DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
+\DeclareDatamodelEntryfields
+[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortsubseries,subnumber,subseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{titlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle}
+\DeclareDatamodelFields[type=field,datatype=literal]{shortform}
+\DeclareDatamodelFields[type=list,datatype=name]{festschrift}
+\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon}
+\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber}
+\DeclareDatamodelFields[type=field,datatype=literal]{eventtype}
+\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate}
+\DeclareDatamodelFields[type=list,datatype=literal]{multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortform,festschrift,festschriftaddon,eventnumber,eventtype
+,eventdate,venue,multieventdate,multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection]
+{booktitlenote}
+\DeclareDatamodelEntryfields{summarytitle,titlenote}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate}
+\DeclareDatamodelEntryfields{realdate,origrealdate}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate}
+\DeclareDatamodelEntryfields
+[article,periodical,suppperiodical,review]{newsdate}
+\DeclareDatamodelEntryfields
+[article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+\endinput
+%%
+%% End of file `mpkoeaw.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx
index 27aeebaee35..b1e4dfeb6ab 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianaefkwLBX,PgermanaefkwLBX')
 %% 
 \ProvidesFile{naustrian-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-aefkw}
 \InheritBibliographyStrings{german-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx
index e909b9e4d93..43c8765e6d9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianarchaLBX,PgermanarchaLBX')
 %% 
 \ProvidesFile{naustrian-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archa}
 \InheritBibliographyStrings{german-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx
index 0042452ca69..c11815b1618 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianLBX,PgermanLBX')
 %% 
 \ProvidesFile{naustrian-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx
index b9586c4e6c5..79df086a463 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustriandgufaltLBX,PgermandgufaltLBX')
 %% 
 \ProvidesFile{naustrian-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-dguf-alt}
 \InheritBibliographyStrings{german-dguf-alt}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx
index b01e1be09c6..56eb88bd380 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustriandgufapaLBX,PgermanLBX')
 %% 
 \ProvidesFile{naustrian-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx
index d0d6c249cca..a5a4ce8c30d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianeazLBX,PgermaneazLBX')
 %% 
 \ProvidesFile{naustrian-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-eaz}
 \InheritBibliographyStrings{german-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx
index e173e15421e..6b209eb5d77 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianfoeLBX,PgermanfoeLBX')
 %% 
 \ProvidesFile{naustrian-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-foe}
 \InheritBibliographyStrings{german-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx
index c363bf59f49..04e88209c8e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianjbkreisneussLBX,PgermanjbkreisneussLBX')
 %% 
 \ProvidesFile{naustrian-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-jb-kreis-neuss}
 \InheritBibliographyStrings{german-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx
index 519aed086a0..9d5c1c62b53 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustriankarlLBX,PgermankarlLBX')
 %% 
 \ProvidesFile{naustrian-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-karl}
 \InheritBibliographyStrings{german-karl}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx
index 60bf5fbf490..d33f63b975b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianmajaLBX,PgermanmajaLBX')
 %% 
 \ProvidesFile{naustrian-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-maja}
 \InheritBibliographyStrings{german-maja}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx
index 643e18f3e42..9cc435c5398 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianmpkLBX,PgermanmpkLBX')
 %% 
 \ProvidesFile{naustrian-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-mpk}
 \InheritBibliographyStrings{german-mpk}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpkoeaw.lbx
new file mode 100644
index 00000000000..dd3d8571dee
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `naustrian-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FnaustrianmpkoeawLBX,PgermanmpkoeawLBX')
+%% 
+\ProvidesFile{naustrian-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-mpkoeaw}
+
+\endinput
+%%
+%% End of file `naustrian-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx
index f9cbfd8fed5..7dbce44d6d3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianoffaLBX,PgermanoffaLBX')
 %% 
 \ProvidesFile{naustrian-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-offa}
 \InheritBibliographyStrings{german-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx
index f497f2c4618..0bfcc763e3c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianrgzmLBX,PgermanrgzmLBX')
 %% 
 \ProvidesFile{naustrian-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-rgzm}
 \InheritBibliographyStrings{german-rgzm}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx
index b5b001ca129..9edaaf60469 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianzaakLBX,PgermanzaakLBX')
 %% 
 \ProvidesFile{naustrian-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaak}
 \InheritBibliographyStrings{german-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx
index fdbedd6f5ef..2fa458a89a5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnaustrianzaesLBX,PgermanzaesLBX')
 %% 
 \ProvidesFile{naustrian-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaes}
 \InheritBibliographyStrings{german-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx
index 8965d16d9b1..47e8abec388 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandaefkwLBX,PenglishaefkwLBX')
 %% 
 \ProvidesFile{newzealand-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-aefkw}
 \InheritBibliographyStrings{english-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx
index 55ca1451542..4c9a34976c8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandarchaLBX,PenglisharchaLBX')
 %% 
 \ProvidesFile{newzealand-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archa}
 \InheritBibliographyStrings{english-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx
index cc33d835653..d17087bc07f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandLBX,PenglishLBX')
 %% 
 \ProvidesFile{newzealand-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx
index 4eedab9c82b..d157e81ac46 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealanddgufaltLBX,PenglishLBX')
 %% 
 \ProvidesFile{newzealand-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx
index 7ac97b85681..31b5b3881e7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealanddgufapaLBX,PenglishdgufapaLBX')
 %% 
 \ProvidesFile{newzealand-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-dguf-apa}
 \InheritBibliographyStrings{english-dguf-apa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx
index d7762509bfa..e754e32c3e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandeazLBX,PenglisheazLBX')
 %% 
 \ProvidesFile{newzealand-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-eaz}
 \InheritBibliographyStrings{english-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx
index 3c0d47f5536..4dd5c7479db 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandfoeLBX,PenglishfoeLBX')
 %% 
 \ProvidesFile{newzealand-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-foe}
 \InheritBibliographyStrings{english-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx
index 5745f25f112..b24d1ffd5b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandjbkreisneussLBX,PenglishjbkreisneussLBX')
 %% 
 \ProvidesFile{newzealand-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-jb-kreis-neuss}
 \InheritBibliographyStrings{english-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx
index dd262ae48ea..a8376430a52 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandkarlLBX,PenglishLBX')
 %% 
 \ProvidesFile{newzealand-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx
index 10122ff933f..a14498fdc2b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandmajaLBX,PenglishLBX')
 %% 
 \ProvidesFile{newzealand-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx
index 769f5e7816f..260ffa20634 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx
@@ -7,9 +7,26 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandmpkLBX,PenglishmpkLBX')
 %% 
 \ProvidesFile{newzealand-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-mpk}
-\InheritBibliographyStrings{english-mpk}
+\InheritBibliographyExtras{english-archaeology}
+\DeclareBibliographyStrings{%
+  inherit  = {english-archaeology},
+  unpublishedbathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublisheddiplomathesis  = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmagisterthesis = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedmathesis       = {{unpublished thesis}
+                               {unpublished thesis}},
+  unpublishedphdthesis      = {{unpublished PhD Dissertation}
+                               {unpublished PhD Dissertation}},
+  unpublishedpostdocthesis  = {{unpublished Habilitationsschrift}
+                               {unpublished Habilitationsschrift}},
+  urlseen  = {{last access}{last access}},
+}
 \endinput
 %%
 %% End of file `newzealand-mpk.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpkoeaw.lbx
new file mode 100644
index 00000000000..70ce709ef5d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `newzealand-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FnewzealandmpkoeawLBX,PenglishmpkoeawLBX')
+%% 
+\ProvidesFile{newzealand-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{english-mpkoeaw}
+\InheritBibliographyStrings{english-mpkoeaw}
+\endinput
+%%
+%% End of file `newzealand-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx
index b474d436201..17efe1c9a0d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandoffaLBX,PenglishoffaLBX')
 %% 
 \ProvidesFile{newzealand-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-offa}
 \InheritBibliographyStrings{english-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx
index 7d37cf01b7d..179413065b7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandrgzmLBX,PenglishLBX')
 %% 
 \ProvidesFile{newzealand-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-archaeology}
 \InheritBibliographyStrings{english-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx
index 956547a6715..63977e35454 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandzaakLBX,PenglishzaakLBX')
 %% 
 \ProvidesFile{newzealand-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaak}
 \InheritBibliographyStrings{english-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx
index 6097775d459..c8996e0122c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnewzealandzaesLBX,PenglishzaesLBX')
 %% 
 \ProvidesFile{newzealand-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{english-zaes}
 \InheritBibliographyStrings{english-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx
index 1c83c260edf..e41f2240302 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanaefkwLBX,PgermanaefkwLBX')
 %% 
 \ProvidesFile{ngerman-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-aefkw}
 \InheritBibliographyStrings{german-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx
index 14a1ed74a9e..c575154d94a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanarchaLBX,PgermanarchaLBX')
 %% 
 \ProvidesFile{ngerman-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archa}
 \InheritBibliographyStrings{german-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx
index 5062e47541e..08a3a318fa6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanLBX,PgermanLBX')
 %% 
 \ProvidesFile{ngerman-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx
index 38e9b04e1ce..7482033afb5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermandgufaltLBX,PgermandgufaltLBX')
 %% 
 \ProvidesFile{ngerman-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-dguf-alt}
 \InheritBibliographyStrings{german-dguf-alt}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx
index 0ebd4dd68f3..7e751311c32 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermandgufapaLBX,PgermanLBX')
 %% 
 \ProvidesFile{ngerman-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx
index 33627086ebc..9306a771059 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermaneazLBX,PgermaneazLBX')
 %% 
 \ProvidesFile{ngerman-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-eaz}
 \InheritBibliographyStrings{german-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx
index f5cc4c28faa..f8b49d2a619 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanfoeLBX,PgermanfoeLBX')
 %% 
 \ProvidesFile{ngerman-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-foe}
 \InheritBibliographyStrings{german-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx
index fedf2ebe266..a9491573109 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanjbkreisneussLBX,PgermanjbkreisneussLBX')
 %% 
 \ProvidesFile{ngerman-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-jb-kreis-neuss}
 \InheritBibliographyStrings{german-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx
index 18157c1e59a..531758b6704 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermankarlLBX,PgermankarlLBX')
 %% 
 \ProvidesFile{ngerman-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-karl}
 \InheritBibliographyStrings{german-karl}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx
index 8b219f5d885..6dc91a8b993 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanmajaLBX,PgermanmajaLBX')
 %% 
 \ProvidesFile{ngerman-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-maja}
 \InheritBibliographyStrings{german-maja}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx
index b3888b76065..0868ef63368 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanmpkLBX,PgermanmpkLBX')
 %% 
 \ProvidesFile{ngerman-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-mpk}
 \InheritBibliographyStrings{german-mpk}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpkoeaw.lbx
new file mode 100644
index 00000000000..2011e22db85
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `ngerman-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FngermanmpkoeawLBX,PgermanmpkoeawLBX')
+%% 
+\ProvidesFile{ngerman-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-mpkoeaw}
+
+\endinput
+%%
+%% End of file `ngerman-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx
index cd80a666fbb..c39bfabe99c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanoffaLBX,PgermanoffaLBX')
 %% 
 \ProvidesFile{ngerman-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-offa}
 \InheritBibliographyStrings{german-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx
index 2e0860d6ff5..41fc10341a2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanrgzmLBX,PgermanrgzmLBX')
 %% 
 \ProvidesFile{ngerman-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-rgzm}
 \InheritBibliographyStrings{german-rgzm}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx
index aa7f787b642..bd89f92e88d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanzaakLBX,PgermanzaakLBX')
 %% 
 \ProvidesFile{ngerman-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaak}
 \InheritBibliographyStrings{german-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx
index 8c7d830da77..ba374e4676e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FngermanzaesLBX,PgermanzaesLBX')
 %% 
 \ProvidesFile{ngerman-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaes}
 \InheritBibliographyStrings{german-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx
index 5b79a64e1c0..140af8d5ae5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `nnuBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{nnu.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-comp-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@nnu}
 \ExecuteBibliographyOptions{
@@ -32,6 +32,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -61,40 +62,40 @@
 \setlength{\bibhang}{2em}
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 \DeclareFieldFormat*{usere}{%
     \ifinteger{#1}
         {\mkbibordinal{#1}\space\bibstring{edition},\space}
         {#1}%
 }
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\nameshortformdelim}{\addspace in\space}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\nameshortformdelim}{\addspace in\space}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `nnu.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx
index 511c22220d8..e18f1dad302 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `nnuCBX,barecitations')
 %% 
 \ProvidesFile{nnu.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-comp-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@nnu}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `nnu.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx
index a25460e2e30..0b20c9958c9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `nnuDBX,DBX')
 %% 
 \ProvidesFile{nnu.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `nnu.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx
index 13cbc81d2a0..6f91aac402e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanaefkwLBX,PgermanaefkwLBX')
 %% 
 \ProvidesFile{nswissgerman-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-aefkw}
 \InheritBibliographyStrings{german-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx
index 3189d756238..a7717f41933 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanarchaLBX,PgermanarchaLBX')
 %% 
 \ProvidesFile{nswissgerman-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archa}
 \InheritBibliographyStrings{german-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx
index 09923ee3e8d..4e88bb0fe97 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanLBX,PgermanLBX')
 %% 
 \ProvidesFile{nswissgerman-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx
index 692fe6dc574..0519ccfd993 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermandgufaltLBX,PgermandgufaltLBX')
 %% 
 \ProvidesFile{nswissgerman-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-dguf-alt}
 \InheritBibliographyStrings{german-dguf-alt}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx
index 2124cf025df..fa548109aa0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermandgufapaLBX,PgermanLBX')
 %% 
 \ProvidesFile{nswissgerman-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx
index a8a69d35e9c..2d0e89a2152 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermaneazLBX,PgermaneazLBX')
 %% 
 \ProvidesFile{nswissgerman-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-eaz}
 \InheritBibliographyStrings{german-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx
index dcc3bd2240a..150fe53b668 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanfoeLBX,PgermanfoeLBX')
 %% 
 \ProvidesFile{nswissgerman-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-foe}
 \InheritBibliographyStrings{german-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx
index 33003c38e26..24f40f0057e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanjbkreisneussLBX,PgermanjbkreisneussLBX')
 %% 
 \ProvidesFile{nswissgerman-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-jb-kreis-neuss}
 \InheritBibliographyStrings{german-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx
index 7e90bcc41fe..fbb8afc5479 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermankarlLBX,PgermankarlLBX')
 %% 
 \ProvidesFile{nswissgerman-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-karl}
 \InheritBibliographyStrings{german-karl}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx
index a32a5b36542..a7af80ba49e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanmajaLBX,PgermanmajaLBX')
 %% 
 \ProvidesFile{nswissgerman-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-maja}
 \InheritBibliographyStrings{german-maja}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx
index 702e01d57d1..77cdc2886e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanmpkLBX,PgermanmpkLBX')
 %% 
 \ProvidesFile{nswissgerman-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-mpk}
 \InheritBibliographyStrings{german-mpk}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpkoeaw.lbx
new file mode 100644
index 00000000000..0b550f6043c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `nswissgerman-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FnswissgermanmpkoeawLBX,PgermanmpkoeawLBX')
+%% 
+\ProvidesFile{nswissgerman-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-mpkoeaw}
+
+\endinput
+%%
+%% End of file `nswissgerman-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx
index a2dee5dd6b5..ea1355d5f44 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanoffaLBX,PgermanoffaLBX')
 %% 
 \ProvidesFile{nswissgerman-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-offa}
 \InheritBibliographyStrings{german-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx
index ecc7592b8bc..990c7cbf8bf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanrgzmLBX,PgermanrgzmLBX')
 %% 
 \ProvidesFile{nswissgerman-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-rgzm}
 \InheritBibliographyStrings{german-rgzm}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx
index 0e11b1f5fba..115e30cbf99 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanzaakLBX,PgermanzaakLBX')
 %% 
 \ProvidesFile{nswissgerman-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaak}
 \InheritBibliographyStrings{german-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx
index f3359ea42d1..77e84d23905 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FnswissgermanzaesLBX,PgermanzaesLBX')
 %% 
 \ProvidesFile{nswissgerman-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaes}
 \InheritBibliographyStrings{german-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.bbx
new file mode 100644
index 00000000000..cb462b2997a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.bbx
@@ -0,0 +1,24 @@
+%%
+%% This is file `numeric-comp-archaeology.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `numericcompBBX,nonauthoryearsharedBBX')
+%% 
+\ProvidesFile{numeric-comp-archaeology.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\def\blxarch@fork@numeric{}
+\def\archaeobibstyletitle{\blxarch@style@numc}
+\RequireBibliographyStyle{numeric-comp}
+\RequirePackage{biblatex-archaeology}
+\ExecuteBibliographyOptions{
+repeatlabel=false
+}
+\renewbibmacro*{repeatlabel}{%
+    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}}
+\csuse{blxarch@issuedate}%
+\renewcommand{\iftabbedlabeldate}[2]{#2}
+\endinput
+%%
+%% End of file `numeric-comp-archaeology.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.cbx
new file mode 100644
index 00000000000..f397dfbf069
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.cbx
@@ -0,0 +1,21 @@
+%%
+%% This is file `numeric-comp-archaeology.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `numericcompCBX,noshortform')
+%% 
+\ProvidesFile{numeric-comp-archaeology.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\def\archaeocitestyletitle{\blxarch@style@numc}
+\RequireCitationStyle{numeric-comp}
+\DeclareFieldFormat*{postnote}{}
+\DeclareFieldFormat*{prenote}{}
+\let\shortformcite\autocite
+\let\shortformcites\autocites
+\let\sfcite\cite
+\let\sfcites\cites
+\endinput
+%%
+%% End of file `numeric-comp-archaeology.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.dbx
new file mode 100644
index 00000000000..94eab0e5bca
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.dbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `numeric-comp-archaeology.dbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `numericcompDBX,DBX')
+%% 
+\ProvidesFile{numeric-comp-archaeology.dbx}
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
+\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
+\DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
+\DeclareDatamodelEntryfields
+[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortsubseries,subnumber,subseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{titlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle}
+\DeclareDatamodelFields[type=field,datatype=literal]{shortform}
+\DeclareDatamodelFields[type=list,datatype=name]{festschrift}
+\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon}
+\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber}
+\DeclareDatamodelFields[type=field,datatype=literal]{eventtype}
+\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate}
+\DeclareDatamodelFields[type=list,datatype=literal]{multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortform,festschrift,festschriftaddon,eventnumber,eventtype
+,eventdate,venue,multieventdate,multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection]
+{booktitlenote}
+\DeclareDatamodelEntryfields{summarytitle,titlenote}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate}
+\DeclareDatamodelEntryfields{realdate,origrealdate}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate}
+\DeclareDatamodelEntryfields
+[article,periodical,suppperiodical,review]{newsdate}
+\DeclareDatamodelEntryfields
+[article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+\endinput
+%%
+%% End of file `numeric-comp-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx
index 6fece610b5e..6673dd5e218 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `offaBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{offa.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-comp-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@offa}
 \DeclareLanguageMappingSuffix{-offa}
@@ -33,6 +33,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=3,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -61,25 +62,25 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\multilistdelim}{\addslash}
-\renewcommand{\repeatlabeldelim}{\addcolon\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\multilistdelim}{\addslash}
+\renewcommand*{\repeatlabeldelim}{\addcolon\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{thesis}{\mkbibparens{#1}}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibparens{#1}}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `offa.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx
index a39b5edfd0b..175f02879aa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `offaCBX,barecitations')
 %% 
 \ProvidesFile{offa.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-comp-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@offa}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `offa.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx
index 81aa375efcc..3d23e8df605 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `offaDBX,DBX')
 %% 
 \ProvidesFile{offa.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `offa.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx
index d951a4115ca..1d5b30b37d7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx
@@ -7,10 +7,11 @@
 %% biblatex-archaeology.dtx  (with options: `rgkinlineBBX,rgksharedBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{rgk-inline.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@rgkinline}
 \ExecuteBibliographyOptions{
+    dashed=true,
     ibidtracker=false,
     idemtracker=false,
     loccittracker=false,
@@ -22,11 +23,10 @@
     sorting=lnyvt,
 }
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
 \ExecuteBibliographyOptions{
-    dashed=true,
     doi=false,
     eprint=false,
     giveninits=true,
@@ -44,6 +44,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -71,34 +72,34 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `rgk-inline.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx
index 94be20c1bef..6e1b59aed4f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `rgkinlineCBX,barecitations')
 %% 
 \ProvidesFile{rgk-inline.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@rgkinline}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `rgk-inline.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx
index 908b1fa6073..124471acaf7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `rgkinlineDBX,DBX')
 %% 
 \ProvidesFile{rgkinlineDBX}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `rgk-inline.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.bbx
new file mode 100644
index 00000000000..6ca757c9ab4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.bbx
@@ -0,0 +1,96 @@
+%%
+%% This is file `rgk-numeric.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `rgknumericBBX,rgksharedBBX,noarticlesubtitlepunct')
+%% 
+\ProvidesFile{rgk-verbose.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\RequireBibliographyStyle{numeric-comp-archaeology}
+\def\archaeobibstyletitle{\blxarch@style@rgknumeric}
+\ExecuteBibliographyOptions{
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+    maxcitenames=500,
+}
+\ExecuteBibliographyOptions{
+    doi=false,
+    eprint=false,
+    giveninits=true,
+    maxbibnames=500,
+    maxcitenames=2,
+    maxitems=2,
+    mincitenames=1,
+    minitems=1,
+    notetype=foot+end,
+    url=false,
+    editionsuperscript=posttitle,
+    giveninitligatures={Ch,Ph,St,Th},
+    idemincitation=false,
+    injournal=false,
+    journallocation=false,
+    maxbooknames=500,
+    minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
+    nothesistitlepunct=true,
+    notitlepunct=true,
+    origfields=true,
+    pagesfirst=false,
+    positionlabeldate=location,
+    preservelastauthor=false,
+    shortform=false,
+    shortjournal=true,
+    shortseries=true,
+    subseries=true,
+    summarytitle=false,
+    tabbedlabeldate=false,
+    titlebrackets=false,
+    titlenote=true,
+    useeventdate=false,
+    useeventnumber=true,
+    usefestschriftaddon=false,
+    useinstitution=false,
+    uselocation=true,
+    usemultivenue=false,
+    usesourceeditor=true,
+    usepublisher=false,
+    useunpublishedthesis=true,
+    volumeafterseries=false,
+}
+\DeclareNameAlias{bookauthor}{given-family}
+\DeclareNameAlias{sortname}{given-family}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
+\renewcommand*{\seriespunct}{\addspace}
+\DeclareFieldFormat*{seriesparens}{#1}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{pages}{#1}
+\DeclareFieldFormat*{volume}{\addspace#1}
+\DeclareFieldFormat*{journaldateparens}{#1}
+\DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
+\DeclareFieldFormat[thesis]{locationdateparens}{#1}
+\DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
+\renewcommand*{\bibpagespunct}{%
+    \iffieldundef{journaltitle}
+        {\addspace}
+        {\addcomma\space}}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{url}{\url{#1}}
+\let\blxarch@buffer@url\url
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
+\endinput
+%%
+%% End of file `rgk-numeric.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.cbx
new file mode 100644
index 00000000000..472c5c32062
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.cbx
@@ -0,0 +1,19 @@
+%%
+%% This is file `rgk-numeric.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `rgknumericCBX,barecitations')
+%% 
+\ProvidesFile{rgk-numeric.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\RequireCitationStyle{numeric-comp-archaeology}
+\def\archaeocitestyletitle{\blxarch@style@rgknumeric}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{volcitevolume}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
+\endinput
+%%
+%% End of file `rgk-numeric.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.dbx
new file mode 100644
index 00000000000..301942506ce
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.dbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `rgk-numeric.dbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `rgknumericDBX,DBX')
+%% 
+\ProvidesFile{rgk-numeric.dbx}
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
+\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
+\DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
+\DeclareDatamodelEntryfields
+[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortsubseries,subnumber,subseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{titlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle}
+\DeclareDatamodelFields[type=field,datatype=literal]{shortform}
+\DeclareDatamodelFields[type=list,datatype=name]{festschrift}
+\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon}
+\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber}
+\DeclareDatamodelFields[type=field,datatype=literal]{eventtype}
+\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate}
+\DeclareDatamodelFields[type=list,datatype=literal]{multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortform,festschrift,festschriftaddon,eventnumber,eventtype
+,eventdate,venue,multieventdate,multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection]
+{booktitlenote}
+\DeclareDatamodelEntryfields{summarytitle,titlenote}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate}
+\DeclareDatamodelEntryfields{realdate,origrealdate}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate}
+\DeclareDatamodelEntryfields
+[article,periodical,suppperiodical,review]{newsdate}
+\DeclareDatamodelEntryfields
+[article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+\endinput
+%%
+%% End of file `rgk-numeric.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx
index f213ef13f1b..85498577541 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx
@@ -7,10 +7,11 @@
 %% biblatex-archaeology.dtx  (with options: `rgkverboseBBX,rgksharedBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{rgk-verbose.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-trad2note-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@rgkverbose}
 \ExecuteBibliographyOptions{
+    dashed=true,
     ibidtracker=true,
     idemtracker=false,
     loccittracker=true,
@@ -18,7 +19,6 @@
     maxcitenames=500,
 }
 \ExecuteBibliographyOptions{
-    dashed=true,
     doi=false,
     eprint=false,
     giveninits=true,
@@ -36,6 +36,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -63,34 +64,34 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `rgk-verbose.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx
index f8ee0e6f6e0..6d3184fd7a7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx
@@ -7,14 +7,14 @@
 %% biblatex-archaeology.dtx  (with options: `rgkverboseCBX,barecitations')
 %% 
 \ProvidesFile{rgk-verbose.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{verbose-trad2note-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@rgkverbose}
 \ExecuteBibliographyOptions{
     citepages=omit, % permit|suppress|omit|separate
 }
 \DeclareFieldFormat*{seenote}{\mkbibparens{#1}}
-\renewcommand{\postnotedelim}{%
+\renewcommand*{\postnotedelim}{%
     \ifboolexpr{
         test {\ifentrytype{article}}
         or
@@ -31,9 +31,10 @@
             {\addspace}}
         {\addspace}}
         %    \end{macrocode}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `rgk-verbose.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx
index 3b5c699fca3..25bfc2cc57a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `rgkverboseDBX,DBX')
 %% 
 \ProvidesFile{rgk-verbose.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `rgk-verbose.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx
index 6c86c294508..08a33477b7c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx
@@ -7,14 +7,15 @@
 %% biblatex-archaeology.dtx  (with options: `rgzminlineBBX,rgzmsharedBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{rgzm-inline.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-comp-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@rgzminline}
 \ExecuteBibliographyOptions{
+    dashed=false,
     ibidtracker=false,
     idemtracker=false,
     loccittracker=false,
-    repeatlabel=true,
+    repeatlabel=dashed,
     mergedate=false,
     maxbibnames=500,
     maxcitenames=2,
@@ -22,12 +23,12 @@
     sorting=lnyvt,
 }
 \setlength{\bibitemsep}{\baselineskip}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\repeatlabeldelim}{\addcolon\space}
+\renewcommand*{\repeatlabeldash}{\hspace*{\bibhang}}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\repeatlabeldelim}{\addcolon\space}
 \DeclareLanguageMappingSuffix{-rgzm}
 \ExecuteBibliographyOptions{
-    dashed=false,
     doi=false,
     eprint=false,
     giveninits=true,
@@ -46,6 +47,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=1,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -73,36 +75,36 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
-\renewcommand{\finalnamedelim}{\addspace\addslash\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\addspace\addslash\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addcomma\space#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{reprintparens}{\addcomma\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibparens{#1}}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `rgzm-inline.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx
index 5c363698ee2..3501afffc65 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `rgzminlineCBX,barecitations')
 %% 
 \ProvidesFile{rgzm-inline.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-comp-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@rgzminline}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `rgzm-inline.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx
index 3cedcf6399e..62807a14e98 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `rgzminlineDBX,DBX')
 %% 
 \ProvidesFile{rgzm-inline.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `rgzm-inline.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.bbx
new file mode 100644
index 00000000000..5ce82334c40
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.bbx
@@ -0,0 +1,95 @@
+%%
+%% This is file `rgzm-numeric.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `rgzmnumericBBX,rgzmsharedBBX,noarticlesubtitlepunct')
+%% 
+\ProvidesFile{rgzm-inline.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\RequireBibliographyStyle{numeric-comp-archaeology}
+\def\archaeobibstyletitle{\blxarch@style@rgzmnumeric}
+\ExecuteBibliographyOptions{
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+}
+\DeclareLanguageMappingSuffix{-rgzm}
+\ExecuteBibliographyOptions{
+    doi=false,
+    eprint=false,
+    giveninits=true,
+    maxbibnames=3,
+    maxcitenames=3,
+    maxitems=3,
+    minbibnames=3,
+    mincitenames=3    ,
+    minitems=3,
+    notetype=foot+end,
+    url=false,
+    editionsuperscript=predate,
+    giveninitligatures={Ch,Ph,St,Th},
+    idemincitation=false,
+    injournal=false,
+    journallocation=false,
+    maxbooknames=500,
+    minbooknames=3,
+    minrealdatediff=1,
+    nothesistitlepunct=true,
+    notitlepunct=true,
+    origfields=true,
+    pagesfirst=false,
+    positionlabeldate=location,
+    preservelastauthor=false,
+    shortform=false,
+    shortjournal=true,
+    shortseries=true,
+    subseries=true,
+    summarytitle=false,
+    tabbedlabeldate=false,
+    titlebrackets=true,
+    titlenote=true,
+    useeventdate=false,
+    useeventnumber=true,
+    usefestschriftaddon=false,
+    useinstitution=omitlocation,
+    uselocation=true,
+    usemultivenue=false,
+    usesourceeditor=true,
+    usepublisher=false,
+    useunpublishedthesis=true,
+    volumeafterseries=false,
+}
+\DeclareNameAlias{bookauthor}{given-family}
+\DeclareNameAlias{sortname}{given-family}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\addspace\addslash\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
+\renewcommand*{\seriespunct}{\addspace}
+\DeclareFieldFormat*{seriesparens}{#1}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{pages}{#1}
+\DeclareFieldFormat*{volume}{\addspace#1}
+\DeclareFieldFormat*{journaldateparens}{#1}
+\DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[thesis]{locationdateparens}{#1}
+\renewcommand*{\bibpagespunct}{%
+    \iffieldundef{journaltitle}
+        {\addspace}
+        {\addcomma\space}}
+\DeclareFieldFormat*{reprintparens}{\addcomma\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{url}{\url{#1}}
+\DeclareFieldFormat*{urldate}{\mkbibparens{#1}}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
+\endinput
+%%
+%% End of file `rgzm-numeric.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.cbx
new file mode 100644
index 00000000000..eaed5bbdb4e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.cbx
@@ -0,0 +1,19 @@
+%%
+%% This is file `rgzm-numeric.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `rgzmnumericCBX,barecitations')
+%% 
+\ProvidesFile{rgzm-numeric.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\RequireCitationStyle{numeric-comp-archaeology}
+\def\archaeocitestyletitle{\blxarch@style@rgzmnumeric}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{volcitevolume}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
+\endinput
+%%
+%% End of file `rgzm-numeric.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.dbx
new file mode 100644
index 00000000000..ae819eacb5c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.dbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `rgzm-numeric.dbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `rgzmnumericDBX,DBX')
+%% 
+\ProvidesFile{rgzm-numeric.dbx}
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
+\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
+\DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
+\DeclareDatamodelEntryfields
+[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortsubseries,subnumber,subseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{titlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle}
+\DeclareDatamodelFields[type=field,datatype=literal]{shortform}
+\DeclareDatamodelFields[type=list,datatype=name]{festschrift}
+\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon}
+\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber}
+\DeclareDatamodelFields[type=field,datatype=literal]{eventtype}
+\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate}
+\DeclareDatamodelFields[type=list,datatype=literal]{multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortform,festschrift,festschriftaddon,eventnumber,eventtype
+,eventdate,venue,multieventdate,multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection]
+{booktitlenote}
+\DeclareDatamodelEntryfields{summarytitle,titlenote}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate}
+\DeclareDatamodelEntryfields{realdate,origrealdate}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate}
+\DeclareDatamodelEntryfields
+[article,periodical,suppperiodical,review]{newsdate}
+\DeclareDatamodelEntryfields
+[article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+\endinput
+%%
+%% End of file `rgzm-numeric.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx
index 780aa973d76..50eb68b8169 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx
@@ -7,10 +7,11 @@
 %% biblatex-archaeology.dtx  (with options: `rgzmverboseBBX,rgzmsharedBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{rgzm-verbose.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-ibid-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@rgzmverbose}
 \ExecuteBibliographyOptions{
+    dashed=false,
     ibidtracker=true,
     idemtracker=false,
     loccittracker=false,
@@ -19,7 +20,6 @@
 }
 \DeclareLanguageMappingSuffix{-rgzm}
 \ExecuteBibliographyOptions{
-    dashed=false,
     doi=false,
     eprint=false,
     giveninits=true,
@@ -38,6 +38,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=1,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
@@ -65,36 +66,36 @@
 }
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
-\renewcommand{\finalnamedelim}{\addspace\addslash\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\addspace\addslash\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addcomma\space#1}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{reprintparens}{\addcomma\space#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibparens{#1}}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `rgzm-verbose.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx
index 923be103761..264b3afab3d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx
@@ -7,15 +7,16 @@
 %% biblatex-archaeology.dtx  (with options: `rgzmverboseCBX,barecitations')
 %% 
 \ProvidesFile{rgzm-verbose.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{verbose-ibid-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@rgzmverbose}
 \ExecuteBibliographyOptions{
     citepages=omit, % permit|suppress|omit|separate
 }
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `rgzm-verbose.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx
index baaa1655471..404e77a48bb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `rgzmverboseDBX,DBX')
 %% 
 \ProvidesFile{rgzm-verbose.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `rgzm-verbose.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx
index f2c31d59bec..1d4d1ce18c4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanaefkwLBX,PgermanaefkwLBX')
 %% 
 \ProvidesFile{swissgerman-aefkw.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-aefkw}
 \InheritBibliographyStrings{german-aefkw}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx
index 10e746cb742..771bee523e4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanarchaLBX,PgermanarchaLBX')
 %% 
 \ProvidesFile{swissgerman-archa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archa}
 \InheritBibliographyStrings{german-archa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx
index f0ec88f3d36..6c6f19d95fb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanLBX,PgermanLBX')
 %% 
 \ProvidesFile{swissgerman-archaeology.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx
index a99d6dab35a..75c27e575ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermandgufaltLBX,PgermandgufaltLBX')
 %% 
 \ProvidesFile{swissgerman-dguf-alt.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-dguf-alt}
 \InheritBibliographyStrings{german-dguf-alt}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx
index c3dfa8df855..35a34b5ea17 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermandgufapaLBX,PgermanLBX')
 %% 
 \ProvidesFile{swissgerman-dguf-apa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-archaeology}
 \InheritBibliographyStrings{german-archaeology}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx
index 47ebde3b30a..73ba31c3172 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermaneazLBX,PgermaneazLBX')
 %% 
 \ProvidesFile{swissgerman-eaz.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-eaz}
 \InheritBibliographyStrings{german-eaz}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx
index 4ab1c1df79a..511b380faa8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanfoeLBX,PgermanfoeLBX')
 %% 
 \ProvidesFile{swissgerman-foe.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-foe}
 \InheritBibliographyStrings{german-foe}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx
index 07cc43c9572..ab2fa312d2b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanjbkreisneussLBX,PgermanjbkreisneussLBX')
 %% 
 \ProvidesFile{swissgerman-jb-kreis-neuss.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-jb-kreis-neuss}
 \InheritBibliographyStrings{german-jb-kreis-neuss}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx
index fa4e874894c..3985867b18a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermankarlLBX,PgermankarlLBX')
 %% 
 \ProvidesFile{swissgerman-karl.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-karl}
 \InheritBibliographyStrings{german-karl}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx
index ba63d985a60..5472b813942 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanmajaLBX,PgermanmajaLBX')
 %% 
 \ProvidesFile{swissgerman-maja.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-maja}
 \InheritBibliographyStrings{german-maja}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx
index c317138812f..bcf0415299a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanmpkLBX,PgermanmpkLBX')
 %% 
 \ProvidesFile{swissgerman-mpk.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-mpk}
 \InheritBibliographyStrings{german-mpk}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpkoeaw.lbx
new file mode 100644
index 00000000000..035d75ee8ee
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpkoeaw.lbx
@@ -0,0 +1,16 @@
+%%
+%% This is file `swissgerman-mpkoeaw.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `FswissgermanmpkoeawLBX,PgermanmpkoeawLBX')
+%% 
+\ProvidesFile{swissgerman-mpkoeaw.lbx}
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
+\InheritBibliographyExtras{german-mpkoeaw}
+
+\endinput
+%%
+%% End of file `swissgerman-mpkoeaw.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx
index cd533ed9609..c86d3941881 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanoffaLBX,PgermanoffaLBX')
 %% 
 \ProvidesFile{swissgerman-offa.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-offa}
 \InheritBibliographyStrings{german-offa}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx
index 5710ffa80c4..a5a6434685c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanrgzmLBX,PgermanrgzmLBX')
 %% 
 \ProvidesFile{swissgerman-rgzm.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-rgzm}
 \InheritBibliographyStrings{german-rgzm}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx
index 92c98cefde8..fbc2ea31079 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanzaakLBX,PgermanzaakLBX')
 %% 
 \ProvidesFile{swissgerman-zaak.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaak}
 \InheritBibliographyStrings{german-zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx
index 3b6fd386a05..075850755d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx
@@ -7,7 +7,8 @@
 %% biblatex-archaeology.dtx  (with options: `FswissgermanzaesLBX,PgermanzaesLBX')
 %% 
 \ProvidesFile{swissgerman-zaes.lbx}
-[2017/11/16 v1.3 biblatex-archaeology localization (IB)]
+[2018/06/10 v2.0 biblatex-archaeology localization (IB)]
+\SuppressAdditiveLbxSuffixes
 \InheritBibliographyExtras{german-zaes}
 \InheritBibliographyStrings{german-zaes}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx
index 537ebd5a649..b89c4230a8c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx
@@ -7,10 +7,11 @@
 %% biblatex-archaeology.dtx  (with options: `ufgmuensterinlineBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{ufg-muenster-inline.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-ibid-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@muensterinline}
 \ExecuteBibliographyOptions{
+    dashed=false,
     ibidtracker=false,
     idemtracker=true,
     loccittracker=false,
@@ -24,7 +25,6 @@
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
 \ExecuteBibliographyOptions{
-    dashed=false,
     doi=false,
     eprint=false,
     giveninits=true,
@@ -42,12 +42,14 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
     pagesfirst=false,
     positionlabeldate=location,
     preservelastauthor=false,
+    repeatlabel=false,
     shortform=title,
     shortjournal=true,
     shortseries=true,
@@ -70,34 +72,34 @@
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
 \DeclareNameAlias{festschrift}{gfull-family}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 \renewcommand{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\typeinstitutiondelim}{\addcolon\space\midsentence}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `ufg-muenster-inline.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx
index 482a30bfcdd..1b64571d95e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx
@@ -7,12 +7,13 @@
 %% biblatex-archaeology.dtx  (with options: `ufgmuensterinlineCBX,barecitations')
 %% 
 \ProvidesFile{ufg-muenster-inline.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-ibid-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@muensterinline}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `ufg-muenster-inline.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx
index 4502f9a84b5..82ab0cf310e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `ufgmuensterinlineDBX,DBX')
 %% 
 \ProvidesFile{ufg-muenster-inline.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `ufg-muenster-inline.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.bbx
new file mode 100644
index 00000000000..da5d203dce1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.bbx
@@ -0,0 +1,97 @@
+%%
+%% This is file `ufg-muenster-numeric.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `ufgmuensternumericBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct')
+%% 
+\ProvidesFile{ufg-muenster-numeric.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\RequireBibliographyStyle{numeric-comp-archaeology}
+\def\archaeobibstyletitle{\blxarch@style@muensternumeric}
+\ExecuteBibliographyOptions{
+    ibidtracker=false,
+    idemtracker=false,
+    loccittracker=false,
+    maxbibnames=500,
+}
+\ExecuteBibliographyOptions{
+    doi=false,
+    eprint=false,
+    giveninits=true,
+    maxbibnames=500,
+    maxcitenames=2,
+    maxitems=2,
+    mincitenames=1,
+    minitems=1,
+    notetype=foot+end,
+    url=false,
+    editionsuperscript=posttitle,
+    giveninitligatures={Ch,Ph,St,Th},
+    idemincitation=false,
+    injournal=false,
+    journallocation=false,
+    maxbooknames=500,
+    minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
+    nothesistitlepunct=true,
+    notitlepunct=true,
+    origfields=true,
+    pagesfirst=false,
+    positionlabeldate=location,
+    preservelastauthor=false,
+    repeatlabel=false,
+    shortform=title,
+    shortjournal=true,
+    shortseries=true,
+    subseries=true,
+    summarytitle=false,
+    tabbedlabeldate=false,
+    titlebrackets=false,
+    titlenote=true,
+    useeventdate=true,
+    useeventnumber=true,
+    usefestschriftaddon=true,
+    useinstitution=locationfirst,
+    uselocation=true,
+    usemultivenue=true,
+    usesourceeditor=true,
+    usepublisher=false,
+    useunpublishedthesis=true,
+    volumeafterseries=false,
+}
+\DeclareNameAlias{bookauthor}{given-family}
+\DeclareNameAlias{sortname}{given-family}
+\DeclareNameAlias{festschrift}{gfull-family}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\DeclareFieldFormat[inreference]{dictionary}{#1}
+\renewcommand*{\seriespunct}{\addspace}
+\DeclareFieldFormat*{seriesparens}{#1}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{volume}{\addspace#1}
+\DeclareFieldFormat*{journaldateparens}{#1}
+\DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
+\DeclareFieldFormat[thesis]{locationdateparens}{#1}
+\DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
+\renewcommand*{\bibpagespunct}{%
+    \iffieldundef{journaltitle}
+        {\addspace}
+        {\addcomma\space}}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
+\renewcommand{\multicitedelim}{\addsemicolon\space}
+\DeclareFieldFormat*{url}{\url{#1}}
+\let\blxarch@buffer@url\url
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
+\endinput
+%%
+%% End of file `ufg-muenster-numeric.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.cbx
new file mode 100644
index 00000000000..b9460cfdca3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.cbx
@@ -0,0 +1,19 @@
+%%
+%% This is file `ufg-muenster-numeric.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `ufgmuensternumericCBX,barecitations')
+%% 
+\ProvidesFile{ufg-muenster-inline.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\RequireCitationStyle{numeric-comp-archaeology}
+\def\archaeocitestyletitle{\blxarch@style@muensternumeric}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{volcitevolume}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
+\endinput
+%%
+%% End of file `ufg-muenster-numeric.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.dbx
new file mode 100644
index 00000000000..de68b19697a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.dbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `ufg-muenster-numeric.dbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `ufgmuensternumericDBX,DBX')
+%% 
+\ProvidesFile{ufg-muenster-numeric.dbx}
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
+\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
+\DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
+\DeclareDatamodelEntryfields
+[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortsubseries,subnumber,subseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{titlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle}
+\DeclareDatamodelFields[type=field,datatype=literal]{shortform}
+\DeclareDatamodelFields[type=list,datatype=name]{festschrift}
+\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon}
+\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber}
+\DeclareDatamodelFields[type=field,datatype=literal]{eventtype}
+\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate}
+\DeclareDatamodelFields[type=list,datatype=literal]{multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortform,festschrift,festschriftaddon,eventnumber,eventtype
+,eventdate,venue,multieventdate,multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection]
+{booktitlenote}
+\DeclareDatamodelEntryfields{summarytitle,titlenote}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate}
+\DeclareDatamodelEntryfields{realdate,origrealdate}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate}
+\DeclareDatamodelEntryfields
+[article,periodical,suppperiodical,review]{newsdate}
+\DeclareDatamodelEntryfields
+[article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+\endinput
+%%
+%% End of file `ufg-muenster-numeric.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx
index 1a9cd884e5f..2d912a51f36 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `ufgmuensterverboseBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{ufg-muenster-verbose.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-trad2note-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@muensterverbose}
 \ExecuteBibliographyOptions{
@@ -18,7 +18,6 @@
     maxcitenames=500,
 }
 \ExecuteBibliographyOptions{
-    dashed=false,
     doi=false,
     eprint=false,
     giveninits=true,
@@ -36,12 +35,14 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=true,
     notitlepunct=true,
     origfields=true,
     pagesfirst=false,
     positionlabeldate=location,
     preservelastauthor=false,
+    repeatlabel=false,
     shortform=title,
     shortjournal=true,
     shortseries=true,
@@ -64,34 +65,34 @@
 \DeclareNameAlias{bookauthor}{given-family}
 \DeclareNameAlias{sortname}{given-family}
 \DeclareNameAlias{festschrift}{gfull-family}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\multinamedelim}{\addslash}
-\renewcommand{\finalnamedelim}{\addslash}
-\renewcommand{\labelnamepunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\multinamedelim}{\addslash}
+\renewcommand*{\finalnamedelim}{\addslash}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat[inreference]{dictionary}{#1}
-\renewcommand{\seriespunct}{\addspace}
+\renewcommand*{\seriespunct}{\addspace}
 \DeclareFieldFormat*{seriesparens}{#1}
-\renewcommand{\volumenumberdelim}{\addcomma\space}
-\DeclareFieldFormat*{realdate}{\mkbibparens{#1}}
-\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}}
+\renewcommand*{\volumenumberdelim}{\addcomma\space}
+\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}}
+\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{volume}{\addspace#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}}
 \DeclareFieldFormat[thesis]{locationdateparens}{#1}
 \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\bibpagespunct}{%
     \iffieldundef{journaltitle}
         {\addspace}
         {\addcomma\space}}
-\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1}
+\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1}
 \renewcommand{\multicitedelim}{\addsemicolon\space}
 \DeclareFieldFormat*{url}{\url{#1}}
 \let\blxarch@buffer@url\url
-\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
-\renewcommand{\typeinstitutiondelim}{\addcolon\space\midsentence}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater}
+\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `ufg-muenster-verbose.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx
index 4bdc661670a..ddee4029010 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `ufgmuensterverboseCBX,barecitations,noshortform')
 %% 
 \ProvidesFile{ufg-muenster-verbose.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{verbose-trad2note-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@muensterverbose}
 \ExecuteBibliographyOptions{
@@ -17,9 +17,10 @@
 \let\shortformcites\autocites
 \let\sfcite\cite
 \let\sfcites\cites
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `ufg-muenster-verbose.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx
index fc88ebce6a9..6190c33d0ec 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `ufgmuensterverboseDBX,DBX')
 %% 
 \ProvidesFile{ufg-muenster-verbose.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `ufg-muenster-verbose.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.bbx
new file mode 100644
index 00000000000..db7b9460da2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.bbx
@@ -0,0 +1,24 @@
+%%
+%% This is file `verbose-archaeology.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `verboseBBX,verbosesharedBBX,nonauthoryearsharedBBX')
+%% 
+\ProvidesFile{verbose-archaeology.bbx}
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
+\RequireBibliographyStyle{verbose}
+\def\archaeobibstyletitle{\blxarch@style@v}
+\def\blxarch@fork@verbose{}
+\RequirePackage{biblatex-archaeology}
+\ExecuteBibliographyOptions{
+repeatlabel=false
+}
+\renewbibmacro*{repeatlabel}{%
+    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}}
+\csuse{blxarch@issuedate}%
+\renewcommand{\iftabbedlabeldate}[2]{#2}
+\endinput
+%%
+%% End of file `verbose-archaeology.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.cbx
new file mode 100644
index 00000000000..67b4fbfcda2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.cbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `verbose-archaeology.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `verboseCBX,verbosesharedCBX')
+%% 
+\ProvidesFile{verbose-archaeology.cbx}
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
+\def\archaeocitestyletitle{\blxarch@style@v}
+\RequireCitationStyle{verbose}
+\providebibmacro*{cite:short}{}
+\renewbibmacro*{cite:short}{%
+    \printnames{labelname}%
+    \setunit*{\printdelim{nametitledelim}}%
+    \printtext[bibhyperlink]{%
+    \iftoggle{archbool:citeshortin}
+        {\ifboolexpr{
+            not test {\iffieldundef{journaltitle}}
+or
+( not test {\ifshortform{false}}
+  and
+  not test {\iffieldundef{shortform}}
+)
+ }
+ {\usebibmacro{cite:short:in}}
+ {\printfield[citetitle]{labeltitle}}%
+        }
+        {\printfield[citetitle]{labeltitle}}}%
+}
+\newbibmacro*{cite:short:in}{%
+\savebibmacro{extendeddate}%
+\renewbibmacro*{extendeddate}[2]{}%
+\iffieldundef{journaltitle}
+{\iffieldundef{shortform}
+{\printfield[citetitle]{labeltitle}}
+{\usebibmacro{in:}%
+ \printfield{shortform}%
+             \setunit{\addspace}%
+             \printfield[shortformvolume]{volume}%
+ \setunit{\addspace}%
+ \usebibmacro{bibliographydate}%
+}
+}
+{\usebibmacro{journal+issuetitle}}%
+\restorebibmacro{extendeddate}%
+}
+\endinput
+%%
+%% End of file `verbose-archaeology.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.dbx
new file mode 100644
index 00000000000..6c2029a517b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.dbx
@@ -0,0 +1,51 @@
+%%
+%% This is file `verbose-archaeology.dbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-archaeology.dtx  (with options: `verboseDBX,DBX')
+%% 
+\ProvidesFile{verbose-archaeology.dbx}
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
+\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
+\DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
+\DeclareDatamodelEntryfields
+[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortsubseries,subnumber,subseries}
+\DeclareDatamodelFields[type=field,datatype=literal]{titlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote}
+\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle}
+\DeclareDatamodelFields[type=field,datatype=literal]{shortform}
+\DeclareDatamodelFields[type=list,datatype=name]{festschrift}
+\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon}
+\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber}
+\DeclareDatamodelFields[type=field,datatype=literal]{eventtype}
+\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate}
+\DeclareDatamodelFields[type=list,datatype=literal]{multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]
+{shortform,festschrift,festschriftaddon,eventnumber,eventtype
+,eventdate,venue,multieventdate,multivenue}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection]
+{booktitlenote}
+\DeclareDatamodelEntryfields{summarytitle,titlenote}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate}
+\DeclareDatamodelEntryfields{realdate,origrealdate}
+\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate}
+\DeclareDatamodelEntryfields
+[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings,
+proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate}
+\DeclareDatamodelEntryfields
+[article,periodical,suppperiodical,review]{newsdate}
+\DeclareDatamodelEntryfields
+[article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
+\endinput
+%%
+%% End of file `verbose-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx
index e1ce7772630..d7c4fd7e831 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx
@@ -4,17 +4,19 @@
 %%
 %% The original source files were:
 %%
-%% biblatex-archaeology.dtx  (with options: `verboseibidBBX,verbosesharedBBX')
+%% biblatex-archaeology.dtx  (with options: `verboseibidBBX,verbosesharedBBX,nonauthoryearsharedBBX')
 %% 
 \ProvidesFile{verbose-ibid-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-ibid}
 \def\archaeobibstyletitle{\blxarch@style@vi}
 \def\blxarch@fork@verbose{}
 \RequirePackage{biblatex-archaeology}
-\ExecuteBibliographyOptions{repeatlabel=false}
+\ExecuteBibliographyOptions{
+repeatlabel=false
+}
 \renewbibmacro*{repeatlabel}{%
-    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose styles}}
+    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}}
 \csuse{blxarch@issuedate}%
 \renewcommand{\iftabbedlabeldate}[2]{#2}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx
index 8aae540c2a1..8bc61a47c58 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx
@@ -4,12 +4,48 @@
 %%
 %% The original source files were:
 %%
-%% biblatex-archaeology.dtx  (with options: `verboseibidCBX')
+%% biblatex-archaeology.dtx  (with options: `verboseibidCBX,verbosesharedCBX')
 %% 
 \ProvidesFile{verbose-ibid-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \def\archaeocitestyletitle{\blxarch@style@vi}
 \RequireCitationStyle{verbose-ibid}
+\providebibmacro*{cite:short}{}
+\renewbibmacro*{cite:short}{%
+    \printnames{labelname}%
+    \setunit*{\printdelim{nametitledelim}}%
+    \printtext[bibhyperlink]{%
+    \iftoggle{archbool:citeshortin}
+        {\ifboolexpr{
+            not test {\iffieldundef{journaltitle}}
+or
+( not test {\ifshortform{false}}
+  and
+  not test {\iffieldundef{shortform}}
+)
+ }
+ {\usebibmacro{cite:short:in}}
+ {\printfield[citetitle]{labeltitle}}%
+        }
+        {\printfield[citetitle]{labeltitle}}}%
+}
+\newbibmacro*{cite:short:in}{%
+\savebibmacro{extendeddate}%
+\renewbibmacro*{extendeddate}[2]{}%
+\iffieldundef{journaltitle}
+{\iffieldundef{shortform}
+{\printfield[citetitle]{labeltitle}}
+{\usebibmacro{in:}%
+ \printfield{shortform}%
+             \setunit{\addspace}%
+             \printfield[shortformvolume]{volume}%
+ \setunit{\addspace}%
+ \usebibmacro{bibliographydate}%
+}
+}
+{\usebibmacro{journal+issuetitle}}%
+\restorebibmacro{extendeddate}%
+}
 \endinput
 %%
 %% End of file `verbose-ibid-archaeology.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx
index c79ae81ea92..73230db0bb4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `verboseibidDBX,DBX')
 %% 
 \ProvidesFile{verbose-ibid-archaeology.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `verbose-ibid-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx
index 0a882446c1e..ca5c282d319 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx
@@ -4,17 +4,19 @@
 %%
 %% The original source files were:
 %%
-%% biblatex-archaeology.dtx  (with options: `verbosetrad2noteBBX,verbosesharedBBX')
+%% biblatex-archaeology.dtx  (with options: `verbosetrad2noteBBX,verbosesharedBBX,nonauthoryearsharedBBX')
 %% 
 \ProvidesFile{verbose-trad2note-archaeology.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{verbose-trad2}
 \def\archaeobibstyletitle{\blxarch@style@vttwo}
 \def\blxarch@fork@verbose{}
 \RequirePackage{biblatex-archaeology}
-\ExecuteBibliographyOptions{repeatlabel=false}
+\ExecuteBibliographyOptions{
+repeatlabel=false
+}
 \renewbibmacro*{repeatlabel}{%
-    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose styles}}
+    \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}}
 \csuse{blxarch@issuedate}%
 \renewcommand{\iftabbedlabeldate}[2]{#2}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx
index f7575e25cbe..b6131434506 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx
@@ -4,17 +4,12 @@
 %%
 %% The original source files were:
 %%
-%% biblatex-archaeology.dtx  (with options: `verbosetrad2noteCBX')
+%% biblatex-archaeology.dtx  (with options: `verbosetrad2noteCBX,verbosesharedCBX')
 %% 
 \ProvidesFile{verbose-trad2note-archaeology.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \def\archaeocitestyletitle{\blxarch@style@vttwo}
 \RequireCitationStyle{verbose-trad2}
-\newbibmacro*{cite:short}{%
-  \printnames{labelname}%
-  \setunit*{\printdelim{labelnamepunct}}%
-  \printtext[bibhyperlink]{%
-    \printfield[citetitle]{labeltitle}}}
 
 \newbibmacro*{footcite}{%
   \usebibmacro{cite:citepages}%
@@ -51,8 +46,8 @@
       {\ifsamepage{\the\value{instcount}}
                   {\csuse{cbx@f@\thefield{entrykey}}}
          {}
- {\addcomma\space\bibstring{page}\addnbspace
-  \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
+     {\addcomma\space\bibstring{page}\addnbspace
+      \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
       {}}}
 
 \newbibmacro*{footcite:shorthand}{%
@@ -127,6 +122,47 @@
         }
         {#2}%
 }
+\DeclareDataInheritance
+{mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference}
+{inbook,bookinbook,suppbook,incollection,suppcollection,inproceedings,inreference}{%
+  \noinherit{options}
+}
+\providebibmacro*{cite:short}{}
+\renewbibmacro*{cite:short}{%
+    \printnames{labelname}%
+    \setunit*{\printdelim{nametitledelim}}%
+    \printtext[bibhyperlink]{%
+    \iftoggle{archbool:citeshortin}
+        {\ifboolexpr{
+            not test {\iffieldundef{journaltitle}}
+or
+( not test {\ifshortform{false}}
+  and
+  not test {\iffieldundef{shortform}}
+)
+ }
+ {\usebibmacro{cite:short:in}}
+ {\printfield[citetitle]{labeltitle}}%
+        }
+        {\printfield[citetitle]{labeltitle}}}%
+}
+\newbibmacro*{cite:short:in}{%
+\savebibmacro{extendeddate}%
+\renewbibmacro*{extendeddate}[2]{}%
+\iffieldundef{journaltitle}
+{\iffieldundef{shortform}
+{\printfield[citetitle]{labeltitle}}
+{\usebibmacro{in:}%
+ \printfield{shortform}%
+             \setunit{\addspace}%
+             \printfield[shortformvolume]{volume}%
+ \setunit{\addspace}%
+ \usebibmacro{bibliographydate}%
+}
+}
+{\usebibmacro{journal+issuetitle}}%
+\restorebibmacro{extendeddate}%
+}
 \endinput
 %%
 %% End of file `verbose-trad2note-archaeology.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx
index 28e0fcfa3be..2294443c022 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `verbosetrad2noteDBX,DBX')
 %% 
 \ProvidesFile{verbose-trad2note-archaeology.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `verbose-trad2note-archaeology.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx
index 9311b6cfa39..345b2034399 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `volkskundeBBX,noarticlesubtitlepunct,nosmallcaps')
 %% 
 \ProvidesFile{volkskunde.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@volkskunde}
 \DeclareStyleSourcemap{
@@ -40,6 +40,7 @@
     journallocation=false,
     maxbooknames=3,
     minbooknames=1,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -67,24 +68,24 @@
     volumeafterseries=false,
 }
 \DeclareNameAlias{bookauthor}{family-given}
-\renewcommand{\labelnamepunct}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
 \DeclareFieldFormat*{labeldateparens}{\mkbibparens{#1}}
 \DeclareFieldFormat*{parens}{#1}
-\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}\space}}
+\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}\space}}
 \DeclareFieldFormat*{seriesparens}{\mkbibparens{#1}}
-\renewcommand{\titleseriesdelim}{\addspace}
-\renewcommand{\institutionlocationdelim}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
+\renewcommand*{\institutionlocationdelim}{\addspace}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \renewcommand{\daterealdatedelim}{\nopunct}
 \DeclareFieldFormat*{number}{\addcomma\space#1}
 \DeclareFieldFormat*{subnumber}{\addcomma\space#1}
 \DeclareFieldFormat[article,review,suppperiodical]{number}{#1}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `volkskunde.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx
index 51efade1f07..1f047884437 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx
@@ -7,15 +7,16 @@
 %% biblatex-archaeology.dtx  (with options: `volkskundeCBX,barecitations')
 %% 
 \ProvidesFile{volkskunde.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@volkskunde}
-\renewcommand{\multicitedelim}{\addsemicolon\space}
-\renewcommand{\postnotedelim}{\addcolon\space}
-\renewcommand{\labelnamepunct}{\addcolon\space}
-\DeclareFieldFormat*{postnote}{#1}
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+\renewcommand*{\postnotedelim}{\addcolon\space}
+\renewcommand*{\labelnamepunct}{\addcolon\space}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `volkskunde.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx
index b07876928d9..e4e834f63b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `volkskundeDBX,DBX')
 %% 
 \ProvidesFile{volkskunde.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `volkskunde.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx
index c6a29fd3123..1d3c6db1ffa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `zaakBBX,nosmallcaps')
 %% 
 \ProvidesFile{zaak.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \DeclareStyleSourcemap{
     \maps[datatype=bibtex]{
         \map[overwrite=true]{
@@ -42,6 +42,7 @@
     journallocation=true,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -71,27 +72,27 @@
 \setlength{\bibhang}{0em}
 \setlength{\bibitemsep}{\baselineskip}
 \DeclareNameAlias{sortname}{family-given}
-\renewcommand{\multinamedelim}{\addspace\addslash\space}
-\renewcommand{\finalnamedelim}{\multinamedelim}
-\renewcommand{\nameyeardelim}{%
+\renewcommand*{\multinamedelim}{\addspace\addslash\space}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
+\renewcommand*{\nameyeardelim}{%
     \iftabbedlabeldate
         {}
         {\addspace}}
 \DeclareFieldFormat[inreference]{dictionary}{#1}
 \DeclareFieldFormat*{seriesparens}{\mkbibparens{=#1}}
-\renewcommand{\seriespunct}{\addspace}
-\renewcommand{\titleseriesdelim}{\addspace}
-\renewcommand{\labelnamepunct}{\addspace}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\seriespunct}{\addspace}
+\renewcommand*{\titleseriesdelim}{\addspace}
+\renewcommand*{\labelnamepunct}{\addspace}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
 \DeclareFieldFormat*{journaldateparens}{#1}
-\renewcommand{\volumenumberdelim}{\addspace}
+\renewcommand*{\volumenumberdelim}{\addspace}
 \DeclareFieldFormat[article]{number}{\mkbibparens{#1}}
 \DeclareFieldFormat*{volume}{\addcomma\space\bibstring{volume}\space#1}
 \DeclareFieldFormat[article]{volume}{\addspace#1}
 \DeclareFieldFormat[article]{number}{\mkbibparens{#1}}
 \DeclareFieldFormat*{urldate}{\mkbibparens{#1}}
-\renewcommand{\volumedatedelim}{}
-\renewcommand{\bibpagespunct}{%
+\renewcommand*{\volumedatedelim}{}
+\renewcommand*{\bibpagespunct}{%
     \ifboolexpr{
         not test {\iffieldundef{usera}}
         and
@@ -101,14 +102,14 @@
         {\addcomma\space\midsentence}}
 \DeclareFieldFormat*{parens}{#1}
 \DeclareFieldFormat*{locationdateparens}{#1}
-\renewcommand{\daterealdatedelim}{%
+\renewcommand*{\daterealdatedelim}{%
     \iftabbedlabeldate
         {\newline}
         {\addspace}}
-\renewcommand{\mkbibnamefamily}[1]{#1}
-\renewcommand{\mkbibnameprefix}[1]{#1}
-\renewcommand{\mkbibrepeatfamily}[1]{#1}
-\renewcommand{\mkbibrepeatprefix}[1]{#1}
+\renewcommand*{\mkbibnamefamily}[1]{#1}
+\renewcommand*{\mkbibnameprefix}[1]{#1}
+\renewcommand*{\mkbibrepeatfamily}[1]{#1}
+\renewcommand*{\mkbibrepeatprefix}[1]{#1}
 \endinput
 %%
 %% End of file `zaak.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx
index 2c3eb0fa853..6bb949f87a0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `zaakCBX')
 %% 
 \ProvidesFile{zaak.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@zaak}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx
index 75e73a5cb57..e7addb00ac4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `zaakDBX,DBX')
 %% 
 \ProvidesFile{zaak.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `zaak.dbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx
index 09b74843410..c610b50e458 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `zaesBBX,noarticlesubtitlepunct')
 %% 
 \ProvidesFile{zaes.bbx}
-[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)]
 \RequireBibliographyStyle{authoryear-ibid-archaeology}
 \def\archaeobibstyletitle{\blxarch@style@zaes}
 \DeclareStyleSourcemap{
@@ -42,6 +42,7 @@
     journallocation=false,
     maxbooknames=500,
     minbooknames=3,
+    minrealdatediff=\blxarch@maxnumber,
     nothesistitlepunct=false,
     notitlepunct=false,
     origfields=false,
@@ -68,32 +69,33 @@
     useunpublishedthesis=false,
     volumeafterseries=false,
 }
-\renewcommand{\newunitpunct}{\addcomma\space}
-\renewcommand{\booklabelnamepunct}{\addcomma\space}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\booklabelnamepunct}{\addcomma\space}
+\renewcommand*{\labelnamepunct}{\addcomma\space}
 \DeclareNameAlias{sortname}{family-given}
 \DeclareNameAlias{bookauthor}{given-family}
-\renewcommand{\mkbibnamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibnameprefix}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbiblistnamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbiblistnameprefix}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibbooknamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibbooknameprefix}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibsourcenamefamily}[1]{\mkbibletterspacing{#1}}
-\renewcommand{\mkbibsourcenameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibnamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbiblistnamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbiblistnameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibbooknamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibbooknameprefix}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibsourcenamefamily}[1]{\mkbibletterspacing{#1}}
+\renewcommand*{\mkbibsourcenameprefix}[1]{\mkbibletterspacing{#1}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{volume}{\addspace#1}
-\renewcommand{\titleseriesdelim}{\addcomma\space}
-\renewcommand{\seriespunct}{\iffieldundef{pages}{\finentrypunct}{\bibpagespunct}}
+\renewcommand*{\titleseriesdelim}{\addcomma\space}
+\renewcommand*{\seriespunct}{\iffieldundef{pages}{\finentrypunct}{\bibpagespunct}}
 \DeclareFieldFormat*{locationdateparens}{#1}
 \DeclareFieldFormat[thesis]{thesis}{#1}
 \DeclareFieldFormat*{seriesparens}{#1}
 \DeclareFieldFormat*{journaldateparens}{#1}
 \DeclareFieldFormat*{parens}{\addcomma\space#1}
-\xpatchbibdriver{inreference}{\usebibmacro{location+date}}{}{}{}
-\renewcommand{\nameshortformdelim}{\addcomma\space}
-\renewcommand{\noseriespunct}{\addcomma\addspace}
-\renewcommand{\articlesubtitlepunct}{\subtitlepunct}
+\xpatchbibdriver{inreference}{\usebibmacro{location+date}}{}
+  {}{Patching driver 'inreference' failed (4)}
+\renewcommand*{\nameshortformdelim}{\addcomma\space}
+\renewcommand*{\noseriespunct}{\addcomma\addspace}
+\renewcommand*{\articlesubtitlepunct}{\subtitlepunct}
 \endinput
 %%
 %% End of file `zaes.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx
index 30a0c2f4767..4bf951c27de 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx
@@ -7,13 +7,14 @@
 %% biblatex-archaeology.dtx  (with options: `zaesCBX,barecitations')
 %% 
 \ProvidesFile{zaes.cbx}
-[2017/11/16 v1.3 biblatex-archaeology citation style (IB)]
+[2018/06/10 v2.0 biblatex-archaeology citation style (IB)]
 \RequireCitationStyle{authoryear-ibid-archaeology}
 \def\archaeocitestyletitle{\blxarch@style@zaes}
 \ExecuteBibliographyOptions{autocite=footnote}
-\DeclareFieldFormat*{postnote}{#1}
+\DeclareFieldFormat*{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat*{volcitevolume}{#1}
-\DeclareFieldFormat*{volcitepages}{#1}
+\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}}
 \endinput
 %%
 %% End of file `zaes.cbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx
index 64aac730193..88ab28494a0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx
@@ -7,7 +7,7 @@
 %% biblatex-archaeology.dtx  (with options: `zaesDBX,DBX')
 %% 
 \ProvidesFile{zaes.dbx}
-[2017/11/16 v1.3 biblatex-archaeology data model (IB)]
+[2018/06/10 v2.0 biblatex-archaeology data model (IB)]
 \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries}
 \DeclareDatamodelFields[type=field,datatype=integer]{subnumber}
 \DeclareDatamodelEntryfields
@@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent
 [article,periodical,suppperiodical,review]{newsdate}
 \DeclareDatamodelEntryfields
 [article,periodical,review,suppperiodical]{location}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an}
+\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an}
 \endinput
 %%
 %% End of file `zaes.dbx'.
author	Karl Berry <karl@freefriends.org>	2018-06-11 22:19:39 +0000
committer	Karl Berry <karl@freefriends.org>	2018-06-11 22:19:39 +0000
commit	97fd3780f5c37e7667a82e30184b6c91469ad1ac (patch)
tree	7c972a9f40057fbee3e6da82578ad48530fcfc59
parent	b00bffe83bc1a4c66e79fe6a340b20b075a2aea6 (diff)