From f402fd2aed97c36d6ef56f6fac4e2e080ae5f2a8 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 11:45:03 +0100
Subject: [PATCH 01/18] feat/#1 Add CSS file type, add button in preferences to
 import custom CSS file, started on import functionality

---
 .../gui/preferences/PreferencesDialog.fxml    |  5 ++++
 .../preferences/PreferencesDialogView.java    |  3 +++
 .../PreferencesDialogViewModel.java           | 23 +++++++++++++++++++
 .../jabref/logic/util/StandardFileType.java   |  3 ++-
 src/main/resources/l10n/JabRef_en.properties  |  4 ++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index d7ee3befc3e..7d338e58e53 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -39,6 +39,11 @@
                     </Button>
                     <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
                     <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
+                    <Button maxWidth="Infinity" onAction="#importStyle" text="%Import CSS">
+                        <tooltip>
+                            <Tooltip text="%Import custom CSS file" />
+                        </tooltip>
+                    </Button>
                 </VBox>
             </VBox>
             <ScrollPane fx:id="preferencesContainer" maxHeight="Infinity" maxWidth="Infinity"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index b40a039ded6..046cd965092 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -114,4 +114,7 @@ private void savePreferencesAndCloseDialog() {
 
     @FXML
     void resetPreferences() { viewModel.resetPreferences(); }
+
+    @FXML
+    void importStyle() {viewModel.importCSSFile();}
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 1d2bfb61bc6..0a90a0b4d38 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -195,4 +195,27 @@ public void setValues() {
             preferencesTab.setValues();
         }
     }
+
+    public void importCSSFile() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.CSS)
+                .withDefaultExtension(StandardFileType.CSS)
+                .withInitialDirectory(preferences.setLastPreferencesExportPath()).build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
+            try {
+                preferences.importPreferences(file);
+                updateAfterPreferenceChanges();
+
+                dialogService.showWarningDialogAndWait(Localization.lang("Import CSS"),
+                        Localization.lang("You must restart JabRef for this to come into effect."));
+            } catch (JabRefException ex) {
+                LOGGER.error("Error while importing preferences", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Import CSS"), ex);
+            }
+        });
+    }
+
+    public void updateCSS() {
+    }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index e89aa27982f..b6c83787ea6 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -38,7 +38,8 @@ public enum StandardFileType implements FileType {
     XML("xml"),
     JSON("json"),
     XMP("xmp"),
-    ZIP("zip");
+    ZIP("zip"),
+    CSS("css");
 
     private final List<String> extensions;
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 5e1bd848dbd..795f643e6da 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -456,6 +456,10 @@ Importing=Importing
 
 Importing\ in\ unknown\ format=Importing in unknown format
 
+Import\ CSS=Import CSS file
+
+Import\ custom\ CSS\ file=Import custom CSS file
+
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Include subgroups: When selected, view entries contained in this group or its subgroups
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Independent group: When selected, view only this group's entries

From 7bf2fede2ba484ba81a28f8b20c3c06f27498b0d Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 11:51:32 +0100
Subject: [PATCH 02/18] feat/#1 Change so that the log messages uses format
 specifiers instead of string concatenation

---
 src/main/java/org/jabref/gui/util/ThemeLoader.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 17065eb74a1..0e5e92b4c24 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -50,7 +50,7 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
         String cssPreferences = jabRefPreferences.get(JabRefPreferences.FX_THEME);
         if (StringUtil.isNotBlank(cssVmArgument)) {
             // First priority: VM argument
-            LOGGER.info("Using css from VM option: " + cssVmArgument);
+            LOGGER.info("Using css from VM option: {}", cssVmArgument);
             URL cssVmUrl = null;
             try {
                 cssVmUrl = Paths.get(cssVmArgument).toUri().toURL();
@@ -62,11 +62,11 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
             // Otherwise load css from preference
             URL cssResource = JabRefFrame.class.getResource(cssPreferences);
             if (cssResource != null) {
-                LOGGER.debug("Using css " + cssResource);
+                LOGGER.debug("Using css {}", cssResource);
                 additionalCssToLoad = Optional.of(cssResource);
             } else {
                 additionalCssToLoad = Optional.empty();
-                LOGGER.warn("Cannot load css " + cssPreferences);
+                LOGGER.warn("Cannot load css {}", cssPreferences);
             }
         } else {
             additionalCssToLoad = Optional.empty();

From b27f26da12b86e3656bf2bb7440457c37b0c1177 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 15:57:30 +0100
Subject: [PATCH 03/18] feat/#1 Add RadioButton for toggling custom theme

---
 .../org/jabref/gui/preferences/AppearanceTab.fxml   |  1 +
 .../jabref/gui/preferences/AppearanceTabView.java   |  3 ++-
 .../gui/preferences/AppearanceTabViewModel.java     | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
index ed2f9605c5e..ee90e52a715 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -29,4 +29,5 @@
     <Label styleClass="sectionHeader" text="%Visual theme"/>
     <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
+    <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme" />
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
index 54eebaeac8e..31b44d64337 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
@@ -20,6 +20,7 @@ public class AppearanceTabView extends AbstractPreferenceTabView<AppearanceTabVi
     @FXML public TextField fontSize;
     @FXML public RadioButton themeLight;
     @FXML public RadioButton themeDark;
+    @FXML public RadioButton customTheme;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
@@ -43,7 +44,7 @@ public void initialize () {
 
         themeLight.selectedProperty().bindBidirectional(viewModel.themeLightProperty());
         themeDark.selectedProperty().bindBidirectional(viewModel.themeDarkProperty());
-
+        customTheme.selectedProperty().bindBidirectional(viewModel.customThemeProperty());
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize));
     }
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index f2ee9d7a59b..6d9444a88aa 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -24,6 +24,7 @@ public class AppearanceTabViewModel implements PreferenceTabViewModel {
     private final StringProperty fontSizeProperty = new SimpleStringProperty();
     private final BooleanProperty themeLightProperty = new SimpleBooleanProperty();
     private final BooleanProperty themeDarkProperty = new SimpleBooleanProperty();
+    private final BooleanProperty themeCustomProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
@@ -60,11 +61,17 @@ public void setValues() {
             case ThemeLoader.DARK_CSS:
                 themeLightProperty.setValue(false);
                 themeDarkProperty.setValue(true);
+                themeCustomProperty.setValue(false);
                 break;
             case ThemeLoader.MAIN_CSS:
-            default:
                 themeLightProperty.setValue(true);
                 themeDarkProperty.setValue(false);
+                themeCustomProperty.setValue(false);
+                break;
+            default:
+                themeLightProperty.setValue(false);
+                themeDarkProperty.setValue(false);
+                themeCustomProperty.setValue(true);
         }
     }
 
@@ -87,6 +94,9 @@ public void storeSettings() {
         } else if (themeDarkProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.DARK_CSS)) {
             restartWarnings.add(Localization.lang("Theme changed to dark theme."));
             preferences.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
+        } else if (themeCustomProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.CUSTOM_THEME)) {
+            restartWarnings.add(Localization.lang("Theme change to a custom theme."));
+            preferences.put(JabRefPreferences.FX_THEME, preferences.getPathToCustomTheme());
         }
     }
 
@@ -113,4 +123,5 @@ public boolean validateSettings() {
 
     public BooleanProperty themeDarkProperty() { return themeDarkProperty; }
 
+    public BooleanProperty customThemeProperty() { return themeCustomProperty; }
 }

