From ec4911b405a739ec0b87d9e62a8da018efb05410 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 13 Jun 2020 18:14:04 +0200
Subject: [PATCH 01/15] Fix dowmloaded files moved to citaiton key dir

---
 CHANGELOG.md                                     |  1 +
 .../java/org/jabref/logic/util/io/FileUtil.java  |  2 +-
 .../logic/cleanup/MoveFilesCleanupTest.java      | 13 +++++++++++++
 .../org/jabref/logic/util/io/FileUtilTest.java   | 16 +++++++++++++---
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0939437856..464443eacf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where "null" appeared in generated BibTeX keys. [#6459](https://github.com/JabRef/jabref/issues/6459)
 - We fixed an issue where the authors' names were incorrectly displayed in the authors' column when they were bracketed. [#6465](https://github.com/JabRef/jabref/issues/6465) [#6459](https://github.com/JabRef/jabref/issues/6459)
 - We fixed an issue where importing certain unlinked files would result in an exception [#5815](https://github.com/JabRef/jabref/issues/5815)
+- We fixed an issue where downloaded files would be moved to a directory named after the citationkey when no file directory pattern is specified [#6589](https://github.com/JabRef/jabref/issues/6589)
 
 ### Removed
 
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index a22cfe551cd..5f9a0d3d229 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -284,7 +284,7 @@ public static String createDirNameFromPattern(BibDatabase database, BibEntry ent
         String targetName = BracketedPattern.expandBrackets(directoryNamePattern, ';', entry, database);
 
         if (targetName.isEmpty()) {
-            targetName = entry.getCiteKeyOptional().orElse("default");
+            return targetName;
         }
 
         // Removes illegal characters from directory name
diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index a237f03d6d8..5168e0300d1 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -111,6 +111,19 @@ void movesFileWithFileDirPattern() throws Exception {
         assertTrue(Files.exists(fileAfter));
     }
 
+    @Test
+    void doesNotmMovesFileWithEmptyFileDirPattern() throws Exception {
+        when(filePreferences.getFileDirPattern()).thenReturn("");
+        cleanup.cleanup(entry);
+
+        Path fileAfter = defaultFileFolder.resolve("test.pdf");
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", "test.pdf", ""))),
+                entry.getField(StandardField.FILE));
+        assertFalse(Files.exists(fileBefore));
+        assertTrue(Files.exists(fileAfter));
+    }
+
     @Test
     void movesFileWithSubdirectoryPattern() throws Exception {
         when(filePreferences.getFileDirPattern()).thenReturn("[entrytype]/[year]/[auth]");
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index f7bec14536d..4d02e48e97d 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -357,15 +357,25 @@ void invalidFilenameWithoutExtension() {
     @Test
     void testGetLinkedDirNameDefaultFullTitle() {
         // bibkey - title
-        String fileNamePattern = "PDF/[year]/[auth]/[bibtexkey] - [fulltitle]";
+        String fileDirPattern = "PDF/[year]/[auth]/[bibtexkey] - [fulltitle]";
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
         entry.setField(StandardField.YEAR, "1998");
         entry.setField(StandardField.AUTHOR, "A. Åuthör and Author, Bete");
 
-        assertEquals("PDF/1998/Åuthör/1234 - mytitle",
-                FileUtil.createDirNameFromPattern(null, entry, fileNamePattern));
+        assertEquals("PDF/1998/Åuthör/1234 - mytitle", FileUtil.createDirNameFromPattern(null, entry, fileDirPattern));
+    }
+    @Test
+    void testGetLinkedDirNamePatterntEmpty() {
+        // bibkey - title
+        BibEntry entry = new BibEntry();
+        entry.setCiteKey("1234");
+        entry.setField(StandardField.TITLE, "mytitle");
+        entry.setField(StandardField.YEAR, "1998");
+        entry.setField(StandardField.AUTHOR, "A. Åuthör and Author, Bete");
+
+        assertEquals("", FileUtil.createDirNameFromPattern(null, entry, ""));
     }
 
     @Test

From f2d7b16f437ce21df6730c5c5666e2d98af13668 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sat, 13 Jun 2020 18:22:49 +0200
Subject: [PATCH 02/15] checkstyle

---
 src/test/java/org/jabref/logic/util/io/FileUtilTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 4d02e48e97d..1100f7232cb 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -366,6 +366,7 @@ void testGetLinkedDirNameDefaultFullTitle() {
 
         assertEquals("PDF/1998/Åuthör/1234 - mytitle", FileUtil.createDirNameFromPattern(null, entry, fileDirPattern));
     }
+
     @Test
     void testGetLinkedDirNamePatterntEmpty() {
         // bibkey - title

From e9570255f72d5d0e8d0bdd836c54c01b860ff419 Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Sun, 14 Jun 2020 16:44:10 +0200
Subject: [PATCH 03/15] Update MoveFilesCleanupTest.java

Fix typo
---
 .../java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index 5168e0300d1..8c792b7dd85 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -112,7 +112,7 @@ void movesFileWithFileDirPattern() throws Exception {
     }
 
     @Test
-    void doesNotmMovesFileWithEmptyFileDirPattern() throws Exception {
+    void doesNotMoveFileWithEmptyFileDirPattern() throws Exception {
         when(filePreferences.getFileDirPattern()).thenReturn("");
         cleanup.cleanup(entry);
 

From 8449243c39eb4e2b6ce7a580c67b70dd496dac33 Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Sun, 14 Jun 2020 16:44:51 +0200
Subject: [PATCH 04/15] Update FileUtilTest.java

Fix typo
---
 src/test/java/org/jabref/logic/util/io/FileUtilTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 1100f7232cb..ae449124186 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -368,7 +368,7 @@ void testGetLinkedDirNameDefaultFullTitle() {
     }
 
     @Test
-    void testGetLinkedDirNamePatterntEmpty() {
+    void testGetLinkedDirNamePatternEmpty() {
         // bibkey - title
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");

From c83f39203728de55d7f33f0ad7f455b6255ba1fa Mon Sep 17 00:00:00 2001
From: github actions <jabrefmail+webfeedback@gmail.com>
Date: Mon, 15 Jun 2020 02:11:51 +0000
Subject: [PATCH 05/15] Squashed 'src/main/resources/csl-styles/' changes from
 c5f14e2c4d..716f63557c

716f63557c Update changes in Harvard-Stellenbosch (#4862)
a6a9a1af3a Create alkoholizmus-a-drogove-zavislosti.csl (#4859)
0560ca0b43 Update journal-of-the-american-college-of-surgeons.csl (#4858)
9e16631063 create independent style for cellular-and-molecular-gastroenterology-and-hepatology.csl (#4852)
87b0853e2c Update antiquity.csl (#4841)
cb4e7f70a0 Update heart-rhythm.csl (#4850)
b3b55eee3f Create iisue-moderno (#4846)
63973a7016 Create etasr.csl (#4848)
9942138d9b Create style for Journal of Vertebrate Biology (#4849)
7c7f3d343d Add Future Medicine dependents (#4838)
abe2066984 Update methods-of-information-in-medicine.csl (#4847)
c64d98b65d create independent style for new-zealand-journal-of-forestry-science (#4844)
28265f9ad8 Create continuity-and-change.csl (#4839)
d065fdd9ec Create journal-of-clinical-ethics.csl (#4842)
b9fbfa37d9 Update future-medicine.csl (#4843)
ceb56fa72f Create future-medicine.csl (#4834)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 716f63557c0f32b3980432a6d124b73933722121
---
 alkoholizmus-a-drogove-zavislosti.csl         | 344 ++++++++++++++
 antiquity.csl                                 |  58 ++-
 ...ecular-gastroenterology-and-hepatology.csl | 206 +++++++++
 continuity-and-change.csl                     | 356 +++++++++++++++
 dependent/bioelectronics-in-medicine.csl      |  17 +
 dependent/biomarkers-in-medicine.csl          |   6 +-
 dependent/breast-cancer-management.csl        |   6 +-
 ...ecular-gastroenterology-and-hepatology.csl |  14 -
 dependent/cns-oncology.csl                    |   6 +-
 dependent/colorectal-cancer.csl               |   6 +-
 dependent/concussion.csl                      |  16 +
 dependent/epigenomics.csl                     |   6 +-
 dependent/future-cardiology.csl               |   6 +-
 dependent/future-microbiology.csl             |   6 +-
 dependent/future-neurology.csl                |   6 +-
 dependent/future-oncology.csl                 |   6 +-
 dependent/future-rare-diseases.csl            |  16 +
 dependent/future-virology.csl                 |   6 +-
 dependent/hepatic-oncology.csl                |   8 +-
 dependent/immunotherapy.csl                   |   6 +-
 ...national-journal-of-endocrine-oncology.csl |   6 +-
 ...tional-journal-of-hematologic-oncology.csl |   6 +-
 .../journal-of-3d-printing-in-medicine.csl    |  17 +
 ...-of-comparative-effectiveness-research.csl |   6 +-
 dependent/lung-cancer-management.csl          |   6 +-
 dependent/melanoma-management.csl             |   6 +-
 dependent/nanomedicine.csl                    |   6 +-
 .../neurodegenerative-disease-management.csl  |   6 +-
 ...ew-zealand-journal-of-forestry-science.csl |  16 -
 dependent/pain-management.csl                 |   6 +-
 dependent/personalized-medicine.csl           |   6 +-
 dependent/pharmacogenomics.csl                |   6 +-
 dependent/regenerative-medicine.csl           |   6 +-
 ...echnology-and-applied-science-research.csl | 365 +++++++++++++++
 future-medicine.csl                           | 220 +++++++++
 harvard-stellenbosch-university.csl           |   4 +-
 heart-rhythm.csl                              |   2 +-
 ...-la-universidad-y-la-educacion-moderno.csl | 431 ++++++++++++++++++
 ...al-of-the-american-college-of-surgeons.csl |  49 +-
 journal-of-vertebrate-biology.csl             | 119 +++++
 methods-of-information-in-medicine.csl        | 146 +++---
 new-zealand-journal-of-forestry-science.csl   | 430 +++++++++++++++++
 the-journal-of-clinical-ethics.csl            | 219 +++++++++
 43 files changed, 2982 insertions(+), 203 deletions(-)
 create mode 100644 alkoholizmus-a-drogove-zavislosti.csl
 create mode 100644 cellular-and-molecular-gastroenterology-and-hepatology.csl
 create mode 100644 continuity-and-change.csl
 create mode 100644 dependent/bioelectronics-in-medicine.csl
 delete mode 100644 dependent/cellular-and-molecular-gastroenterology-and-hepatology.csl
 create mode 100644 dependent/concussion.csl
 create mode 100644 dependent/future-rare-diseases.csl
 create mode 100644 dependent/journal-of-3d-printing-in-medicine.csl
 delete mode 100644 dependent/new-zealand-journal-of-forestry-science.csl
 create mode 100644 engineering-technology-and-applied-science-research.csl
 create mode 100644 future-medicine.csl
 create mode 100644 instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl
 create mode 100644 journal-of-vertebrate-biology.csl
 create mode 100644 new-zealand-journal-of-forestry-science.csl
 create mode 100644 the-journal-of-clinical-ethics.csl

diff --git a/alkoholizmus-a-drogove-zavislosti.csl b/alkoholizmus-a-drogove-zavislosti.csl
new file mode 100644
index 00000000000..f0bfa703897
--- /dev/null
+++ b/alkoholizmus-a-drogove-zavislosti.csl
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Alkoholizmus a drogové závislosti</title>
+    <title-short>Alkohol Drog Záv</title-short>
+    <id>http://www.zotero.org/styles/alkoholizmus-a-drogove-zavislosti</id>
+    <link href="http://www.zotero.org/styles/alkoholizmus-a-drogove-zavislosti" rel="self"/>
+    <link href="https://www.adzpo.sk/sk/adzpo-pokyny-pre-autorov" rel="documentation"/>
+    <author>
+      <name>MT</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>0862-0350</issn>
+    <summary>ADZ journal citation style</summary>
+    <updated>2020-06-11T21:17:42+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <date form="text" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short" strip-periods="true"/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="presented at">presented at</term>
+      <term name="retrieved">available</term>
+      <term name="section" form="short">sect.</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper book chapter graphic interview broadcast entry-encyclopedia figure legal_case manuscript musical_score pamphlet paper-conference patent personal_communication post post-weblog report review review-book speech thesis webpage song motion_picture map bill legislation" match="any">
+        <names variable="author" font-style="italic">
+          <name delimiter=" &#8211; " delimiter-precedes-et-al="never" initialize-with=". " name-as-sort-order="all" sort-separator=",  "/>
+          <substitute>
+            <names variable="editor"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <group delimiter=": ">
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <text term="in" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <names variable="editor" suffix=":">
+        <name delimiter=" &#8211; " delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all" sort-separator=",  "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=", " suffix=".">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="song" match="any"/>
+      <else>
+        <group delimiter=": " suffix=",">
+          <choose>
+            <if type="speech" match="any"/>
+            <else-if type="article-newspaper" match="any"/>
+            <else>
+              <text variable="publisher-place"/>
+            </else>
+          </choose>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+    <choose>
+      <if type="musical_score song" match="any">
+        <names variable="composer" prefix=" " suffix=",">
+          <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage article post-weblog" match="any">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text value="Dostupné na" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if type="article-journal article article-magazine article-newspaper">
+              <text variable="container-title" form="short" strip-periods="true" suffix=","/>
+            </if>
+            <else-if type="webpage post-weblog" match="any">
+              <text variable="container-title" suffix=" [web]"/>
+            </else-if>
+            <else>
+              <text variable="container-title" strip-periods="false" suffix="."/>
+            </else>
+          </choose>
+        </group>
+        <text macro="edition" prefix=" "/>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number" suffix="."/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=": " suffix=";">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text term="presented at" strip-periods="false" quotes="false" vertical-align="sup"/>
+          </group>
+          <text variable="event"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" font-style="normal"/>
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper post-weblog webpage patent bill" match="none">
+        <text macro="edition" prefix=". "/>
+      </if>
+      <else-if type="post-weblog webpage">
+        <text value=" [online]" text-case="lowercase" font-style="normal"/>
+      </else-if>
+    </choose>
+    <choose>
+      <if type="song" match="any">
+        <text value=" [skladba]" font-style="normal"/>
+      </if>
+      <else-if type="motion_picture" match="any">
+        <text value=" [video]" font-style="normal"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number font-style="normal" vertical-align="baseline" variable="edition" form="ordinal"/>
+          <text term="edition" font-style="normal"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" font-style="normal" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-journal" match="any">
+        <group delimiter=" ">
+          <date date-parts="year" form="text" variable="issued" suffix=", "/>
+        </group>
+      </if>
+      <else-if type="article-magazine article-newspaper">
+        <date delimiter="." variable="issued">
+          <date-part name="day" form="numeric-leading-zeros"/>
+          <date-part name="month" form="numeric-leading-zeros"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if match="any" variable="issued">
+            <date date-parts="year" form="text" variable="issued" suffix=". "/>
+          </if>
+          <else-if match="any" variable="accessed">
+            <text value="2016"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="report">
+        <date delimiter=" " variable="issued" suffix=".">
+          <date-part name="year"/>
+          <date-part name="month" form="short" strip-periods="true"/>
+        </date>
+      </else-if>
+      <else-if type="patent">
+        <group suffix=".">
+          <group delimiter=", ">
+            <text variable="number" prefix="Patent "/>
+            <date date-parts="year" form="numeric" variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <date variable="issued" delimiter=" ">
+              <date-part name="year"/>
+              <date-part name="month" form="short" strip-periods="true"/>
+              <date-part name="day"/>
+            </date>
+          </group>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any"/>
+      <else>
+        <group suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="issue" suffix=", "/>
+        <text variable="page" prefix=" s. "/>
+      </if>
+      <else-if type="book" match="any">
+        <text variable="number-of-pages" prefix=" " suffix=" s."/>
+      </else-if>
+      <else-if type="report" match="any">
+        <text variable="page" prefix=" " suffix=" s. "/>
+      </else-if>
+      <else-if type="article-newspaper" match="any"/>
+      <else-if type="thesis" match="any">
+        <text value="" suffix=" s."/>
+      </else-if>
+      <else>
+        <group prefix=" " delimiter=" ">
+          <text variable="page" prefix=" s. "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume" suffix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Report No. "/>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" collapse="citation-number">
+    <sort>
+      <key macro="author"/>
+      <key macro="date"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <names variable="author">
+        <name form="short" and="symbol"/>
+        <substitute>
+          <choose>
+            <if match="none" variable="author">
+              <choose>
+                <if type="webpage post post-weblog dataset" match="any">
+                  <text variable="URL" form="short"/>
+                </if>
+                <else-if type="interview" match="any">
+                  <names variable="interviewer"/>
+                </else-if>
+                <else-if type="book bill chapter entry entry-dictionary entry-encyclopedia legislation manuscript map pamphlet report treaty" match="any">
+                  <names variable="editor collection-editor"/>
+                </else-if>
+                <else-if type="figure graphic" match="any">
+                  <names variable="illustrator"/>
+                </else-if>
+                <else-if type="motion_picture musical_score song broadcast" match="any">
+                  <names variable="composer director"/>
+                  <text variable="publisher" form="short"/>
+                </else-if>
+              </choose>
+            </if>
+          </choose>
+        </substitute>
+      </names>
+      <date date-parts="year" form="numeric" variable="issued" prefix=", "/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" sort-separator="," entry-spacing="0" line-spacing="2" hanging-indent="true">
+    <sort>
+      <key variable="author"/>
+      <key macro="date"/>
+    </sort>
+    <layout>
+      <group font-style="italic" delimiter=": " suffix=". ">
+        <text macro="author" font-style="normal"/>
+        <text macro="title"/>
+      </group>
+      <text macro="report-details" suffix=". "/>
+      <group delimiter=" ">
+        <text macro="editor"/>
+        <text macro="container-title"/>
+        <text macro="publisher"/>
+        <group>
+          <text macro="journal-location"/>
+          <text macro="date"/>
+          <text macro="pages"/>
+        </group>
+      </group>
+      <text macro="access"/>
+      <choose>
+        <if type="article-journal" match="all">
+          <choose>
+            <if match="none" variable="page">
+              <text variable="DOI" prefix=" doi: "/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+      <choose>
+        <if type="motion_picture song" match="any">
+          <text variable="dimensions" form="short" strip-periods="false" prefix=" "/>
+        </if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/antiquity.csl b/antiquity.csl
index eeded43edc3..5dad8a7782b 100644
--- a/antiquity.csl
+++ b/antiquity.csl
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="chicago" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" page-range-format="chicago" demote-non-dropping-particle="never" default-locale="en-GB">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Antiquity</title>
     <id>http://www.zotero.org/styles/antiquity</id>
@@ -9,10 +10,13 @@
     <author>
       <name>Sebastian Karcher</name>
     </author>
+    <contributor>
+      <name>Víctor Jiménez Jáimez</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="anthropology"/>
     <issn>0003-598X</issn>
-    <updated>2014-03-02T18:37:55+00:00</updated>
+    <updated>2020-06-03T06:44:38+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -40,11 +44,11 @@
         <text macro="container-prefix" suffix=" " prefix=", "/>
         <group delimiter=", ">
           <names variable="container-author" delimiter=", ">
-            <name initialize-with="." and="symbol" delimiter=", "/>
+            <name and="symbol" initialize-with="."/>
             <label form="short" prefix=" (" suffix=")" plural="never"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name initialize-with="." and="symbol" delimiter=", "/>
+            <name and="symbol" initialize-with="."/>
             <label form="short" prefix=" (" suffix=")" plural="never"/>
           </names>
         </group>
@@ -72,7 +76,7 @@
   <macro name="contributors">
     <group delimiter=". ">
       <names variable="author">
-        <name initialize-with="." and="symbol" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never" suffix=".">
+        <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first">
           <name-part name="family" font-variant="small-caps"/>
         </name>
         <label form="short" prefix=" (" suffix=")" plural="never"/>
@@ -85,9 +89,22 @@
       <text macro="recipient"/>
     </group>
   </macro>
+  <macro name="contributors-count">
+    <group delimiter=". ">
+      <names variable="author">
+        <name form="count"/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
   <macro name="contributors-short">
     <names variable="author">
-      <name initialize-with="." form="short" and="symbol" delimiter=", "/>
+      <name form="short" and="symbol" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" initialize-with="." name-as-sort-order="all"/>
       <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
@@ -159,8 +176,11 @@
       <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
-      <else>
+      <else-if type="chapter" match="any">
         <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" suffix="."/>
       </else>
     </choose>
   </macro>
@@ -371,7 +391,6 @@
         </group>
       </else>
     </choose>
-    <!--This is for computer programs only. Localization new to 1.0.1, so may be missing in many locales-->
     <group delimiter=" " prefix=" (" suffix=")">
       <text term="version"/>
       <text variable="version"/>
@@ -404,7 +423,11 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
+  <citation name-form="short" and="symbol" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" name-as-sort-order="all" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year-suffix">
+    <sort>
+      <key variable="issued"/>
+      <key variable="author"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=": ">
         <group delimiter=" ">
@@ -415,18 +438,18 @@
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="99" et-al-use-first="20" subsequent-author-substitute="&#8212;" entry-spacing="0">
+  <bibliography and="symbol" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="10" et-al-use-first="1" et-al-subsequent-min="10" et-al-subsequent-use-first="1" subsequent-author-substitute="&#8212;" entry-spacing="0" hanging-indent="true">
     <sort>
-      <key macro="contributors"/>
+      <key macro="contributors" names-min="1" names-use-first="1"/>
+      <key macro="contributors-count" names-min="3" names-use-first="3"/>
+      <key macro="contributors" names-min="3" names-use-first="1"/>
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <group delimiter=" ">
+      <group delimiter=". ">
         <text macro="contributors"/>
-        <group delimiter=". ">
-          <text macro="date"/>
-          <text macro="title"/>
-        </group>
+        <text macro="date"/>
+        <text macro="title"/>
       </group>
       <text macro="description"/>
       <text macro="secondary-contributors" prefix=". "/>
@@ -435,10 +458,11 @@
       <text macro="edition"/>
       <text macro="locators-chapter"/>
       <text macro="locators"/>
-      <text macro="collection-title" prefix=". "/>
+      <text macro="collection-title" prefix=" (" suffix=")"/>
       <text macro="issue"/>
       <text macro="locators-article"/>
       <text macro="access" prefix=". "/>
+      <text variable="DOI" prefix=". https://doi.org/"/>
     </layout>
   </bibliography>
 </style>
diff --git a/cellular-and-molecular-gastroenterology-and-hepatology.csl b/cellular-and-molecular-gastroenterology-and-hepatology.csl
new file mode 100644
index 00000000000..1ad94ebb158
--- /dev/null
+++ b/cellular-and-molecular-gastroenterology-and-hepatology.csl
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Cellular and Molecular Gastroenterology and Hepatology</title>
+    <title-short>CMGH</title-short>
+    <id>http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology</id>
+    <link href="http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology" rel="self"/>
+    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="template"/>
+    <link href="https://www.cmghjournal.org/content/authorinfo" rel="documentation"/>
+    <link href="https://www.elsevier.com/journals/cellular-and-molecular-gastroenterology-and-hepatology/2352-345x/submitting#guidelines" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2352-345X</issn>
+    <updated>2020-06-08T09:53:50+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author" suffix=". ">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-newspaper report" match="any">
+        <date variable="issued" form="text"/>
+      </if>
+      <else>
+        <date variable="issued" form="text" date-parts="year"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=". ">
+      <group delimiter=" ">
+        <text variable="genre" text-case="title"/>
+        <text variable="number"/>
+      </group>
+      <group delimiter=": ">
+        <choose>
+          <if type="thesis" match="none">
+            <text variable="publisher-place"/>
+          </if>
+        </choose>
+        <text variable="publisher"/>
+      </group>
+      <choose>
+        <if variable="URL" match="none">
+          <text macro="date"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="page" match="none">
+        <choose>
+          <if variable="DOI" match="any">
+            <group prefix=". " delimiter=". ">
+              <date variable="issued" form="text" prefix="Epub ahead of print "/>
+              <text variable="DOI" prefix="DOI: "/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="available at" text-case="capitalize-first"/>
+                <text variable="URL"/>
+              </group>
+              <text macro="accessed-date"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL">
+        <group delimiter=". ">
+          <text macro="date"/>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+      </if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book patent report thesis" match="any">
+        <text variable="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="page">
+    <group delimiter=" ">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography delimiter-precedes-et-al="always" second-field-align="flush" line-spacing="2">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <text macro="title"/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture patent report song thesis" match="any">
+          <group delimiter=". " prefix=". ">
+            <text macro="edition"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter="; " prefix=". ">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <text term="in" suffix=":" text-case="capitalize-first"/>
+                <text macro="editor"/>
+                <text variable="container-title" font-style="normal"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper article-magazine" match="any">
+          <group delimiter=", " prefix=". ">
+            <text macro="container-title"/>
+            <text macro="date"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=";" prefix=". ">
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <choose>
+                <if variable="page" match="any">
+                  <text macro="date"/>
+                </if>
+              </choose>
+            </group>
+            <group delimiter=":">
+              <text variable="volume"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/continuity-and-change.csl b/continuity-and-change.csl
new file mode 100644
index 00000000000..2e0f71862e5
--- /dev/null
+++ b/continuity-and-change.csl
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Continuity and Change</title>
+    <id>http://www.zotero.org/styles/continuity-and-change</id>
+    <link href="http://www.zotero.org/styles/continuity-and-change" rel="self"/>
+    <link href="http://www.zotero.org/styles/the-journal-of-transport-history" rel="template"/>
+    <link href="https://www.cambridge.org/core/services/aop-file-manager/file/5c33779fe094043a087773c3/CON-ifc.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="history"/>
+    <category field="sociology"/>
+    <issn>0268-4160</issn>
+    <eissn>1469-218X</eissn>
+    <updated>2020-06-01T12:32:27+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale>
+    <style-options punctuation-in-quote="false"/>
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="translator" form="verb-short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title-note"/>
+      </substitute>
+    </names>
+    <text macro="recipient-note"/>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <text variable="title" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="article-journal article-magazine" match="any">
+        <text variable="title" form="long" quotes="true" suffix=","/>
+      </else-if>
+      <else>
+        <text variable="title" quotes="true" suffix=","/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <group delimiter=", ">
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <text variable="title" font-style="italic" text-case="title" form="short"/>
+        </if>
+        <else>
+          <text variable="title" quotes="true" text-case="title" form="short"/>
+        </else>
+      </choose>
+      <text macro="locators-specific-note"/>
+    </group>
+  </macro>
+  <macro name="title-sort-substitute">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic" text-case="title" form="short"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true" text-case="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor-translator">
+    <text term="in" suffix=" "/>
+    <names variable="editor" delimiter=", ">
+      <name and="text" delimiter-precedes-last="never"/>
+      <label form="verb-short" prefix=" "/>
+    </names>
+    <choose>
+      <if variable="author editor" match="any">
+        <names variable="translator" delimiter=", ">
+          <label form="verb-short" suffix=" "/>
+          <name and="text" delimiter=", " delimiter-precedes-last="never"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", ">
+          <text variable="volume" font-weight="bold"/>
+          <text variable="issue"/>
+        </group>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume">
+            <text macro="issued" prefix=" (" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued" prefix=", "/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="title" match="none"/>
+              <else-if type="thesis speech" match="any">
+                <text variable="genre"/>
+              </else-if>
+            </choose>
+            <text macro="event"/>
+          </group>
+          <text macro="publisher"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued" prefix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-specific-note">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="volume">
+            <number variable="volume" form="roman" font-variant="small-caps"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title-note">
+    <text variable="container-title" form="long" font-style="italic"/>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" prefix=" " suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title-sort-substitute"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group>
+            <text term="section" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="graphic report article-newspaper" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if match="any" variable="page">
+        <text variable="page"/>
+        <group delimiter=" " prefix=", ">
+          <choose>
+            <if match="none" locator="page">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
+          <text variable="locator" form="long"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator" form="long"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <group delimiter=", ">
+      <text variable="archive_location"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive-note" prefix=", "/>
+        </if>
+        <else-if type="article-journal article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="none">
+          <text macro="archive-note" prefix=", "/>
+        </else-if>
+      </choose>
+    </group>
+    <choose>
+      <if type="webpage post-weblog" match="any">
+        <text variable="URL" prefix=" "/>
+        <group prefix=" [" suffix="]">
+          <text term="accessed"/>
+          <date variable="accessed">
+            <date-part name="day" prefix=" "/>
+            <date-part name="month" prefix=" "/>
+            <date-part name="year" prefix=" "/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-subsequent">
+    <group>
+      <choose>
+        <if match="none" locator="chapter">
+          <label variable="locator" form="short"/>
+        </if>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" form="short"/>
+            <text macro="locators-subsequent"/>
+          </group>
+        </if>
+        <else-if match="any" position="ibid">
+          <text term="ibid" form="short"/>
+        </else-if>
+        <else-if position="subsequent">
+          <text macro="contributors-short"/>
+          <text macro="title-short" prefix=", "/>
+          <text macro="locators-subsequent" prefix=", "/>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <text macro="contributors-note" suffix=","/>
+            <text macro="title-note"/>
+            <text macro="editor-translator" suffix=","/>
+            <text macro="container-title-note"/>
+            <text macro="locators-note"/>
+          </group>
+          <text macro="issue-note"/>
+          <text macro="locators-specific-note" prefix=", "/>
+          <text macro="locators-newspaper" prefix=", "/>
+          <text macro="point-locators" prefix=", "/>
+          <text macro="access-note"/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="contributors-note" suffix=","/>
+        <text macro="title-note" suffix=","/>
+        <text macro="editor-translator" suffix=","/>
+        <text macro="container-title-note"/>
+        <text macro="locators-note"/>
+      </group>
+      <text macro="issue-note"/>
+      <text macro="locators-specific-note" prefix=", "/>
+      <text macro="locators-newspaper" prefix=", "/>
+      <text macro="point-locators" prefix=", "/>
+      <text macro="access-note"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/dependent/bioelectronics-in-medicine.csl b/dependent/bioelectronics-in-medicine.csl
new file mode 100644
index 00000000000..6e9a13d038c
--- /dev/null
+++ b/dependent/bioelectronics-in-medicine.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Bioelectronics in Medicine</title>
+    <id>http://www.zotero.org/styles/bioelectronics-in-medicine</id>
+    <link href="http://www.zotero.org/styles/bioelectronics-in-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
+    <link href="https://www.futuremedicine.com/journal/bem" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2059-1500</issn>
+    <eissn>2059-1519</eissn>
+    <updated>2020-06-01T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/dependent/biomarkers-in-medicine.csl b/dependent/biomarkers-in-medicine.csl
index 7cad923e0a6..a4d274619e1 100644
--- a/dependent/biomarkers-in-medicine.csl
+++ b/dependent/biomarkers-in-medicine.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Biomarkers in Medicine</title>
     <id>http://www.zotero.org/styles/biomarkers-in-medicine</id>
     <link href="http://www.zotero.org/styles/biomarkers-in-medicine" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/bmm" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1752-0363</issn>
     <eissn>1752-0371</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/breast-cancer-management.csl b/dependent/breast-cancer-management.csl
index 47b03208550..73f71b3fee1 100644
--- a/dependent/breast-cancer-management.csl
+++ b/dependent/breast-cancer-management.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Breast Cancer Management</title>
     <id>http://www.zotero.org/styles/breast-cancer-management</id>
     <link href="http://www.zotero.org/styles/breast-cancer-management" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/bmt" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1758-1923</issn>
     <eissn>1758-1931</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/cellular-and-molecular-gastroenterology-and-hepatology.csl b/dependent/cellular-and-molecular-gastroenterology-and-hepatology.csl
deleted file mode 100644
index 62fb933570e..00000000000
--- a/dependent/cellular-and-molecular-gastroenterology-and-hepatology.csl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Elsevier, generated from "elsevier" metadata at https://github.com/citation-style-language/journals -->
-  <info>
-    <title>Cellular and Molecular Gastroenterology and Hepatology</title>
-    <id>http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology</id>
-    <link href="http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology" rel="self"/>
-    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
-    <category citation-format="numeric"/>
-    <issn>2352-345X</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-  </info>
-</style>
diff --git a/dependent/cns-oncology.csl b/dependent/cns-oncology.csl
index c71f9a7cbac..49bcee0d7f3 100644
--- a/dependent/cns-oncology.csl
+++ b/dependent/cns-oncology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>CNS Oncology</title>
     <id>http://www.zotero.org/styles/cns-oncology</id>
     <link href="http://www.zotero.org/styles/cns-oncology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/cns" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2045-0907</issn>
     <eissn>2045-0915</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/colorectal-cancer.csl b/dependent/colorectal-cancer.csl
index d3e831dae41..4d3088a6836 100644
--- a/dependent/colorectal-cancer.csl
+++ b/dependent/colorectal-cancer.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Colorectal Cancer</title>
     <id>http://www.zotero.org/styles/colorectal-cancer</id>
     <link href="http://www.zotero.org/styles/colorectal-cancer" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/crc" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1758-194X</issn>
     <eissn>1758-1958</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/concussion.csl b/dependent/concussion.csl
new file mode 100644
index 00000000000..c35db174e22
--- /dev/null
+++ b/dependent/concussion.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Concussion</title>
+    <id>http://www.zotero.org/styles/concussion</id>
+    <link href="http://www.zotero.org/styles/concussion" rel="self"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
+    <link href="https://www.futuremedicine.com/journal/cnc" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2056-3299</eissn>
+    <updated>2020-06-01T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/dependent/epigenomics.csl b/dependent/epigenomics.csl
index 76492045583..5a6c2b62252 100644
--- a/dependent/epigenomics.csl
+++ b/dependent/epigenomics.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Epigenomics</title>
     <id>http://www.zotero.org/styles/epigenomics</id>
     <link href="http://www.zotero.org/styles/epigenomics" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/epi" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1750-1911</issn>
     <eissn>1750-192X</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/future-cardiology.csl b/dependent/future-cardiology.csl
index fec572a8ae4..7462ab6478b 100644
--- a/dependent/future-cardiology.csl
+++ b/dependent/future-cardiology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Future Cardiology</title>
     <id>http://www.zotero.org/styles/future-cardiology</id>
     <link href="http://www.zotero.org/styles/future-cardiology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/fca" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1479-6678</issn>
     <eissn>1744-8298</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/future-microbiology.csl b/dependent/future-microbiology.csl
index 5cc9b8ffd85..18a72243734 100644
--- a/dependent/future-microbiology.csl
+++ b/dependent/future-microbiology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Future Microbiology</title>
     <id>http://www.zotero.org/styles/future-microbiology</id>
     <link href="http://www.zotero.org/styles/future-microbiology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/fmb" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1746-0913</issn>
     <eissn>1746-0921</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/future-neurology.csl b/dependent/future-neurology.csl
index 062fa12912b..a7ee8302f59 100644
--- a/dependent/future-neurology.csl
+++ b/dependent/future-neurology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Future Neurology</title>
     <id>http://www.zotero.org/styles/future-neurology</id>
     <link href="http://www.zotero.org/styles/future-neurology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/fnl" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1479-6708</issn>
     <eissn>1748-6971</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/future-oncology.csl b/dependent/future-oncology.csl
index f72f79bdf4d..591555b15bd 100644
--- a/dependent/future-oncology.csl
+++ b/dependent/future-oncology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Future Oncology</title>
     <id>http://www.zotero.org/styles/future-oncology</id>
     <link href="http://www.zotero.org/styles/future-oncology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/fon" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1479-6694</issn>
     <eissn>1744-8301</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/future-rare-diseases.csl b/dependent/future-rare-diseases.csl
new file mode 100644
index 00000000000..5b835028658
--- /dev/null
+++ b/dependent/future-rare-diseases.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Future Rare Diseases</title>
+    <id>http://www.zotero.org/styles/future-rare-diseases</id>
+    <link href="http://www.zotero.org/styles/future-rare-diseases" rel="self"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
+    <link href="https://www.futuremedicine.com/journal/frd" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2399-5262</eissn>
+    <updated>2020-06-01T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/dependent/future-virology.csl b/dependent/future-virology.csl
index 172f9b47ba4..0dcc36005f8 100644
--- a/dependent/future-virology.csl
+++ b/dependent/future-virology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Future Virology</title>
     <id>http://www.zotero.org/styles/future-virology</id>
     <link href="http://www.zotero.org/styles/future-virology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/fvl" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1746-0794</issn>
     <eissn>1746-0808</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/hepatic-oncology.csl b/dependent/hepatic-oncology.csl
index af91d7fe29e..78cb3686c72 100644
--- a/dependent/hepatic-oncology.csl
+++ b/dependent/hepatic-oncology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Hepatic Oncology</title>
     <id>http://www.zotero.org/styles/hepatic-oncology</id>
     <link href="http://www.zotero.org/styles/hepatic-oncology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
-    <link href="http://www.futuremedicine.com/loi/hep" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
+    <link href="https://www.futuremedicine.com/journal/hep" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2045-0923</issn>
     <eissn>2045-0931</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/immunotherapy.csl b/dependent/immunotherapy.csl
index 7b6cdbf751b..1aefd5979ad 100644
--- a/dependent/immunotherapy.csl
+++ b/dependent/immunotherapy.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Immunotherapy</title>
     <id>http://www.zotero.org/styles/immunotherapy</id>
     <link href="http://www.zotero.org/styles/immunotherapy" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/imt" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1750-743X</issn>
     <eissn>1750-7448</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/international-journal-of-endocrine-oncology.csl b/dependent/international-journal-of-endocrine-oncology.csl
index 58d586377eb..c6ef26edbe4 100644
--- a/dependent/international-journal-of-endocrine-oncology.csl
+++ b/dependent/international-journal-of-endocrine-oncology.csl
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>International Journal of Endocrine Oncology</title>
     <id>http://www.zotero.org/styles/international-journal-of-endocrine-oncology</id>
     <link href="http://www.zotero.org/styles/international-journal-of-endocrine-oncology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/ije" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2045-0869</issn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/international-journal-of-hematologic-oncology.csl b/dependent/international-journal-of-hematologic-oncology.csl
index e847f7d81e8..d076e708042 100644
--- a/dependent/international-journal-of-hematologic-oncology.csl
+++ b/dependent/international-journal-of-hematologic-oncology.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>International Journal of Hematologic Oncology</title>
     <id>http://www.zotero.org/styles/international-journal-of-hematologic-oncology</id>
     <link href="http://www.zotero.org/styles/international-journal-of-hematologic-oncology" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/ijh" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2045-1393</issn>
     <eissn>2045-1407</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/journal-of-3d-printing-in-medicine.csl b/dependent/journal-of-3d-printing-in-medicine.csl
new file mode 100644
index 00000000000..338e6b1832d
--- /dev/null
+++ b/dependent/journal-of-3d-printing-in-medicine.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of 3D Printing in Medicine</title>
+    <id>http://www.zotero.org/styles/journal-of-3d-printing-in-medicine</id>
+    <link href="http://www.zotero.org/styles/journal-of-3d-printing-in-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
+    <link href="https://www.futuremedicine.com/journal/3dp" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2059-4755</issn>
+    <eissn>2059-4763</eissn>
+    <updated>2020-06-01T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/dependent/journal-of-comparative-effectiveness-research.csl b/dependent/journal-of-comparative-effectiveness-research.csl
index a3fa7d30ddc..5229097b17d 100644
--- a/dependent/journal-of-comparative-effectiveness-research.csl
+++ b/dependent/journal-of-comparative-effectiveness-research.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Journal of Comparative Effectiveness Research</title>
     <id>http://www.zotero.org/styles/journal-of-comparative-effectiveness-research</id>
     <link href="http://www.zotero.org/styles/journal-of-comparative-effectiveness-research" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/cer" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2042-6305</issn>
     <eissn>2042-6313</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/lung-cancer-management.csl b/dependent/lung-cancer-management.csl
index 740f8fd694c..0ce9258be14 100644
--- a/dependent/lung-cancer-management.csl
+++ b/dependent/lung-cancer-management.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Lung Cancer Management</title>
     <id>http://www.zotero.org/styles/lung-cancer-management</id>
     <link href="http://www.zotero.org/styles/lung-cancer-management" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/lmt" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1758-1966</issn>
     <eissn>1758-1974</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/melanoma-management.csl b/dependent/melanoma-management.csl
index 52f699ac012..d6547e16049 100644
--- a/dependent/melanoma-management.csl
+++ b/dependent/melanoma-management.csl
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Melanoma Management</title>
     <id>http://www.zotero.org/styles/melanoma-management</id>
     <link href="http://www.zotero.org/styles/melanoma-management" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2045-0885</issn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/nanomedicine.csl b/dependent/nanomedicine.csl
index 4256372b472..b2e0a6c5350 100644
--- a/dependent/nanomedicine.csl
+++ b/dependent/nanomedicine.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Nanomedicine</title>
     <id>http://www.zotero.org/styles/nanomedicine</id>
     <link href="http://www.zotero.org/styles/nanomedicine" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/nnm" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1743-5889</issn>
     <eissn>1748-6963</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/neurodegenerative-disease-management.csl b/dependent/neurodegenerative-disease-management.csl
index 2c961cc80c9..76d21417a54 100644
--- a/dependent/neurodegenerative-disease-management.csl
+++ b/dependent/neurodegenerative-disease-management.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Neurodegenerative Disease Management</title>
     <id>http://www.zotero.org/styles/neurodegenerative-disease-management</id>
     <link href="http://www.zotero.org/styles/neurodegenerative-disease-management" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/nmt" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1758-2024</issn>
     <eissn>1758-2032</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/new-zealand-journal-of-forestry-science.csl b/dependent/new-zealand-journal-of-forestry-science.csl
deleted file mode 100644
index 18d05fa8cdf..00000000000
--- a/dependent/new-zealand-journal-of-forestry-science.csl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/springer -->
-  <info>
-    <title>New Zealand Journal of Forestry Science</title>
-    <id>http://www.zotero.org/styles/new-zealand-journal-of-forestry-science</id>
-    <link href="http://www.zotero.org/styles/new-zealand-journal-of-forestry-science" rel="self"/>
-    <link href="http://www.zotero.org/styles/springer-socpsych-author-date" rel="independent-parent"/>
-    <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/Key_Style_Points_1.0.pdf" rel="documentation"/>
-    <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/manuscript-guidelines-1.0.pdf" rel="documentation"/>
-    <category citation-format="author-date"/>
-    <eissn>1179-5395</eissn>
-    <updated>2014-05-15T12:00:00+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-  </info>
-</style>
diff --git a/dependent/pain-management.csl b/dependent/pain-management.csl
index be78c681f0f..7db393df681 100644
--- a/dependent/pain-management.csl
+++ b/dependent/pain-management.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Pain Management</title>
     <id>http://www.zotero.org/styles/pain-management</id>
     <link href="http://www.zotero.org/styles/pain-management" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/pmt" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1758-1869</issn>
     <eissn>1758-1877</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/personalized-medicine.csl b/dependent/personalized-medicine.csl
index 4c23974aa0e..caf4dfad022 100644
--- a/dependent/personalized-medicine.csl
+++ b/dependent/personalized-medicine.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Personalized Medicine</title>
     <id>http://www.zotero.org/styles/personalized-medicine</id>
     <link href="http://www.zotero.org/styles/personalized-medicine" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/pme" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1741-0541</issn>
     <eissn>1744-828X</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/pharmacogenomics.csl b/dependent/pharmacogenomics.csl
index cf49553b00d..949dddd3782 100644
--- a/dependent/pharmacogenomics.csl
+++ b/dependent/pharmacogenomics.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Pharmacogenomics</title>
     <id>http://www.zotero.org/styles/pharmacogenomics</id>
     <link href="http://www.zotero.org/styles/pharmacogenomics" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/pgs" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1462-2416</issn>
     <eissn>1744-8042</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/dependent/regenerative-medicine.csl b/dependent/regenerative-medicine.csl
index 9e0b3296433..5d9d676a95a 100644
--- a/dependent/regenerative-medicine.csl
+++ b/dependent/regenerative-medicine.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/future-science-group -->
+  <!-- Future Science Group, generated from "future-science-group" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Regenerative Medicine</title>
     <id>http://www.zotero.org/styles/regenerative-medicine</id>
     <link href="http://www.zotero.org/styles/regenerative-medicine" rel="self"/>
-    <link href="http://www.zotero.org/styles/future-science-group" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="independent-parent"/>
     <link href="http://www.futuremedicine.com/loi/rme" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1746-0751</issn>
     <eissn>1746-076X</eissn>
-    <updated>2014-05-10T12:00:00+00:00</updated>
+    <updated>2020-06-01T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/engineering-technology-and-applied-science-research.csl b/engineering-technology-and-applied-science-research.csl
new file mode 100644
index 00000000000..350a9590491
--- /dev/null
+++ b/engineering-technology-and-applied-science-research.csl
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Engineering, Technology &amp; Applied Science Research</title>
+    <title-short>ETASR</title-short>
+    <id>http://www.zotero.org/styles/engineering-technology-and-applied-science-research</id>
+    <link href="http://www.zotero.org/styles/engineering-technology-and-applied-science-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/ieee" rel="template"/>
+    <link href="http://etasr.com/ETASRTEMPLATE.docx" rel="documentation"/>
+    <author>
+      <name>Dr D. Pylarinos</name>
+      <email>editor@etasr.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2241-4487</issn>
+    <eissn>1792-8036</eissn>
+    <summary>ETASR style largely based on IEEE 2018 guidelines, V 11.12.2018 without the use of abbreviations for containers.</summary>
+    <updated>2020-06-05T21:02:10+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="chapter" form="short">ch.</term>
+      <term name="presented at">presented at the</term>
+      <term name="available at">available</term>
+    </terms>
+  </locale>
+  <!-- Macros -->
+  <macro name="status">
+    <choose>
+      <if variable="page issue volume" match="none">
+        <text variable="status" text-case="capitalize-first" suffix="" font-weight="bold"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="article-journal report" match="any">
+        <date variable="issued">
+          <date-part name="month" form="short" suffix=" "/>
+          <date-part name="year" form="long"/>
+        </date>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture song thesis" match="any">
+        <date variable="issued">
+          <date-part name="year" form="long"/>
+        </date>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <date variable="issued">
+          <date-part name="month" form="short"/>
+          <date-part name="year" prefix=" "/>
+        </date>
+      </else-if>
+      <else>
+        <date variable="issued">
+          <date-part name="month" form="short" suffix=" "/>
+          <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" et-al-min="7" et-al-use-first="1" initialize-with=". "/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with=". " delimiter=", " and="text"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="locators">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="volume" form="short"/>
+        <number variable="volume" form="numeric"/>
+      </group>
+      <group delimiter=" ">
+        <number variable="number-of-volumes" form="numeric"/>
+        <text term="volume" form="short" plural="true"/>
+      </group>
+      <group delimiter=" ">
+        <text term="issue" form="short"/>
+        <number variable="issue" form="numeric"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference song" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if type="paper-conference speech" match="any">
+        <choose>
+          <!-- Published Conference Paper -->
+          <if variable="container-title">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text term="in"/>
+                <text variable="container-title" font-style="italic"/>
+              </group>
+              <text variable="event-place"/>
+            </group>
+          </if>
+          <!-- Unpublished Conference Paper -->
+          <else>
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text term="presented at"/>
+                <text variable="event"/>
+              </group>
+              <text variable="event-place"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <group delimiter=" ">
+              <text variable="URL"/>
+              <group delimiter=" " prefix="(" suffix=")">
+                <text term="accessed"/>
+                <date variable="accessed">
+                  <date-part name="month" form="short" strip-periods="false"/>
+                  <date-part name="day" form="numeric-leading-zeros" prefix=" " suffix=", "/>
+                  <date-part name="year" form="long"/>
+                </date>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+      <else-if match="any" variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </else-if>
+      <else>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="month" form="short" suffix=" "/>
+              <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text term="online" prefix="[" suffix="]" text-case="capitalize-first"/>
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="page">
+    <group>
+      <label variable="page" form="short" suffix=" "/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page">
+          <label variable="locator" form="short"/>
+        </if>
+        <else>
+          <label variable="locator" form="short" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <!-- Citation -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=", ">
+      <group prefix="[" suffix="]" delimiter=", ">
+        <text variable="citation-number"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <!-- Bibliography -->
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout suffix=".">
+      <!-- Citation Number -->
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <!-- Author(s) -->
+      <text macro="author" suffix=", "/>
+      <!-- Rest of Citation -->
+      <choose>
+        <!-- Specific Formats -->
+        <if type="article-journal">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+            <text macro="status"/>
+            <text macro="access"/>
+          </group>
+        </if>
+        <else-if type="paper-conference speech" match="any">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text macro="event"/>
+            <text macro="issued"/>
+            <text macro="locators"/>
+            <text macro="page"/>
+            <text macro="status"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="report">
+          <group delimiter=". ">
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <text variable="genre"/>
+                <text variable="number"/>
+              </group>
+              <text macro="issued"/>
+            </group>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="genre"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog post" match="any">
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="number"/>
+            <text macro="issued"/>
+          </group>
+        </else-if>
+        <!-- Generic/Fallback Formats -->
+        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text macro="locators"/>
+          </group>
+          <group delimiter=", ">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+            <text macro="publisher"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=", " suffix=", ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text term="in"/>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <text macro="locators"/>
+          </group>
+          <text macro="editor" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+          </group>
+          <group delimiter=", ">
+            <text macro="publisher"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+            <text macro="access"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/future-medicine.csl b/future-medicine.csl
new file mode 100644
index 00000000000..508b86c8441
--- /dev/null
+++ b/future-medicine.csl
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Future Medicine journals</title>
+    <id>http://www.zotero.org/styles/future-medicine</id>
+    <link href="http://www.zotero.org/styles/future-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-applied-pharmaceutical-research" rel="template"/>
+    <link href="https://www.futuremedicine.com/authorguide/preparingyourarticle" rel="documentation"/>
+    <link href="https://www.futuremedicine.com/pb-assets/Future-Medicine-Author-Guidelines-1585216135307.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Bien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <category field="biology"/>
+    <updated>2020-06-03T12:27:46+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="presented at">presented at</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-et-al="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" font-style="italic"/>
+      </if>
+      <else-if type="chapter paper-conference" match="any">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="container-title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <number suffix=" " variable="edition" form="ordinal"/>
+    <label plural="never" text-case="capitalize-first" variable="edition"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" quotes="false" font-style="italic"/>
+      </if>
+      <else-if type="webpage" match="any">
+        <text variable="title" quotes="true"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="paper-conference" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <date date-parts="year" form="numeric" variable="issued" prefix="(" suffix=")">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" plural="never" text-case="capitalize-first" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="book chapter" match="any">
+        <group font-style="italic" delimiter=", " prefix="(" suffix=")">
+          <group delimiter=" ">
+            <text term="volume" text-case="capitalize-first"/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="chapter" form="short" text-case="capitalize-first" suffix=" "/>
+            <text variable="chapter-number"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="page">
+    <text variable="page"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="baseline" delimiter="," prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number"/>
+      <text macro="author" suffix=". "/>
+      <choose>
+        <if type="article-journal">
+          <group delimiter=". ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <group delimiter=", ">
+                <text macro="locators"/>
+                <text macro="page"/>
+              </group>
+              <text macro="issued"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="book" match="any">
+          <group delimiter=". ">
+            <text macro="title"/>
+            <text macro="locators"/>
+            <group delimiter=" ">
+              <text macro="publisher"/>
+              <text macro="issued"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="chapter" match="any">
+          <group delimiter=". ">
+            <text variable="title"/>
+            <group delimiter=": ">
+              <text term="in" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <text macro="container-title"/>
+                <text macro="locators"/>
+              </group>
+            </group>
+            <group delimiter=", ">
+              <text macro="editor"/>
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <text macro="page"/>
+                <text macro="issued"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="paper-conference" match="any">
+          <group delimiter=". ">
+            <text variable="title"/>
+            <group delimiter=": ">
+              <text term="presented at" text-case="capitalize-first"/>
+              <text macro="container-title"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="issued"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="number"/>
+            <text macro="issued"/>
+          </group>
+        </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=", ">
+            <text variable="genre"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+          </group>
+        </else-if>
+        <else-if type="webpage post post-weblog" match="any">
+          <group delimiter=". ">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="issued"/>
+            </group>
+            <text variable="URL"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/harvard-stellenbosch-university.csl b/harvard-stellenbosch-university.csl
index f962a4ca09e..610543553b0 100644
--- a/harvard-stellenbosch-university.csl
+++ b/harvard-stellenbosch-university.csl
@@ -277,9 +277,9 @@
           <else-if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
             <text macro="title"/>
             <group delimiter=" ">
-              <text term="in" text-case="capitalize-first"/>
-              <text macro="book-details"/>
+              <text term="in"/>
               <text variable="container-title" font-style="italic"/>
+              <text macro="book-details"/>
             </group>
             <text variable="page"/>
           </else-if>
diff --git a/heart-rhythm.csl b/heart-rhythm.csl
index cb769f46c9c..e75269e235f 100644
--- a/heart-rhythm.csl
+++ b/heart-rhythm.csl
@@ -259,7 +259,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography et-al-min="13" et-al-use-first="3" second-field-align="flush">
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
     <layout>
       <text variable="citation-number" suffix=". "/>
       <group delimiter=": " suffix=". ">
diff --git a/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl b/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl
new file mode 100644
index 00000000000..59efddef356
--- /dev/null
+++ b/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="es-ES">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Instituto de Investigaciones sobre la Universidad y la Educación - Moderno (autor-fecha, Spanish)</title>
+    <title-short>IISUE Moderno</title-short>
+    <id>http://www.zotero.org/styles/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno</id>
+    <link href="http://www.zotero.org/styles/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno" rel="self"/>
+    <link href="http://www.zotero.org/styles/comision-economica-para-america-latina-y-el-caribe" rel="template"/>
+    <link href="http://www.iisue.unam.mx/iisue/avisos/pautas-editoriales-del-IISUE.pdf" rel="documentation"/>
+    <author>
+      <name>Jonathan Girón Palau</name>
+      <email>jonathan.giron@unam.mx</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <category field="humanities"/>
+    <summary>Estilo bibliográfico, sistema moderno, del Instituto de Investigaciones sobre la Universidad y la Educación de la UNAM</summary>
+    <updated>2020-06-02T04:58:21+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale>
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="editor">
+        <single>ed</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="et-al">et al.</term>
+      <term name="and">y</term>
+      <term name="page" form="short">
+        <single>p.</single>
+        <multiple>pp.</multiple>
+      </term>
+      <term name="page">
+        <single>p.</single>
+        <multiple>pp.</multiple>
+      </term>
+      <term name="chapter" form="short">
+        <single>cap</single>
+        <multiple>caps.</multiple>
+      </term>
+      <term name="chapter">
+        <single>cap</single>
+        <multiple>caps.</multiple>
+      </term>
+      <term name="accessed">consultado el</term>
+      <term name="in">en</term>
+      <term name="forthcoming">en prensa</term>
+      <term name="no date">sin datos</term>
+      <term name="no date" form="short">s.d.</term>
+      <term name="month-01">enero</term>
+      <term name="month-02">febrero</term>
+      <term name="month-03">marzo</term>
+      <term name="month-04">abril</term>
+      <term name="month-05">mayo</term>
+      <term name="month-06">junio</term>
+      <term name="month-07">julio</term>
+      <term name="month-08">agosto</term>
+      <term name="month-09">septiembre</term>
+      <term name="month-10">octubre</term>
+      <term name="month-11">noviembre</term>
+      <term name="month-12">diciembre</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="short" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="none">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <names variable="author">
+              <name and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="20" et-al-use-first="19" initialize="false" initialize-with=". " name-as-sort-order="first"/>
+              <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+              </substitute>
+            </names>
+          </if>
+          <else-if variable="publisher" match="any">
+            <choose>
+              <if type="article-journal article-magazine article-newspaper" match="any">
+                <text variable="publisher" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="publisher"/>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <choose>
+              <if type="article-journal article-magazine article-newspaper" match="any">
+                <text variable="container-title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="container-title"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="author editor translator" match="any">
+            <names variable="author">
+              <name and="text" delimiter-precedes-last="never" et-al-min="20" et-al-use-first="19" initialize="false" initialize-with=". " name-as-sort-order="first"/>
+              <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+              </substitute>
+            </names>
+          </if>
+          <else-if variable="collection-title">
+            <text variable="collection-title" font-style="italic"/>
+          </else-if>
+          <else-if variable="publisher" match="any">
+            <text variable="publisher"/>
+          </else-if>
+          <else>
+            <text variable="container-title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="lowercase" prefix=" [" suffix="]"/>
+          </if>
+          <else>
+            <text value="en línea" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+        <text variable="URL" prefix=" &lt;" suffix="&gt;" font-style="normal"/>
+        <group prefix=" " delimiter=" ">
+          <group>
+            <text term="accessed" suffix=" "/>
+            <date variable="accessed">
+              <date-part name="day" suffix=" de "/>
+              <date-part name="month" text-case="lowercase" suffix=" de "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <date variable="issued" prefix=" ">
+          <date-part name="day" prefix="consultado el " suffix=" de "/>
+          <date-part name="month" text-case="lowercase"/>
+          <date-part name="year" prefix=" de "/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report">
+        <text variable="title"/>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" quotes="false"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="event"/>
+      <text variable="publisher-place"/>
+      <choose>
+        <if variable="author editor translator" match="any">
+          <text variable="publisher"/>
+        </if>
+      </choose>
+      <choose>
+        <if variable="publisher publisher-place" match="none">
+          <text variable="container-title"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if type="webpage">
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </if>
+          <else-if variable="accessed">
+            <date variable="accessed">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else>
+            <text term="no date" form="short"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </if>
+          <else>
+            <text term="no date" form="short"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <text variable="volume" prefix=" vol. "/>
+          <text variable="issue" prefix=" núm. "/>
+        </group>
+      </if>
+      <else-if type="report">
+        <text variable="number" prefix=" núm. "/>
+      </else-if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if variable="collection-title" match="none">
+            <group prefix=" (" suffix=")" delimiter=", ">
+              <group>
+                <text term="volume" form="short" plural="true" suffix=" "/>
+                <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+              </group>
+              <group>
+                <text term="volume" form="short" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+              <group>
+                <label variable="page" form="short" suffix=" "/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="volume" prefix=" vol. "/>
+              <text variable="collection-number" prefix=" núm. "/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <group delimiter=", ">
+              <text macro="author-short"/>
+              <text macro="year-date"/>
+            </group>
+            <text macro="citation-locator"/>
+          </if>
+          <else-if variable="publisher" match="any">
+            <group delimiter=", ">
+              <text variable="publisher" font-style="italic"/>
+              <text macro="year-date"/>
+            </group>
+            <text macro="citation-locator"/>
+          </else-if>
+          <else>
+            <group delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="year-date"/>
+            </group>
+            <text macro="citation-locator"/>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" entry-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued" sort="descending"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix=" "/>
+      <text macro="year-date" prefix="(" suffix="),"/>
+      <choose>
+        <if type="report">
+          <text macro="title" quotes="false" prefix=" &quot;" suffix="&quot;"/>
+          <group prefix=", " delimiter=", ">
+            <text variable="collection-title" font-style="italic"/>
+            <text macro="locators"/>
+          </group>
+          <group prefix=", " delimiter=", ">
+            <text macro="publisher"/>
+            <text variable="page" prefix="p. "/>
+            <date variable="issued">
+              <date-part name="month" text-case="lowercase"/>
+            </date>
+          </group>
+        </if>
+        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group>
+                <text macro="title" prefix=" "/>
+              </group>
+              <group prefix=", " delimiter=", ">
+                <text macro="editor"/>
+                <text macro="publisher"/>
+                <date variable="issued">
+                  <date-part name="month" text-case="lowercase"/>
+                </date>
+              </group>
+            </if>
+            <else>
+              <text macro="title" prefix=" " suffix=", "/>
+              <text variable="collection-title" suffix=", "/>
+              <text macro="locators"/>
+              <text macro="publisher" prefix=", "/>
+              <date variable="issued" prefix=", ">
+                <date-part name="day" suffix=" de "/>
+                <date-part name="month" text-case="lowercase"/>
+              </date>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="chapter paper-conference article article-journal article-magazine article-newspaper" match="any">
+          <group>
+            <text macro="title" quotes="false" prefix=" &quot;" suffix="&quot;"/>
+          </group>
+          <group prefix=", " delimiter=", ">
+            <text variable="container-title" font-style="italic"/>
+            <text variable="collection-title"/>
+            <text macro="editor"/>
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+            <text variable="page" prefix="pp. "/>
+          </group>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper" match="any">
+          <group>
+            <text macro="title" strip-periods="false" quotes="true" prefix=" "/>
+            <choose>
+              <if variable="container-title" match="none"></if>
+            </choose>
+          </group>
+          <group prefix=", " delimiter=", ">
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text variable="container-title" font-style="italic"/>
+              </if>
+            </choose>
+            <text variable="collection-title"/>
+            <text macro="locators"/>
+          </group>
+          <choose>
+            <if variable="container-title"></if>
+          </choose>
+          <group prefix=", " delimiter=", ">
+            <text macro="editor"/>
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="speech">
+          <text macro="title" prefix=" " quotes="true"/>
+          <choose>
+            <if variable="genre">
+              <text variable="event" prefix=", documento preparado para el proyecto "/>
+            </if>
+            <else>
+              <text variable="event" prefix=", documento presentado en "/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="title" quotes="false" prefix=" &quot;" suffix="&quot;"/>
+            <text macro="editor"/>
+            <text variable="container-title" font-style="italic"/>
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </else>
+      </choose>
+      <choose>
+        <if type="article article-journal article-magazine article-newspaper bill" match="any">
+          <text variable="DOI" prefix=", &lt;" suffix="&gt;"/>
+          <text variable="URL" prefix=", &lt;" suffix="&gt;"/>
+        </if>
+      </choose>
+      <text macro="access" prefix=","/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-of-the-american-college-of-surgeons.csl b/journal-of-the-american-college-of-surgeons.csl
index 5c5d63b59f4..f1f54a55864 100644
--- a/journal-of-the-american-college-of-surgeons.csl
+++ b/journal-of-the-american-college-of-surgeons.csl
@@ -14,8 +14,9 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1072-7515</issn>
+    <eissn>1879-1190</eissn>
     <summary>Journal of the American College of surgeons</summary>
-    <updated>2014-06-05T04:18:55+00:00</updated>
+    <updated>2020-06-11T10:06:59+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
@@ -41,7 +42,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
+      <if type="webpage post post-weblog" match="any">
         <text value="Available at:" suffix=" "/>
         <text variable="URL" suffix="."/>
         <group prefix=" ">
@@ -56,33 +57,15 @@
     </choose>
   </macro>
   <macro name="title">
-    <choose>
-      <if type="article-journal article-magazine article-newspaper book" match="any">
-        <text variable="title" suffix=". "/>
-        <choose>
-          <if variable="URL">
-            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
-          </if>
-        </choose>
-        <text macro="edition" prefix=". "/>
-      </if>
-      <else-if type="chapter">
-        <text variable="title" suffix=", "/>
-      </else-if>
-    </choose>
+    <text variable="title"/>
   </macro>
   <macro name="container-title">
     <choose>
       <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
-        <group suffix="" delimiter=" ">
-          <text variable="container-title" form="short"/>
-          <choose>
-            <if variable="URL">
-              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
-            </if>
-          </choose>
+        <group delimiter=". ">
+          <text variable="container-title" form="short" strip-periods="true"/>
+          <text macro="edition" prefix=" "/>
         </group>
-        <text macro="edition" prefix=" "/>
       </if>
       <else>
         <text variable="container-title" suffix="" form="short"/>
@@ -122,13 +105,13 @@
       <text macro="author"/>
       <choose>
         <if type="article-journal article-magazine article-newspaper" match="any">
-          <group suffix=".">
+          <group delimiter=". ">
             <text macro="title" prefix=" " suffix="."/>
             <text macro="container-title"/>
             <text macro="edition" prefix=" "/>
           </group>
           <text prefix=" " macro="publisher"/>
-          <group suffix="." prefix="; ">
+          <group prefix=" " suffix=".">
             <date variable="issued">
               <date-part name="year"/>
             </date>
@@ -137,17 +120,19 @@
           </group>
         </if>
         <else-if type="chapter paper-conference book" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" ">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="editor"/>
+          <group delimiter=". ">
+            <text macro="title" prefix=" "/>
+            <group delimiter=": " prefix=" ">
+              <text term="in" text-case="capitalize-first"/>
+              <text macro="editor"/>
+            </group>
             <text variable="container-title" prefix=" " suffix="."/>
             <text variable="volume" prefix="Vol " suffix="."/>
             <text macro="edition" prefix=" "/>
             <text variable="collection-title" prefix=" " suffix="."/>
-            <group suffix=".">
+            <group delimiter="; " suffix=".">
               <text macro="publisher" prefix=" "/>
-              <group suffix="." prefix=", ">
+              <group>
                 <date variable="issued">
                   <date-part name="year"/>
                 </date>
diff --git a/journal-of-vertebrate-biology.csl b/journal-of-vertebrate-biology.csl
new file mode 100644
index 00000000000..c04300d17e0
--- /dev/null
+++ b/journal-of-vertebrate-biology.csl
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" page-range-format="expanded" default-locale="en-US">
+  <info>
+    <title>Journal of Vertebrate Biology</title>
+    <id>http://www.zotero.org/styles/journal-of-vertebrate-biology</id>
+    <link href="http://www.zotero.org/styles/journal-of-vertebrate-biology" rel="self"/>
+    <link href="http://www.zotero.org/styles/invertebrate-biology" rel="template"/>
+    <link href="https://www.jvertbiol.cz/submission.php#literature" rel="documentation"/>
+    <author>
+      <name>Pavel Najman</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <eissn>2694-7684</eissn>
+    <updated>2020-06-06T22:06:38+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" delimiter=". ">
+      <name delimiter=". " and="symbol" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=". "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author" suffix=".">
+      <name delimiter=". " and="symbol" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" delimiter=". " and="symbol" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=". ">
+      <text variable="genre"/>
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation collapse="year-suffix" et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" year-suffix-delimiter=". ">
+    <sort>
+      <key variable="issued"/>
+    </sort>
+    <layout delimiter=". " prefix="(" suffix=")">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator" prefix=" "/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" line-spacing="2">
+    <sort>
+      <key macro="author-short"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <date variable="issued" prefix=" " suffix=":">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+          <group suffix=".">
+            <text macro="title" prefix=" "/>
+            <text macro="editor-translator" prefix=" "/>
+          </group>
+          <text prefix=" " macro="publisher"/>
+          <text variable="number-of-pages" prefix=". " suffix=" pp"/>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" "/>
+          <group prefix=".">
+            <group prefix=" In:" delimiter=". ">
+              <text variable="container-title" form="short"/>
+              <text macro="editor-translator"/>
+            </group>
+            <label variable="page" form="short" prefix=", " suffix=" "/>
+            <text variable="page" suffix="."/>
+            <text macro="publisher" prefix=" "/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix=".">
+            <text macro="title" font-weight="normal" prefix=" "/>
+            <text macro="editor-translator" font-weight="normal" prefix=" "/>
+          </group>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" form="short"/>
+            <group prefix=" ">
+              <text variable="volume" form="long" font-weight="normal"/>
+            </group>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/methods-of-information-in-medicine.csl b/methods-of-information-in-medicine.csl
index 37b05e6d1c3..89394b3b690 100644
--- a/methods-of-information-in-medicine.csl
+++ b/methods-of-information-in-medicine.csl
@@ -4,7 +4,8 @@
     <title>Methods of Information in Medicine</title>
     <id>http://www.zotero.org/styles/methods-of-information-in-medicine</id>
     <link href="http://www.zotero.org/styles/methods-of-information-in-medicine" rel="self"/>
-    <link href="http://www.schattauer.de/fileadmin/assets/zeitschriften/methods/Instruction_to_Authors.pdf" rel="documentation"/>
+    <link href="https://www.thieme.com/books-main/clinical-informatics/product/4439-methods-of-information-in-medicine" rel="documentation"/>
+    <link href="https://www.thieme.com/media/ita/Methods_authors_instructions.pdf" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
@@ -12,21 +13,25 @@
       <name>Michael Berkowitz</name>
       <email>mberkowi@gmu.edu</email>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>0026-1270</issn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2020-06-05T09:29:34+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
     <terms>
       <term name="no date" form="long">date unknown</term>
+      <term name="presented at">paper presented at</term>
     </terms>
   </locale>
   <macro name="author">
-    <names variable="author" suffix=". ">
+    <names variable="author">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="long" prefix=", " suffix="."/>
+      <label form="short" prefix=", " suffix="."/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -36,23 +41,24 @@
   <macro name="editor">
     <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="long" prefix=", " suffix=". "/>
+      <label form="short" prefix=", " suffix=". "/>
     </names>
   </macro>
   <macro name="publisher">
-    <text variable="publisher-place" suffix=": "/>
-    <text variable="publisher" suffix="; "/>
-    <text macro="date"/>
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="date"/>
+    </group>
   </macro>
   <macro name="date">
     <choose>
       <if variable="issued">
         <choose>
-          <if type="article-journal">
-            <date variable="issued">
-              <date-part name="year"/>
-              <date-part name="month" form="short" prefix=" " strip-periods="true"/>
-            </date>
+          <if type="report paper-conference" match="any">
+            <date form="text" date-parts="year-month-day" variable="issued"/>
           </if>
           <else>
             <date variable="issued">
@@ -67,19 +73,26 @@
     </choose>
   </macro>
   <macro name="access">
-    <text variable="URL" suffix=". "/>
-    <group delimiter=" ">
-      <text term="accessed" text-case="capitalize-first"/>
-      <date variable="accessed">
-        <date-part name="year"/>
-        <date-part name="month" form="numeric" prefix="-"/>
-        <date-part name="day" prefix="-"/>
-      </date>
-    </group>
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </group>
+      </if>
+    </choose>
   </macro>
   <macro name="title">
     <group delimiter=" ">
       <text variable="title"/>
+      <choose>
+        <if type="thesis" match="any">
+          <text variable="genre" prefix="[" suffix="]"/>
+        </if>
+      </choose>
     </group>
   </macro>
   <macro name="edition">
@@ -99,38 +112,69 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout prefix="[" suffix="]" delimiter="; ">
+    <layout vertical-align="sup" delimiter="; ">
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <text macro="title" suffix=". "/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="edition" suffix=" "/>
-          <text macro="publisher" suffix="."/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group prefix=" " suffix=". ">
-            <text term="in" suffix=": " text-case="capitalize-first"/>
-            <text macro="editor"/>
-            <text variable="container-title"/>
-          </group>
-          <text macro="publisher" prefix=" "/>
-          <text variable="page" prefix=" p. " suffix="."/>
-        </else-if>
-        <else>
-          <text variable="container-title" suffix=" " form="short"/>
-          <text macro="date" suffix=";"/>
-          <text variable="volume"/>
-          <text variable="issue" prefix=" (" suffix=")"/>
-          <text variable="page" prefix=":" suffix="."/>
-        </else>
-      </choose>
-      <text macro="access" prefix=" "/>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=" "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture song thesis" match="any">
+            <group delimiter=". ">
+              <text macro="edition"/>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter" match="any">
+            <group prefix=" ">
+              <text term="in" suffix=": " text-case="capitalize-first"/>
+              <text macro="editor"/>
+              <text variable="container-title"/>
+              <group delimiter=":">
+                <group delimiter="; ">
+                  <text macro="publisher" prefix=" "/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="paper-conference" match="any">
+            <group delimiter="; ">
+              <group delimiter=": ">
+                <text term="presented at" text-case="capitalize-first"/>
+                <text variable="container-title"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="report" match="any">
+            <group delimiter=". ">
+              <text macro="publisher"/>
+              <text variable="number"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="container-title" form="short" strip-periods="true"/>
+              <group delimiter=";">
+                <text macro="date"/>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+        <text macro="access" prefix=" "/>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/new-zealand-journal-of-forestry-science.csl b/new-zealand-journal-of-forestry-science.csl
new file mode 100644
index 00000000000..49cf871fab5
--- /dev/null
+++ b/new-zealand-journal-of-forestry-science.csl
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+  <info>
+    <title>New Zealand Journal of Forestry Science</title>
+    <title-short>NZJFS</title-short>
+    <id>http://www.zotero.org/styles/new-zealand-journal-of-forestry-science</id>
+    <link href="http://www.zotero.org/styles/new-zealand-journal-of-forestry-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/springer-socpsych-author-date" rel="template"/>
+    <link href="http://nzjforestryscience.nz/index.php/nzjfs/about/submissions#authorGuidelines" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>0048-0134</issn>
+    <eissn>1179-5395</eissn>
+    <updated>2020-06-04T11:32:11+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="accessed" form="long">zugegriffen:</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name and="symbol" initialize-with="."/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal chapter paper-conference" match="none">
+        <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
+          <name and="symbol" initialize-with="."/>
+          <label form="short" prefix=", " text-case="title"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text macro="title"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </else-if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="archive" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="page volume" match="none">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else>
+            <choose>
+              <if type="article-journal" match="none">
+                <group delimiter=". ">
+                  <text variable="URL"/>
+                  <group delimiter=" ">
+                    <text term="accessed" text-case="capitalize-first"/>
+                    <date variable="accessed" form="text"/>
+                  </group>
+                </group>
+              </if>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="No. "/>
+        </group>
+      </if>
+      <else-if type="book graphic  motion_picture report song manuscript speech" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <choose>
+            <if variable="event" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="article-journal article-magazine" match="none">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="genre" match="none">
+            <text term="presented at" text-case="capitalize-first" suffix=" "/>
+            <text variable="event"/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text term="presented at"/>
+              <text variable="event"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <choose>
+          <if variable="issued">
+            <group prefix=" (" suffix=")">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </group>
+          </if>
+          <else>
+            <group prefix=" (" suffix=")">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="book graphic motion_picture report song chapter paper-conference" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+          </group>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legal_case">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <date variable="issued" form="text"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <date variable="issued" prefix=" (" suffix=")">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <group>
+      <choose>
+        <if type="chapter paper-conference entry-encyclopedia" match="any">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </if>
+      </choose>
+      <text macro="container-contributors"/>
+      <text macro="secondary-contributors"/>
+      <text macro="container-title"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+      <else>
+        <group delimiter=" " prefix=", ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <choose>
+                <if type="legal_case">
+                  <text variable="number" prefix="No. "/>
+                </if>
+                <else>
+                  <text variable="number" prefix="Pub. L. No. "/>
+                  <group delimiter=" ">
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued-year"/>
+        </group>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <text macro="issued"/>
+          <text macro="title" prefix=" "/>
+          <text macro="container"/>
+        </group>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/the-journal-of-clinical-ethics.csl b/the-journal-of-clinical-ethics.csl
new file mode 100644
index 00000000000..c7c50a4bab9
--- /dev/null
+++ b/the-journal-of-clinical-ethics.csl
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>The Journal of Clinical Ethics</title>
+    <title-short>JCE</title-short>
+    <id>http://www.zotero.org/styles/the-journal-of-clinical-ethics</id>
+    <link href="http://www.zotero.org/styles/the-journal-of-clinical-ethics" rel="self"/>
+    <link href="http://www.zotero.org/styles/comparative-politics" rel="template"/>
+    <link href="http://www.clinicalethics.com/JCE%20Reference%20Style.pdf" rel="documentation"/>
+    <link href="http://www.clinicalethics.com/Instructions.htm#FORMAT_" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="medicine"/>
+    <issn>1046-7890</issn>
+    <eissn>1945-5879</eissn>
+    <updated>2020-06-03T10:48:27+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." sort-separator=" "/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+      <label form="short" strip-periods="false" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <choose>
+          <if type="article-journal" match="any">
+            <date date-parts="year-month" form="text" variable="issued"/>
+          </if>
+          <else>
+            <date date-parts="year" form="text" variable="issued"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group prefix="[" suffix="]" delimiter=": ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+              <date-part name="month" form="short" suffix="-" strip-periods="true"/>
+              <date-part name="year" form="long"/>
+            </date>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " prefix=" (" suffix=")">
+      <group delimiter=": ">
+        <text variable="publisher-place" form="long"/>
+        <text variable="publisher" form="long"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <group delimiter=" ">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if variable="locator">
+        <text macro="locator"/>
+      </if>
+      <else>
+        <text variable="page"/>
+      </else>
+    </choose>
+  </macro>
+  <citation>
+    <layout delimiter="; " suffix=".">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid"/>
+            <text macro="locator"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="author"/>
+            <choose>
+              <if match="any" variable="title-short">
+                <text variable="title-short"/>
+              </if>
+              <else>
+                <text variable="title"/>
+              </else>
+            </choose>
+            <text macro="locator"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="author" suffix=", "/>
+          <choose>
+            <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+              <group>
+                <group delimiter=", ">
+                  <text variable="title" font-style="italic"/>
+                  <text macro="edition"/>
+                </group>
+                <text macro="publisher"/>
+              </group>
+            </if>
+            <else-if type="chapter paper-conference" match="any">
+              <text variable="title" quotes="true" suffix=", "/>
+              <text term="in" suffix=" "/>
+              <group delimiter=", ">
+                <text macro="editor"/>
+                <text variable="container-title" text-case="title" font-style="italic"/>
+                <text macro="edition"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="pages"/>
+              </group>
+            </else-if>
+            <else-if type="webpage">
+              <group delimiter=", " suffix=".">
+                <text variable="title"/>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="year-date"/>
+              </group>
+              <text macro="access" prefix=". "/>
+            </else-if>
+            <else-if type="patent">
+              <group delimiter=", ">
+                <text variable="title"/>
+                <text variable="number"/>
+                <text macro="year-date"/>
+              </group>
+            </else-if>
+            <else-if type="thesis">
+              <group delimiter=" ">
+                <text variable="title"/>
+                <group delimiter=", " prefix="(" suffix=")">
+                  <text variable="genre"/>
+                  <text variable="publisher"/>
+                  <text macro="year-date"/>
+                </group>
+              </group>
+            </else-if>
+            <else-if type="article article-journal" match="any">
+              <group delimiter=" ">
+                <text variable="title" quotes="true" suffix=","/>
+                <text variable="container-title" text-case="title" font-style="italic"/>
+                <group delimiter=", ">
+                  <text variable="volume" font-weight="normal"/>
+                  <group delimiter=" ">
+                    <label variable="issue" form="short"/>
+                    <text variable="issue"/>
+                  </group>
+                </group>
+                <group delimiter=": ">
+                  <text macro="year-date" prefix="(" suffix=")"/>
+                  <text macro="pages"/>
+                </group>
+              </group>
+            </else-if>
+            <else>
+              <group delimiter=", ">
+                <text variable="title" quotes="true" suffix=","/>
+                <text variable="container-title" text-case="title" font-style="italic"/>
+                <text variable="volume" font-weight="normal"/>
+                <text macro="year-date"/>
+                <text variable="page" form="short"/>
+              </group>
+            </else>
+          </choose>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+</style>

From fff66d2234bfabff388fd967148cf1f37af2b6db Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Mon, 15 Jun 2020 07:33:44 +0200
Subject: [PATCH 06/15] Update FileUtilTest.java

Remove obsolete comment
---
 src/test/java/org/jabref/logic/util/io/FileUtilTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index ae449124186..be07e7aecb6 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -65,7 +65,6 @@ void extensionBakAddedCorrectlyToAFileContainedInTmpDirectory() {
 
     @Test
     void testGetLinkedFileNameDefaultFullTitle() {
-        // bibkey - title
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");

From f17cb5d43dfa5f916ea010a5547f74ef02a03657 Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Mon, 15 Jun 2020 07:36:02 +0200
Subject: [PATCH 07/15] Update FileUtilTest.java

Revert previous change., remove right comment
---
 src/test/java/org/jabref/logic/util/io/FileUtilTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index be07e7aecb6..2ef874ba744 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -65,6 +65,7 @@ void extensionBakAddedCorrectlyToAFileContainedInTmpDirectory() {
 
     @Test
     void testGetLinkedFileNameDefaultFullTitle() {
+        // bibkey - title
         String fileNamePattern = "[bibtexkey] - [fulltitle]";
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");
@@ -368,7 +369,6 @@ void testGetLinkedDirNameDefaultFullTitle() {
 
     @Test
     void testGetLinkedDirNamePatternEmpty() {
-        // bibkey - title
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");

From bf1825ca898d9cce5facfceb56f7296ce8d769dd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2020 09:19:26 +0000
Subject: [PATCH 08/15] Bump classgraph from 4.8.83 to 4.8.86

Bumps [classgraph](https://github.com/classgraph/classgraph) from 4.8.83 to 4.8.86.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.83...classgraph-4.8.86)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6e267acdf2c..38051d4c42b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -196,7 +196,7 @@ dependencies {
     implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
     implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.83'
+    testImplementation 'io.github.classgraph:classgraph:4.8.86'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.2'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.6.2'

From 379cc435faf2c9f7e753c217771b2d0b6ea310c2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2020 09:19:59 +0000
Subject: [PATCH 09/15] Bump org.beryx.jlink from 2.19.0 to 2.20.0

Bumps org.beryx.jlink from 2.19.0 to 2.20.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6e267acdf2c..9284babb08d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.28.0'
     id 'org.javamodularity.moduleplugin' version '1.5.0'
     id 'org.openjfx.javafxplugin' version '0.0.8'
-    id 'org.beryx.jlink' version '2.19.0'
+    id 'org.beryx.jlink' version '2.20.0'
 
     // nicer test outputs during running and completion
     id 'com.adarshr.test-logger' version '2.0.0'

From 165d0b26018759ee70a43ed1ca180a91d0a222ff Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2020 09:21:05 +0000
Subject: [PATCH 10/15] Bump com.simonharrer.modernizer from 1.8.0-1 to 2.1.0-1

Bumps com.simonharrer.modernizer from 1.8.0-1 to 2.1.0-1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6e267acdf2c..e96f44269ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ import org.jabref.build.xjc.XjcTask
 
 plugins {
     id 'application'
-    id "com.simonharrer.modernizer" version '1.8.0-1'
+    id "com.simonharrer.modernizer" version '2.1.0-1'
     id 'me.champeau.gradle.jmh' version '0.5.0'
     id 'com.github.ben-manes.versions' version '0.28.0'
     id 'org.javamodularity.moduleplugin' version '1.5.0'

From fcf61462ae3867cb4bcfe75466772db63726a8bb Mon Sep 17 00:00:00 2001
From: k3KAW8Pnf7mkmdSMPHz27
 <2598631+k3KAW8Pnf7mkmdSMPHz27@users.noreply.github.com>
Date: Tue, 16 Jun 2020 15:24:32 -0400
Subject: [PATCH 11/15] Fix author formatter for unchanged names (#6552)

Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>
---
 config/checkstyle/checkstyle.xml              |   2 +-
 .../gui/maintable/BibEntryTableViewModel.java |  37 +-
 .../gui/maintable/MainTableDataModel.java     |  12 +-
 .../MainTableFieldValueFormatter.java         |  87 ++++
 .../gui/maintable/MainTableNameFormatter.java |  54 ---
 .../java/org/jabref/model/entry/Author.java   |   4 +-
 .../org/jabref/model/entry/AuthorList.java    |  91 +---
 .../jabref/model/entry/AuthorListParser.java  | 150 +++++--
 ...terTest.java => AuthorListParserTest.java} |  14 +-
 .../jabref/model/entry/AuthorListTest.java    | 387 ++++++++++++------
 10 files changed, 490 insertions(+), 348 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
 delete mode 100644 src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
 rename src/test/java/org/jabref/model/entry/{AuthorListParameterTest.java => AuthorListParserTest.java} (72%)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index ade463b0d6c..2b267604f65 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -12,7 +12,7 @@
 
     <!-- BeforeExecutionFileFilters is required for sources that are based on java14 -->
     <module name="BeforeExecutionExclusionFileFilter">
-      <property name="fileNamePattern" value="AuthorAndsReplacer.java|Ordinal.java|EntryTypeView.java" />
+      <property name="fileNamePattern" value="AuthorAndsReplacer.java|EntryTypeView.java|MainTableFieldValueFormatter.java|Ordinal.java" />
     </module>
 
     <module name="SuppressionFilter">
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index cbd68c085a3..1d368e5496c 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -14,13 +14,11 @@
 import javafx.beans.value.ObservableValue;
 
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
-import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
@@ -33,22 +31,20 @@
 
 public class BibEntryTableViewModel {
     private final BibEntry entry;
-    private final BibDatabase database;
-    private final ObservableValue<MainTableNameFormatter> nameFormatter;
+    private final ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter;
     private final Map<OrFields, ObservableValue<String>> fieldValues = new HashMap<>();
     private final Map<SpecialField, OptionalBinding<SpecialFieldValueViewModel>> specialFieldValues = new HashMap<>();
     private final EasyBinding<List<LinkedFile>> linkedFiles;
     private final EasyBinding<Map<Field, String>> linkedIdentifiers;
     private final ObservableValue<List<AbstractGroup>> matchedGroups;
 
-    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext database, ObservableValue<MainTableNameFormatter> nameFormatter) {
+    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext bibDatabaseContext, ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter) {
         this.entry = entry;
-        this.database = database.getDatabase();
-        this.nameFormatter = nameFormatter;
+        this.fieldValueFormatter = fieldValueFormatter;
 
         this.linkedFiles = getField(StandardField.FILE).map(FileFieldParser::parse).orElse(Collections.emptyList());
         this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
-        this.matchedGroups = createMatchedGroupsBinding(database, entry);
+        this.matchedGroups = createMatchedGroupsBinding(bibDatabaseContext, entry);
     }
 
     private static EasyBinding<Map<Field, String>> createLinkedIdentifiersBinding(BibEntry entry) {
@@ -120,26 +116,11 @@ public ObservableValue<String> getFields(OrFields fields) {
         }
 
         ArrayList<Observable> observables = new ArrayList<>(List.of(entry.getObservables()));
-        observables.add(nameFormatter);
-
-        value = Bindings.createStringBinding(() -> {
-            for (Field field : fields) {
-                if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
-                    Optional<String> name = entry.getResolvedFieldOrAlias(field, database);
-
-                    if (name.isPresent()) {
-                        return nameFormatter.getValue().formatNameLatexFree(name.get());
-                    }
-                } else {
-                    Optional<String> content = entry.getResolvedFieldOrAliasLatexFree(field, database);
-
-                    if (content.isPresent()) {
-                        return content.get();
-                    }
-                }
-            }
-            return "";
-        }, observables.toArray(Observable[]::new));
+        observables.add(fieldValueFormatter);
+
+        value = Bindings.createStringBinding(() ->
+                fieldValueFormatter.getValue().formatFieldsValues(fields, entry),
+                observables.toArray(Observable[]::new));
         fieldValues.put(fields, value);
         return value;
     }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index e9f6ecb5b82..2a7e6f176c8 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -29,15 +29,19 @@ public class MainTableDataModel {
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesSorted;
     private final GroupViewMode groupViewMode;
-    private final ObjectProperty<MainTableNameFormatter> nameFormatter;
+    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
     private final PreferencesService preferencesService;
+    private final BibDatabaseContext bibDatabaseContext;
 
     public MainTableDataModel(BibDatabaseContext context, PreferencesService preferencesService, StateManager stateManager) {
-        this.nameFormatter = new SimpleObjectProperty<>(new MainTableNameFormatter(preferencesService));
         this.preferencesService = preferencesService;
+        this.bibDatabaseContext = context;
+        this.fieldValueFormatter = new SimpleObjectProperty<>(
+                new MainTableFieldValueFormatter(preferencesService, bibDatabaseContext));
 
         ObservableList<BibEntry> allEntries = BindingsHelper.forUI(context.getDatabase().getEntries());
-        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(allEntries, entry -> new BibEntryTableViewModel(entry, context, nameFormatter));
+        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(allEntries, entry ->
+                new BibEntryTableViewModel(entry, bibDatabaseContext, fieldValueFormatter));
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
         entriesFiltered.predicateProperty().bind(
@@ -86,6 +90,6 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
     }
 
     public void refresh() {
-        this.nameFormatter.setValue(new MainTableNameFormatter(preferencesService));
+        this.fieldValueFormatter.setValue(new MainTableFieldValueFormatter(preferencesService, bibDatabaseContext));
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
new file mode 100644
index 00000000000..6c83a0a2a04
--- /dev/null
+++ b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
@@ -0,0 +1,87 @@
+package org.jabref.gui.maintable;
+
+import java.util.Optional;
+
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldProperty;
+import org.jabref.model.entry.field.OrFields;
+import org.jabref.preferences.PreferencesService;
+
+import static org.jabref.gui.maintable.MainTableNameFormatPreferences.AbbreviationStyle;
+import static org.jabref.gui.maintable.MainTableNameFormatPreferences.DisplayStyle;
+
+public class MainTableFieldValueFormatter {
+    private final DisplayStyle displayStyle;
+    private final AbbreviationStyle abbreviationStyle;
+    private final BibDatabase bibDatabase;
+
+    MainTableFieldValueFormatter(PreferencesService preferences, BibDatabaseContext bibDatabaseContext) {
+        MainTableNameFormatPreferences nameFormatPreferences = preferences.getMainTableNameFormatPreferences();
+        this.displayStyle = nameFormatPreferences.getDisplayStyle();
+        this.abbreviationStyle = nameFormatPreferences.getAbbreviationStyle();
+        this.bibDatabase = bibDatabaseContext.getDatabase();
+    }
+
+    /**
+     * Format fields for {@link BibEntryTableViewModel}, according to user preferences and with latex translated to
+     * unicode if possible.
+     *
+     * @param fields the fields argument of {@link BibEntryTableViewModel#getFields(OrFields)}.
+     * @param entry the BibEntry of {@link BibEntryTableViewModel}.
+     * @return The formatted name field.
+     */
+    public String formatFieldsValues(final OrFields fields, final BibEntry entry) {
+        for (Field field : fields) {
+            if (field.getProperties().contains(FieldProperty.PERSON_NAMES) && displayStyle != DisplayStyle.AS_IS) {
+                Optional<String> name = entry.getResolvedFieldOrAlias(field, bibDatabase);
+
+                if (name.isPresent()) {
+                    return formatFieldWithAuthorValue(name.get());
+                }
+            } else {
+                Optional<String> content = entry.getResolvedFieldOrAliasLatexFree(field, bibDatabase);
+
+                if (content.isPresent()) {
+                    return content.get();
+                }
+            }
+        }
+        return "";
+    }
+
+    /**
+     * Format a name field for the table, according to user preferences and with latex expressions translated if
+     * possible.
+     *
+     * @param nameToFormat The contents of the name field.
+     * @return The formatted name field.
+     */
+    private String formatFieldWithAuthorValue(final String nameToFormat) {
+        if (nameToFormat == null) {
+            return null;
+        }
+
+        AuthorList authors = AuthorList.parse(nameToFormat);
+
+        if (((displayStyle == DisplayStyle.FIRSTNAME_LASTNAME)
+                || (displayStyle == DisplayStyle.LASTNAME_FIRSTNAME))
+                && abbreviationStyle == AbbreviationStyle.LASTNAME_ONLY) {
+            return authors.getAsLastNamesLatexFree(false);
+        }
+
+        return switch (displayStyle) {
+            default -> nameToFormat;
+            case FIRSTNAME_LASTNAME -> authors.getAsFirstLastNamesLatexFree(
+                    abbreviationStyle == AbbreviationStyle.FULL,
+                    false);
+            case LASTNAME_FIRSTNAME -> authors.getAsLastFirstNamesLatexFree(
+                    abbreviationStyle == AbbreviationStyle.FULL,
+                    false);
+            case NATBIB -> authors.getAsNatbibLatexFree();
+        };
+    }
+}
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
deleted file mode 100644
index 06766cdecbe..00000000000
--- a/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jabref.gui.maintable;
-
-import org.jabref.model.entry.AuthorList;
-import org.jabref.preferences.PreferencesService;
-
-public class MainTableNameFormatter {
-
-    private final PreferencesService preferencesService;
-
-    MainTableNameFormatter(PreferencesService preferences) {
-        this.preferencesService = preferences;
-    }
-
-    /**
-     * Format a name field for the table, according to user preferences and with latex expressions translated if
-     * possible.
-     *
-     * @param nameToFormat The contents of the name field.
-     * @return The formatted name field.
-     */
-    public String formatNameLatexFree(final String nameToFormat) {
-        if (nameToFormat == null) {
-            return null;
-        }
-
-        MainTableNameFormatPreferences nameFormatPreferences = preferencesService.getMainTableNameFormatPreferences();
-        MainTableNameFormatPreferences.DisplayStyle displayStyle = nameFormatPreferences.getDisplayStyle();
-        MainTableNameFormatPreferences.AbbreviationStyle abbreviationStyle = nameFormatPreferences.getAbbreviationStyle();
-
-        AuthorList authors = AuthorList.parse(nameToFormat);
-
-        if (((displayStyle == MainTableNameFormatPreferences.DisplayStyle.FIRSTNAME_LASTNAME)
-                || (displayStyle == MainTableNameFormatPreferences.DisplayStyle.LASTNAME_FIRSTNAME))
-                && abbreviationStyle == MainTableNameFormatPreferences.AbbreviationStyle.LASTNAME_ONLY) {
-            return authors.getAsLastNamesLatexFree(false);
-        }
-
-        switch (nameFormatPreferences.getDisplayStyle()) {
-            case AS_IS:
-                return nameToFormat;
-            case NATBIB:
-                return authors.getAsNatbibLatexFree();
-            case FIRSTNAME_LASTNAME:
-                return authors.getAsFirstLastNamesLatexFree(
-                        abbreviationStyle == MainTableNameFormatPreferences.AbbreviationStyle.FULL,
-                        false);
-            default:
-            case LASTNAME_FIRSTNAME:
-                return authors.getAsLastFirstNamesLatexFree(
-                        abbreviationStyle == MainTableNameFormatPreferences.AbbreviationStyle.FULL,
-                        false);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/model/entry/Author.java b/src/main/java/org/jabref/model/entry/Author.java
index 32be4e9ce96..b325a3fa92f 100644
--- a/src/main/java/org/jabref/model/entry/Author.java
+++ b/src/main/java/org/jabref/model/entry/Author.java
@@ -146,8 +146,8 @@ public int hashCode() {
 
     /**
      * Compare this object with the given one.
-     * <p>
-     * Will return true iff the other object is an Author and all fields are identical on a string comparison.
+     *
+     * @return `true` iff the other object is an Author and all fields are `Objects.equals`.
      */
     @Override
     public boolean equals(Object other) {
diff --git a/src/main/java/org/jabref/model/entry/AuthorList.java b/src/main/java/org/jabref/model/entry/AuthorList.java
index b617b792632..4f2467da8f9 100644
--- a/src/main/java/org/jabref/model/entry/AuthorList.java
+++ b/src/main/java/org/jabref/model/entry/AuthorList.java
@@ -1,12 +1,8 @@
 package org.jabref.model.entry;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
@@ -123,8 +119,6 @@
 public class AuthorList {
 
     private static final WeakHashMap<String, AuthorList> AUTHOR_CACHE = new WeakHashMap<>();
-    // Avoid partition where these values are contained
-    private final static Collection<String> AVOID_TERMS_IN_LOWER_CASE = Arrays.asList("jr", "sr", "jnr", "snr", "von", "zu", "van", "der");
     private final List<Author> authors;
     private final String[] authorsFirstFirst = new String[4];
     private final String[] authorsFirstFirstLatexFree = new String[4];
@@ -157,7 +151,7 @@ protected AuthorList(Author author) {
     }
 
     public AuthorList() {
-        this(new ArrayList<Author>());
+        this(new ArrayList<>());
     }
 
     /**
@@ -168,53 +162,9 @@ public AuthorList() {
      * @param authors The string of authors or editors in bibtex format to parse.
      * @return An AuthorList object representing the given authors.
      */
-    public static AuthorList parse(String authors) {
+    public static AuthorList parse(final String authors) {
         Objects.requireNonNull(authors);
 
-        // Handle case names in order lastname, firstname and separated by ","
-        // E.g., Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H.
-        final boolean authorsContainAND = authors.toUpperCase(Locale.ENGLISH).contains(" AND ");
-        final boolean authorsContainOpeningBrace = authors.contains("{");
-        final boolean authorsContainSemicolon = authors.contains(";");
-        final boolean authorsContainTwoOrMoreCommas = (authors.length() - authors.replace(",", "").length()) >= 2;
-        if (!authorsContainAND && !authorsContainOpeningBrace && !authorsContainSemicolon && authorsContainTwoOrMoreCommas) {
-            List<String> arrayNameList = Arrays.asList(authors.split(","));
-
-            // Delete spaces for correct case identification
-            arrayNameList.replaceAll(String::trim);
-
-            // Looking for space between pre- and lastname
-            boolean spaceInAllParts = arrayNameList.stream().filter(name -> name.contains(" ")).collect(Collectors
-                    .toList()).size() == arrayNameList.size();
-
-            // We hit the comma name separator case
-            // Usually the getAsLastFirstNamesWithAnd method would separate them if pre- and lastname are separated with "and"
-            // If not, we check if spaces separate pre- and lastname
-            if (spaceInAllParts) {
-                authors = authors.replaceAll(",", " and");
-            } else {
-                // Looking for name affixes to avoid
-                // arrayNameList needs to reduce by the count off avoiding terms
-                // valuePartsCount holds the count of name parts without the avoided terms
-
-                int valuePartsCount = arrayNameList.size();
-                // Holds the index of each term which needs to be avoided
-                Collection<Integer> avoidIndex = new HashSet<>();
-
-                for (int i = 0; i < arrayNameList.size(); i++) {
-                    if (AVOID_TERMS_IN_LOWER_CASE.contains(arrayNameList.get(i).toLowerCase(Locale.ROOT))) {
-                        avoidIndex.add(i);
-                        valuePartsCount--;
-                    }
-                }
-
-                if ((valuePartsCount % 2) == 0) {
-                    // We hit the described special case with name affix like Jr
-                    authors = buildWithAffix(avoidIndex, arrayNameList).toString();
-                }
-            }
-        }
-
         AuthorList authorList = AUTHOR_CACHE.get(authors);
         if (authorList == null) {
             AuthorListParser parser = new AuthorListParser();
@@ -296,37 +246,6 @@ public static String fixAuthorNatbib(String authors) {
         return AuthorList.parse(authors).getAsNatbib();
     }
 
-    /**
-     * Builds a new array of strings with stringbuilder.
-     * Regarding to the name affixes.
-     *
-     * @return New string with correct seperation
-     */
-    private static StringBuilder buildWithAffix(Collection<Integer> indexArray, List<String> nameList) {
-        StringBuilder stringBuilder = new StringBuilder();
-        // avoidedTimes needs to be increased by the count of avoided terms for correct odd/even calculation
-        int avoidedTimes = 0;
-        for (int i = 0; i < nameList.size(); i++) {
-            if (indexArray.contains(i)) {
-                // We hit a name affix
-                stringBuilder.append(nameList.get(i));
-                stringBuilder.append(',');
-                avoidedTimes++;
-            } else {
-                stringBuilder.append(nameList.get(i));
-                if (((i + avoidedTimes) % 2) == 0) {
-                    // Hit separation between last name and firstname --> comma has to be kept
-                    stringBuilder.append(',');
-                } else {
-                    // Hit separation between full names (e.g., Ali Babar, M. and Dingsøyr, T.) --> semicolon has to be used
-                    // Will be treated correctly by AuthorList.parse(authors);
-                    stringBuilder.append(';');
-                }
-            }
-        }
-        return stringBuilder;
-    }
-
     /**
      * Returns the number of author names in this object.
      *
@@ -647,10 +566,14 @@ public String getAsFirstLastNamesLatexFree(boolean abbreviate, boolean oxfordCom
     /**
      * Compare this object with the given one.
      * <p>
-     * Will return true iff the other object is an Author and all fields are identical on a string comparison.
+     * @return `true` iff the other object is an AuthorList, all contained authors are in the same order (and these
+     * authors' fields are `Objects.equals`)
      */
     @Override
     public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
         if (!(o instanceof AuthorList)) {
             return false;
         }
diff --git a/src/main/java/org/jabref/model/entry/AuthorListParser.java b/src/main/java/org/jabref/model/entry/AuthorListParser.java
index d584868f17c..eca4ee598e9 100644
--- a/src/main/java/org/jabref/model/entry/AuthorListParser.java
+++ b/src/main/java/org/jabref/model/entry/AuthorListParser.java
@@ -1,6 +1,8 @@
 package org.jabref.model.entry;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -10,6 +12,10 @@
 
 public class AuthorListParser {
 
+    // Avoid partition where these values are contained
+    private final static Set<String> AVOID_TERMS_IN_LOWER_CASE = Set.of(
+            "jr", "sr", "jnr", "snr", "von", "zu", "van", "der");
+
     private static final int TOKEN_GROUP_LENGTH = 4; // number of entries for a token
 
     // the following are offsets of an entry in a group of entries for one token
@@ -21,31 +27,16 @@ public class AuthorListParser {
     // "-") comma)
 
     // Token types (returned by getToken procedure)
-    private static final int TOKEN_EOF = 0;
-
-    private static final int TOKEN_AND = 1;
-
-    private static final int TOKEN_COMMA = 2;
-
-    private static final int TOKEN_WORD = 3;
+    private enum Token {
+        EOF,
+        AND,
+        COMMA,
+        WORD
+    }
 
     // Constant HashSet containing names of TeX special characters
-    private static final Set<String> TEX_NAMES = new HashSet<>();
-
-    static {
-        TEX_NAMES.add("aa");
-        TEX_NAMES.add("ae");
-        TEX_NAMES.add("l");
-        TEX_NAMES.add("o");
-        TEX_NAMES.add("oe");
-        TEX_NAMES.add("i");
-        TEX_NAMES.add("AA");
-        TEX_NAMES.add("AE");
-        TEX_NAMES.add("L");
-        TEX_NAMES.add("O");
-        TEX_NAMES.add("OE");
-        TEX_NAMES.add("j");
-    }
+    private static final Set<String> TEX_NAMES = Set.of(
+            "aa", "ae", "l", "o", "oe", "i", "AA", "AE", "L", "O", "OE", "j");
 
     /**
      * the raw bibtex author/editor field
@@ -61,7 +52,7 @@ public class AuthorListParser {
     private int tokenEnd;
     /**
      * end of token abbreviation (always: tokenStart < tokenAbbrEnd <= tokenEnd), only valid if getToken returns
-     * TOKEN_WORD
+     * Token.WORD
      */
     private int tokenAbbrEnd;
     /**
@@ -82,6 +73,50 @@ public class AuthorListParser {
     public AuthorList parse(String listOfNames) {
         Objects.requireNonNull(listOfNames);
 
+        // Handle case names in order lastname, firstname and separated by ","
+        // E.g., Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H.
+        final boolean authorsContainAND = listOfNames.toUpperCase(Locale.ENGLISH).contains(" AND ");
+        final boolean authorsContainOpeningBrace = listOfNames.contains("{");
+        final boolean authorsContainSemicolon = listOfNames.contains(";");
+        final boolean authorsContainTwoOrMoreCommas = (listOfNames.length() - listOfNames.replace(",", "").length()) >= 2;
+        if (!authorsContainAND && !authorsContainOpeningBrace && !authorsContainSemicolon && authorsContainTwoOrMoreCommas) {
+            List<String> arrayNameList = Arrays.asList(listOfNames.split(","));
+
+            // Delete spaces for correct case identification
+            arrayNameList.replaceAll(String::trim);
+
+            // Looking for space between pre- and lastname
+            boolean spaceInAllParts = arrayNameList.stream().filter(name -> name.contains(" "))
+                                                   .count() == arrayNameList.size();
+
+            // We hit the comma name separator case
+            // Usually the getAsLastFirstNamesWithAnd method would separate them if pre- and lastname are separated with "and"
+            // If not, we check if spaces separate pre- and lastname
+            if (spaceInAllParts) {
+                listOfNames = listOfNames.replaceAll(",", " and");
+            } else {
+                // Looking for name affixes to avoid
+                // arrayNameList needs to reduce by the count off avoiding terms
+                // valuePartsCount holds the count of name parts without the avoided terms
+
+                int valuePartsCount = arrayNameList.size();
+                // Holds the index of each term which needs to be avoided
+                Collection<Integer> avoidIndex = new HashSet<>();
+
+                for (int i = 0; i < arrayNameList.size(); i++) {
+                    if (AVOID_TERMS_IN_LOWER_CASE.contains(arrayNameList.get(i).toLowerCase(Locale.ROOT))) {
+                        avoidIndex.add(i);
+                        valuePartsCount--;
+                    }
+                }
+
+                if ((valuePartsCount % 2) == 0) {
+                    // We hit the described special case with name affix like Jr
+                    listOfNames = buildWithAffix(avoidIndex, arrayNameList).toString();
+                }
+            }
+        }
+
         // initialization of parser
         original = listOfNames;
         tokenStart = 0;
@@ -95,6 +130,37 @@ public AuthorList parse(String listOfNames) {
         return new AuthorList(authors);
     }
 
+    /**
+     * Builds a new array of strings with stringbuilder.
+     * Regarding to the name affixes.
+     *
+     * @return New string with correct seperation
+     */
+    private static StringBuilder buildWithAffix(Collection<Integer> indexArray, List<String> nameList) {
+        StringBuilder stringBuilder = new StringBuilder();
+        // avoidedTimes needs to be increased by the count of avoided terms for correct odd/even calculation
+        int avoidedTimes = 0;
+        for (int i = 0; i < nameList.size(); i++) {
+            if (indexArray.contains(i)) {
+                // We hit a name affix
+                stringBuilder.append(nameList.get(i));
+                stringBuilder.append(',');
+                avoidedTimes++;
+            } else {
+                stringBuilder.append(nameList.get(i));
+                if (((i + avoidedTimes) % 2) == 0) {
+                    // Hit separation between last name and firstname --> comma has to be kept
+                    stringBuilder.append(',');
+                } else {
+                    // Hit separation between full names (e.g., Ali Babar, M. and Dingsøyr, T.) --> semicolon has to be used
+                    // Will be treated correctly by AuthorList.parse(authors);
+                    stringBuilder.append(';');
+                }
+            }
+        }
+        return stringBuilder;
+    }
+
     /**
      * Parses one author name and returns preformatted information.
      *
@@ -111,20 +177,20 @@ private Optional<Author> getAuthor() {
         // First step: collect tokens in 'tokens' Vector and calculate indices
         boolean continueLoop = true;
         while (continueLoop) {
-            int token = getToken();
+            Token token = getToken();
             switch (token) {
-                case TOKEN_EOF:
-                case TOKEN_AND:
+                case EOF:
+                case AND:
                     continueLoop = false;
                     break;
-                case TOKEN_COMMA:
+                case COMMA:
                     if (commaFirst < 0) {
                         commaFirst = tokens.size();
                     } else if (commaSecond < 0) {
                         commaSecond = tokens.size();
                     }
                     break;
-                case TOKEN_WORD:
+                case WORD:
                     tokens.add(original.substring(tokenStart, tokenEnd));
                     tokens.add(original.substring(tokenStart, tokenAbbrEnd));
                     tokens.add(tokenTerm);
@@ -305,31 +371,31 @@ private String concatTokens(List<Object> tokens, int start, int end, int offset,
     /**
      * Parses the next token.
      * <p>
-     * The string being parsed is stored in global variable <CODE>orig</CODE>,
+     * The string being parsed is stored in global variable <CODE>original</CODE>,
      * and position which parsing has to start from is stored in global variable
      * <CODE>token_end</CODE>; thus, <CODE>token_end</CODE> has to be set
      * to 0 before the first invocation. Procedure updates <CODE>token_end</CODE>;
      * thus, subsequent invocations do not require any additional variable
      * settings.
      * <p>
-     * The type of the token is returned; if it is <CODE>TOKEN_WORD</CODE>,
+     * The type of the token is returned; if it is <CODE>Token.WORD</CODE>,
      * additional information is given in global variables <CODE>token_start</CODE>,
      * <CODE>token_end</CODE>, <CODE>token_abbr</CODE>, <CODE>token_term</CODE>,
-     * and <CODE>token_case</CODE>; namely: <CODE>orig.substring(token_start,token_end)</CODE>
-     * is the text of the token, <CODE>orig.substring(token_start,token_abbr)</CODE>
+     * and <CODE>token_case</CODE>; namely: <CODE>original.substring(token_start,token_end)</CODE>
+     * is the text of the token, <CODE>original.substring(token_start,token_abbr)</CODE>
      * is the token abbreviation, <CODE>token_term</CODE> contains token
      * terminator (space or dash), and <CODE>token_case</CODE> is <CODE>true</CODE>,
      * if token is upper-case and <CODE>false</CODE> if token is lower-case.
      *
-     * @return <CODE>TOKEN_EOF</CODE> -- no more tokens, <CODE>TOKEN_COMMA</CODE> --
-     * token is comma, <CODE>TOKEN_AND</CODE> -- token is the word
-     * "and" (or "And", or "aND", etc.) or a semicolon, <CODE>TOKEN_WORD</CODE> --
+     * @return <CODE>Token.EOF</CODE> -- no more tokens, <CODE>Token.COMMA</CODE> --
+     * token is comma, <CODE>Token.AND</CODE> -- token is the word
+     * "and" (or "And", or "aND", etc.) or a semicolon, <CODE>Token.WORD</CODE> --
      * token is a word; additional information is given in global
      * variables <CODE>token_start</CODE>, <CODE>token_end</CODE>,
      * <CODE>token_abbr</CODE>, <CODE>token_term</CODE>, and
      * <CODE>token_case</CODE>.
      */
-    private int getToken() {
+    private Token getToken() {
         tokenStart = tokenEnd;
         while (tokenStart < original.length()) {
             char c = original.charAt(tokenStart);
@@ -340,16 +406,16 @@ private int getToken() {
         }
         tokenEnd = tokenStart;
         if (tokenStart >= original.length()) {
-            return TOKEN_EOF;
+            return Token.EOF;
         }
         if (original.charAt(tokenStart) == ',') {
             tokenEnd++;
-            return TOKEN_COMMA;
+            return Token.COMMA;
         }
         // Semicolon is considered to separate names like "and"
         if (original.charAt(tokenStart) == ';') {
             tokenEnd++;
-            return TOKEN_AND;
+            return Token.AND;
         }
         tokenAbbrEnd = -1;
         tokenTerm = ' ';
@@ -405,9 +471,9 @@ private int getToken() {
             tokenTerm = '-';
         }
         if ("and".equalsIgnoreCase(original.substring(tokenStart, tokenEnd))) {
-            return TOKEN_AND;
+            return Token.AND;
         } else {
-            return TOKEN_WORD;
+            return Token.WORD;
         }
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java b/src/test/java/org/jabref/model/entry/AuthorListParserTest.java
similarity index 72%
rename from src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
rename to src/test/java/org/jabref/model/entry/AuthorListParserTest.java
index 4947265355b..c2112663f65 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListParameterTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListParserTest.java
@@ -2,21 +2,22 @@
 
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-class AuthorListParameterTest {
+class AuthorListParserTest {
 
     private static Stream<Arguments> data() {
         return Stream.of(
                 Arguments.of("王, 军", new Author("军", "军.", null, "王", null)),
                 Arguments.of("Doe, John", new Author("John", "J.", null, "Doe", null)),
                 Arguments.of("von Berlichingen zu Hornberg, Johann Gottfried", new Author("Johann Gottfried", "J. G.", "von", "Berlichingen zu Hornberg", null)),
-                // Arguments.of("Robert and Sons, Inc.", new Author(null, null, null, "Robert and Sons, Inc.", null))),
-                // Arguments.of("al-Ṣāliḥ, Abdallāh", new Author("Abdallāh", "A.", null, "al-Ṣāliḥ", null))),
+                Arguments.of("{Robert and Sons, Inc.}", new Author(null, null, null, "Robert and Sons, Inc.", null)),
+                Arguments.of("al-Ṣāliḥ, Abdallāh", new Author("Abdallāh", "A.", null, "al-Ṣāliḥ", null)),
                 Arguments.of("de la Vallée Poussin, Jean Charles Gabriel", new Author("Jean Charles Gabriel", "J. C. G.", "de la", "Vallée Poussin", null)),
                 Arguments.of("de la Vallée Poussin, J. C. G.", new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null)),
                 Arguments.of("{K}ent-{B}oswell, E. S.", new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null)),
@@ -30,4 +31,11 @@ void parseCorrectly(String authorsString, Author authorsParsed) {
         AuthorListParser parser = new AuthorListParser();
         assertEquals(new AuthorList(authorsParsed), parser.parse(authorsString));
     }
+
+    @Test
+    public void parseAuthorWithFirstNameAbbreviationContainingUmlaut() {
+        assertEquals(new AuthorList(
+                new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null)),
+                new AuthorListParser().parse("{\\OE}rjan Umlauts"));
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/src/test/java/org/jabref/model/entry/AuthorListTest.java
index eda59858ac6..949368a3f33 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListTest.java
@@ -1,6 +1,8 @@
 package org.jabref.model.entry;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
@@ -8,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -18,47 +21,30 @@ public class AuthorListTest {
     Examples are similar to page 4 in
     [BibTeXing by Oren Patashnik](https://ctan.org/tex-archive/biblio/bibtex/contrib/doc/)
     */
-    private static final String MUHAMMAD_ALKHWARIZMI = "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}}";
-    private static final String CORRADO_BOHM = "Corrado B{\\\"o}hm";
-    private static final String KURT_GODEL = "Kurt G{\\\"{o}}del";
-    private static final String BANU_MOSA = "{The Ban\\={u} M\\={u}s\\={a} brothers}";
+    private static final Author MUHAMMAD_ALKHWARIZMI =
+            new Author("Mu{\\d{h}}ammad", "M.", null, "al-Khw{\\={a}}rizm{\\={i}}", null);
+    private static final Author CORRADO_BOHM =
+            new Author("Corrado", "C.", null, "B{\\\"o}hm", null);
+    private static final Author KURT_GODEL =
+            new Author("Kurt", "K.", null, "G{\\\"{o}}del", null);
+    private static final Author BANU_MOSA =
+            new Author(null, null, null, "{The Ban\\={u} M\\={u}s\\={a} brothers}", null);
+    private static final AuthorList EMPTY_AUTHOR = new AuthorList(Collections.emptyList());
+    private static final AuthorList ONE_AUTHOR_WITH_LATEX = new AuthorList(MUHAMMAD_ALKHWARIZMI);
+    private static final AuthorList TWO_AUTHORS_WITH_LATEX = new AuthorList(List.of(MUHAMMAD_ALKHWARIZMI, CORRADO_BOHM));
+    private static final AuthorList THREE_AUTHORS_WITH_LATEX = new AuthorList(
+            List.of(MUHAMMAD_ALKHWARIZMI, CORRADO_BOHM, KURT_GODEL));
+    private static final AuthorList ONE_INSTITUTION_WITH_LATEX = new AuthorList(BANU_MOSA);
+    private static final AuthorList ONE_INSTITUTION_WITH_STARTING_PARANTHESIS = new AuthorList(new Author(
+            null, null, null, "{{\\L{}}ukasz Micha\\l{}}", null));
+    private static final AuthorList TWO_INSTITUTIONS_WITH_LATEX = new AuthorList(List.of(BANU_MOSA, BANU_MOSA));
+    private static final AuthorList MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX = new AuthorList(
+            List.of(BANU_MOSA, CORRADO_BOHM));
 
     public static int size(String bibtex) {
         return AuthorList.parse(bibtex).getNumberOfAuthors();
     }
 
-    private static AuthorList emptyAuthor() {
-        return AuthorList.parse("");
-    }
-
-    private static AuthorList oneAuthorWithLatex() {
-        return AuthorList.parse(MUHAMMAD_ALKHWARIZMI);
-    }
-
-    private static AuthorList twoAuthorsWithLatex() {
-        return AuthorList.parse(MUHAMMAD_ALKHWARIZMI + " and " + CORRADO_BOHM);
-    }
-
-    private static AuthorList threeAuthorsWithLatex() {
-        return AuthorList.parse(MUHAMMAD_ALKHWARIZMI + " and " + CORRADO_BOHM + " and " + KURT_GODEL);
-    }
-
-    private static AuthorList oneInstitutionWithLatex() {
-        return AuthorList.parse(BANU_MOSA);
-    }
-
-    private static AuthorList oneInstitutionWithParanthesisAtStart() {
-        return AuthorList.parse("{{\\L{}}ukasz Micha\\l{}}");
-    }
-
-    private static AuthorList twoInstitutionsWithLatex() {
-        return AuthorList.parse(BANU_MOSA + " and " + BANU_MOSA);
-    }
-
-    private static AuthorList mixedAuthorAndInstituteWithLatex() {
-        return AuthorList.parse(BANU_MOSA + " and " + CORRADO_BOHM);
-    }
-
     @Test
     public void testFixAuthorNatbib() {
         assertEquals("", AuthorList.fixAuthorNatbib(""));
@@ -76,55 +62,55 @@ public void testFixAuthorNatbib() {
 
     @Test
     public void getAsNatbibLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals("", emptyAuthor().getAsNatbibLatexFree());
+        assertEquals("", EMPTY_AUTHOR.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeCachesLatexFreeString() {
-        String cachedString = oneAuthorWithLatex().getAsNatbibLatexFree();
-        assertSame(cachedString, oneAuthorWithLatex().getAsNatbibLatexFree());
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsNatbibLatexFree();
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeOneAuthorNameFromLatex() {
         assertEquals("al-Khwārizmī",
-                oneAuthorWithLatex().getAsNatbibLatexFree());
+                ONE_AUTHOR_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeTwoAuthorNamesFromLatex() {
         assertEquals("al-Khwārizmī and Böhm",
-                twoAuthorsWithLatex().getAsNatbibLatexFree());
+                TWO_AUTHORS_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeAuthorEtAlFromLatex() {
         assertEquals("al-Khwārizmī et al.",
-                threeAuthorsWithLatex().getAsNatbibLatexFree());
+                THREE_AUTHORS_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeOneInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers",
-                oneInstitutionWithLatex().getAsNatbibLatexFree());
+                ONE_INSTITUTION_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeTwoInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsNatbibLatexFree());
+                TWO_INSTITUTIONS_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals("The Banū Mūsā brothers and Böhm",
-                mixedAuthorAndInstituteWithLatex().getAsNatbibLatexFree());
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsNatbibLatexFree());
     }
 
     @Test
     public void getAsNatbibLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsNatbibLatexFree());
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsNatbibLatexFree());
     }
 
     @Test
@@ -201,108 +187,120 @@ public void testFixAuthorFirstNameFirstCommas() {
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInputAbbr() {
-        assertEquals("", emptyAuthor().getAsFirstLastNamesLatexFree(true, false));
+    public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInputAbbreviate() {
+        assertEquals("", EMPTY_AUTHOR.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeCachesLatexFreeStringAbbr() {
-        String cachedString = oneAuthorWithLatex().getAsFirstLastNamesLatexFree(true, false);
-        assertSame(cachedString, oneAuthorWithLatex().getAsFirstLastNamesLatexFree(true, false));
+    public void getAsFirstLastNamesLatexFreeCachesLatexFreeStringAbbreviate() {
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbr() {
+    public void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbreviate() {
         assertEquals("M. al-Khwārizmī",
-                oneAuthorWithLatex().getAsFirstLastNamesLatexFree(true, false));
+                ONE_AUTHOR_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
+    }
+
+    @Test
+    public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviate() {
+        assertEquals("M. al-Khwārizmī and C. Böhm",
+                TWO_AUTHORS_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbr() {
+    public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviateAndOxfordComma() {
         assertEquals("M. al-Khwārizmī and C. Böhm",
-                twoAuthorsWithLatex().getAsFirstLastNamesLatexFree(true, false));
+                TWO_AUTHORS_WITH_LATEX.getAsFirstLastNamesLatexFree(true, true));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbr() {
+    public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviate() {
         assertEquals("M. al-Khwārizmī, C. Böhm and K. Gödel",
-                threeAuthorsWithLatex().getAsFirstLastNamesLatexFree(true, false));
+                THREE_AUTHORS_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbr() {
-        assertEquals("The Banū Mūsā brothers", oneInstitutionWithLatex().getAsFirstLastNamesLatexFree(true, false));
+    public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviateAndOxfordComma() {
+        assertEquals("M. al-Khwārizmī, C. Böhm, and K. Gödel",
+                THREE_AUTHORS_WITH_LATEX.getAsFirstLastNamesLatexFree(true, true));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbr() {
+    public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbreviate() {
+        assertEquals("The Banū Mūsā brothers", ONE_INSTITUTION_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
+    }
+
+    @Test
+    public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbreviate() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsFirstLastNamesLatexFree(true, false));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbr() {
+    public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbreviate() {
         assertEquals("The Banū Mūsā brothers and C. Böhm",
-                mixedAuthorAndInstituteWithLatex().getAsFirstLastNamesLatexFree(true, false));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
-    public void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbr() {
+    public void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbreviate() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsFirstLastNamesLatexFree(true, false));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsFirstLastNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals("", emptyAuthor().getAsFirstLastNamesLatexFree(false, false));
+        assertEquals("", EMPTY_AUTHOR.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeCachesLatexFreeString() {
-        String cachedString = oneAuthorWithLatex().getAsFirstLastNamesLatexFree(false, false);
-        assertSame(cachedString, oneAuthorWithLatex().getAsFirstLastNamesLatexFree(false, false));
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
         assertEquals("Muḥammad al-Khwārizmī",
-                oneAuthorWithLatex().getAsFirstLastNamesLatexFree(false, false));
+                ONE_AUTHOR_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
         assertEquals("Muḥammad al-Khwārizmī and Corrado Böhm",
-                twoAuthorsWithLatex().getAsFirstLastNamesLatexFree(false, false));
+                TWO_AUTHORS_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
         assertEquals("Muḥammad al-Khwārizmī, Corrado Böhm and Kurt Gödel",
-                threeAuthorsWithLatex().getAsFirstLastNamesLatexFree(false, false));
+                THREE_AUTHORS_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers",
-                oneInstitutionWithLatex().getAsFirstLastNamesLatexFree(false, false));
+                ONE_INSTITUTION_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsFirstLastNamesLatexFree(false, false));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals("The Banū Mūsā brothers and Corrado Böhm",
-                mixedAuthorAndInstituteWithLatex().getAsFirstLastNamesLatexFree(false, false));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsFirstLastNamesLatexFree(false, false));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsFirstLastNamesLatexFree(false, false));
     }
 
     @Test
@@ -393,214 +391,214 @@ public void testFixAuthorLastNameFirstCommasOxfordComma() {
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbr() {
-        assertEquals("", emptyAuthor().getAsLastFirstNamesLatexFree(true, false));
+        assertEquals("", EMPTY_AUTHOR.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeCachesLatexFreeStringAbbr() {
-        String cachedString = oneAuthorWithLatex().getAsLastFirstNamesLatexFree(true, false);
-        assertSame(cachedString, oneAuthorWithLatex().getAsLastFirstNamesLatexFree(true, false));
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbr() {
         assertEquals("al-Khwārizmī, M.",
-                oneAuthorWithLatex().getAsLastFirstNamesLatexFree(true, false));
+                ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbr() {
         assertEquals("al-Khwārizmī, M. and Böhm, C.",
-                twoAuthorsWithLatex().getAsLastFirstNamesLatexFree(true, false));
+                TWO_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbr() {
         assertEquals("al-Khwārizmī, M., Böhm, C. and Gödel, K.",
-                threeAuthorsWithLatex().getAsLastFirstNamesLatexFree(true, false));
+                THREE_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbr() {
         assertEquals("The Banū Mūsā brothers",
-                oneInstitutionWithLatex().getAsLastFirstNamesLatexFree(true, false));
+                ONE_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbr() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsLastFirstNamesLatexFree(true, false));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbr() {
         assertEquals("The Banū Mūsā brothers and Böhm, C.",
-                mixedAuthorAndInstituteWithLatex().getAsLastFirstNamesLatexFree(true, false));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbr() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsLastFirstNamesLatexFree(true, false));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsLastFirstNamesLatexFree(true, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals("", emptyAuthor().getAsLastFirstNamesLatexFree(false, false));
+        assertEquals("", EMPTY_AUTHOR.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeCachesLatexFreeString() {
-        String cachedString = oneAuthorWithLatex().getAsLastFirstNamesLatexFree(false, false);
-        assertSame(cachedString, oneAuthorWithLatex().getAsLastFirstNamesLatexFree(false, false));
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
         assertEquals("al-Khwārizmī, Muḥammad",
-                oneAuthorWithLatex().getAsLastFirstNamesLatexFree(false, false));
+                ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
         assertEquals("al-Khwārizmī, Muḥammad and Böhm, Corrado",
-                twoAuthorsWithLatex().getAsLastFirstNamesLatexFree(false, false));
+                TWO_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
         assertEquals("al-Khwārizmī, Muḥammad, Böhm, Corrado and Gödel, Kurt",
-                threeAuthorsWithLatex().getAsLastFirstNamesLatexFree(false, false));
+                THREE_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers",
-                oneInstitutionWithLatex().getAsLastFirstNamesLatexFree(false, false));
+                ONE_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsLastFirstNamesLatexFree(false, false));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals("The Banū Mūsā brothers and Böhm, Corrado",
-                mixedAuthorAndInstituteWithLatex().getAsLastFirstNamesLatexFree(false, false));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsLastFirstNamesLatexFree(false, false));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsLastFirstNamesLatexFree(false, false));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbrOxfordComma() {
-        assertEquals("", emptyAuthor().getAsLastFirstNamesLatexFree(true, true));
+        assertEquals("", EMPTY_AUTHOR.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeCachesLatexFreeStringAbbrOxfordComma() {
-        String cachedString = oneAuthorWithLatex().getAsLastFirstNamesLatexFree(true, true);
-        assertSame(cachedString, oneAuthorWithLatex().getAsLastFirstNamesLatexFree(true, true));
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbrOxfordComma() {
         assertEquals("al-Khwārizmī, M.",
-                oneAuthorWithLatex().getAsLastFirstNamesLatexFree(true, true));
+                ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbrOxfordComma() {
         assertEquals("al-Khwārizmī, M. and Böhm, C.",
-                twoAuthorsWithLatex().getAsLastFirstNamesLatexFree(true, true));
+                TWO_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbrOxfordComma() {
         assertEquals("al-Khwārizmī, M., Böhm, C., and Gödel, K.",
-                threeAuthorsWithLatex().getAsLastFirstNamesLatexFree(true, true));
+                THREE_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbrOxfordComma() {
         assertEquals("The Banū Mūsā brothers",
-                oneInstitutionWithLatex().getAsLastFirstNamesLatexFree(true, true));
+                ONE_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbrOxfordComma() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsLastFirstNamesLatexFree(true, true));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbrOxfordComma() {
         assertEquals("The Banū Mūsā brothers and Böhm, C.",
-                mixedAuthorAndInstituteWithLatex().getAsLastFirstNamesLatexFree(true, true));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbrOxfordComma() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsLastFirstNamesLatexFree(true, true));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsLastFirstNamesLatexFree(true, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputOxfordComma() {
-        assertEquals("", emptyAuthor().getAsLastFirstNamesLatexFree(false, true));
+        assertEquals("", EMPTY_AUTHOR.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeCachesLatexFreeStringOxfordComma() {
-        String cachedString = oneAuthorWithLatex().getAsLastFirstNamesLatexFree(false, true);
-        assertSame(cachedString, oneAuthorWithLatex().getAsLastFirstNamesLatexFree(false, true));
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexOxfordComma() {
         assertEquals("al-Khwārizmī, Muḥammad",
-                oneAuthorWithLatex().getAsLastFirstNamesLatexFree(false, true));
+                ONE_AUTHOR_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexOxfordComma() {
         assertEquals("al-Khwārizmī, Muḥammad and Böhm, Corrado",
-                twoAuthorsWithLatex().getAsLastFirstNamesLatexFree(false, true));
+                TWO_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexOxfordComma() {
         assertEquals("al-Khwārizmī, Muḥammad, Böhm, Corrado, and Gödel, Kurt",
-                threeAuthorsWithLatex().getAsLastFirstNamesLatexFree(false, true));
+                THREE_AUTHORS_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexOxfordComma() {
         assertEquals("The Banū Mūsā brothers",
-                oneInstitutionWithLatex().getAsLastFirstNamesLatexFree(false, true));
+                ONE_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexOxfordComma() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsLastFirstNamesLatexFree(false, true));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexOxfordComma() {
         assertEquals("The Banū Mūsā brothers and Böhm, Corrado",
-                mixedAuthorAndInstituteWithLatex().getAsLastFirstNamesLatexFree(false, true));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartOxfordComma() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsLastFirstNamesLatexFree(false, true));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsLastFirstNamesLatexFree(false, true));
     }
 
     @Test
@@ -689,46 +687,56 @@ public void testFixAuthorLastNameOnlyCommas() {
 
     @Test
     public void getAsLastNamesLatexFreeCachesLatexFreeString() {
-        String cachedString = oneAuthorWithLatex().getAsLastNamesLatexFree(false);
-        assertSame(cachedString, oneAuthorWithLatex().getAsLastNamesLatexFree(false));
+        String cachedString = ONE_AUTHOR_WITH_LATEX.getAsLastNamesLatexFree(false);
+        assertSame(cachedString, ONE_AUTHOR_WITH_LATEX.getAsLastNamesLatexFree(false));
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("al-Khwārizmī", oneAuthorWithLatex().getAsLastNamesLatexFree(false));
+        assertEquals("al-Khwārizmī", ONE_AUTHOR_WITH_LATEX.getAsLastNamesLatexFree(false));
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("al-Khwārizmī and Böhm", twoAuthorsWithLatex().getAsLastNamesLatexFree(false));
+        assertEquals("al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.getAsLastNamesLatexFree(false));
+    }
+
+    @Test
+    public void getAsLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexUsingOxfordComma() {
+        assertEquals("al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.getAsLastNamesLatexFree(true));
+    }
+
+    @Test
+    public void getAsLastNamesLatexFreeUnicodeThreeAuthorsFromLatex() {
+        assertEquals("al-Khwārizmī, Böhm and Gödel", THREE_AUTHORS_WITH_LATEX.getAsLastNamesLatexFree(false));
     }
 
     @Test
-    public void getAsLastNamesLatexFreeUnicodeThreeUnicodeAuthorsFromLatex() {
-        assertEquals("al-Khwārizmī, Böhm and Gödel", threeAuthorsWithLatex().getAsLastNamesLatexFree(false));
+    public void getAsLastNamesLatexFreeUnicodeThreeAuthorsFromLatexUsingOxfordComma() {
+        assertEquals("al-Khwārizmī, Böhm, and Gödel", THREE_AUTHORS_WITH_LATEX.getAsLastNamesLatexFree(true));
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers", oneInstitutionWithLatex().getAsLastNamesLatexFree(false));
+        assertEquals("The Banū Mūsā brothers", ONE_INSTITUTION_WITH_LATEX.getAsLastNamesLatexFree(false));
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
         assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                twoInstitutionsWithLatex().getAsLastNamesLatexFree(false));
+                TWO_INSTITUTIONS_WITH_LATEX.getAsLastNamesLatexFree(false));
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals("The Banū Mūsā brothers and Böhm",
-                mixedAuthorAndInstituteWithLatex().getAsLastNamesLatexFree(false));
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.getAsLastNamesLatexFree(false));
     }
 
     @Test
     public void getAsLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals("Łukasz Michał",
-                oneInstitutionWithParanthesisAtStart().getAsLastNamesLatexFree(false));
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.getAsLastNamesLatexFree(false));
     }
 
     @Test
@@ -1108,31 +1116,84 @@ public void parseNameWithBraces() throws Exception {
     @Test
     public void parseFirstNameFromFirstAuthorMultipleAuthorsWithLatexNames() throws Exception {
         assertEquals("Mu{\\d{h}}ammad",
-                twoAuthorsWithLatex().getAuthor(0).getFirst().orElse(null));
+                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                .getAuthor(0).getFirst().orElse(null));
     }
 
     @Test
     public void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
         assertEquals("Corrado",
-                twoAuthorsWithLatex().getAuthor(1).getFirst().orElse(null));
+                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                .getAuthor(1).getFirst().orElse(null));
     }
 
     @Test
     public void parseLastNameFromFirstAuthorMultipleAuthorsWithLatexNames() throws Exception {
         assertEquals("al-Khw{\\={a}}rizm{\\={i}}",
-                twoAuthorsWithLatex().getAuthor(0).getLast().orElse(null));
+                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                .getAuthor(0).getLast().orElse(null));
     }
 
     @Test
     public void parseLastNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
         assertEquals("B{\\\"o}hm",
-                twoAuthorsWithLatex().getAuthor(1).getLast().orElse(null));
+                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                .getAuthor(1).getLast().orElse(null));
     }
 
     @Test
     public void parseInstitutionAuthorWithLatexNames() throws Exception {
         assertEquals("The Ban\\={u} M\\={u}s\\={a} brothers",
-                oneInstitutionWithLatex().getAuthor(0).getLast().orElse(null));
+                AuthorList.parse("{The Ban\\={u} M\\={u}s\\={a} brothers}").getAuthor(0).getLast().orElse(null));
+    }
+
+    @Test
+    public void parseRetrieveCachedAuthorListAfterGarbageCollection() throws Exception {
+        final String uniqueAuthorName = "Osvaldo Iongi";
+        AuthorList author = AuthorList.parse(uniqueAuthorName);
+        System.gc();
+        assertSame(author, AuthorList.parse(uniqueAuthorName));
+    }
+
+    @Test
+    public void parseGarbageCollectAuthorListForUnreachableKey() throws Exception {
+        final String uniqueAuthorName = "Fleur Hornbach";
+        // Note that "new String()" is needed, uniqueAuthorName is a reference to a String literal
+        AuthorList uniqueAuthor = AuthorList.parse(new String(uniqueAuthorName));
+        System.gc();
+        assertNotSame(uniqueAuthor, AuthorList.parse(uniqueAuthorName));
+    }
+
+    @Test
+    public void parseGarbageCollectUnreachableInstitution() throws Exception {
+        final String uniqueInstitutionName = "{Unique LLC}";
+        // Note that "new String()" is needed, uniqueAuthorName is a reference to a String literal
+        AuthorList uniqueInstitution = AuthorList.parse(new String(uniqueInstitutionName));
+        System.gc();
+        assertNotSame(uniqueInstitution, AuthorList.parse(uniqueInstitutionName));
+    }
+
+    /**
+     * This tests an unreachable key issue addressed in [#6552](https://github.com/JabRef/jabref/pull/6552).
+     * The test is incorrect BibTeX but is handled by the parser and common in practice.
+     */
+    @Test
+    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts() throws Exception {
+        final String uniqueAuthorsNames = "Basil Dankworth, Gianna Birdwhistle, Cosmo Berrycloth";
+        AuthorList uniqueAuthors = AuthorList.parse(uniqueAuthorsNames);
+        System.gc();
+        assertSame(uniqueAuthors, AuthorList.parse(uniqueAuthorsNames));
+    }
+
+    /**
+     * This tests an unreachable key issue addressed in [#6552](https://github.com/JabRef/jabref/pull/6552).
+     */
+    @Test
+    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts() throws Exception {
+        final String uniqueAuthorsNames = "Dankworth, Jr., Braelynn";
+        AuthorList uniqueAuthors = AuthorList.parse(uniqueAuthorsNames);
+        System.gc();
+        assertSame(uniqueAuthors, AuthorList.parse(uniqueAuthorsNames));
     }
 
     /**
@@ -1152,4 +1213,70 @@ public void correctNamesWithOneComma() throws Exception {
         expected = new Author("José María", "J. M.", null, "Rodriguez Fernandez", null);
         assertEquals(new AuthorList(expected), AuthorList.parse("Rodriguez Fernandez, José María"));
     }
+
+    @Test
+    public void equalsFalseDifferentOrder() {
+        Author firstAuthor = new Author("A", null, null, null, null);
+        Author secondAuthor = new Author("B", null, null, null, null);
+        AuthorList firstAuthorList = new AuthorList(List.of(firstAuthor, secondAuthor));
+        AuthorList secondAuthorList = new AuthorList(List.of(secondAuthor, firstAuthor));
+        assertNotEquals(firstAuthorList, secondAuthorList);
+    }
+
+    @Test
+    public void equalsFalseWhenNotAuthorList() {
+        assertNotEquals(new AuthorList(new Author(null, null, null, null, null)),
+                new Author(null, null, null, null, null));
+    }
+
+    @Test
+    public void equalsTrueReflexive() {
+        AuthorList authorList = new AuthorList(new Author(null, null, null, null, null));
+        assertEquals(authorList, authorList);
+    }
+
+    @Test
+    public void equalsTrueSymmetric() {
+        AuthorList firstAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        assertEquals(firstAuthorList, secondAuthorList);
+        assertEquals(secondAuthorList, firstAuthorList);
+    }
+
+    @Test
+    public void equalsTrueTransitive() {
+        AuthorList firstAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        AuthorList thirdAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        assertEquals(firstAuthorList, secondAuthorList);
+        assertEquals(secondAuthorList, thirdAuthorList);
+        assertEquals(firstAuthorList, thirdAuthorList);
+    }
+
+    @Test
+    public void equalsTrueConsistent() {
+        AuthorList firstAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        assertEquals(firstAuthorList, secondAuthorList);
+        assertEquals(firstAuthorList, secondAuthorList);
+        assertEquals(firstAuthorList, secondAuthorList);
+    }
+
+    @Test
+    public void equalsFalseForNull() {
+        assertNotEquals(null, new AuthorList(new Author(null, null, null, null, null)));
+    }
+
+    @Test
+    public void hashCodeConsistent() {
+        AuthorList authorList = new AuthorList(new Author(null, null, null, null, null));
+        assertEquals(authorList.hashCode(), authorList.hashCode());
+    }
+
+    @Test
+    public void hashCodeNotConstant() {
+        AuthorList firstAuthorList = new AuthorList(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = new AuthorList(new Author("B", null, null, null, null));
+        assertNotEquals(firstAuthorList.hashCode(), secondAuthorList.hashCode());
+    }
 }

From 2ad23e3937442ceb0f3b3952436e884d7d1b09f8 Mon Sep 17 00:00:00 2001
From: systemoperator <3658393+systemoperator@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:53:31 +0200
Subject: [PATCH 12/15] Catch InaccessibleObjectException (#6519)

---
 src/main/java/org/jabref/gui/actions/ActionFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
index d0b75659396..3050c302c12 100644
--- a/src/main/java/org/jabref/gui/actions/ActionFactory.java
+++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.actions;
 
+import java.lang.reflect.InaccessibleObjectException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Objects;
@@ -66,7 +67,7 @@ private static Label getAssociatedNode(MenuItem menuItem) {
                 Method getLabel = ContextMenuContent.MenuItemContainer.class.getDeclaredMethod("getLabel");
                 getLabel.setAccessible(true);
                 return (Label) getLabel.invoke(container);
-            } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            } catch (InaccessibleObjectException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
                 LOGGER.warn("Could not get label of menu item", e);
             }
         }

From bc63ccb1e1424fa8245e818d4f1346a07a5d83a9 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Wed, 17 Jun 2020 00:26:40 +0200
Subject: [PATCH 13/15] Add markdown-link-check (#6542)

---
 .github/workflows/tests.yml | 11 ++++++++++-
 mlc_config.json             |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 55f7a948ec2..3ac4fd47577 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -42,8 +42,17 @@ jobs:
       - name: Run markdown-lint
         uses: avto-dev/markdown-lint@v1
         with:
-          args: CHANGELOG.md README.md docs/
+          args: CHANGELOG.md CONTRIBUTING.md README.md docs/
           config: '.markdownlint.yml'
+      - name: Prepare markdown-link-check
+        run: mkdir docs/ROOT && cp CHANGELOG.md README.md docs/ROOT
+      - name: Run markdown-link-check
+        uses: gaurav-nelson/github-action-markdown-link-check@619e549
+        with:
+          use-quiet-mode: 'yes'
+          use-verbose-mode: 'no'
+          config-file: 'mlc_config.json'
+          folder-path: 'docs/'
   tests:
     name: Unit tests
     runs-on: ubuntu-latest
diff --git a/mlc_config.json b/mlc_config.json
index 43d1ec18e04..e6d24fd541a 100644
--- a/mlc_config.json
+++ b/mlc_config.json
@@ -1,8 +1,17 @@
 {
     "ignorePatterns": [
+        {
+            "pattern": "^CONTRIBUTING\\.md"
+        },
         {
             "pattern": "^https://dl\\.acm\\.org"
         },
+        {
+            "pattern": "^https://github\\.com"
+        },
+        {
+            "pattern": "^https://.*\\.jabref\\.org"
+        },
         {
             "pattern": "^http://purl\\.org/net/bibteXMP"
         },

From f768fe0b12c6ea4e88922741a9fd9b3334c583b1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 00:38:34 +0200
Subject: [PATCH 14/15] Bump postgresql from 42.2.12 to 42.2.14 (#6610)

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.2.14.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.2.14)
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3a85a775a3e..d7cfadfa056 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,7 +140,7 @@ dependencies {
 
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.6.0'
 
-    implementation 'org.postgresql:postgresql:42.2.12'
+    implementation 'org.postgresql:postgresql:42.2.14'
 
     implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
         // causing module issues

From ef0a6bbba081a11baefc376203c866361e8e6af8 Mon Sep 17 00:00:00 2001
From: systemoperator <3658393+systemoperator@users.noreply.github.com>
Date: Wed, 17 Jun 2020 21:33:54 +0200
Subject: [PATCH 15/15] Validates the file path of a TexGroup and fixes
 Texgroup's "Library has been modified by another program" (#6586)

---
 CHANGELOG.md                                  |  2 +
 .../jabref/gui/groups/GroupDialogView.java    |  1 +
 .../gui/groups/GroupDialogViewModel.java      | 34 ++++++++-
 .../logic/importer/util/MetaDataParser.java   | 70 +++++++++----------
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 .../importer/fileformat/BibtexParserTest.java | 30 ++++++++
 6 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66c50e62c33..47a94281554 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where the authors' names were incorrectly displayed in the authors' column when they were bracketed. [#6465](https://github.com/JabRef/jabref/issues/6465) [#6459](https://github.com/JabRef/jabref/issues/6459)
 - We fixed an issue where importing certain unlinked files would result in an exception [#5815](https://github.com/JabRef/jabref/issues/5815)
 - We fixed an issue where downloaded files would be moved to a directory named after the citationkey when no file directory pattern is specified [#6589](https://github.com/JabRef/jabref/issues/6589)
+- We fixed an issue with the creation of a group of cited entries which incorrectly showed the message that the library had been modified externally whenever saving the library. [#6420](https://github.com/JabRef/jabref/issues/6420)
+- We fixed an issue with the creation of a group of cited entries. Now the file path to an aux file gets validated. [#6585](https://github.com/JabRef/jabref/issues/6585)
 
 ### Removed
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index d6523a97c45..92883417a99 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -142,6 +142,7 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.keywordRegexValidationStatus(), keywordGroupSearchTerm);
             validationVisualizer.initVisualization(viewModel.keywordSearchTermEmptyValidationStatus(), keywordGroupSearchTerm);
             validationVisualizer.initVisualization(viewModel.keywordFieldEmptyValidationStatus(), keywordGroupSearchField);
+            validationVisualizer.initVisualization(viewModel.texGroupFilePathValidatonStatus(), texGroupFilePath);
             nameField.requestFocus();
         });
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index a5bc2d7c9af..a971378982b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.groups;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -98,6 +99,7 @@ public class GroupDialogViewModel {
     private Validator keywordSearchTermEmptyValidator;
     private Validator searchRegexValidator;
     private Validator searchSearchTermEmptyValidator;
+    private Validator texGroupFilePathValidator;
     private final CompositeValidator validator = new CompositeValidator();
 
     private final DialogService dialogService;
@@ -212,8 +214,24 @@ private void setupValidation() {
                 input -> !StringUtil.isNullOrEmpty(input),
                 ValidationMessage.error(String.format("%s > %n %s",
                         Localization.lang("Free search expression"),
-                        Localization.lang("Search term is empty.")
-                )));
+                        Localization.lang("Search term is empty."))));
+
+        texGroupFilePathValidator = new FunctionBasedValidator<>(
+                texGroupFilePathProperty,
+                input -> {
+                    if (StringUtil.isBlank(input)) {
+                        return false;
+                    } else {
+                        Path texFilePath = preferencesService.getWorkingDir().resolve(input);
+                        if (!Files.isRegularFile(texFilePath)) {
+                            return false;
+                        }
+                        return FileUtil.getFileExtension(input)
+                                .map(extension -> extension.toLowerCase().equals("aux"))
+                                .orElse(false);
+                    }
+                },
+                ValidationMessage.error(Localization.lang("Please provide a valid aux file.")));
 
         validator.addValidators(nameValidator, sameNameValidator);
 
@@ -232,6 +250,14 @@ private void setupValidation() {
                 validator.removeValidators(keywordFieldEmptyValidator, keywordRegexValidator, keywordSearchTermEmptyValidator);
             }
         });
+
+        typeTexProperty.addListener((obs, oldValue, isSelected) -> {
+            if (isSelected) {
+                validator.addValidators(texGroupFilePathValidator);
+            } else {
+                validator.removeValidators(texGroupFilePathValidator);
+            }
+        });
     }
 
     public void validationHandler(Event event) {
@@ -439,6 +465,10 @@ public ValidationStatus keywordSearchTermEmptyValidationStatus() {
         return keywordSearchTermEmptyValidator.getValidationStatus();
     }
 
+    public ValidationStatus texGroupFilePathValidatonStatus() {
+        return texGroupFilePathValidator.getValidationStatus();
+    }
+
     public StringProperty nameProperty() {
         return nameProperty;
     }
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 146bdf6eddc..e6ac1eb1da1 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -6,6 +6,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,61 +50,51 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
         List<String> defaultCiteKeyPattern = new ArrayList<>();
         Map<EntryType, List<String>> nonDefaultCiteKeyPatterns = new HashMap<>();
 
-        for (Map.Entry<String, String> entry : data.entrySet()) {
+        // process groups (GROUPSTREE and GROUPSTREE_LEGACY) at the very end (otherwise it can happen that not all dependent data are set)
+        List<Map.Entry<String, String>> entryList = new ArrayList<>(data.entrySet());
+        entryList.sort(groupsLast());
+
+        for (Map.Entry<String, String> entry : entryList) {
             List<String> value = getAsList(entry.getValue());
 
             if (entry.getKey().startsWith(MetaData.PREFIX_KEYPATTERN)) {
                 EntryType entryType = EntryTypeFactory.parse(entry.getKey().substring(MetaData.PREFIX_KEYPATTERN.length()));
                 nonDefaultCiteKeyPatterns.put(entryType, Collections.singletonList(getSingleItem(value)));
-                continue;
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name comes directly after "FILE_DIRECTORY-"
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
                 metaData.setUserFileDirectory(user, getSingleItem(value));
-                continue;
             } else if (entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)) {
                 metaData.addContentSelector(ContentSelectors.parse(FieldFactory.parseField(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length())), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
-                continue;
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + "Latex-")) {
                 // The user name comes directly after "FILE_DIRECTORYLatex-"
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 6);
                 Path path = Path.of(getSingleItem(value)).normalize();
                 metaData.setLatexFileDirectory(user, path);
-                continue;
-            }
-
-            switch (entry.getKey()) {
-                case MetaData.GROUPSTREE:
-                case MetaData.GROUPSTREE_LEGACY:
-                    metaData.setGroups(GroupsParser.importGroups(value, keywordSeparator, fileMonitor, metaData));
-                    break;
-                case MetaData.SAVE_ACTIONS:
-                    metaData.setSaveActions(Cleanups.parse(value));
-                    break;
-                case MetaData.DATABASE_TYPE:
-                    metaData.setMode(BibDatabaseMode.parse(getSingleItem(value)));
-                    break;
-                case MetaData.KEYPATTERNDEFAULT:
-                    defaultCiteKeyPattern = Collections.singletonList(getSingleItem(value));
-                    break;
-                case MetaData.PROTECTED_FLAG_META:
-                    if (Boolean.parseBoolean(getSingleItem(value))) {
-                        metaData.markAsProtected();
-                    } else {
-                        metaData.markAsNotProtected();
-                    }
-                    break;
-                case MetaData.FILE_DIRECTORY:
-                    metaData.setDefaultFileDirectory(getSingleItem(value));
-                    break;
-                case MetaData.SAVE_ORDER_CONFIG:
-                    metaData.setSaveOrderConfig(SaveOrderConfig.parse(value));
-                    break;
-                default:
-                    // Keep meta data items that we do not know in the file
-                    metaData.putUnknownMetaDataItem(entry.getKey(), value);
+            } else if (entry.getKey().equals(MetaData.SAVE_ACTIONS)) {
+                metaData.setSaveActions(Cleanups.parse(value));
+            } else if (entry.getKey().equals(MetaData.DATABASE_TYPE)) {
+                metaData.setMode(BibDatabaseMode.parse(getSingleItem(value)));
+            } else if (entry.getKey().equals(MetaData.KEYPATTERNDEFAULT)) {
+                defaultCiteKeyPattern = Collections.singletonList(getSingleItem(value));
+            } else if (entry.getKey().equals(MetaData.PROTECTED_FLAG_META)) {
+                if (Boolean.parseBoolean(getSingleItem(value))) {
+                    metaData.markAsProtected();
+                } else {
+                    metaData.markAsNotProtected();
+                }
+            } else if (entry.getKey().equals(MetaData.FILE_DIRECTORY)) {
+                metaData.setDefaultFileDirectory(getSingleItem(value));
+            } else if (entry.getKey().equals(MetaData.SAVE_ORDER_CONFIG)) {
+                metaData.setSaveOrderConfig(SaveOrderConfig.parse(value));
+            } else if (entry.getKey().equals(MetaData.GROUPSTREE) || entry.getKey().equals(MetaData.GROUPSTREE_LEGACY)) {
+                metaData.setGroups(GroupsParser.importGroups(value, keywordSeparator, fileMonitor, metaData));
+            } else {
+                // Keep meta data items that we do not know in the file
+                metaData.putUnknownMetaDataItem(entry.getKey(), value);
             }
         }
+
         if (!defaultCiteKeyPattern.isEmpty() || !nonDefaultCiteKeyPatterns.isEmpty()) {
             metaData.setCiteKeyPattern(defaultCiteKeyPattern, nonDefaultCiteKeyPatterns);
         }
@@ -111,6 +102,11 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
         return metaData;
     }
 
+    private static Comparator<? super Map.Entry<String, String>> groupsLast() {
+        return (s1, s2) -> MetaData.GROUPSTREE.equals(s1.getKey()) || MetaData.GROUPSTREE_LEGACY.equals(s1.getKey()) ? 1 :
+                MetaData.GROUPSTREE.equals(s2.getKey()) || MetaData.GROUPSTREE_LEGACY.equals(s2.getKey()) ? -1 : 0;
+    }
+
     /**
      * Returns the first item in the list.
      * If the specified list does not contain exactly one item, then a {@link ParseException} will be thrown.
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 56b4bc677ba..3bb17ba3aaf 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2065,6 +2065,7 @@ Specified\ keywords=Specified keywords
 Cited\ entries=Cited entries
 Search\ term\ is\ empty.=Search term is empty.
 Invalid\ regular\ expression.=Invalid regular expression.
+Please\ provide\ a\ valid\ aux\ file.=Please provide a valid aux file.
 Keyword\ delimiter=Keyword delimiter
 Hierarchical\ keyword\ delimiter=Hierarchical keyword delimiter
 Escape\ ampersands=Escape ampersands
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 17ae1ac3941..d988b03bce4 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,6 +41,7 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.groups.RegexKeywordGroup;
+import org.jabref.model.groups.TexGroup;
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.model.util.DummyFileUpdateMonitor;
@@ -1388,6 +1390,34 @@ void integrationTestGroupTree() throws IOException, ParseException {
                 ((ExplicitGroup) root.getChildren().get(2).getGroup()).getLegacyEntryKeys());
     }
 
+    /**
+     * Checks that a TexGroup finally gets the required data, after parsing the library.
+     */
+    @Test
+    void integrationTestTexGroup() throws Exception {
+        ParserResult result = parser.parse(new StringReader(
+             "@comment{jabref-meta: grouping:" + OS.NEWLINE
+                     + "0 AllEntriesGroup:;" + OS.NEWLINE
+                     + "1 TexGroup:cited entries\\;0\\;paper.aux\\;1\\;0x8a8a8aff\\;\\;\\;;"
+                     + "}" + OS.NEWLINE
+           + "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE
+           + "@Comment{jabref-meta: fileDirectory:src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
+           + "@Comment{jabref-meta: fileDirectory-"
+                     + System.getProperty("user.name") + "-"
+                     + InetAddress.getLocalHost().getHostName()
+                     + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
+           + "@Comment{jabref-meta: fileDirectoryLatex-"
+                     + System.getProperty("user.name") + "-"
+                     + InetAddress.getLocalHost().getHostName()
+                     + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
+        ));
+
+        GroupTreeNode root = result.getMetaData().getGroups().get();
+
+        assertEquals("src/test/resources/org/jabref/model/groups/paper.aux",
+                ((TexGroup) root.getChildren().get(0).getGroup()).getFilePath().toString());
+    }
+
     @Test
     void integrationTestProtectedFlag() throws IOException {
         ParserResult result = parser