diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index a487e1cb348..f97a582daab 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -8,7 +8,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Optional;
 import java.util.prefs.BackingStoreException;
 
@@ -459,8 +458,7 @@ private void importPreferences() {
             Globals.prefs.importPreferences(cli.getPreferencesImport());
             EntryTypes.loadCustomEntryTypes(Globals.prefs.loadCustomEntryTypes(BibDatabaseMode.BIBTEX),
                     Globals.prefs.loadCustomEntryTypes(BibDatabaseMode.BIBLATEX));
-            Map<String, TemplateExporter> customExporters = Globals.prefs.customExports.getCustomExportFormats(Globals.prefs,
-                    Globals.journalAbbreviationLoader);
+            List<TemplateExporter> customExporters = Globals.prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
             LayoutFormatterPreferences layoutPreferences = Globals.prefs
                     .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
             SavePreferences savePreferences = Globals.prefs.loadForExportFromPreferences();
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index e6ef5d3128f..bc3a4e8a722 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -454,9 +454,6 @@ private void tearDownJabRef(List<String> filenames) {
         }
 
         fileHistory.storeHistory();
-        prefs.customExports.store(Globals.prefs);
-        prefs.customImports.store();
-
         prefs.flush();
 
         // dispose all windows, even if they are not displayed anymore
@@ -928,7 +925,7 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
                 factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction(this)),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
                 factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
                 factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
                 factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
diff --git a/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java b/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java
index 90567f5f820..60298e05555 100644
--- a/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java
+++ b/src/main/java/org/jabref/gui/actions/ManageCustomExportsAction.java
@@ -1,20 +1,12 @@
 package org.jabref.gui.actions;
 
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.exporter.ExportCustomizationDialog;
+import org.jabref.gui.exporter.ExportCustomizationDialogView;
 
 public class ManageCustomExportsAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