From 8cb3a50292ab7f175568437c2aff8d4d3f18e6a5 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 16:17:24 +0100
Subject: [PATCH 04/18] feat/#1 Add preference for setting path to custom CSS
 theme

---
 .../jabref/preferences/JabRefPreferences.java | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 08037697918..9738371c2d9 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -117,7 +117,7 @@ public class JabRefPreferences implements PreferencesService {
 
     /* contents of the defaults HashMap that are defined in this class.
      * There are more default parameters in this map which belong to separate preference classes.
-    */
+     */
     public static final String TEXSTUDIO_PATH = "TeXstudioPath";
     public static final String WIN_EDT_PATH = "winEdtPath";
     public static final String TEXMAKER_PATH = "texmakerPath";
@@ -403,6 +403,8 @@ public class JabRefPreferences implements PreferencesService {
     private static final int EXPORTER_FILENAME_INDEX = 1;
     private static final int EXPORTER_EXTENSION_INDEX = 2;
 
+    private static final String PATH_TO_CUSTOM_THEME = "pathToCustomTheme";
+
     // The only instance of this class:
     private static JabRefPreferences singleton;
     /**
@@ -759,6 +761,7 @@ private JabRefPreferences() {
 
         // set default theme
         defaults.put(JabRefPreferences.FX_THEME, ThemeLoader.MAIN_CSS);
+        defaults.put(JabRefPreferences.PATH_TO_CUSTOM_THEME, "");
 
         setLanguageDependentDefaultValues();
     }
@@ -968,6 +971,14 @@ private List<Field> getCustomTabFieldNames() {
         return customFields;
     }
 
+    public void setPathToCustomTheme(String path) {
+        put(PATH_TO_CUSTOM_THEME, path);
+    }
+
+    public String getPathToCustomTheme() {
+        return get(PATH_TO_CUSTOM_THEME);
+    }
+
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
@@ -1129,7 +1140,7 @@ public BibDatabaseMode getDefaultBibDatabaseMode() {
      * Set the default value for a key. This is useful for plugins that need to add default values for the prefs keys
      * they use.
      *
-     * @param key The preferences key.
+     * @param key   The preferences key.
      * @param value The default value.
      */
     public void putDefaultValue(String key, Object value) {
@@ -1139,7 +1150,7 @@ public void putDefaultValue(String key, Object value) {
     /**
      * Stores a color in preferences.
      *
-     * @param key The key for this setting.
+     * @param key   The key for this setting.
      * @param color The Color to store.
      */
     public void putColor(String key, Color color) {
@@ -1356,7 +1367,7 @@ public void exportPreferences(Path file) throws JabRefException {
             prefs.exportSubtree(os);
         } catch (BackingStoreException | IOException ex) {
             throw new JabRefException("Could not export preferences", Localization.lang("Could not export preferences"),
-                                      ex);
+                                                  ex);
         }
     }
 
@@ -2097,7 +2108,7 @@ public void saveCustomEntryTypes() {
     }
 
     private void saveCustomEntryTypes(BibDatabaseMode bibDatabaseMode) {
-        List<BibEntryType> customBiblatexBibTexTypes = Globals.entryTypesManager.getAllTypes(bibDatabaseMode).stream()                                                  
+        List<BibEntryType> customBiblatexBibTexTypes = Globals.entryTypesManager.getAllTypes(bibDatabaseMode).stream()
                                                                                 .map(entryType -> entryType).collect(Collectors.toList());
 
         storeBibEntryTypes(customBiblatexBibTexTypes, bibDatabaseMode);

From bd6c561609bdddbe5e848a3a1b1f4312dbb9b8f9 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 17:32:22 +0100
Subject: [PATCH 05/18] feat/#1 Load custom CSS if toggled

---
 .../java/org/jabref/gui/util/ThemeLoader.java | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 0e5e92b4c24..3f8cda5dbb5 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.util;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -48,6 +49,7 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
 
         String cssVmArgument = System.getProperty("jabref.theme.css");
         String cssPreferences = jabRefPreferences.get(JabRefPreferences.FX_THEME);
+
         if (StringUtil.isNotBlank(cssVmArgument)) {
             // First priority: VM argument
             LOGGER.info("Using css from VM option: {}", cssVmArgument);
@@ -60,10 +62,20 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
             additionalCssToLoad = Optional.ofNullable(cssVmUrl);
         } else if (StringUtil.isNotBlank(cssPreferences) && !MAIN_CSS.equalsIgnoreCase(cssPreferences)) {
             // Otherwise load css from preference
-            URL cssResource = JabRefFrame.class.getResource(cssPreferences);
-            if (cssResource != null) {
+            Optional<URL> cssResource = Optional.empty();
+            if (DARK_CSS.equals(cssPreferences)) {
+                cssResource = Optional.ofNullable(JabRefFrame.class.getResource(cssPreferences));
+            } else {
+                try {
+                    cssResource = Optional.of(new File(cssPreferences).toURI().toURL());
+                } catch (MalformedURLException e) {
+                    LOGGER.warn("Cannot load css {}", cssResource);
+                }
+            }
+
+            if (cssResource.isPresent()) {
                 LOGGER.debug("Using css {}", cssResource);
-                additionalCssToLoad = Optional.of(cssResource);
+                additionalCssToLoad = cssResource;
             } else {
                 additionalCssToLoad = Optional.empty();
                 LOGGER.warn("Cannot load css {}", cssPreferences);
@@ -104,7 +116,7 @@ private void addAndWatchForChanges(Scene scene, URL cssFile, int index) {
                 });
             }
         } catch (IOException | URISyntaxException | UnsupportedOperationException e) {
-            LOGGER.error("Could not watch css file for changes " + cssFile, e);
+            LOGGER.error("Could not watch css file for changes {}", cssFile, e);
         }
     }
 }

From 6a5f73ceeb42471856fea32fb3cff29a827752aa Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 17:34:15 +0100
Subject: [PATCH 06/18] feat/#1 Add missing language keys

---
 .../java/org/jabref/gui/preferences/PreferencesDialog.fxml | 2 +-
 src/main/resources/l10n/JabRef_en.properties               | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index 7d338e58e53..8b80006330a 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -39,7 +39,7 @@
                     </Button>
                     <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
                     <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
-                    <Button maxWidth="Infinity" onAction="#importStyle" text="%Import CSS">
+                    <Button maxWidth="Infinity" onAction="#importStyle" text="%Import CSS file">
                         <tooltip>
                             <Tooltip text="%Import custom CSS file" />
                         </tooltip>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 795f643e6da..04a0e0001bd 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -456,10 +456,14 @@ Importing=Importing
 
 Importing\ in\ unknown\ format=Importing in unknown format
 
-Import\ CSS=Import CSS file
+Import\ CSS=Import CSS
+
+Import\ CSS\ file=Import CSS file
 
 Import\ custom\ CSS\ file=Import custom CSS file
 
+Theme\ change\ to\ a\ custom\ theme.=Theme change to a custom theme.
+
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Include subgroups: When selected, view entries contained in this group or its subgroups
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Independent group: When selected, view only this group's entries
@@ -2045,6 +2049,7 @@ Font=Font
 Visual\ theme=Visual theme
 Light\ theme=Light theme
 Dark\ theme=Dark theme
+Custom\ theme=Custom theme
 Overwrite\ existing\ keys=Overwrite existing keys
 Key\ patterns=Key patterns
 Size\:=Size:

From b5b56bf6b1e8693f580f188e27cb673750bc3b6d Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 18:00:31 +0100
Subject: [PATCH 07/18] feat/#1 Remove check if current theme is applied again,
 check is remove since we don't need it

---
 .../java/org/jabref/gui/preferences/AppearanceTabViewModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index 6d9444a88aa..a6bd9f76dcf 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -94,7 +94,7 @@ public void storeSettings() {
         } else if (themeDarkProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.DARK_CSS)) {
             restartWarnings.add(Localization.lang("Theme changed to dark theme."));
             preferences.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
-        } else if (themeCustomProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.CUSTOM_THEME)) {
+        } else if (themeCustomProperty.getValue()) {
             restartWarnings.add(Localization.lang("Theme change to a custom theme."));
             preferences.put(JabRefPreferences.FX_THEME, preferences.getPathToCustomTheme());
         }

From 99d9768c0d1b24c2e2545da31cc78bd81aa4b6aa Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 18:01:23 +0100
Subject: [PATCH 08/18] feat/#1 Save path to custom CSS file in program
 preferences

---
 .../preferences/PreferencesDialogViewModel.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 0a90a0b4d38..4001be6ed89 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -203,19 +203,11 @@ public void importCSSFile() {
                 .withInitialDirectory(preferences.setLastPreferencesExportPath()).build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
-            try {
-                preferences.importPreferences(file);
-                updateAfterPreferenceChanges();
 
-                dialogService.showWarningDialogAndWait(Localization.lang("Import CSS"),
-                        Localization.lang("You must restart JabRef for this to come into effect."));
-            } catch (JabRefException ex) {
-                LOGGER.error("Error while importing preferences", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Import CSS"), ex);
-            }
-        });
-    }
+            preferences.setPathToCustomTheme(file.toAbsolutePath().toString());
 
-    public void updateCSS() {
+            dialogService.showWarningDialogAndWait(Localization.lang("Import CSS"),
+                    Localization.lang("You must restart JabRef for this to come into effect."));
+        });
     }
 }

From bcf800412f76f4e3e200af51e25bed6271bb5a9e Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Wed, 26 Feb 2020 18:30:20 +0100
Subject: [PATCH 09/18] Add functionality to let the user import custom CSS
 file #5790

* Add CSS file type, add button in preferences to import a custom CSS file, started on import functionality

* Change so that the log uses format specifiers instead of string concatenation

* Add RadioButton for toggling custom theme

* Add preference for setting the path to custom CSS theme

* Load custom CSS if toggled

* Add missing language keys

* Remove check if the current theme is applied again, the check is removed since we don't need it

* Save path to the custom CSS file in program preferences
---
 .../jabref/gui/preferences/AppearanceTab.fxml |  1 +
 .../gui/preferences/AppearanceTabView.java    |  3 ++-
 .../preferences/AppearanceTabViewModel.java   | 13 +++++++++-
 .../gui/preferences/PreferencesDialog.fxml    |  5 ++++
 .../preferences/PreferencesDialogView.java    |  3 +++
 .../PreferencesDialogViewModel.java           | 15 +++++++++++
 .../java/org/jabref/gui/util/ThemeLoader.java | 26 ++++++++++++++-----
 .../jabref/logic/util/StandardFileType.java   |  3 ++-
 .../jabref/preferences/JabRefPreferences.java | 21 +++++++++++----
 src/main/resources/l10n/JabRef_en.properties  |  9 +++++++
 10 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
index ed2f9605c5e..ee90e52a715 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -29,4 +29,5 @@
     <Label styleClass="sectionHeader" text="%Visual theme"/>
     <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
+    <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme" />
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
index 54eebaeac8e..31b44d64337 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
@@ -20,6 +20,7 @@ public class AppearanceTabView extends AbstractPreferenceTabView<AppearanceTabVi
     @FXML public TextField fontSize;
     @FXML public RadioButton themeLight;
     @FXML public RadioButton themeDark;
+    @FXML public RadioButton customTheme;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
@@ -43,7 +44,7 @@ public void initialize () {
 
         themeLight.selectedProperty().bindBidirectional(viewModel.themeLightProperty());
         themeDark.selectedProperty().bindBidirectional(viewModel.themeDarkProperty());
-
+        customTheme.selectedProperty().bindBidirectional(viewModel.customThemeProperty());
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize));
     }
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index f2ee9d7a59b..a6bd9f76dcf 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -24,6 +24,7 @@ public class AppearanceTabViewModel implements PreferenceTabViewModel {
     private final StringProperty fontSizeProperty = new SimpleStringProperty();
     private final BooleanProperty themeLightProperty = new SimpleBooleanProperty();
     private final BooleanProperty themeDarkProperty = new SimpleBooleanProperty();
+    private final BooleanProperty themeCustomProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
@@ -60,11 +61,17 @@ public void setValues() {
             case ThemeLoader.DARK_CSS:
                 themeLightProperty.setValue(false);
                 themeDarkProperty.setValue(true);
+                themeCustomProperty.setValue(false);
                 break;
             case ThemeLoader.MAIN_CSS:
-            default:
                 themeLightProperty.setValue(true);
                 themeDarkProperty.setValue(false);
+                themeCustomProperty.setValue(false);
+                break;
+            default:
+                themeLightProperty.setValue(false);
+                themeDarkProperty.setValue(false);
+                themeCustomProperty.setValue(true);
         }
     }
 
@@ -87,6 +94,9 @@ public void storeSettings() {
         } else if (themeDarkProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.DARK_CSS)) {
             restartWarnings.add(Localization.lang("Theme changed to dark theme."));
             preferences.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
+        } else if (themeCustomProperty.getValue()) {
+            restartWarnings.add(Localization.lang("Theme change to a custom theme."));
+            preferences.put(JabRefPreferences.FX_THEME, preferences.getPathToCustomTheme());
         }
     }
 
@@ -113,4 +123,5 @@ public boolean validateSettings() {
 
     public BooleanProperty themeDarkProperty() { return themeDarkProperty; }
 
+    public BooleanProperty customThemeProperty() { return themeCustomProperty; }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index d7ee3befc3e..8b80006330a 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -39,6 +39,11 @@
                     </Button>
                     <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
                     <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
+                    <Button maxWidth="Infinity" onAction="#importStyle" text="%Import CSS file">
+                        <tooltip>
+                            <Tooltip text="%Import custom CSS file" />
+                        </tooltip>
+                    </Button>
                 </VBox>
             </VBox>
             <ScrollPane fx:id="preferencesContainer" maxHeight="Infinity" maxWidth="Infinity"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index b40a039ded6..046cd965092 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -114,4 +114,7 @@ private void savePreferencesAndCloseDialog() {
 
     @FXML
     void resetPreferences() { viewModel.resetPreferences(); }
+
+    @FXML
+    void importStyle() {viewModel.importCSSFile();}
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 1d2bfb61bc6..4001be6ed89 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -195,4 +195,19 @@ public void setValues() {
             preferencesTab.setValues();
         }
     }
+
+    public void importCSSFile() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.CSS)
+                .withDefaultExtension(StandardFileType.CSS)
+                .withInitialDirectory(preferences.setLastPreferencesExportPath()).build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
+
+            preferences.setPathToCustomTheme(file.toAbsolutePath().toString());
+
+            dialogService.showWarningDialogAndWait(Localization.lang("Import CSS"),
+                    Localization.lang("You must restart JabRef for this to come into effect."));
+        });
+    }
 }
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 17065eb74a1..3f8cda5dbb5 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.util;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -48,9 +49,10 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
 
         String cssVmArgument = System.getProperty("jabref.theme.css");
         String cssPreferences = jabRefPreferences.get(JabRefPreferences.FX_THEME);
+
         if (StringUtil.isNotBlank(cssVmArgument)) {
             // First priority: VM argument
-            LOGGER.info("Using css from VM option: " + cssVmArgument);
+            LOGGER.info("Using css from VM option: {}", cssVmArgument);
             URL cssVmUrl = null;
             try {
                 cssVmUrl = Paths.get(cssVmArgument).toUri().toURL();
@@ -60,13 +62,23 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
             additionalCssToLoad = Optional.ofNullable(cssVmUrl);
         } else if (StringUtil.isNotBlank(cssPreferences) && !MAIN_CSS.equalsIgnoreCase(cssPreferences)) {
             // Otherwise load css from preference
-            URL cssResource = JabRefFrame.class.getResource(cssPreferences);
-            if (cssResource != null) {
-                LOGGER.debug("Using css " + cssResource);
-                additionalCssToLoad = Optional.of(cssResource);
+            Optional<URL> cssResource = Optional.empty();
+            if (DARK_CSS.equals(cssPreferences)) {
+                cssResource = Optional.ofNullable(JabRefFrame.class.getResource(cssPreferences));
+            } else {
+                try {
+                    cssResource = Optional.of(new File(cssPreferences).toURI().toURL());
+                } catch (MalformedURLException e) {
+                    LOGGER.warn("Cannot load css {}", cssResource);
+                }
+            }
+
+            if (cssResource.isPresent()) {
+                LOGGER.debug("Using css {}", cssResource);
+                additionalCssToLoad = cssResource;
             } else {
                 additionalCssToLoad = Optional.empty();
-                LOGGER.warn("Cannot load css " + cssPreferences);
+                LOGGER.warn("Cannot load css {}", cssPreferences);
             }
         } else {
             additionalCssToLoad = Optional.empty();
@@ -104,7 +116,7 @@ private void addAndWatchForChanges(Scene scene, URL cssFile, int index) {
                 });
             }
         } catch (IOException | URISyntaxException | UnsupportedOperationException e) {
-            LOGGER.error("Could not watch css file for changes " + cssFile, e);
+            LOGGER.error("Could not watch css file for changes {}", cssFile, e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index e89aa27982f..b6c83787ea6 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -38,7 +38,8 @@ public enum StandardFileType implements FileType {
     XML("xml"),
     JSON("json"),
     XMP("xmp"),
-    ZIP("zip");
+    ZIP("zip"),
+    CSS("css");
 
     private final List<String> extensions;
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 08037697918..9738371c2d9 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -117,7 +117,7 @@ public class JabRefPreferences implements PreferencesService {
 
     /* contents of the defaults HashMap that are defined in this class.
      * There are more default parameters in this map which belong to separate preference classes.
-    */
+     */
     public static final String TEXSTUDIO_PATH = "TeXstudioPath";
     public static final String WIN_EDT_PATH = "winEdtPath";
     public static final String TEXMAKER_PATH = "texmakerPath";
@@ -403,6 +403,8 @@ public class JabRefPreferences implements PreferencesService {
     private static final int EXPORTER_FILENAME_INDEX = 1;
     private static final int EXPORTER_EXTENSION_INDEX = 2;
 
+    private static final String PATH_TO_CUSTOM_THEME = "pathToCustomTheme";
+
     // The only instance of this class:
     private static JabRefPreferences singleton;
     /**
@@ -759,6 +761,7 @@ private JabRefPreferences() {
 
         // set default theme
         defaults.put(JabRefPreferences.FX_THEME, ThemeLoader.MAIN_CSS);
+        defaults.put(JabRefPreferences.PATH_TO_CUSTOM_THEME, "");
 
         setLanguageDependentDefaultValues();
     }
@@ -968,6 +971,14 @@ private List<Field> getCustomTabFieldNames() {
         return customFields;
     }
 
+    public void setPathToCustomTheme(String path) {
+        put(PATH_TO_CUSTOM_THEME, path);
+    }
+
+    public String getPathToCustomTheme() {
+        return get(PATH_TO_CUSTOM_THEME);
+    }
+
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
@@ -1129,7 +1140,7 @@ public BibDatabaseMode getDefaultBibDatabaseMode() {
      * Set the default value for a key. This is useful for plugins that need to add default values for the prefs keys
      * they use.
      *
-     * @param key The preferences key.
+     * @param key   The preferences key.
      * @param value The default value.
      */
     public void putDefaultValue(String key, Object value) {
@@ -1139,7 +1150,7 @@ public void putDefaultValue(String key, Object value) {
     /**
      * Stores a color in preferences.
      *
-     * @param key The key for this setting.
+     * @param key   The key for this setting.
      * @param color The Color to store.
      */
     public void putColor(String key, Color color) {
@@ -1356,7 +1367,7 @@ public void exportPreferences(Path file) throws JabRefException {
             prefs.exportSubtree(os);
         } catch (BackingStoreException | IOException ex) {
             throw new JabRefException("Could not export preferences", Localization.lang("Could not export preferences"),
-                                      ex);
+                                                  ex);
         }
     }
 
@@ -2097,7 +2108,7 @@ public void saveCustomEntryTypes() {
     }
 
     private void saveCustomEntryTypes(BibDatabaseMode bibDatabaseMode) {
-        List<BibEntryType> customBiblatexBibTexTypes = Globals.entryTypesManager.getAllTypes(bibDatabaseMode).stream()                                                  
+        List<BibEntryType> customBiblatexBibTexTypes = Globals.entryTypesManager.getAllTypes(bibDatabaseMode).stream()
                                                                                 .map(entryType -> entryType).collect(Collectors.toList());
 
         storeBibEntryTypes(customBiblatexBibTexTypes, bibDatabaseMode);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 5e1bd848dbd..04a0e0001bd 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -456,6 +456,14 @@ Importing=Importing
 
 Importing\ in\ unknown\ format=Importing in unknown format
 
+Import\ CSS=Import CSS
+
+Import\ CSS\ file=Import CSS file
+
+Import\ custom\ CSS\ file=Import custom CSS file
+
+Theme\ change\ to\ a\ custom\ theme.=Theme change to a custom theme.
+
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Include subgroups: When selected, view entries contained in this group or its subgroups
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Independent group: When selected, view only this group's entries
@@ -2041,6 +2049,7 @@ Font=Font
 Visual\ theme=Visual theme
 Light\ theme=Light theme
 Dark\ theme=Dark theme
+Custom\ theme=Custom theme
 Overwrite\ existing\ keys=Overwrite existing keys
 Key\ patterns=Key patterns
 Size\:=Size:

From f2fc2ab53b1a600d08c7fbf9a3863b0496fab199 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 11:09:59 +0100
Subject: [PATCH 10/18] fix/#5 Add checks so that the theme change notification
 is only shown once, disable custom theme radio button i no custom theme has
 been imported

---
 .../jabref/gui/preferences/AppearanceTab.fxml |  2 +-
 .../gui/preferences/AppearanceTabView.java    |  1 +
 .../preferences/AppearanceTabViewModel.java   | 32 +++++++++----------
 .../java/org/jabref/gui/util/ThemeLoader.java |  4 ++-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
index ee90e52a715..a81c965e606 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -29,5 +29,5 @@
     <Label styleClass="sectionHeader" text="%Visual theme"/>
     <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
-    <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme" />
+    <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
index 31b44d64337..da60cf0dbac 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
@@ -45,6 +45,7 @@ public void initialize () {
         themeLight.selectedProperty().bindBidirectional(viewModel.themeLightProperty());
         themeDark.selectedProperty().bindBidirectional(viewModel.themeDarkProperty());
         customTheme.selectedProperty().bindBidirectional(viewModel.customThemeProperty());
+        customTheme.setDisable(preferences.getPathToCustomTheme().isBlank());
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize));
     }
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index a6bd9f76dcf..af44c7313fe 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -56,22 +56,20 @@ public AppearanceTabViewModel(DialogService dialogService, JabRefPreferences pre
     public void setValues() {
         fontOverrideProperty.setValue(preferences.getBoolean(JabRefPreferences.OVERRIDE_DEFAULT_FONT_SIZE));
         fontSizeProperty.setValue(String.valueOf(preferences.getInt(JabRefPreferences.MAIN_FONT_SIZE)));
-
-        switch (preferences.get(JabRefPreferences.FX_THEME)) {
-            case ThemeLoader.DARK_CSS:
-                themeLightProperty.setValue(false);
-                themeDarkProperty.setValue(true);
-                themeCustomProperty.setValue(false);
-                break;
-            case ThemeLoader.MAIN_CSS:
-                themeLightProperty.setValue(true);
-                themeDarkProperty.setValue(false);
-                themeCustomProperty.setValue(false);
-                break;
-            default:
-                themeLightProperty.setValue(false);
-                themeDarkProperty.setValue(false);
-                themeCustomProperty.setValue(true);
+        String currentTheme = preferences.get(JabRefPreferences.FX_THEME);
+
+        if (ThemeLoader.DARK_CSS.equals(currentTheme)) {
+            themeLightProperty.setValue(false);
+            themeDarkProperty.setValue(true);
+            themeCustomProperty.setValue(false);
+        } else if (ThemeLoader.MAIN_CSS.equals(currentTheme) || currentTheme.isBlank() || currentTheme.isEmpty()) {
+            themeLightProperty.setValue(true);
+            themeDarkProperty.setValue(false);
+            themeCustomProperty.setValue(false);
+        } else {
+            themeLightProperty.setValue(false);
+            themeDarkProperty.setValue(false);
+            themeCustomProperty.setValue(true);
         }
     }
 
@@ -94,7 +92,7 @@ public void storeSettings() {
         } else if (themeDarkProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.DARK_CSS)) {
             restartWarnings.add(Localization.lang("Theme changed to dark theme."));
             preferences.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
-        } else if (themeCustomProperty.getValue()) {
+        } else if (themeCustomProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.CUSTOM_CSS)) {
             restartWarnings.add(Localization.lang("Theme change to a custom theme."));
             preferences.put(JabRefPreferences.FX_THEME, preferences.getPathToCustomTheme());
         }
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 3f8cda5dbb5..33d6d885669 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -39,6 +39,7 @@ public class ThemeLoader {
 
     public static final String MAIN_CSS = "Base.css";
     public static final String DARK_CSS = "Dark.css";
+    public static String CUSTOM_CSS = "";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
     private final Optional<URL> additionalCssToLoad;
@@ -68,8 +69,9 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
             } else {
                 try {
                     cssResource = Optional.of(new File(cssPreferences).toURI().toURL());
+                    CUSTOM_CSS = cssPreferences;
                 } catch (MalformedURLException e) {
-                    LOGGER.warn("Cannot load css {}", cssResource);
+                    LOGGER.warn("Cannot load css {}", cssPreferences);
                 }
             }
 

From 198be4747cb6a9c60ba60a6af98f5ecfa1444814 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 11:39:51 +0100
Subject: [PATCH 11/18] Remove added stuff from merge conflict

---
 src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
index f9a3d140012..a81c965e606 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -29,9 +29,5 @@
     <Label styleClass="sectionHeader" text="%Visual theme"/>
     <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
-<<<<<<< HEAD
-    <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme" />
-=======
     <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
->>>>>>> fixCustomCSSFile
 </fx:root>

From 00eac4e2b860cc8252c0b49f13749c73223093ee Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 15:33:42 +0100
Subject: [PATCH 12/18] Add export current theme #5790

* Add method for saving theme to file

* Add modal for selection witch theme to export as CSS
---
 .../gui/preferences/ExportThemeDialog.fxml    |  28 ++++
 .../gui/preferences/ExportThemeDialog.java    | 121 ++++++++++++++++++
 .../gui/preferences/PreferencesDialog.fxml    |   7 +-
 .../preferences/PreferencesDialogView.java    |   5 +-
 .../PreferencesDialogViewModel.java           |   4 +
 .../jabref/preferences/JabRefPreferences.java |  22 ++++
 6 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preferences/ExportThemeDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java

diff --git a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.fxml b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.fxml
new file mode 100644
index 00000000000..ec8909a150b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.fxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<?import javafx.geometry.Insets?>
+<DialogPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="org.jabref.gui.preferences.ExportThemeDialog"
+            prefHeight="300.0" prefWidth="500.0">
+
+    <content>
+        <BorderPane>
+            <center>
+                <TableView fx:id="table">
+                    <columns>
+                        <TableColumn fx:id="columnName" text="%Theme name"/>
+                        <TableColumn fx:id="columnPath" text="%Path to theme"/>
+                    </columns>
+                    <padding>
+                        <Insets bottom="30.0"/>
+                    </padding>
+                </TableView>
+            </center>
+        </BorderPane>
+    </content>
+    <ButtonType fx:constant="CLOSE"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
new file mode 100644
index 00000000000..1c1d5ea8f10
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
@@ -0,0 +1,121 @@
+package org.jabref.gui.preferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TablePosition;
+import javafx.scene.control.TableRow;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.input.KeyCode;
+import org.jabref.JabRefException;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.ThemeLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.preferences.JabRefPreferences;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExportThemeDialog extends BaseDialog<Void> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportThemeDialog.class);
+
+    @FXML private TableView<Theme> table;
+    @FXML private TableColumn<Theme, String> columnName;
+    @FXML private TableColumn<Theme, String> columnPath;
+
+    private JabRefPreferences preferences;
+    private DialogService dialogService;
+
+    public ExportThemeDialog(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+
+        ViewLoader
+                .view(this)
+                .load()
+                .setAsDialogPane(this);
+
+        this.setTitle(Localization.lang("Export Theme"));
+    }
+
+    @FXML
+    private void initialize() {
+        columnName.setCellValueFactory(new PropertyValueFactory<>("name"));
+        columnPath.setCellValueFactory(new PropertyValueFactory<>("path"));
+
+        ObservableList<Theme> data =
+                FXCollections.observableArrayList(new Theme("Light theme", ThemeLoader.MAIN_CSS), new Theme("Dark theme", ThemeLoader.DARK_CSS));
+
+        if (!(ThemeLoader.CUSTOM_CSS.isBlank() || ThemeLoader.CUSTOM_CSS.isEmpty())) {
+            data.add(new Theme("Custom theme", ThemeLoader.CUSTOM_CSS));
+        }
+
+        table.setItems(data);
+
+        table.setOnKeyPressed(event -> {
+            TablePosition tablePosition;
+            if (event.getCode().equals(KeyCode.ENTER)) {
+                tablePosition = table.getFocusModel().getFocusedCell();
+                final int row = tablePosition.getRow();
+                ObservableList<Theme> list = table.getItems();
+                Theme theme = list.get(row);
+                exportCSSFile(theme.getPath());
+            }
+        });
+
+        table.setRowFactory(tv -> {
+            TableRow<Theme> row = new TableRow<>();
+            row.setOnMouseClicked(event -> handleSelectedRowEvent(row));
+            return row;
+        });
+    }
+
+    private void handleSelectedRowEvent(TableRow<Theme> row) {
+        if (!row.isEmpty()) {
+            exportCSSFile(row.getItem().getPath());
+        }
+    }
+
+    private void exportCSSFile(String theme) {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.CSS)
+                .withDefaultExtension(StandardFileType.CSS)
+                .withInitialDirectory(preferences.setLastPreferencesExportPath())
+                .build();
+
+        dialogService.showFileSaveDialog(fileDialogConfiguration)
+                     .ifPresent(exportFile -> {
+                         try {
+                             preferences.exportTheme(exportFile.getFileName(), theme);
+                         } catch (JabRefException ex) {
+                             LOGGER.warn(ex.getMessage(), ex);
+                             dialogService.showErrorDialogAndWait(Localization.lang("Export theme"), ex);
+                         }
+                     });
+    }
+
+    public static class Theme {
+        private SimpleStringProperty name;
+        private SimpleStringProperty path;
+
+        public Theme(String name, String path) {
+            this.name = new SimpleStringProperty(name);
+            this.path = new SimpleStringProperty(path);
+        }
+
+        public String getName() {
+            return name.get();
+        }
+
+        public String getPath() {
+            return path.get();
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index 8b80006330a..15801e20962 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -39,11 +39,16 @@
                     </Button>
                     <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
                     <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
-                    <Button maxWidth="Infinity" onAction="#importStyle" text="%Import CSS file">
+                    <Button maxWidth="Infinity" onAction="#importTheme" text="%Import theme">
                         <tooltip>
                             <Tooltip text="%Import custom CSS file" />
                         </tooltip>
                     </Button>
+                    <Button maxWidth="Infinity" onAction="#exportTheme" text="%Export theme">
+                    <tooltip>
+                        <Tooltip text="%Export theme as CSS" />
+                    </tooltip>
+                    </Button>
                 </VBox>
             </VBox>
             <ScrollPane fx:id="preferencesContainer" maxHeight="Infinity" maxWidth="Infinity"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 046cd965092..ab7352d7301 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -116,5 +116,8 @@ private void savePreferencesAndCloseDialog() {
     void resetPreferences() { viewModel.resetPreferences(); }
 
     @FXML
-    void importStyle() {viewModel.importCSSFile();}
+    void importTheme() {viewModel.importCSSFile();}
+
+    @FXML
+    void exportTheme() {viewModel.openExportThemeDialog();}
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 4001be6ed89..b76b1852ec5 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -210,4 +210,8 @@ public void importCSSFile() {
                     Localization.lang("You must restart JabRef for this to come into effect."));
         });
     }
+
+    public void openExportThemeDialog() {
+        new ExportThemeDialog(dialogService, preferences).showAndWait();
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 9738371c2d9..4149dd424ea 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -7,6 +7,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.net.InetAddress;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -37,6 +38,7 @@
 import org.jabref.Globals;
 import org.jabref.JabRefException;
 import org.jabref.JabRefMain;
+import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.SidePaneType;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
@@ -69,6 +71,7 @@
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.importer.fileformat.endnote.Url;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.l10n.Language;
@@ -1391,6 +1394,25 @@ public void importPreferences(Path file) throws JabRefException {
         }
     }
 
+    public void exportTheme(Path targetFile, String theme) throws JabRefException {
+        try (OutputStream os = Files.newOutputStream(targetFile)) {
+            if (theme.equals(ThemeLoader.MAIN_CSS) || theme.equals(ThemeLoader.DARK_CSS)) {
+                Path path = new File(JabRefFrame.class.getResource(theme).toURI()).toPath();
+                writeThemeToFile(path, os);
+            } else {
+                Path path = new File(theme).toPath();
+                writeThemeToFile(path, os);
+            }
+        } catch (IOException | URISyntaxException ex) {
+            throw new JabRefException("Could not export theme", Localization.lang("Could not export theme"),
+                    ex);
+        }
+    }
+
+    private void writeThemeToFile(Path path, OutputStream os) throws IOException {
+        Files.copy(path, os);
+    }
+
     /**
      * ONLY FOR TESTING!
      *

From 9fc33820ec39827d1e77ce7c23847dc8e7019ac1 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 16:26:56 +0100
Subject: [PATCH 13/18] Add missing language lines

---
 src/main/resources/l10n/JabRef_en.properties | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 04a0e0001bd..b3cc32b4fe8 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -458,8 +458,6 @@ Importing\ in\ unknown\ format=Importing in unknown format
 
 Import\ CSS=Import CSS
 
-Import\ CSS\ file=Import CSS file
-
 Import\ custom\ CSS\ file=Import custom CSS file
 
 Theme\ change\ to\ a\ custom\ theme.=Theme change to a custom theme.
@@ -2124,3 +2122,17 @@ Optional=Optional
 Required=Required
 Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Entry type cannot be empty. Please enter a name.
 Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Field cannot be empty. Please enter a name.
+
+Import\ theme=Import theme
+
+Export\ theme=Export theme
+
+Export\ theme\ as\ CSS=Export theme as CSS
+
+Could\ not\ export\ theme=Could not export theme
+
+Export\ Theme=Export Theme
+
+Path\ to\ theme=Path to theme
+
+Theme\ name=Theme name

From 4f0db2426624b01ee7f29acc8fed302e25a01d25 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 17:55:00 +0100
Subject: [PATCH 14/18] Add information about import/export of themes, #5790

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49dc2aac9bd..ea9e4803928 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Filenames of external files can no longer contain curly braces. [#5926](https://github.com/JabRef/jabref/pull/5926)
 - We made the filters more easily accessible in the integrity check dialog. [#5955](https://github.com/JabRef/jabref/pull/5955)
 - We reimplemented and improved the dialog "Customize entry types" [#4719](https://github.com/JabRef/jabref/issues/4719)
+- We made it possible to customise the look of JabRef by importing custom CSS files. We also made it possible to export both the standard _Light_ and _Dark_ themes as well as imported themes. [#5790](https://github.com/JabRef/jabref/issues/5790)
 
 ### Fixed
 

From a8feb948d67d85fe365b79803687ebe169f8e01c Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 18:36:01 +0100
Subject: [PATCH 15/18] Fix CodaCy and checkstyle issues, #5790

---
 .../preferences/AppearanceTabViewModel.java    |  2 +-
 .../gui/preferences/ExportThemeDialog.java     | 18 ++++++++++++------
 .../gui/preferences/PreferencesDialogView.java |  4 ++--
 .../java/org/jabref/gui/util/ThemeLoader.java  | 10 +++++++++-
 .../jabref/preferences/JabRefPreferences.java  |  1 -
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index a004ab7ac11..8491f8ee8e8 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -93,7 +93,7 @@ public void storeSettings() {
         } else if (themeDarkProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.DARK_CSS)) {
             restartWarnings.add(Localization.lang("Theme changed to dark theme."));
             preferences.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
-        } else if (themeCustomProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.CUSTOM_CSS)) {
+        } else if (themeCustomProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.getCustomCss())) {
             restartWarnings.add(Localization.lang("Theme change to a custom theme."));
             preferences.put(JabRefPreferences.FX_THEME, preferences.getPathToCustomTheme());
         }
diff --git a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
index 1c1d5ea8f10..f779334338f 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.preferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -11,6 +12,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.KeyCode;
+
 import org.jabref.JabRefException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
@@ -19,6 +21,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.JabRefPreferences;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,9 +29,12 @@ public class ExportThemeDialog extends BaseDialog<Void> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportThemeDialog.class);
 
-    @FXML private TableView<Theme> table;
-    @FXML private TableColumn<Theme, String> columnName;
-    @FXML private TableColumn<Theme, String> columnPath;
+    @FXML
+    private TableView<Theme> table;
+    @FXML
+    private TableColumn<Theme, String> columnName;
+    @FXML
+    private TableColumn<Theme, String> columnPath;
 
     private JabRefPreferences preferences;
     private DialogService dialogService;
@@ -46,15 +52,15 @@ public ExportThemeDialog(DialogService dialogService, JabRefPreferences preferen
     }
 
     @FXML
-    private void initialize() {
+    public void initialize() {
         columnName.setCellValueFactory(new PropertyValueFactory<>("name"));
         columnPath.setCellValueFactory(new PropertyValueFactory<>("path"));
 
         ObservableList<Theme> data =
                 FXCollections.observableArrayList(new Theme("Light theme", ThemeLoader.MAIN_CSS), new Theme("Dark theme", ThemeLoader.DARK_CSS));
 
-        if (!(ThemeLoader.CUSTOM_CSS.isBlank() || ThemeLoader.CUSTOM_CSS.isEmpty())) {
-            data.add(new Theme("Custom theme", ThemeLoader.CUSTOM_CSS));
+        if (!(ThemeLoader.getCustomCss().isBlank() || ThemeLoader.getCustomCss().isEmpty())) {
+            data.add(new Theme("Custom theme", ThemeLoader.getCustomCss()));
         }
 
         table.setItems(data);
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index ab7352d7301..cc739c1bab0 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -116,8 +116,8 @@ private void savePreferencesAndCloseDialog() {
     void resetPreferences() { viewModel.resetPreferences(); }
 
     @FXML
-    void importTheme() {viewModel.importCSSFile();}
+    void importTheme() { viewModel.importCSSFile();}
 
     @FXML
-    void exportTheme() {viewModel.openExportThemeDialog();}
+    void exportTheme() { viewModel.openExportThemeDialog();}
 }
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 33d6d885669..063fa9459e1 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -69,7 +69,7 @@ public ThemeLoader(FileUpdateMonitor fileUpdateMonitor, JabRefPreferences jabRef
             } else {
                 try {
                     cssResource = Optional.of(new File(cssPreferences).toURI().toURL());
-                    CUSTOM_CSS = cssPreferences;
+                    setCustomCss(cssPreferences);
                 } catch (MalformedURLException e) {
                     LOGGER.warn("Cannot load css {}", cssPreferences);
                 }
@@ -121,4 +121,12 @@ private void addAndWatchForChanges(Scene scene, URL cssFile, int index) {
             LOGGER.error("Could not watch css file for changes {}", cssFile, e);
         }
     }
+
+    public static String getCustomCss() {
+        return CUSTOM_CSS;
+    }
+
+    public static void setCustomCss(String customCss) {
+        CUSTOM_CSS = customCss;
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 4149dd424ea..7ae9dfe84f9 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -71,7 +71,6 @@
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
-import org.jabref.logic.importer.fileformat.endnote.Url;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.l10n.Language;

From 8c1e2c28ef99c599e026341f5aa10b0040e0503c Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 21:14:29 +0100
Subject: [PATCH 16/18] Add fixes from code review, #5790

---
 .../preferences/AppearanceTabViewModel.java   |  4 ++--
 .../gui/preferences/ExportThemeDialog.java    | 23 ++-----------------
 .../org/jabref/gui/preferences/Theme.java     | 21 +++++++++++++++++
 .../java/org/jabref/gui/util/ThemeLoader.java |  2 +-
 src/main/resources/l10n/JabRef_en.properties  | 19 +++++----------
 5 files changed, 32 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preferences/Theme.java

diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index 8491f8ee8e8..6c55a346c11 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -63,7 +63,7 @@ public void setValues() {
             themeLightProperty.setValue(false);
             themeDarkProperty.setValue(true);
             themeCustomProperty.setValue(false);
-        } else if (ThemeLoader.MAIN_CSS.equals(currentTheme) || currentTheme.isBlank() || currentTheme.isEmpty()) {
+        } else if (ThemeLoader.MAIN_CSS.equals(currentTheme) || currentTheme.isBlank()) {
             themeLightProperty.setValue(true);
             themeDarkProperty.setValue(false);
             themeCustomProperty.setValue(false);
@@ -94,7 +94,7 @@ public void storeSettings() {
             restartWarnings.add(Localization.lang("Theme changed to dark theme."));
             preferences.put(JabRefPreferences.FX_THEME, ThemeLoader.DARK_CSS);
         } else if (themeCustomProperty.getValue() && !preferences.get(JabRefPreferences.FX_THEME).equals(ThemeLoader.getCustomCss())) {
-            restartWarnings.add(Localization.lang("Theme change to a custom theme."));
+            restartWarnings.add(Localization.lang("Theme changed to a custom theme."));
             preferences.put(JabRefPreferences.FX_THEME, preferences.getPathToCustomTheme());
         }
     }
diff --git a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
index f779334338f..38f8baddcd3 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -22,6 +20,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +58,7 @@ public void initialize() {
         ObservableList<Theme> data =
                 FXCollections.observableArrayList(new Theme("Light theme", ThemeLoader.MAIN_CSS), new Theme("Dark theme", ThemeLoader.DARK_CSS));
 
-        if (!(ThemeLoader.getCustomCss().isBlank() || ThemeLoader.getCustomCss().isEmpty())) {
+        if (!(ThemeLoader.getCustomCss().isBlank())) {
             data.add(new Theme("Custom theme", ThemeLoader.getCustomCss()));
         }
 
@@ -106,22 +105,4 @@ private void exportCSSFile(String theme) {
                          }
                      });
     }
-
-    public static class Theme {
-        private SimpleStringProperty name;
-        private SimpleStringProperty path;
-
-        public Theme(String name, String path) {
-            this.name = new SimpleStringProperty(name);
-            this.path = new SimpleStringProperty(path);
-        }
-
-        public String getName() {
-            return name.get();
-        }
-
-        public String getPath() {
-            return path.get();
-        }
-    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/Theme.java b/src/main/java/org/jabref/gui/preferences/Theme.java
new file mode 100644
index 00000000000..11b9d97f0a5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/Theme.java
@@ -0,0 +1,21 @@
+package org.jabref.gui.preferences;
+
+import javafx.beans.property.SimpleStringProperty;
+
+public class Theme {
+    private SimpleStringProperty name;
+    private SimpleStringProperty path;
+
+    public Theme(String name, String path) {
+        this.name = new SimpleStringProperty(name);
+        this.path = new SimpleStringProperty(path);
+    }
+
+    public String getName() {
+        return name.get();
+    }
+
+    public String getPath() {
+        return path.get();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/util/ThemeLoader.java b/src/main/java/org/jabref/gui/util/ThemeLoader.java
index 063fa9459e1..ad86a272dd7 100644
--- a/src/main/java/org/jabref/gui/util/ThemeLoader.java
+++ b/src/main/java/org/jabref/gui/util/ThemeLoader.java
@@ -39,7 +39,7 @@ public class ThemeLoader {
 
     public static final String MAIN_CSS = "Base.css";
     public static final String DARK_CSS = "Dark.css";
-    public static String CUSTOM_CSS = "";
+    private static String CUSTOM_CSS = "";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
     private final Optional<URL> additionalCssToLoad;
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f24eb0b9adc..e9ad163957a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -456,12 +456,6 @@ Importing=Importing
 
 Importing\ in\ unknown\ format=Importing in unknown format
 
-Import\ CSS=Import CSS
-
-Import\ custom\ CSS\ file=Import custom CSS file
-
-Theme\ change\ to\ a\ custom\ theme.=Theme change to a custom theme.
-
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Include subgroups: When selected, view entries contained in this group or its subgroups
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Independent group: When selected, view only this group's entries
@@ -2126,14 +2120,13 @@ Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Field cannot be empty. Please
 Shared\ database=Shared database
 Lookup=Lookup
 
-Import\ theme=Import theme
-
-Export\ theme=Export theme
-
 Export\ theme\ as\ CSS=Export theme as CSS
-
 Could\ not\ export\ theme=Could not export theme
-
 Path\ to\ theme=Path to theme
-
 Theme\ name=Theme name
+Theme\ changed\ to\ a\ custom\ theme.=Theme changed to a custom theme.
+Import\ theme=Import theme
+Export\ Theme=Export Theme
+
+Import\ CSS=Import CSS
+Import\ custom\ CSS\ file=Import custom CSS file

From e4a4f68190b224a24456d8876bdedbb69125dab3 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 21:18:15 +0100
Subject: [PATCH 17/18] Remove unused import #5790

---
 src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
index 38f8baddcd3..218b114f0d7 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportThemeDialog.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.preferences;
 
-import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;

From 00d8ef60dba901eb569db81cabb1a294f8da8f32 Mon Sep 17 00:00:00 2001
From: Nils Streijffert <nils.streijffert@gmail.com>
Date: Thu, 27 Feb 2020 22:25:26 +0100
Subject: [PATCH 18/18] Move the import/export buttons to the Appearance tab
 #5790

---
 .../AbstractPreferenceTabView.java            |  3 +++
 .../jabref/gui/preferences/AppearanceTab.fxml | 15 +++++++++++++
 .../gui/preferences/AppearanceTabView.java    |  6 ++++++
 .../preferences/AppearanceTabViewModel.java   | 21 +++++++++++++++++++
 .../gui/preferences/PreferencesDialog.fxml    | 10 ---------
 .../preferences/PreferencesDialogView.java    |  6 ------
 .../PreferencesDialogViewModel.java           | 19 -----------------
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 8 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index cf8b4e69c4c..4718db0d5d7 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -8,7 +8,10 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.JabRefPreferences;
 
 public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel> extends VBox implements PreferencesTab {
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
index a81c965e606..3fcbae580c9 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -9,6 +9,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Tooltip?>
 <fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
          xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.AppearanceTabView">
     <fx:define>
@@ -30,4 +32,17 @@
     <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
     <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
+
+    <Label styleClass="sectionHeader" text="%Import custom theme" />
+    <Button maxWidth="Infinity" onAction="#importTheme" text="%Import theme">
+        <tooltip>
+            <Tooltip text="%Import custom CSS file" />
+        </tooltip>
+    </Button>
+    <Button maxWidth="Infinity" onAction="#exportTheme" text="%Export theme">
+        <tooltip>
+            <Tooltip text="%Export theme as CSS" />
+        </tooltip>
+    </Button>
+
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
index 4042132209d..ade50e130ac 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
@@ -51,4 +51,10 @@ public void initialize () {
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize));
     }
+
+    @FXML
+    void importTheme() { viewModel.importCSSFile();}
+
+    @FXML
+    void exportTheme() { viewModel.openExportThemeDialog();}
 }
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index 6c55a346c11..35b32816338 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -9,8 +9,10 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.ThemeLoader;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.JabRefPreferences;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
@@ -123,4 +125,23 @@ public boolean validateSettings() {
     public BooleanProperty themeDarkProperty() { return themeDarkProperty; }
 
     public BooleanProperty customThemeProperty() { return themeCustomProperty; }
+
+    public void importCSSFile() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.CSS)
+                .withDefaultExtension(StandardFileType.CSS)
+                .withInitialDirectory(preferences.setLastPreferencesExportPath()).build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
+
+            preferences.setPathToCustomTheme(file.toAbsolutePath().toString());
+
+            dialogService.showWarningDialogAndWait(Localization.lang("Import CSS"),
+                    Localization.lang("You must restart JabRef for this to come into effect."));
+        });
+    }
+
+    public void openExportThemeDialog() {
+        new ExportThemeDialog(dialogService, preferences).showAndWait();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index 15801e20962..d7ee3befc3e 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -39,16 +39,6 @@
                     </Button>
                     <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
                     <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
-                    <Button maxWidth="Infinity" onAction="#importTheme" text="%Import theme">
-                        <tooltip>
-                            <Tooltip text="%Import custom CSS file" />
-                        </tooltip>
-                    </Button>
-                    <Button maxWidth="Infinity" onAction="#exportTheme" text="%Export theme">
-                    <tooltip>
-                        <Tooltip text="%Export theme as CSS" />
-                    </tooltip>
-                    </Button>
                 </VBox>
             </VBox>
             <ScrollPane fx:id="preferencesContainer" maxHeight="Infinity" maxWidth="Infinity"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index cc739c1bab0..b40a039ded6 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -114,10 +114,4 @@ private void savePreferencesAndCloseDialog() {
 
     @FXML
     void resetPreferences() { viewModel.resetPreferences(); }
-
-    @FXML
-    void importTheme() { viewModel.importCSSFile();}
-
-    @FXML
-    void exportTheme() { viewModel.openExportThemeDialog();}
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index b76b1852ec5..1d2bfb61bc6 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -195,23 +195,4 @@ public void setValues() {
             preferencesTab.setValues();
         }
     }
-
-    public void importCSSFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSS)
-                .withDefaultExtension(StandardFileType.CSS)
-                .withInitialDirectory(preferences.setLastPreferencesExportPath()).build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
-
-            preferences.setPathToCustomTheme(file.toAbsolutePath().toString());
-
-            dialogService.showWarningDialogAndWait(Localization.lang("Import CSS"),
-                    Localization.lang("You must restart JabRef for this to come into effect."));
-        });
-    }
-
-    public void openExportThemeDialog() {
-        new ExportThemeDialog(dialogService, preferences).showAndWait();
-    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index e9ad163957a..0fa4c70953b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2127,6 +2127,7 @@ Theme\ name=Theme name
 Theme\ changed\ to\ a\ custom\ theme.=Theme changed to a custom theme.
 Import\ theme=Import theme
 Export\ Theme=Export Theme
+Import\ custom\ theme=Import custom theme
 
 Import\ CSS=Import CSS
 Import\ custom\ CSS\ file=Import custom CSS file