-
-    public ManageCustomExportsAction(JabRefFrame jabRefFrame) {
-        this.jabRefFrame = jabRefFrame;
-    }
-
     @Override
     public void execute() {
-        ExportCustomizationDialog ecd = new ExportCustomizationDialog(jabRefFrame);
-        ecd.setVisible(true);
+        new ExportCustomizationDialogView().show();
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml
new file mode 100644
index 00000000000..1c63d7e8008
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialog.fxml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<DialogPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="480.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.exporter.CreateModifyExporterDialogView">
+    <content>
+      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="320.0">
+         <children>
+            <GridPane prefWidth="480.0" scaleShape="false">
+              <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+              </columnConstraints>
+              <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+               <children>
+                  <TextField fx:id="name" GridPane.rowIndex="1" />
+                  <Label text="%Main layout file:" GridPane.rowIndex="2" />
+                  <TextField fx:id="fileName" GridPane.rowIndex="3" />
+                  <TextField fx:id="extension" GridPane.rowIndex="6" />
+                  <Label alignment="TOP_LEFT" text="%Export format name:">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <Label text="%File extension:" GridPane.rowIndex="5" />
+                  <Button fx:id="browseButton" text="%Browse" onAction="#browse" GridPane.rowIndex="4" />
+               </children>
+               <padding>
+                  <Insets bottom="30.0" left="30.0" right="30.0" top="30.0" />
+               </padding>
+            </GridPane>
+         </children></AnchorPane>
+    </content>
+    <ButtonType fx:id="saveExporter" text="%Save exporter" />
+    <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
new file mode 100644
index 00000000000..c3464567625
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -0,0 +1,67 @@
+package org.jabref.gui.exporter;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
+
+    @FXML private Button browseButton;
+    @FXML private TextField name;
+    @FXML private TextField fileName;
+    @FXML private TextField extension;
+    @FXML private ButtonType saveExporter;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferences;
+    @Inject private final JournalAbbreviationLoader loader;
+    private CreateModifyExporterDialogViewModel viewModel;
+
+    private final ExporterViewModel exporter;
+
+    public CreateModifyExporterDialogView(ExporterViewModel exporter, DialogService dialogService,
+                                          PreferencesService preferences, JournalAbbreviationLoader loader) {
+        this.setTitle(Localization.lang("Customize Export Formats"));
+        this.exporter = exporter;
+        this.loader = loader;
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        this.setResultConverter(button -> {
+            if (button == saveExporter) {
+                return viewModel.saveExporter();
+            } else {
+                return null;
+            }
+        });
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new CreateModifyExporterDialogViewModel(exporter, dialogService, preferences, loader);
+        name.textProperty().bindBidirectional(viewModel.getName());
+        fileName.textProperty().bindBidirectional(viewModel.getLayoutFileName());
+        extension.textProperty().bindBidirectional(viewModel.getExtension());
+    }
+
+    @FXML
+    private void browse(ActionEvent event) {
+        viewModel.browse();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
new file mode 100644
index 00000000000..96331a29842
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -0,0 +1,107 @@
+package org.jabref.gui.exporter;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.preferences.PreferencesService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * This view model can be used both for "add exporter" and "modify exporter" functionalities.
+ * It takes an optional exporter which is empty for "add exporter," and takes the selected exporter
+ * for "modify exporter."  It returns an optional exporter which empty if an invalid or no exporter is
+ * created, and otherwise contains the exporter to be added or that is modified.
+ *
+ */
+
+public class CreateModifyExporterDialogViewModel extends AbstractViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateModifyExporterDialogViewModel.class);
+
+    private final DialogService dialogService;
+    private final PreferencesService preferences;
+
+    private final StringProperty name = new SimpleStringProperty("");
+    private final StringProperty layoutFile = new SimpleStringProperty("");
+    private final StringProperty extension = new SimpleStringProperty("");
+
+    private final JournalAbbreviationLoader loader;
+
+    public CreateModifyExporterDialogViewModel(ExporterViewModel exporter, DialogService dialogService, PreferencesService preferences,
+                                               JournalAbbreviationLoader loader) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.loader = loader;
+
+        //Set text of each of the boxes
+        if (exporter != null) {
+            name.setValue(exporter.name().get());
+            layoutFile.setValue(exporter.layoutFileName().get());
+            extension.setValue(exporter.extension().get());
+        }
+    }
+
+    public ExporterViewModel saveExporter() {
+        Path layoutFileDir = Paths.get(layoutFile.get()).getParent();
+        if (layoutFileDir != null) {
+            String layoutFileDirString = layoutFileDir.toString();
+            preferences.setExportWorkingDirectory(layoutFileDirString);
+        }
+
+        // Check that there are no empty strings.
+        if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
+            || !layoutFile.get().endsWith(".layout")) {
+
+            LOGGER.info("One of the fields is empty or invalid!");
+            return null;
+        }
+
+        // Create a new exporter to be returned to ExportCustomizationDialogViewModel, which requested it
+        LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(loader);
+        SavePreferences savePreferences = preferences.loadForExportFromPreferences();
+        TemplateExporter format = new TemplateExporter(name.get(), layoutFile.get(), extension.get(),
+                                                       layoutPreferences, savePreferences);
+        format.setCustomExport(true);
+        return new ExporterViewModel(format);
+    }
+
+    public String getExportWorkingDirectory() {
+        return preferences.getExportWorkingDirectory();
+    }
+
+    public void browse() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+            .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+            .withInitialDirectory(getExportWorkingDirectory()).build();
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
+    }
+
+    public StringProperty getName() {
+        return name;
+    }
+
+    public StringProperty getLayoutFileName() {
+        return layoutFile;
+    }
+
+    public StringProperty getExtension() {
+        return extension;
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
deleted file mode 100644
index 21552963b45..00000000000
--- a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.jabref.gui.exporter;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.jabref.Globals;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.preferences.JabRefPreferences;
-
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Dialog for creating or modifying custom exports.
- */
-class CustomExportDialog extends JabRefDialog {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomExportDialog.class);
-
-    private final JTextField name = new JTextField(60);
-    private final JTextField layoutFile = new JTextField(60);
-    private final JTextField extension = new JTextField(60);
-    private JabRefFrame frame;
-    private boolean okPressed;
-
-    public CustomExportDialog(final JabRefFrame parent, final String exporterName, final String layoutFileName,
-            final String extensionName) {
-        this(parent);
-        frame = parent;
-        name.setText(exporterName);
-        layoutFile.setText(layoutFileName);
-        extension.setText(extensionName);
-    }
-
-    public CustomExportDialog(final JabRefFrame parent) {
-        super(Localization.lang("Edit custom export"), true, CustomExportDialog.class);
-        frame = parent;
-        ActionListener okListener = e -> {
-            Path layoutFileDir = Paths.get(layoutFile.getText()).getParent();
-            if (layoutFileDir != null) {
-                Globals.prefs.put(JabRefPreferences.EXPORT_WORKING_DIRECTORY, layoutFileDir.toString());
-
-            }
-
-            // Check that there are no empty strings.
-            if (layoutFile.getText().isEmpty() || name.getText().isEmpty() || extension.getText().isEmpty()
-                    || !layoutFile.getText().endsWith(".layout")) {
-
-                LOGGER.info("One field is empty!"); //TODO: Better error message
-                return;
-            }
-
-            // Handling of : and ; must also be done.
-
-            okPressed = true;
-            dispose();
-        };
-
-        layoutFile.setText(Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY));
-
-        JButton ok = new JButton(Localization.lang("OK"));
-        ok.addActionListener(okListener);
-        name.addActionListener(okListener);
-        layoutFile.addActionListener(okListener);
-        extension.addActionListener(okListener);
-
-        JButton cancel = new JButton(Localization.lang("Cancel"));
-        cancel.addActionListener(e -> dispose());
-
-        JButton browse = new JButton(Localization.lang("Browse"));
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withInitialDirectory(Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY)).build();
-        browse.addActionListener(
-                e -> DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showFileOpenDialog(fileDialogConfiguration))
-                                        .ifPresent(f -> layoutFile.setText(f.toAbsolutePath().toString())));
-
-        AbstractAction cancelAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-        // Key bindings:
-        JPanel main = new JPanel();
-        ActionMap am = main.getActionMap();
-        InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", cancelAction);
-
-        // Layout starts here.
-        GridBagLayout gbl = new GridBagLayout();
-        main.setLayout(gbl);
-        main.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-                Localization.lang("Export properties")));
-
-        // Main panel:
-        GridBagConstraints con = new GridBagConstraints();
-        con.weightx = 0;
-        con.gridwidth = 1;
-        con.insets = new Insets(3, 5, 3, 5);
-        con.anchor = GridBagConstraints.EAST;
-        con.fill = GridBagConstraints.NONE;
-        con.gridx = 0;
-        con.gridy = 0;
-        JLabel nl = new JLabel(Localization.lang("Export name") + ':');
-        gbl.setConstraints(nl, con);
-        main.add(nl);
-        con.gridy = 1;
-        JLabel nr = new JLabel(Localization.lang("Main layout file") + ':');
-        gbl.setConstraints(nr, con);
-        main.add(nr);
-        con.gridy = 2;
-        JLabel nf = new JLabel(Localization.lang("Extension") + ':');
-        gbl.setConstraints(nf, con);
-        main.add(nf);
-
-        con.gridwidth = 2;
-        con.weightx = 1;
-        con.anchor = GridBagConstraints.WEST;
-        con.fill = GridBagConstraints.HORIZONTAL;
-        con.gridy = 0;
-        con.gridx = 1;
-        gbl.setConstraints(name, con);
-        main.add(name);
-        con.gridy = 1;
-        con.gridwidth = 1;
-        gbl.setConstraints(layoutFile, con);
-        main.add(layoutFile);
-        con.gridx = 2;
-        con.weightx = 0;
-        gbl.setConstraints(browse, con);
-        main.add(browse);
-        con.weightx = 1;
-        con.gridwidth = 2;
-        con.gridx = 1;
-        con.gridy = 2;
-        gbl.setConstraints(extension, con);
-        main.add(extension);
-
-        JPanel buttons = new JPanel();
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        buttons.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        bb.addGlue();
-        bb.addButton(ok);
-        bb.addButton(cancel);
-        bb.addGlue();
-
-        getContentPane().add(main, BorderLayout.CENTER);
-        getContentPane().add(buttons, BorderLayout.SOUTH);
-
-        setSize(700, 200);
-
-    }
-
-    public boolean okPressed() {
-        return okPressed;
-    }
-
-    public String layoutFile() {
-        return layoutFile.getText();
-    }
-
-    public String name() {
-        return name.getText();
-    }
-
-    public String extension() {
-        String ext = extension.getText();
-        if (ext.startsWith(".")) {
-            return ext;
-        } else if (ext.startsWith("*.")) {
-            return ext.substring(1);
-        } else {
-            return '.' + ext;
-        }
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 102d36d9e24..5277d271c19 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 
 import javafx.stage.FileChooser;
 
@@ -50,7 +49,7 @@ public ExportCommand(JabRefFrame frame, boolean selectedOnly, JabRefPreferences
 
     @Override
     public void execute() {
-        Map<String, TemplateExporter> customExporters = preferences.customExports.getCustomExportFormats(preferences, Globals.journalAbbreviationLoader);
+        List<TemplateExporter> customExporters = preferences.getCustomExportFormats(Globals.journalAbbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
         SavePreferences savePreferences = preferences.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = preferences.getXMPPreferences();
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
new file mode 100644
index 00000000000..d25e272ed38
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="org.jabref.gui.exporter.ExportCustomizationDialogView">
+   <content>
+      <VBox prefHeight="200.0" prefWidth="500.0">
+         <children>
+            <TableView fx:id="exporterTable" prefHeight="150.0" prefWidth="500.0">
+              <columns>
+                <TableColumn fx:id="nameColumn" prefWidth="150.0" text="%Export name" />
+                <TableColumn fx:id="layoutColumn" prefWidth="250.0" text="%Main layout file" />
+                <TableColumn fx:id="extensionColumn" prefWidth="100.0" text="%Extension" />
+              </columns>
+            </TableView>
+         </children>
+      </VBox>
+   </content>
+   <ButtonType fx:id="addButton" text="%Add" />
+   <ButtonType fx:id="modifyButton" text="%Modify" />
+   <ButtonType fx:id="removeButton" text="%Remove" />
+   <ButtonType fx:id="closeButton" fx:constant="OK" />
+   <ButtonType fx:constant="CANCEL" />
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
deleted file mode 100644
index 4348c4c1956..00000000000
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.jabref.gui.exporter;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.InputMap;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.table.TableColumnModel;
-
-import org.jabref.Globals;
-import org.jabref.gui.JabRefDialog;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-
-import ca.odell.glazedlists.gui.TableFormat;
-import ca.odell.glazedlists.swing.DefaultEventTableModel;
-import com.jgoodies.forms.builder.ButtonBarBuilder;
-
-public class ExportCustomizationDialog extends JabRefDialog {
-
-    // Column widths for export customization dialog table:
-    private static final int COL_0_WIDTH = 50;
-    private static final int COL_1_WIDTH = 200;
-    private static final int COL_2_WIDTH = 30;
-
-    public ExportCustomizationDialog(final JabRefFrame frame) {
-
-        super(Localization.lang("Manage custom exports"), false, ExportCustomizationDialog.class);
-        DefaultEventTableModel<List<String>> tableModel = new DefaultEventTableModel<>(
-                Globals.prefs.customExports.getSortedList(), new ExportTableFormat());
-        JTable table = new JTable(tableModel);
-        TableColumnModel cm = table.getColumnModel();
-        cm.getColumn(0).setPreferredWidth(COL_0_WIDTH);
-        cm.getColumn(1).setPreferredWidth(COL_1_WIDTH);
-        cm.getColumn(2).setPreferredWidth(COL_2_WIDTH);
-        JScrollPane sp = new JScrollPane(table, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        table.setPreferredScrollableViewportSize(new Dimension(500, 150));
-        if (table.getRowCount() > 0) {
-            table.setRowSelectionInterval(0, 0);
-        }
-
-        JButton addExport = new JButton(Localization.lang("Add new"));
-        addExport.addActionListener(e -> {
-            CustomExportDialog ecd = new CustomExportDialog(frame);
-            ecd.setVisible(true);
-            if (ecd.okPressed()) {
-                Globals.prefs.customExports.addFormat(ecd.name(), ecd.layoutFile(), ecd.extension(),
-                        Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
-                        Globals.prefs.loadForExportFromPreferences());
-                Globals.prefs.customExports.store(Globals.prefs);
-            }
-        });
-
-        JButton modify = new JButton(Localization.lang("Modify"));
-        modify.addActionListener(e -> {
-            int row = table.getSelectedRow();
-            if (row == -1) {
-                return;
-            }
-            List<String> old = Globals.prefs.customExports.getSortedList().get(row);
-            CustomExportDialog ecd = new CustomExportDialog(frame, old.get(0), old.get(1), old.get(2));
-            ecd.setVisible(true); // ecd.show(); -> deprecated since 1.5
-            if (ecd.okPressed()) {
-                old.set(0, ecd.name());
-                old.set(1, ecd.layoutFile());
-                old.set(2, ecd.extension());
-                table.revalidate();
-                table.repaint();
-                Globals.prefs.customExports.store(Globals.prefs);
-            }
-        });
-
-        JButton remove = new JButton(Localization.lang("Remove"));
-        remove.addActionListener(e -> {
-            int[] rows = table.getSelectedRows();
-            if (rows.length == 0) {
-                return;
-            }
-            List<List<String>> entries = new ArrayList<>();
-            for (int i = 0; i < rows.length; i++) {
-                entries.add(Globals.prefs.customExports.getSortedList().get(rows[i]));
-            }
-            LayoutFormatterPreferences layoutPreferences = Globals.prefs
-                    .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
-            SavePreferences savePreferences = Globals.prefs.loadForExportFromPreferences();
-            for (List<String> list : entries) {
-                Globals.prefs.customExports.remove(list, layoutPreferences, savePreferences);
-            }
-            Globals.prefs.customExports.store(Globals.prefs);
-        });
-
-        Action closeAction = new AbstractAction() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dispose();
-            }
-        };
-
-        JButton close = new JButton(Localization.lang("Close"));
-        close.addActionListener(closeAction);
-
-        JButton help = new HelpAction(HelpFile.CUSTOM_EXPORTS).getHelpButton();
-
-        // Key bindings:
-        JPanel main = new JPanel();
-        ActionMap am = main.getActionMap();
-        InputMap im = main.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        im.put(Globals.getKeyPrefs().getKey(KeyBinding.CLOSE), "close");
-        am.put("close", closeAction);
-        main.setLayout(new BorderLayout());
-        main.add(sp, BorderLayout.CENTER);
-        JPanel buttons = new JPanel();
-        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-        buttons.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        bb.addGlue();
-        bb.addButton(addExport);
-        bb.addButton(modify);
-        bb.addButton(remove);
-        bb.addButton(close);
-        bb.addUnrelatedGap();
-        bb.addButton(help);
-        bb.addGlue();
-
-        getContentPane().add(main, BorderLayout.CENTER);
-        getContentPane().add(buttons, BorderLayout.SOUTH);
-        pack();
-        table.requestFocus();
-    }
-
-    private static class ExportTableFormat implements TableFormat<List<String>> {
-
-        @Override
-        public Object getColumnValue(List<String> strings, int i) {
-            return strings.get(i);
-        }
-
-        @Override
-        public int getColumnCount() {
-            return 3;
-        }
-
-        @Override
-        public String getColumnName(int col) {
-            switch (col) {
-            case 0:
-                return Localization.lang("Export name");
-            case 1:
-                return Localization.lang("Main layout file");
-            default:
-                return Localization.lang("Extension");
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
new file mode 100644
index 00000000000..0ca7d26c5ee
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
@@ -0,0 +1,77 @@
+package org.jabref.gui.exporter;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.fxmisc.easybind.EasyBind;
+
+public class ExportCustomizationDialogView extends BaseDialog<Void> {
+
+    @FXML private ButtonType addButton;
+    @FXML private ButtonType modifyButton;
+    @FXML private ButtonType removeButton;
+    @FXML private ButtonType closeButton;
+    @FXML private TableView<ExporterViewModel> exporterTable;
+    @FXML private TableColumn<ExporterViewModel, String> nameColumn;
+    @FXML private TableColumn<ExporterViewModel, String> layoutColumn;
+    @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferences;
+    @Inject private JournalAbbreviationLoader loader;
+    private ExportCustomizationDialogViewModel viewModel;
+
+    public ExportCustomizationDialogView() {
+        this.setTitle(Localization.lang("Customize Export Formats"));
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        ControlHelper.setAction(addButton, getDialogPane(), event -> addExporter());
+        ControlHelper.setAction(modifyButton, getDialogPane(), event -> modifyExporter());
+        ControlHelper.setAction(removeButton, getDialogPane(), event -> removeExporter());
+        ControlHelper.setAction(closeButton, getDialogPane(), event -> saveAndClose());
+    }
+
+    private void addExporter() {
+        viewModel.addExporter();
+    }
+
+    private void modifyExporter() {
+        viewModel.modifyExporter();
+    }
+
+    private void removeExporter() {
+        viewModel.removeExporters();
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new ExportCustomizationDialogViewModel(preferences, dialogService, loader);
+        exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        exporterTable.itemsProperty().bind(viewModel.exportersProperty());
+        EasyBind.listBind(viewModel.selectedExportersProperty(), exporterTable.getSelectionModel().getSelectedItems());
+        nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
+        layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
+        extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
+    }
+
+    private void saveAndClose() {
+        viewModel.saveToPrefs();
+        close();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
new file mode 100644
index 00000000000..76bbecce5dc
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
@@ -0,0 +1,81 @@
+package org.jabref.gui.exporter;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.preferences.PreferencesService;
+
+public class ExportCustomizationDialogViewModel extends AbstractViewModel {
+
+    private final ListProperty<ExporterViewModel> exporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ExporterViewModel> selectedExporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+
+    private final PreferencesService preferences;
+    private final DialogService dialogService;
+    private final JournalAbbreviationLoader loader;
+
+    public ExportCustomizationDialogViewModel(PreferencesService preferences, DialogService dialogService, JournalAbbreviationLoader loader) {
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+        this.loader = loader;
+        loadExporters();
+    }
+
+    private void loadExporters() {
+        List<TemplateExporter> exportersLogic = preferences.getCustomExportFormats(loader);
+        for (TemplateExporter exporter : exportersLogic) {
+            exporters.add(new ExporterViewModel(exporter));
+        }
+    }
+
+    public void addExporter() {
+        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(null, dialogService, preferences,
+                                                                                   loader);
+        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
+        if ((exporter != null) && exporter.isPresent()) {
+            exporters.add(exporter.get());
+        }
+    }
+
+    public void modifyExporter() {
+        CreateModifyExporterDialogView dialog;
+        ExporterViewModel exporterToModify = null;
+        if (selectedExporters.isEmpty()) {
+            return;
+        }
+        exporterToModify = selectedExporters.get(0);
+        dialog = new CreateModifyExporterDialogView(exporterToModify, dialogService, preferences, loader);
+        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
+        if ((exporter != null) && exporter.isPresent()) {
+            exporters.remove(exporterToModify);
+            exporters.add(exporter.get());
+        }
+    }
+
+    public void removeExporters() {
+        exporters.removeAll(selectedExporters);
+    }
+
+    public void saveToPrefs() {
+        List<TemplateExporter> exportersLogic = exporters.stream().map(ExporterViewModel::getLogic).collect(Collectors.toList());
+        preferences.storeCustomExportFormats(exportersLogic);
+
+    }
+
+    public ListProperty<ExporterViewModel> selectedExportersProperty() {
+        return selectedExporters;
+    }
+
+    public ListProperty<ExporterViewModel> exportersProperty() {
+        return exporters;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
new file mode 100644
index 00000000000..1b4b838ea69
--- /dev/null
+++ b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
@@ -0,0 +1,47 @@
+package org.jabref.gui.exporter;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.logic.exporter.TemplateExporter;
+
+/**
+ * ExporterViewModel wraps a TemplateExporter from logic and is used in the exporter customization dialog view
+ * and ViewModel.
+ *
+ *
+ */
+
+public class ExporterViewModel {
+
+    private final TemplateExporter exporter;
+    private final StringProperty name = new SimpleStringProperty();
+    private final StringProperty layoutFileName = new SimpleStringProperty();
+    private final StringProperty extension = new SimpleStringProperty();
+
+    public ExporterViewModel(TemplateExporter exporter) {
+        this.exporter = exporter;
+        this.name.setValue(exporter.getName());
+        this.layoutFileName.setValue(exporter.getLayoutFileNameWithExtension());
+        // Only the first of the extensions gotten from FileType is saved into the class using get(0)
+        String extensionString = exporter.getFileType().getExtensions().get(0);
+        this.extension.setValue(extensionString);
+    }
+
+    public TemplateExporter getLogic() {
+        return this.exporter;
+    }
+
+    public StringProperty name() {
+        return this.name;
+
+    }
+
+    public StringProperty layoutFileName() {
+        return this.layoutFileName;
+    }
+
+    public StringProperty extension() {
+        return this.extension;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
index 0fe12a13eaf..53a8d561a11 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.preferences;
 
-import java.util.Map;
+import java.util.List;
 import java.util.prefs.BackingStoreException;
 
 import javafx.collections.FXCollections;
@@ -193,7 +193,7 @@ private void importPreferences() {
 
     private void updateAfterPreferenceChanges() {
         setValues();
-        Map<String, TemplateExporter> customExporters = prefs.customExports.getCustomExportFormats(prefs, Globals.journalAbbreviationLoader);
+        List<TemplateExporter> customExporters = prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
         SavePreferences savePreferences = prefs.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = prefs.getXMPPreferences();
diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index be7b62252f3..52e88dacc73 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -28,7 +27,7 @@ private ExporterFactory(List<Exporter> exporters) {
         this.exporters = Objects.requireNonNull(exporters);
     }
 
-    public static ExporterFactory create(Map<String, TemplateExporter> customFormats,
+    public static ExporterFactory create(List<TemplateExporter> customFormats,
             LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences, XmpPreferences xmpPreferences) {
 
         List<Exporter> exporters = new ArrayList<>();
@@ -61,7 +60,7 @@ public static ExporterFactory create(Map<String, TemplateExporter> customFormats
         exporters.add(new XmpPdfExporter(xmpPreferences));
 
         // Now add custom export formats
-        exporters.addAll(customFormats.values());
+        exporters.addAll(customFormats);
 
         return new ExporterFactory(exporters);
     }
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index de3a7ab022c..4694e1b9f7e 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -41,6 +41,10 @@ public class TemplateExporter extends Exporter {
      * \\s simply marks any whitespace character
      */
     private static final Pattern BLANK_LINE_MATCHER = Pattern.compile("(?m)^\\s");
+    private static final String LAYOUT_EXTENSION = ".layout";
+    private static final String FORMATTERS_EXTENSION = ".formatters";
+    private static final String BEGIN_INFIX = ".begin";
+    private static final String END_INFIX = ".end";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class);
 
@@ -66,6 +70,22 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
         this(displayName, consoleName, lfFileName, directory, extension, null, null);
     }
 
+    /**
+     * Initialize another export format based on templates stored in dir with
+     * layoutFile lfFilename.
+     *
+     * @param name to display to the user and to call this format in the console.
+     * @param lfFileName  Name of the main layout file.
+     * @param directory   Directory in which to find the layout file.
+     * @param extension   May or may not contain the . (for instance .txt).
+     * @param layoutPreferences Preferences for the layout
+     * @param savePreferences Preferences for saving
+     */
+    public TemplateExporter(String name, String lfFileName, String extension, LayoutFormatterPreferences layoutPreferences,
+                            SavePreferences savePreferences) {
+        this(name, name, lfFileName, null, StandardFileType.newFileType(extension), layoutPreferences, savePreferences);
+    }
+
     /**
      * Initialize another export format based on templates stored in dir with
      * layoutFile lfFilename.
@@ -81,7 +101,11 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
     public TemplateExporter(String displayName, String consoleName, String lfFileName, String directory, FileType extension,
             LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences) {
         super(consoleName, displayName, extension);
-        this.lfFileName = Objects.requireNonNull(lfFileName);
+        if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
+            this.lfFileName = lfFileName.substring(0, lfFileName.length() - LAYOUT_EXTENSION.length());
+        } else {
+            this.lfFileName = lfFileName;
+        }
         this.directory = directory;
         this.layoutPreferences = layoutPreferences;
         this.savePreferences = savePreferences;
@@ -191,7 +215,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             List<String> missingFormatters = new ArrayList<>(1);
 
             // Print header
-            try (Reader reader = getReader(lfFileName + ".begin.layout")) {
+            try (Reader reader = getReader(lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION)) {
                 LayoutHelper layoutHelper = new LayoutHelper(reader, layoutPreferences);
                 beginLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
@@ -216,7 +240,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             // Load default layout
             Layout defLayout;
             LayoutHelper layoutHelper;
-            try (Reader reader = getReader(lfFileName + ".layout")) {
+            try (Reader reader = getReader(lfFileName + LAYOUT_EXTENSION)) {
                 layoutHelper = new LayoutHelper(reader, layoutPreferences);
                 defLayout = layoutHelper.getLayoutFromText();
             }
@@ -237,7 +261,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
                 if (layouts.containsKey(type)) {
                     layout = layouts.get(type);
                 } else {
-                    try (Reader reader = getReader(lfFileName + '.' + type + ".layout")) {
+                    try (Reader reader = getReader(lfFileName + '.' + type + LAYOUT_EXTENSION)) {
                         // We try to get a type-specific layout for this entry.
                         layoutHelper = new LayoutHelper(reader, layoutPreferences);
                         layout = layoutHelper.getLayoutFromText();
@@ -269,7 +293,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
 
             // changed section - begin (arudert)
             Layout endLayout = null;
-            try (Reader reader = getReader(lfFileName + ".end.layout")) {
+            try (Reader reader = getReader(lfFileName + END_INFIX + LAYOUT_EXTENSION)) {
                 layoutHelper = new LayoutHelper(reader, layoutPreferences);
                 endLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
@@ -300,7 +324,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
      *
      */
     private void readFormatterFile() {
-        File formatterFile = new File(lfFileName + ".formatters");
+        File formatterFile = new File(lfFileName + FORMATTERS_EXTENSION);
         if (formatterFile.exists()) {
             try (Reader in = new FileReader(formatterFile)) {
                 // Ok, we found and opened the file. Read all contents:
@@ -331,4 +355,12 @@ private void readFormatterFile() {
             }
         }
     }
+
+    public String getLayoutFileName() {
+        return lfFileName;
+    }
+
+    public String getLayoutFileNameWithExtension() {
+        return lfFileName + LAYOUT_EXTENSION;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index db7766e9811..0d62f73ef65 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -52,6 +52,11 @@ public List<String> getExtensions() {
     }
 
     public static FileType newFileType(String... extensions) {
+        for (int i = 0; i < extensions.length; i++) {
+            if (extensions[i].contains(".")) {
+                extensions[i] = extensions[i].substring(extensions[i].indexOf('.') + 1);
+            }
+        }
         return () -> Arrays.asList(extensions);
     }
 }
diff --git a/src/main/java/org/jabref/preferences/CustomExportList.java b/src/main/java/org/jabref/preferences/CustomExportList.java
deleted file mode 100644
index 81efca437a6..00000000000
--- a/src/main/java/org/jabref/preferences/CustomExportList.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.jabref.preferences;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.TreeMap;
-
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.TemplateExporter;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.util.FileType;
-import org.jabref.logic.util.StandardFileType;
-
-import ca.odell.glazedlists.BasicEventList;
-import ca.odell.glazedlists.EventList;
-import ca.odell.glazedlists.SortedList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class handles user defined custom export formats. They are initially
- * read from Preferences, and kept alphabetically (sorted by name). Formats can
- * be added or removed. When modified, the sort() method must be called to make
- * sure the formats stay properly sorted. When the method store() is called,
- * export formats are written to Preferences.
- */
-
-public class CustomExportList {
-
-    private static final int EXPORTER_NAME_INDEX = 0;
-    private static final int EXPORTER_FILENAME_INDEX = 1;
-    private static final int EXPORTER_EXTENSION_INDEX = 2;
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomExportList.class);
-    private final EventList<List<String>> list;
-    private final SortedList<List<String>> sorted;
-
-    private final Map<String, TemplateExporter> formats = new TreeMap<>();
-
-    public CustomExportList(Comparator<List<String>> comp) {
-        list = new BasicEventList<>();
-        sorted = new SortedList<>(list, comp);
-    }
-
-    public int size() {
-        return list.size();
-    }
-
-    public EventList<List<String>> getSortedList() {
-        return sorted;
-    }
-
-    public Map<String, TemplateExporter> getCustomExportFormats(JabRefPreferences prefs,
-            JournalAbbreviationLoader loader) {
-        Objects.requireNonNull(prefs);
-        Objects.requireNonNull(loader);
-        formats.clear();
-        readPrefs(prefs, loader);
-        return formats;
-    }
-
-    private void readPrefs(JabRefPreferences prefs, JournalAbbreviationLoader loader) {
-        Objects.requireNonNull(prefs);
-        Objects.requireNonNull(loader);
-        formats.clear();
-        list.clear();
-        int i = 0;
-        List<String> s;
-        LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(loader);
-        SavePreferences savePreferences = prefs.loadForExportFromPreferences();
-        while (!((s = prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i)).isEmpty())) {
-            Optional<TemplateExporter> format = createFormat(s.get(EXPORTER_NAME_INDEX), s.get(EXPORTER_FILENAME_INDEX), s.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences);
-            if (format.isPresent()) {
-                formats.put(format.get().getId(), format.get());
-                list.add(s);
-            } else {
-                String customExportFormat = prefs.get(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i);
-                LOGGER.error("Error initializing custom export format from string " + customExportFormat);
-            }
-            i++;
-        }
-    }
-
-    private Optional<TemplateExporter> createFormat(String exporterName, String filename, String extension, LayoutFormatterPreferences layoutPreferences,
-            SavePreferences savePreferences) {
-
-        String lfFileName;
-        if (filename.endsWith(".layout")) {
-            lfFileName = filename.substring(0, filename.length() - ".layout".length());
-        } else {
-            lfFileName = filename;
-        }
-        if (extension.contains(".")) {
-            extension = extension.substring(extension.indexOf('.') + 1, extension.length());
-        }
-        FileType fileType = StandardFileType.newFileType(extension);
-        TemplateExporter format = new TemplateExporter(exporterName, exporterName, lfFileName, null, fileType, layoutPreferences,
-                savePreferences);
-        format.setCustomExport(true);
-        return Optional.of(format);
-    }
-
-    public void store(JabRefPreferences prefs) {
-
-        if (list.isEmpty()) {
-            purge(0, prefs);
-        } else {
-            for (int i = 0; i < list.size(); i++) {
-                prefs.putStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i, list.get(i));
-            }
-            purge(list.size(), prefs);
-        }
-    }
-
-    private void purge(int from, JabRefPreferences prefs) {
-        int i = from;
-        while (!prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i).isEmpty()) {
-            prefs.remove(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i);
-            i++;
-        }
-    }
-
-    public void remove(List<String> toRemove, LayoutFormatterPreferences layoutPreferences,
-            SavePreferences savePreferences) {
-        createFormat(toRemove.get(EXPORTER_NAME_INDEX), toRemove.get(EXPORTER_FILENAME_INDEX), toRemove.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences).ifPresent(format -> {
-            formats.remove(format.getId());
-            list.remove(toRemove);
-        });
-    }
-
-    public void addFormat(String name, String layoutFile, String extension, LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences) {
-        createFormat(name, layoutFile, extension, layoutPreferences, savePreferences).ifPresent(format -> {
-            formats.put(format.getId(), format);
-            list.add(Arrays.asList(name, layoutFile, extension));
-        });
-
-    }
-}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index cd69952856f..692df3eec82 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -408,14 +408,17 @@ public class JabRefPreferences implements PreferencesService {
     // Helper string
     private static final String USER_HOME = System.getProperty("user.home");
 
+    // Indexes for Strings within stored custom export entries
+    private static final int EXPORTER_NAME_INDEX = 0;
+    private static final int EXPORTER_FILENAME_INDEX = 1;
+    private static final int EXPORTER_EXTENSION_INDEX = 2;
+
     // The only instance of this class:
     private static JabRefPreferences singleton;
     /**
      * HashMap that contains all preferences which are set by default
      */
     public final Map<String, Object> defaults = new HashMap<>();
-    // Object containing custom export formats:
-    public final CustomExportList customExports;
     /**
      * Set with all custom {@link org.jabref.logic.importer.Importer}s
      */
@@ -729,7 +732,6 @@ private JabRefPreferences() {
         //Default empty String to be backwards compatible
         defaults.put(IMPORT_FILEDIRPATTERN, "");
 
-        customExports = new CustomExportList(new ExportComparator());
         customImports = new CustomImportList(this);
 
         String defaultExpression = "**/.*[bibtexkey].*\\\\.[extension]";
@@ -1463,6 +1465,7 @@ public ImportFormatPreferences getImportFormatPreferences() {
                                            isKeywordSyncEnabled());
     }
 
+    @Override
     public SavePreferences loadForExportFromPreferences() {
         Boolean saveInOriginalOrder = this.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER);
         SaveOrderConfig saveOrder = null;
@@ -1503,7 +1506,7 @@ public SavePreferences loadForSaveFromPreferences() {
     }
 
     public ExporterFactory getExporterFactory(JournalAbbreviationLoader abbreviationLoader) {
-        Map<String, TemplateExporter> customFormats = this.customExports.getCustomExportFormats(this, abbreviationLoader);
+        List<TemplateExporter> customFormats = getCustomExportFormats(abbreviationLoader);
         LayoutFormatterPreferences layoutPreferences = this.getLayoutFormatterPreferences(abbreviationLoader);
         SavePreferences savePreferences = this.loadForExportFromPreferences();
         XmpPreferences xmpPreferences = this.getXMPPreferences();
@@ -1525,8 +1528,8 @@ public TimestampPreferences getTimestampPreferences() {
         return new TimestampPreferences(getBoolean(USE_TIME_STAMP), getBoolean(UPDATE_TIMESTAMP), get(TIME_STAMP_FIELD), get(TIME_STAMP_FORMAT), getBoolean(OVERWRITE_TIME_STAMP));
     }
 
-    public LayoutFormatterPreferences getLayoutFormatterPreferences(
-                                                                    JournalAbbreviationLoader journalAbbreviationLoader) {
+    @Override
+    public LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationLoader journalAbbreviationLoader) {
         Objects.requireNonNull(journalAbbreviationLoader);
         return new LayoutFormatterPreferences(getNameFormatterPreferences(), getJournalAbbreviationPreferences(),
                                               getFileLinkPreferences(), journalAbbreviationLoader);
@@ -1983,4 +1986,62 @@ public FileDragDropPreferenceType getEntryEditorFileLinkPreference() {
     public void storeEntryEditorFileLinkPreference(FileDragDropPreferenceType type) {
         put(ENTRY_EDITOR_DRAG_DROP_PREFERENCE_TYPE, type.name());
     }
+
+    @Override
+    public List<TemplateExporter> getCustomExportFormats(JournalAbbreviationLoader loader) {
+        int i = 0;
+        List<TemplateExporter> formats = new ArrayList<>();
+        String exporterName;
+        String filename;
+        String extension;
+        LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences(loader);
+        SavePreferences savePreferences = loadForExportFromPreferences();
+        List<String> formatData;
+        while (!((formatData = getStringList(CUSTOM_EXPORT_FORMAT + i)).isEmpty())) {
+            exporterName = formatData.get(EXPORTER_NAME_INDEX);
+            filename = formatData.get(EXPORTER_FILENAME_INDEX);
+            extension = formatData.get(EXPORTER_EXTENSION_INDEX);
+            TemplateExporter format = new TemplateExporter(exporterName, filename, extension,
+                                                           layoutPreferences, savePreferences);
+            format.setCustomExport(true);
+            formats.add(format);
+            i++;
+        }
+        return formats;
+    }
+
+    @Override
+    public void storeCustomExportFormats(List<TemplateExporter> exporters) {
+        if (exporters.isEmpty()) {
+            purgeCustomExportFormats(0);
+        } else {
+            for (int i = 0; i < exporters.size(); i++) {
+                List<String> exporterData = new ArrayList<>();
+                exporterData.add(EXPORTER_NAME_INDEX, exporters.get(i).getName());
+                exporterData.add(EXPORTER_FILENAME_INDEX, exporters.get(i).getLayoutFileName());
+                // Only stores the first extension associated with FileType
+                exporterData.add(EXPORTER_EXTENSION_INDEX, exporters.get(i).getFileType().getExtensions().get(0));
+                putStringList(CUSTOM_EXPORT_FORMAT + i, exporterData);
+            }
+            purgeCustomExportFormats(exporters.size());
+        }
+    }
+
+    private void purgeCustomExportFormats(int from) {
+        int i = from;
+        while (!getStringList(CUSTOM_EXPORT_FORMAT + i).isEmpty()) {
+            remove(CUSTOM_EXPORT_FORMAT + i);
+            i++;
+        }
+    }
+
+    @Override
+    public void setExportWorkingDirectory(String layoutFileDirString) {
+        put(EXPORT_WORKING_DIRECTORY, layoutFileDirString);
+    }
+
+    @Override
+    public String getExportWorkingDirectory() {
+        return get(EXPORT_WORKING_DIRECTORY);
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 0458c688759..00da6820019 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -5,7 +5,11 @@
 import java.util.Map;
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.model.metadata.FilePreferences;
 
 public interface PreferencesService {
@@ -35,4 +39,15 @@ public interface PreferencesService {
 
     public void updateEntryEditorTabList();
 
+    List<TemplateExporter> getCustomExportFormats(JournalAbbreviationLoader loader);
+
+    void storeCustomExportFormats(List<TemplateExporter> exporters);
+
+    LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationLoader loader);
+
+    SavePreferences loadForExportFromPreferences();
+
+    void setExportWorkingDirectory(String layoutFileDirString);
+
+    String getExportWorkingDirectory();
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a79cfd436cb..8a86a4706cc 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -37,8 +37,6 @@ Action=Action
 
 Add=Add
 
-Add\ new=Add new
-
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Add a (compiled) custom Importer class from a class path.
 The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=The path need not be on the classpath of JabRef.
 
@@ -331,7 +329,6 @@ Each\ line\ must\ be\ of\ the\ following\ form=Each line must be of the followin
 
 Edit=Edit
 
-Edit\ custom\ export=Edit custom export
 Edit\ entry=Edit entry
 Save\ file=Save file
 Edit\ file\ type=Edit file type
@@ -388,14 +385,10 @@ Overwrite\ file?=Overwrite file?
 
 Export=Export
 
-Export\ name=Export name
-
 Export\ preferences=Export preferences
 
 Export\ preferences\ to\ file=Export preferences to file
 
-Export\ properties=Export properties
-
 Export\ to\ clipboard=Export to clipboard
 
 Export\ to\ text\ file.=Export to text file.
@@ -624,8 +617,6 @@ Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\
 
 Main\ file\ directory=Main file directory
 
-Main\ layout\ file=Main layout file
-
 Manage\ custom\ exports=Manage custom exports
 
 Manage\ custom\ imports=Manage custom imports
@@ -2236,3 +2227,10 @@ Copy\ file\ to\ default\ file\ folder=Copy file to default file folder
 Link\ file\ (without\ copying)=Link file (without copying)
 Copy,\ rename\ and\ link\ file=Copy, rename and link file
 Type=Type
+Customize\ Export\ Formats=Customize Export Formats
+Export\ name=Export name
+Main\ layout\ file\:=Main layout file\:
+Main\ layout\ file=Main layout file
+Save\ exporter=Save exporter
+File\ extension\:=File extension\:
+Export\ format\ name\:=Export format name\:
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index a2e7cd9ccfa..a408b035221 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -5,10 +5,9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -34,7 +33,7 @@ public class CsvExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index 948d47facf7..a97c72ef463 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -7,10 +7,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -47,7 +46,7 @@ public class DocBook5ExporterTest {
     public void setUp() throws URISyntaxException {
         xmlFile = Paths.get(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
 
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index 842319f2bb3..67c7087f8da 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -7,9 +7,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -44,7 +42,7 @@ public void setUp() {
     private static Stream<Object[]> exportFormats() {
         Collection<Object[]> result = new ArrayList<>();
 
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 7fe930f9fd5..28067d99bde 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -4,10 +4,9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -33,7 +32,7 @@ public class HtmlExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 7038e8f436e..d06fc91e374 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -5,11 +5,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -37,7 +36,7 @@ public class XmpExporterTest {
 
     @BeforeEach
     public void setUp() {
-        Map<String, TemplateExporter> customFormats = new HashMap<>();
+        List<TemplateExporter> customFormats = new ArrayList<>();
         LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         SavePreferences savePreferences = mock(SavePreferences.class);
         ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences);