diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index ab8631489d5..9c2f2ddb6d2 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -121,12 +121,12 @@ public class BasePanel extends StackPane {
     // Keeps track of the string dialog if it is open.
     private final Map<Actions, BaseAction> actions = new HashMap<>();
     private final SidePaneManager sidePaneManager;
-    private final BasePanelPreferences preferences;
     private final ExternalFileTypes externalFileTypes;
 
     private final EntryEditor entryEditor;
     private final DialogService dialogService;
     private MainTable mainTable;
+    private BasePanelPreferences preferences;
     // To contain instantiated entry editors. This is to save time
     // As most enums, this must not be null
     private BasePanelMode mode = BasePanelMode.SHOWING_NOTHING;
@@ -727,6 +727,8 @@ public void actionPerformed(ActionEvent e) {
     }
 
     public void setupMainPanel() {
+        preferences = BasePanelPreferences.from(Globals.prefs);
+
         splitPane = new SplitPane();
         splitPane.setOrientation(Orientation.VERTICAL);
         adjustSplitter(); // restore last splitting state (before mainTable is created as creation affects the stored size of the entryEditors)
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index d8304f472cd..74c2e327603 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -694,41 +694,17 @@ private MenuBar createMenu() {
         );
 
         if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
-            boolean menuItemAdded = false;
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.RANKING, factory, undoManager));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.RELEVANCE, factory));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.QUALITY, factory));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.PRINTED, factory));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.PRIORITY, factory, undoManager));
-                menuItemAdded = true;
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ)) {
-                edit.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.READ_STATUS, factory, undoManager));
-                menuItemAdded = true;
-            }
-
-            if (menuItemAdded) {
-                edit.getItems().add(new SeparatorMenuItem());
-            }
+            edit.getItems().addAll(
+                    SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.RANKING, factory, undoManager),
+                    SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.RELEVANCE, factory),
+                    SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.QUALITY, factory),
+                    SpecialFieldMenuItemFactory.getSpecialFieldSingleItemForActiveDatabase(SpecialField.PRINTED, factory),
+                    SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.PRIORITY, factory, undoManager),
+                    SpecialFieldMenuItemFactory.createSpecialFieldMenuForActiveDatabase(SpecialField.READ_STATUS, factory, undoManager),
+                    new SeparatorMenuItem()
+            );
         }
+
         //@formatter:off
         library.getItems().addAll(
                 factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs, stateManager)),
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
index c02ab26df61..f2a8364f7c7 100644
--- a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -5,29 +5,31 @@
 
 import javafx.scene.control.TableColumn.SortType;
 
-import org.jabref.model.entry.field.SpecialField;
-
 public class ColumnPreferences {
 
     public static final double DEFAULT_FIELD_LENGTH = 100;
     private final boolean showFileColumn;
     private final boolean showUrlColumn;
     private final boolean preferDoiOverUrl;
-    private final boolean showEprintColumn;
-    private final List<String> normalColumns;
-    private final List<SpecialField> specialFieldColumns;
-    private final List<String> extraFileColumns;
+    private final boolean showEPrintColumn;
+    private final List<String> columnNames;
+    private final boolean specialFieldsEnabled;
+    private final boolean autoSyncSpecialFieldsToKeyWords;
+    private final boolean serializeSpecialFields;
+    private final boolean extraFileColumnsEnabled;
     private final Map<String, Double> columnWidths;
     private final Map<String, SortType> columnSortType;
 
-    public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean preferDoiOverUrl, boolean showEprintColumn, List<String> normalColumns, List<SpecialField> specialFieldColumns, List<String> extraFileColumns, Map<String, Double> columnWidths, Map<String, SortType> columnSortType) {
+    public ColumnPreferences(boolean showFileColumn, boolean showUrlColumn, boolean preferDoiOverUrl, boolean showEPrintColumn, List<String> columnNames, boolean specialFieldsEnabled, boolean autoSyncSpecialFieldsToKeyWords, boolean serializeSpecialFields, boolean extraFileColumnsEnabled, Map<String, Double> columnWidths, Map<String, SortType> columnSortType) {
         this.showFileColumn = showFileColumn;
         this.showUrlColumn = showUrlColumn;
         this.preferDoiOverUrl = preferDoiOverUrl;
-        this.showEprintColumn = showEprintColumn;
-        this.normalColumns = normalColumns;
-        this.specialFieldColumns = specialFieldColumns;
-        this.extraFileColumns = extraFileColumns;
+        this.showEPrintColumn = showEPrintColumn;
+        this.columnNames = columnNames;
+        this.specialFieldsEnabled = specialFieldsEnabled;
+        this.autoSyncSpecialFieldsToKeyWords = autoSyncSpecialFieldsToKeyWords;
+        this.serializeSpecialFields = serializeSpecialFields;
+        this.extraFileColumnsEnabled = extraFileColumnsEnabled;
         this.columnWidths = columnWidths;
         this.columnSortType = columnSortType;
     }
@@ -45,22 +47,30 @@ public boolean preferDoiOverUrl() {
     }
 
     public boolean showEprintColumn() {
-        return showEprintColumn;
+        return showEPrintColumn;
     }
 
-    public List<String> getExtraFileColumns() {
-        return extraFileColumns;
+    public boolean getSpecialFieldsEnabled() { return specialFieldsEnabled; }
+
+    public boolean getAutoSyncSpecialFieldsToKeyWords() {
+        return autoSyncSpecialFieldsToKeyWords;
     }
 
-    public List<SpecialField> getSpecialFieldColumns() {
-        return specialFieldColumns;
+    public boolean getSerializeSpecialFields() {
+        return serializeSpecialFields;
+    }
+
+    public boolean getExtraFileColumnsEnabled() { return extraFileColumnsEnabled; }
+
+    public List<String> getColumnNames() {
+        return columnNames;
     }
 
-    public List<String> getNormalColumns() {
-        return normalColumns;
+    public Map<String, Double> getColumnWidths() {
+        return columnWidths;
     }
 
-    public double getPrefColumnWidth(String columnName) {
+    public double getColumnWidth(String columnName) {
         return columnWidths.getOrDefault(columnName, DEFAULT_FIELD_LENGTH);
     }
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index 2c2845638e5..45fc7c7b72c 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -33,6 +33,7 @@
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.gui.specialfields.SpecialFieldViewModel;
+import org.jabref.gui.util.FieldsUtil;
 import org.jabref.gui.util.OptionalValueTableCellFactory;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.comparator.RankingFieldComparator;
@@ -81,12 +82,11 @@ public MainTableColumnFactory(BibDatabaseContext database, ColumnPreferences pre
     public List<TableColumn<BibEntryTableViewModel, ?>> createColumns() {
         List<TableColumn<BibEntryTableViewModel, ?>> columns = new ArrayList<>();
         columns.add(createGroupColumn());
-        // Add column for linked files
+
         if (preferences.showFileColumn()) {
             columns.add(createFileColumn());
         }
 
-        // Add column for DOI/URL
         if (preferences.showUrlColumn()) {
             if (preferences.preferDoiOverUrl()) {
                 columns.add(createUrlOrDoiColumn(IconTheme.JabRefIcons.DOI, StandardField.DOI, StandardField.URL));
@@ -95,21 +95,19 @@ public MainTableColumnFactory(BibDatabaseContext database, ColumnPreferences pre
             }
         }
 
-        // Add column for eprints
         if (preferences.showEprintColumn()) {
             columns.add(createEprintColumn(IconTheme.JabRefIcons.WWW, StandardField.EPRINT));
         }
 
-        // Add columns for other file types
-        columns.addAll(preferences.getExtraFileColumns().stream().map(this::createExtraFileColumn).collect(Collectors.toList()));
-
-        // Add 'normal' bibtex fields as configured in the preferences
-        columns.addAll(createNormalColumns());
-
-        // Add the "special" icon columns (e.g., ranking, file, ...) that are enabled in preferences
-        for (SpecialField field : preferences.getSpecialFieldColumns()) {
-            columns.add(createSpecialFieldColumn((field)));
-        }
+        preferences.getColumnNames().stream().map(FieldFactory::parseField).forEach(field -> {
+                    if (field instanceof FieldsUtil.ExtraFilePseudoField) {
+                        columns.add(createExtraFileColumn(field.getName()));
+                    } else if (field instanceof SpecialField) {
+                        columns.add(createSpecialFieldColumn((SpecialField) field));
+                    } else {
+                        columns.add(createNormalColumn(field));
+                    }
+                });
 
         return columns;
     }
@@ -163,20 +161,15 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractG
         return new Pane();
     }
 
-    private List<TableColumn<BibEntryTableViewModel, ?>> createNormalColumns() {
-        List<TableColumn<BibEntryTableViewModel, ?>> columns = new ArrayList<>();
-
-        // Read table columns from preferences
-        for (String columnName : preferences.getNormalColumns()) {
-            NormalTableColumn column = new NormalTableColumn(columnName, FieldFactory.parseOrFields(columnName), database.getDatabase());
+    private TableColumn<BibEntryTableViewModel, ?> createNormalColumn(Field field) {
+        String columnName = field.getName();
+        NormalTableColumn column = new NormalTableColumn(columnName, FieldFactory.parseOrFields(columnName), database.getDatabase());
             new ValueTableCellFactory<BibEntryTableViewModel, String>()
                     .withText(text -> text)
                     .install(column);
             column.setSortable(true);
-            column.setPrefWidth(preferences.getPrefColumnWidth(columnName));
-            columns.add(column);
-        }
-        return columns;
+            column.setPrefWidth(preferences.getColumnWidth(columnName));
+        return column;
     }
 
     private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>> createSpecialFieldColumn(SpecialField specialField) {
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index dbabf52e37e..7029810a2fa 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -48,29 +48,12 @@ public static ContextMenu create(BibEntryTableViewModel entry, KeyBindingReposit
         contextMenu.getItems().add(new SeparatorMenuItem());
 
         if (Globals.prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED)) {
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING)) {
-                contextMenu.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, panel));
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE)) {
-                contextMenu.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, panel));
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY)) {
-                contextMenu.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, panel));
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED)) {
-                contextMenu.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, panel));
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY)) {
-                contextMenu.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, panel));
-            }
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ)) {
-                contextMenu.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, panel));
-            }
+            contextMenu.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, panel));
+            contextMenu.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, panel));
+            contextMenu.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, panel));
+            contextMenu.getItems().add(SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, panel));
+            contextMenu.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, panel));
+            contextMenu.getItems().add(SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, panel));
         }
 
         contextMenu.getItems().add(new SeparatorMenuItem());
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index d1a64d69c58..94d9af78de5 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -49,7 +49,7 @@ public PreferencesDialogViewModel(DialogService dialogService, TaskExecutor task
                 new GeneralTabView(prefs),
                 new FileTabView(prefs),
                 new TablePrefsTab(prefs),
-                new TableColumnsTab(prefs, frame),
+                new TableColumnsTabView(prefs),
                 new PreviewTabView(prefs),
                 new ExternalTabView(prefs, frame),
                 new GroupsTabView(prefs),
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsItemModel.java b/src/main/java/org/jabref/gui/preferences/TableColumnsItemModel.java
new file mode 100644
index 00000000000..9ac5faa8fb7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsItemModel.java
@@ -0,0 +1,90 @@
+package org.jabref.gui.preferences;
+
+import java.util.Objects;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.value.ObservableValue;
+
+import org.jabref.gui.maintable.ColumnPreferences;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.UnknownField;
+
+public class TableColumnsItemModel {
+
+    private final ObjectProperty<Field> field;
+    private final StringProperty name = new SimpleStringProperty("");
+    private final DoubleProperty length = new SimpleDoubleProperty(ColumnPreferences.DEFAULT_FIELD_LENGTH);
+    private final BooleanProperty editableProperty = new SimpleBooleanProperty(true);
+
+    public TableColumnsItemModel() {
+        this.field = new SimpleObjectProperty<>(new UnknownField(Localization.lang("New column")));
+    }
+
+    public TableColumnsItemModel(Field field) {
+        this.field = new SimpleObjectProperty<>(field);
+        this.editableProperty.setValue(this.field.get() instanceof UnknownField);
+    }
+
+    public TableColumnsItemModel(Field field, double length) {
+        this.field = new SimpleObjectProperty<>(field);
+        this.length.setValue(length);
+        this.editableProperty.setValue(this.field.get() instanceof UnknownField);
+    }
+
+    public void setField(Field field) {
+        this.field.set(field);
+    }
+
+    public Field getField() {
+        return field.get();
+    }
+
+    public ObservableValue<Field> fieldProperty() { return this.field; }
+
+    public void setName(String name) {
+        if (editableProperty.get()) {
+            field.setValue(new UnknownField(name));
+        }
+    }
+
+    public String getName() {
+        return field.get().getName();
+    }
+
+    public StringProperty nameProperty() { return this.name; }
+
+    public void setLength(double length) {
+        this.length.set(length);
+    }
+
+    public double getLength() {
+        return length.get();
+    }
+
+    public DoubleProperty lengthProperty() { return this.length; }
+
+    public ReadOnlyBooleanProperty editableProperty() { return editableProperty; }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(field);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof TableColumnsItemModel) {
+            return Objects.equals(this.field, ((TableColumnsItemModel) obj).field);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml
new file mode 100644
index 00000000000..69912ee367c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<?import org.jabref.gui.icon.JabRefIconView?>
+<?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.TableColumnsTabView">
+    <fx:define>
+        <ToggleGroup fx:id="specialFieldsStoreMode"/>
+        <ToggleGroup fx:id="urlDoiShownFirst"/>
+    </fx:define>
+    <Label styleClass="titleHeader" text="%Entry table"/>
+    <Label styleClass="sectionHeader" text="%Columns"/>
+    <HBox spacing="4.0">
+        <VBox spacing="4.0" HBox.hgrow="SOMETIMES">
+            <TableView fx:id="columnsList" editable="true" prefHeight="300.0" prefWidth="220.0">
+                <columns>
+                    <TableColumn fx:id="nameColumn" prefWidth="160.0" text="Name"/>
+                    <TableColumn fx:id="actionsColumn" maxWidth="40.0" minWidth="40.0" resizable="false"/>
+                </columns>
+                <columnResizePolicy>
+                    <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                </columnResizePolicy>
+            </TableView>
+            <ComboBox fx:id="addColumnName" editable="true" maxWidth="Infinity"/>
+        </VBox>
+        <VBox alignment="CENTER">
+            <Button fx:id="reloadTableColumns" prefHeight="20.0" prefWidth="20.0"
+                    styleClass="icon-button,narrow" onAction="#updateToCurrentColumnOrder">
+                <graphic>
+                    <JabRefIconView glyph="REFRESH"/>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="%Update to current column order"/>
+                </tooltip>
+            </Button>
+            <VBox alignment="CENTER" spacing="10.0" VBox.vgrow="ALWAYS">
+                <Button prefHeight="20.0" prefWidth="20.0"
+                        styleClass="icon-button,narrow" onAction="#sortColumnUp">
+                    <graphic>
+                        <JabRefIconView glyph="UP"/>
+                    </graphic>
+                    <tooltip>
+                        <Tooltip text="%Sort column one step upwards"/>
+                    </tooltip>
+                </Button>
+                <Button prefHeight="20.0" prefWidth="20.0"
+                        styleClass="icon-button,narrow" onAction="#sortColumnDown">
+                    <graphic>
+                        <JabRefIconView glyph="DOWN"/>
+                    </graphic>
+                    <tooltip>
+                        <Tooltip text="%Sort column one step downwards"/>
+                    </tooltip>
+                </Button>
+            </VBox>
+            <Button prefHeight="20.0" prefWidth="20.0"
+                    styleClass="icon-button,narrow" onAction="#addColumn">
+                <graphic>
+                    <JabRefIconView glyph="ADD_NOBOX"/>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="%Add custom column"/>
+                </tooltip>
+            </Button>
+        </VBox>
+        <VBox spacing="10.0">
+            <padding>
+                <Insets left="20.0"/>
+            </padding>
+            <CheckBox fx:id="showFileColumn" text="%Show file column"/>
+            <CheckBox fx:id="showUrlColumn" text="%Show URL/DOI column"/>
+            <VBox spacing="10.0">
+                <padding>
+                    <Insets left="20.0"/>
+                </padding>
+                <RadioButton fx:id="urlFirst" text="%Show URL first" toggleGroup="$urlDoiShownFirst"/>
+                <RadioButton fx:id="doiFirst" text="%Show DOI first" toggleGroup="$urlDoiShownFirst"/>
+            </VBox>
+            <CheckBox fx:id="showEPrintColumn" text="%Show ArXiv column"/>
+            <HBox alignment="CENTER_LEFT" spacing="10.0">
+                <padding>
+                    <Insets bottom="-5.0"/>
+                </padding>
+                <CheckBox fx:id="specialFieldsEnable" text="%Enable special fields"/>
+                <Button fx:id="specialFieldsHelp" prefWidth="20.0"/>
+            </HBox>
+            <VBox spacing="10.0">
+                <padding>
+                    <Insets left="20.0"/>
+                </padding>
+                <RadioButton fx:id="specialFieldsSyncKeywords"
+                             text="%Synchronize with keywords"
+                             toggleGroup="$specialFieldsStoreMode"/>
+                <RadioButton fx:id="specialFieldsSerialize"
+                             text="%Write values of special fields as separate fields to BibTeX"
+                             toggleGroup="$specialFieldsStoreMode"/>
+            </VBox>
+            <CheckBox fx:id="extraFileColumnsEnable" text="%Show extra columns"/>
+        </VBox>
+    </HBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
deleted file mode 100644
index b681aa5fd81..00000000000
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ /dev/null
@@ -1,562 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.control.cell.TextFieldTableCell;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.maintable.ColumnPreferences;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-class TableColumnsTab extends Pane implements PreferencesTab {
-
-    private final JabRefPreferences prefs;
-    private boolean tableChanged;
-    private final TableView<TableRow> colSetup;
-    private final JabRefFrame frame;
-
-    private final CheckBox urlColumn;
-    private final CheckBox fileColumn;
-    private final CheckBox arxivColumn;
-
-    private final CheckBox extraFileColumns;
-    private final ListView listOfFileColumns;
-
-    private final RadioButton preferUrl;
-    private final RadioButton preferDoi;
-    /*** begin: special fields ***/
-    private final Button addRow;
-    private final Button deleteRow;
-    private final Button down;
-    private final Button up;
-    private final CheckBox specialFieldsEnabled;
-    private final CheckBox rankingColumn;
-    private final CheckBox qualityColumn;
-    private final CheckBox priorityColumn;
-    private final CheckBox relevanceColumn;
-    private final CheckBox printedColumn;
-    private final CheckBox readStatusColumn;
-    private final RadioButton syncKeywords;
-    private final RadioButton writeSpecialFields;
-    private boolean oldSpecialFieldsEnabled;
-    private boolean oldRankingColumn;
-    private boolean oldQualityColumn;
-    private boolean oldPriorityColumn;
-    private boolean oldRelevanceColumn;
-    private boolean oldPrintedColumn;
-    private boolean oldReadStatusColumn;
-    private boolean oldSyncKeyWords;
-    private boolean oldWriteSpecialFields;
-    private final VBox listOfFileColumnsVBox;
-    private final ObservableList<TableRow> data;
-    private final GridPane builder = new GridPane();
-
-    /**
-     * Customization of external program paths.
-     *
-     * @param prefs a <code>JabRefPreferences</code> value
-     */
-    public TableColumnsTab(JabRefPreferences prefs, JabRefFrame frame) {
-        this.prefs = prefs;
-        this.frame = frame;
-
-        /* Populate the data of Entry table columns */
-        List<String> prefColNames = this.prefs.getStringList(JabRefPreferences.COLUMN_NAMES);
-        List<String> prefColWidths = this.prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS);
-        this.data = FXCollections.observableArrayList();
-        for (int i = 0; i < prefColNames.size(); i++) {
-            this.data.add(new TableRow(prefColNames.get(i), Double.parseDouble(prefColWidths.get(i))));
-        }
-
-        /* UI for Entry table columns */
-        colSetup = new TableView<>();
-        colSetup.setEditable(true);
-        TableColumn<TableRow, String> field = new TableColumn<>(Localization.lang("Field name"));
-        field.setPrefWidth(400);
-        field.setCellValueFactory(new PropertyValueFactory<>("name"));
-        field.setCellFactory(TextFieldTableCell.forTableColumn());
-        field.setEditable(true);
-        field.setOnEditCommit(
-                              (TableColumn.CellEditEvent<TableRow, String> t) -> {
-                                  t.getTableView().getItems().get(
-                                                                  t.getTablePosition().getRow())
-                                   .setName(t.getNewValue());
-                                  // Since data is an ObservableList, updating it updates the displayed field name.
-                                  this.data.set(t.getTablePosition().getRow(), new TableRow(t.getNewValue()));
-                                  // Update the User Preference of COLUMN_NAMES
-                                  List<String> tempColumnNames = this.prefs.getStringList(JabRefPreferences.COLUMN_NAMES);
-                                  tempColumnNames.set(t.getTablePosition().getRow(), t.getNewValue());
-                                  this.prefs.putStringList(JabRefPreferences.COLUMN_NAMES, tempColumnNames);
-                              });
-
-        colSetup.setItems(data);
-        colSetup.getColumns().add(field);
-
-        final TextField addName = new TextField();
-        addName.setPromptText("name");
-        addName.setMaxWidth(field.getPrefWidth());
-        addName.setPrefHeight(30);
-        BorderPane tabPanel = new BorderPane();
-        ScrollPane sp = new ScrollPane();
-        sp.setContent(colSetup);
-        tabPanel.setCenter(sp);
-
-        HBox toolBar = new HBox();
-        addRow = new Button("Add");
-        addRow.setPrefSize(80, 20);
-        addRow.setOnAction(e -> {
-            TableRow tableRow = new TableRow(addName.getText());
-            addName.clear();
-            data.add(tableRow);
-            tableChanged = true;
-
-        });
-
-        deleteRow = new Button("Delete");
-        deleteRow.setPrefSize(80, 20);
-        deleteRow.setOnAction(e -> {
-            if ((colSetup.getFocusModel() != null) && (colSetup.getFocusModel().getFocusedIndex() != -1)) {
-                tableChanged = true;
-                int row = colSetup.getFocusModel().getFocusedIndex();
-                TableRow tableRow = data.get(row);
-                data.remove(tableRow);
-            }
-        });
-        up = new Button("Up");
-        up.setPrefSize(80, 20);
-        up.setOnAction(e -> {
-            if (colSetup.getFocusModel() != null) {
-                int row = colSetup.getFocusModel().getFocusedIndex();
-                if ((row > data.size()) || (row == 0)) {
-                    return;
-                }
-                TableRow tableRow1 = data.get(row);
-                TableRow tableRow2 = data.get(row - 1);
-                data.set(row - 1, tableRow1);
-                data.set(row, tableRow2);
-            } else {
-                return;
-            }
-        });
-        down = new Button("Down");
-        down.setPrefSize(80, 20);
-        down.setOnAction(e -> {
-            if (colSetup.getFocusModel() != null) {
-                int row = colSetup.getFocusModel().getFocusedIndex();
-                if ((row + 1) > data.size()) {
-                    return;
-                }
-                TableRow tableRow1 = data.get(row);
-                TableRow tableRow2 = data.get(row + 1);
-                data.set(row + 1, tableRow1);
-                data.set(row, tableRow2);
-            } else {
-                return;
-            }
-        });
-        toolBar.getChildren().addAll(addName, addRow, deleteRow, up, down);
-        tabPanel.setBottom(toolBar);
-        /* end UI for Entry table columns */
-
-        fileColumn = new CheckBox(Localization.lang("Show file column"));
-        urlColumn = new CheckBox(Localization.lang("Show URL/DOI column"));
-        preferUrl = new RadioButton(Localization.lang("Show URL first"));
-        preferDoi = new RadioButton(Localization.lang("Show DOI first"));
-
-        urlColumn.setOnAction(arg0 -> {
-            preferUrl.setDisable(!urlColumn.isSelected());
-            preferDoi.setDisable(!urlColumn.isSelected());
-        });
-        arxivColumn = new CheckBox(Localization.lang("Show ArXiv column"));
-
-        Collection<ExternalFileType> fileTypes = ExternalFileTypes.getInstance().getExternalFileTypeSelection();
-        String[] fileTypeNames = new String[fileTypes.size()];
-        int i = 0;
-        for (ExternalFileType fileType : fileTypes) {
-            fileTypeNames[i++] = fileType.getName();
-        }
-        listOfFileColumns = new ListView<>(FXCollections.observableArrayList(fileTypeNames));
-        listOfFileColumnsVBox = new VBox();
-        listOfFileColumnsVBox.getChildren().add(listOfFileColumns);
-        ScrollPane listOfFileColumnsScrollPane = new ScrollPane();
-        listOfFileColumnsScrollPane.setMaxHeight(80);
-        listOfFileColumnsScrollPane.setContent(listOfFileColumnsVBox);
-        extraFileColumns = new CheckBox(Localization.lang("Show extra columns"));
-        if (!extraFileColumns.isSelected()) {
-            listOfFileColumnsVBox.setDisable(true);
-        }
-        extraFileColumns.setOnAction(arg0 -> listOfFileColumnsVBox.setDisable(!extraFileColumns.isSelected()));
-
-        /** begin: special table columns and special fields ***/
-
-        ActionFactory factory = new ActionFactory(prefs.getKeyBindingRepository());
-
-        Button helpButton = factory.createIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS));
-
-        rankingColumn = new CheckBox(Localization.lang("Show rank"));
-        qualityColumn = new CheckBox(Localization.lang("Show quality"));
-        priorityColumn = new CheckBox(Localization.lang("Show priority"));
-        relevanceColumn = new CheckBox(Localization.lang("Show relevance"));
-        printedColumn = new CheckBox(Localization.lang("Show printed status"));
-        readStatusColumn = new CheckBox(Localization.lang("Show read status"));
-
-        // "sync keywords" and "write special" fields may be configured mutually exclusive only
-        // The implementation supports all combinations (TRUE+TRUE and FALSE+FALSE, even if the latter does not make sense)
-        // To avoid confusion, we opted to make the setting mutually exclusive
-        syncKeywords = new RadioButton(Localization.lang("Synchronize with keywords"));
-        writeSpecialFields = new RadioButton(Localization.lang("Write values of special fields as separate fields to BibTeX"));
-
-        specialFieldsEnabled = new CheckBox(Localization.lang("Enable special fields"));
-        specialFieldsEnabled.setOnAction(event -> {
-            boolean isEnabled = specialFieldsEnabled.isSelected();
-            rankingColumn.setDisable(!isEnabled);
-            qualityColumn.setDisable(!isEnabled);
-            priorityColumn.setDisable(!isEnabled);
-            relevanceColumn.setDisable(!isEnabled);
-            printedColumn.setDisable(!isEnabled);
-            readStatusColumn.setDisable(!isEnabled);
-            syncKeywords.setDisable(!isEnabled);
-            writeSpecialFields.setDisable(!isEnabled);
-        });
-
-        Label specialTableColumns = new Label(Localization.lang("Special table columns"));
-        specialTableColumns.getStyleClass().add("sectionHeader");
-        builder.add(specialTableColumns, 1, 1);
-
-        GridPane specialTableColumnsBuilder = new GridPane();
-        specialTableColumnsBuilder.add(specialFieldsEnabled, 1, 1);
-        specialTableColumnsBuilder.add(rankingColumn, 1, 2);
-        specialTableColumnsBuilder.add(relevanceColumn, 1, 3);
-        specialTableColumnsBuilder.add(qualityColumn, 1, 4);
-        specialTableColumnsBuilder.add(priorityColumn, 1, 5);
-        specialTableColumnsBuilder.add(printedColumn, 1, 6);
-        specialTableColumnsBuilder.add(readStatusColumn, 1, 7);
-        final ToggleGroup syncGroup = new ToggleGroup();
-        specialTableColumnsBuilder.add(syncKeywords, 1, 8);
-        specialTableColumnsBuilder.add(writeSpecialFields, 1, 9);
-        syncKeywords.setToggleGroup(syncGroup);
-        writeSpecialFields.setToggleGroup(syncGroup);
-        specialTableColumnsBuilder.add(helpButton, 1, 10);
-
-        specialTableColumnsBuilder.add(fileColumn, 2, 1);
-        specialTableColumnsBuilder.add(urlColumn, 2, 2);
-        final ToggleGroup preferUrlOrDoi = new ToggleGroup();
-        specialTableColumnsBuilder.add(preferUrl, 2, 3);
-        specialTableColumnsBuilder.add(preferDoi, 2, 4);
-        preferUrl.setToggleGroup(preferUrlOrDoi);
-        preferDoi.setToggleGroup(preferUrlOrDoi);
-        specialTableColumnsBuilder.add(arxivColumn, 2, 5);
-
-        specialTableColumnsBuilder.add(extraFileColumns, 2, 6);
-        specialTableColumnsBuilder.add(listOfFileColumnsScrollPane, 2, 10);
-
-        builder.add(specialTableColumnsBuilder, 1, 2);
-
-        /*** end: special table columns and special fields ***/
-        builder.add(new Label(""), 1, 3);
-        Label entryTableColumns = new Label(Localization.lang("Entry table columns"));
-        entryTableColumns.getStyleClass().add("sectionHeader");
-        builder.add(entryTableColumns, 1, 4);
-        builder.add(tabPanel, 1, 5);
-        Button buttonOrder = new Button("Update to current column order");
-        buttonOrder.setPrefSize(300, 30);
-        buttonOrder.setOnAction(e -> updateOrderAction());
-        builder.add(buttonOrder, 1, 7);
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        fileColumn.setSelected(prefs.getBoolean(JabRefPreferences.FILE_COLUMN));
-        urlColumn.setSelected(prefs.getBoolean(JabRefPreferences.URL_COLUMN));
-        preferUrl.setSelected(!prefs.getBoolean(JabRefPreferences.PREFER_URL_DOI));
-        preferDoi.setSelected(prefs.getBoolean(JabRefPreferences.PREFER_URL_DOI));
-        fileColumn.setSelected(prefs.getBoolean(JabRefPreferences.FILE_COLUMN));
-        arxivColumn.setSelected(prefs.getBoolean(JabRefPreferences.ARXIV_COLUMN));
-
-        extraFileColumns.setSelected(prefs.getBoolean(JabRefPreferences.EXTRA_FILE_COLUMNS));
-        if (extraFileColumns.isSelected()) {
-            List<String> desiredColumns = prefs.getStringList(JabRefPreferences.LIST_OF_FILE_COLUMNS);
-            int listSize = listOfFileColumns.getSelectionModel().getSelectedIndex();
-            if (listSize < 0) {
-                listSize = 0;
-            }
-            int[] indicesToSelect = new int[listSize];
-            for (int i = 0; i < listSize; i++) {
-                indicesToSelect[i] = listSize + 1;
-                for (String desiredColumn : desiredColumns) {
-                    if (listOfFileColumns.getAccessibleText().equals(desiredColumn)) {
-                        indicesToSelect[i] = i;
-                        break;
-                    }
-                }
-            }
-            for (int i = 0; i < listSize; i++) {
-                listOfFileColumns.getSelectionModel().select(indicesToSelect[i]);
-            }
-        } else {
-            listOfFileColumns.getSelectionModel().select(new int[] {});
-        }
-
-        /*** begin: special fields ***/
-
-        oldRankingColumn = prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RANKING);
-        rankingColumn.setSelected(oldRankingColumn);
-
-        oldQualityColumn = prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY);
-        qualityColumn.setSelected(oldQualityColumn);
-
-        oldPriorityColumn = prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY);
-        priorityColumn.setSelected(oldPriorityColumn);
-
-        oldRelevanceColumn = prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE);
-        relevanceColumn.setSelected(oldRelevanceColumn);
-
-        oldPrintedColumn = prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED);
-        printedColumn.setSelected(oldPrintedColumn);
-
-        oldReadStatusColumn = prefs.getBoolean(JabRefPreferences.SHOWCOLUMN_READ);
-        readStatusColumn.setSelected(oldReadStatusColumn);
-
-        oldSyncKeyWords = prefs.getBoolean(JabRefPreferences.AUTOSYNCSPECIALFIELDSTOKEYWORDS);
-        syncKeywords.setSelected(oldSyncKeyWords);
-
-        oldWriteSpecialFields = prefs.getBoolean(JabRefPreferences.SERIALIZESPECIALFIELDS);
-        writeSpecialFields.setSelected(oldWriteSpecialFields);
-
-        // has to be called as last to correctly enable/disable the other settings
-        oldSpecialFieldsEnabled = prefs.getBoolean(JabRefPreferences.SPECIALFIELDSENABLED);
-        specialFieldsEnabled.setSelected(!oldSpecialFieldsEnabled);
-        specialFieldsEnabled.setSelected(oldSpecialFieldsEnabled); // Call twice to make sure the ChangeListener is triggered
-
-        /*** end: special fields ***/
-
-        data.clear();
-        List<String> prefColNames = this.prefs.getStringList(JabRefPreferences.COLUMN_NAMES);
-        List<String> prefColWidths = this.prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS);
-        for (int i = 0; i < prefColNames.size(); i++) {
-            this.data.add(new TableRow(prefColNames.get(i), Double.parseDouble(prefColWidths.get(i))));
-        }
-    }
-
-    /*** end: special fields ***/
-
-    public static class TableRow {
-
-        private final SimpleStringProperty name;
-        private final SimpleDoubleProperty length;
-
-        public TableRow() {
-            name = new SimpleStringProperty("");
-            length = new SimpleDoubleProperty(ColumnPreferences.DEFAULT_FIELD_LENGTH);
-        }
-
-        public TableRow(String name) {
-            this.name = new SimpleStringProperty(name);
-            length = new SimpleDoubleProperty(ColumnPreferences.DEFAULT_FIELD_LENGTH);
-        }
-
-        public TableRow(String name, double length) {
-            this.name = new SimpleStringProperty(name);
-            this.length = new SimpleDoubleProperty(length);
-        }
-
-        public String getName() {
-            return name.get();
-        }
-
-        public void setName(String name) {
-            this.name.set(name);
-        }
-
-        public double getLength() {
-            return length.get();
-        }
-
-        public void setLength(double length) {
-            this.length.set(length);
-        }
-    }
-
-    /**
-     * Store changes to table preferences. This method is called when
-     * the user clicks Ok.
-     */
-    @Override
-    public void storeSettings() {
-        prefs.putBoolean(JabRefPreferences.FILE_COLUMN, fileColumn.isSelected());
-        prefs.putBoolean(JabRefPreferences.URL_COLUMN, urlColumn.isSelected());
-        prefs.putBoolean(JabRefPreferences.PREFER_URL_DOI, preferDoi.isSelected());
-        prefs.putBoolean(JabRefPreferences.ARXIV_COLUMN, arxivColumn.isSelected());
-
-        prefs.putBoolean(JabRefPreferences.EXTRA_FILE_COLUMNS, extraFileColumns.isSelected());
-        if (extraFileColumns.isSelected() && !listOfFileColumns.getSelectionModel().isEmpty()) {
-            ObservableList selections = listOfFileColumns.getSelectionModel().getSelectedItems();
-            prefs.putStringList(JabRefPreferences.LIST_OF_FILE_COLUMNS, selections);
-        } else {
-            prefs.putStringList(JabRefPreferences.LIST_OF_FILE_COLUMNS, new ArrayList<>());
-        }
-
-        /*** begin: special fields ***/
-
-        boolean newSpecialFieldsEnabled = specialFieldsEnabled.isSelected();
-        boolean newRankingColumn = rankingColumn.isSelected();
-        boolean newQualityColumn = qualityColumn.isSelected();
-        boolean newPriorityColumn = priorityColumn.isSelected();
-        boolean newRelevanceColumn = relevanceColumn.isSelected();
-        boolean newPrintedColumn = printedColumn.isSelected();
-        boolean newReadStatusColumn = readStatusColumn.isSelected();
-        boolean newSyncKeyWords = syncKeywords.isSelected();
-        boolean newWriteSpecialFields = writeSpecialFields.isSelected();
-
-        boolean restartRequired;
-        restartRequired = (oldSpecialFieldsEnabled != newSpecialFieldsEnabled) ||
-                          (oldRankingColumn != newRankingColumn) ||
-                          (oldQualityColumn != newQualityColumn) ||
-                          (oldPriorityColumn != newPriorityColumn) ||
-                          (oldRelevanceColumn != newRelevanceColumn) ||
-                          (oldPrintedColumn != newPrintedColumn) ||
-                          (oldReadStatusColumn != newReadStatusColumn) ||
-                          (oldSyncKeyWords != newSyncKeyWords) ||
-                          (oldWriteSpecialFields != newWriteSpecialFields);
-        if (restartRequired) {
-            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().showWarningDialogAndWait(Localization.lang("Changed special field settings"),
-                                                                                                          Localization.lang("You have changed settings for special fields.")
-                                                                                                                      .concat(" ")
-                                                                                                                      .concat(Localization.lang("You must restart JabRef for this to come into effect."))));
-
-        }
-
-        // restart required implies that the settings have been changed
-        // the settings need to be stored
-        if (restartRequired) {
-            prefs.putBoolean(JabRefPreferences.SPECIALFIELDSENABLED, newSpecialFieldsEnabled);
-            prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_RANKING, newRankingColumn);
-            prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_PRIORITY, newPriorityColumn);
-            prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_QUALITY, newQualityColumn);
-            prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_RELEVANCE, newRelevanceColumn);
-            prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_PRINTED, newPrintedColumn);
-            prefs.putBoolean(JabRefPreferences.SHOWCOLUMN_READ, newReadStatusColumn);
-            prefs.putBoolean(JabRefPreferences.AUTOSYNCSPECIALFIELDSTOKEYWORDS, newSyncKeyWords);
-            prefs.putBoolean(JabRefPreferences.SERIALIZESPECIALFIELDS, newWriteSpecialFields);
-        }
-
-        /*** end: special fields ***/
-
-        //        if (colSetup.isEditing()) {
-        //            int col = colSetup.getEditingColumn();
-        //            int row = colSetup.getEditingRow();
-        //            colSetup.getCellEditor(row, col).stopCellEditing();
-        //        }
-
-        // Now we need to make sense of the contents the user has made to the
-        // table setup table.
-        if (tableChanged) {
-            // First we remove all rows with empty names.
-            int i = 0;
-            while (i < data.size()) {
-                if (data.get(i).getName().isEmpty()) {
-                    data.remove(i);
-                } else {
-                    i++;
-                }
-            }
-            // Then we make arrays
-            List<String> names = new ArrayList<>(data.size());
-            List<String> widths = new ArrayList<>(data.size());
-
-            for (TableRow tr : data) {
-                names.add(tr.getName().toLowerCase(Locale.ROOT));
-                widths.add(String.valueOf(Double.valueOf(tr.getLength()).intValue()));
-            }
-
-            // Finally, we store the new preferences.
-            prefs.putStringList(JabRefPreferences.COLUMN_NAMES, names);
-            prefs.putStringList(JabRefPreferences.COLUMN_WIDTHS, widths);
-        }
-
-    }
-
-    private void updateOrderAction() {
-        BasePanel panel = frame.getCurrentBasePanel();
-        if (panel == null) {
-            return;
-        }
-        // idea: sort elements according to value stored in hash, keep
-        // everything not inside hash/mainTable as it was
-        final HashMap<String, Integer> map = new HashMap<>();
-
-        // first element (#) not inside data
-        /*
-        for (TableColumn<BibEntry, ?> column : panel.getMainTable().getColumns()) {
-            String name = column.getText();
-            if ((name != null) && !name.isEmpty()) {
-                map.put(name.toLowerCase(Locale.ROOT), i);
-            }
-        }
-        */
-        data.sort((o1, o2) -> {
-            Integer n1 = map.get(o1.getName());
-            Integer n2 = map.get(o2.getName());
-            if ((n1 == null) || (n2 == null)) {
-                return 0;
-            }
-            return n1.compareTo(n2);
-        });
-
-        colSetup.setItems(data);
-        colSetup.refresh();
-        tableChanged = true;
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("Entry table columns");
-    }
-
-    @Override
-    public List<String> getRestartWarnings() { return new ArrayList<>(); }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
new file mode 100644
index 00000000000..20fa77d23e3
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
@@ -0,0 +1,145 @@
+package org.jabref.gui.preferences;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.input.KeyCode;
+import javafx.util.StringConverter;
+
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.FieldsUtil;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+public class TableColumnsTabView extends AbstractPreferenceTabView implements PreferencesTab {
+
+    @FXML private TableView<TableColumnsItemModel> columnsList;
+    @FXML private TableColumn<TableColumnsItemModel, Field> nameColumn;
+    @FXML private TableColumn<TableColumnsItemModel, Field> actionsColumn;
+    @FXML private ComboBox<Field> addColumnName;
+    @FXML private CheckBox showFileColumn;
+    @FXML private CheckBox showUrlColumn;
+    @FXML private RadioButton urlFirst;
+    @FXML private RadioButton doiFirst;
+    @FXML private CheckBox showEPrintColumn;
+    @FXML private CheckBox specialFieldsEnable;
+    @FXML private Button specialFieldsHelp;
+    @FXML private RadioButton specialFieldsSyncKeywords;
+    @FXML private RadioButton specialFieldsSerialize;
+    @FXML private CheckBox extraFileColumnsEnable;
+
+    private ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+
+    private final JabRefPreferences preferences;
+
+    public TableColumnsTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Entry table columns");
+    }
+
+    public void initialize() {
+        this.viewModel = new TableColumnsTabViewModel(dialogService, preferences);
+
+        setupTable();
+        setupBindings();
+
+        ActionFactory actionFactory = new ActionFactory(preferences.getKeyBindingRepository());
+        actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS), specialFieldsHelp);
+    }
+
+    private void setupTable() {
+        nameColumn.setSortable(false);
+        nameColumn.setReorderable(false);
+        nameColumn.setCellValueFactory(cellData -> cellData.getValue().fieldProperty());
+        new ValueTableCellFactory<TableColumnsItemModel, Field>().withText(FieldsUtil::getNameWithType).install(nameColumn);
+
+        actionsColumn.setSortable(false);
+        actionsColumn.setReorderable(false);
+        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().fieldProperty());
+        new ValueTableCellFactory<TableColumnsItemModel, Field>()
+                .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+                .withTooltip(name -> Localization.lang("Remove column") + " " + name.getDisplayName())
+                .withOnMouseClickedEvent(item -> evt ->
+                        ((TableColumnsTabViewModel) viewModel).removeColumn(columnsList.getFocusModel().getFocusedItem()))
+                .install(actionsColumn);
+
+        ((TableColumnsTabViewModel) viewModel).selectedColumnModelProperty().setValue(columnsList.getSelectionModel());
+        columnsList.setOnKeyPressed(event -> {
+            if (event.getCode() == KeyCode.DELETE) {
+                ((TableColumnsTabViewModel) viewModel).removeColumn(columnsList.getSelectionModel().getSelectedItem());
+            }
+        });
+
+        columnsList.itemsProperty().bind(((TableColumnsTabViewModel) viewModel).columnsListProperty());
+
+        new ViewModelListCellFactory<Field>()
+                .withText(FieldsUtil::getNameWithType)
+                .install(addColumnName);
+        addColumnName.itemsProperty().bind(((TableColumnsTabViewModel) viewModel).availableColumnsProperty());
+        addColumnName.valueProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).addColumnProperty());
+        addColumnName.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(Field object) {
+                if (object != null) {
+                    return object.getName();
+                } else {
+                    return "";
+                }
+            }
+
+            @Override
+            public Field fromString(String string) {
+                return FieldFactory.parseField(string);
+            }
+        });
+
+        validationVisualizer.setDecoration(new IconValidationDecorator());
+        Platform.runLater(() -> validationVisualizer.initVisualization(((TableColumnsTabViewModel) viewModel).columnsListValidationStatus(), columnsList));
+    }
+
+    private void setupBindings() {
+        showFileColumn.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).showFileColumnProperty());
+        showUrlColumn.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).showUrlColumnProperty());
+        urlFirst.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).preferUrlProperty());
+        doiFirst.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).preferDoiProperty());
+        showEPrintColumn.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).showEPrintColumnProperty());
+        specialFieldsEnable.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).specialFieldsEnabledProperty());
+        specialFieldsSyncKeywords.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).specialFieldsSyncKeywordsProperty());
+        specialFieldsSerialize.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).specialFieldsSerializeProperty());
+        extraFileColumnsEnable.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).extraFileColumnsEnabledProperty());
+    }
+
+    public void updateToCurrentColumnOrder() { ((TableColumnsTabViewModel) viewModel).fillColumnList(); }
+
+    public void sortColumnUp() { ((TableColumnsTabViewModel) viewModel).moveColumnUp(); }
+
+    public void sortColumnDown() { ((TableColumnsTabViewModel) viewModel).moveColumnDown(); }
+
+    public void addColumn() { ((TableColumnsTabViewModel) viewModel).insertColumnInList(); }
+
+}
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
new file mode 100644
index 00000000000..7227149ca7f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
@@ -0,0 +1,274 @@
+package org.jabref.gui.preferences;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.scene.control.SelectionModel;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.maintable.ColumnPreferences;
+import org.jabref.gui.util.FieldsUtil;
+import org.jabref.gui.util.NoSelectionModel;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.SpecialField;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.preferences.JabRefPreferences;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+
+public class TableColumnsTabViewModel implements PreferenceTabViewModel {
+
+    private final ListProperty<TableColumnsItemModel> columnsListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<SelectionModel<TableColumnsItemModel>> selectedColumnModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
+    private final ListProperty<Field> availableColumnsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<Field> addColumnProperty = new SimpleObjectProperty<>();
+    private final BooleanProperty specialFieldsEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty specialFieldsSyncKeywordsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty specialFieldsSerializeProperty = new SimpleBooleanProperty();
+    private final BooleanProperty showFileColumnProperty = new SimpleBooleanProperty();
+    private final BooleanProperty showUrlColumnProperty = new SimpleBooleanProperty();
+    private final BooleanProperty preferUrlProperty = new SimpleBooleanProperty();
+    private final BooleanProperty preferDoiProperty = new SimpleBooleanProperty();
+    private final BooleanProperty showEPrintColumnProperty = new SimpleBooleanProperty();
+    private final BooleanProperty extraFileColumnsEnabledProperty = new SimpleBooleanProperty();
+
+    private FunctionBasedValidator columnsNotEmptyValidator;
+
+    private List<String> restartWarnings = new ArrayList<>();
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+    private final ColumnPreferences columnPreferences;
+
+    public TableColumnsTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.columnPreferences = preferences.getColumnPreferences();
+
+        specialFieldsEnabledProperty.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                insertSpecialFieldColumns();
+            } else {
+                removeSpecialFieldColumns();
+            }
+        });
+
+        extraFileColumnsEnabledProperty.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                insertExtraFileColumns();
+            } else {
+                removeExtraFileColumns();
+            }
+        });
+
+        columnsNotEmptyValidator = new FunctionBasedValidator<>(
+                columnsListProperty,
+                list -> list.size() > 0,
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Entry table columns"),
+                        Localization.lang("Columns"),
+                        Localization.lang("List must not be empty."))));
+
+        setValues();
+    }
+
+    @Override
+    public void setValues() {
+        showFileColumnProperty.setValue(columnPreferences.showFileColumn());
+        showUrlColumnProperty.setValue(columnPreferences.showUrlColumn());
+        preferUrlProperty.setValue(!columnPreferences.preferDoiOverUrl());
+        preferDoiProperty.setValue(columnPreferences.preferDoiOverUrl());
+        showEPrintColumnProperty.setValue(columnPreferences.showEprintColumn());
+        specialFieldsEnabledProperty.setValue(columnPreferences.getSpecialFieldsEnabled());
+        specialFieldsSyncKeywordsProperty.setValue(columnPreferences.getAutoSyncSpecialFieldsToKeyWords());
+        specialFieldsSerializeProperty.setValue(columnPreferences.getSerializeSpecialFields());
+        extraFileColumnsEnabledProperty.setValue(columnPreferences.getExtraFileColumnsEnabled());
+
+        fillColumnList();
+
+        List<Field> internalFields = new ArrayList<>();
+        internalFields.add(InternalField.OWNER);
+        internalFields.add(InternalField.TIMESTAMP);
+        internalFields.add(InternalField.GROUPS);
+        internalFields.add(InternalField.KEY_FIELD);
+        internalFields.add(InternalField.TYPE_HEADER);
+        internalFields.forEach(item -> availableColumnsProperty.getValue().add(item));
+
+        EnumSet.allOf(StandardField.class).forEach(item -> availableColumnsProperty.getValue().add(item));
+
+        if (specialFieldsEnabledProperty.getValue()) {
+            insertSpecialFieldColumns();
+        }
+
+        if (extraFileColumnsEnabledProperty.getValue()) {
+            insertExtraFileColumns();
+        }
+    }
+
+    public void fillColumnList() {
+        columnsListProperty.getValue().clear();
+
+        columnPreferences.getColumnNames().stream()
+                .map(FieldFactory::parseField)
+                .map(field -> new TableColumnsItemModel(field, columnPreferences.getColumnWidth(field.getName())))
+                .forEach(columnsListProperty.getValue()::add);
+    }
+
+    private void insertSpecialFieldColumns() {
+        EnumSet.allOf(SpecialField.class).forEach(item -> availableColumnsProperty.getValue().add(0, item));
+    }
+
+    private void removeSpecialFieldColumns() {
+        columnsListProperty.getValue().removeIf(column -> column.getField() instanceof SpecialField);
+        availableColumnsProperty.getValue().removeIf(field -> field instanceof SpecialField);
+    }
+
+    private void insertExtraFileColumns() {
+        ExternalFileTypes.getInstance().getExternalFileTypeSelection().stream()
+                .map(ExternalFileType::getName)
+                .map(FieldsUtil.ExtraFilePseudoField::new)
+                .forEach(availableColumnsProperty::add);
+    }
+
+    private void removeExtraFileColumns() {
+        columnsListProperty.getValue().removeIf(column -> column.getField() instanceof FieldsUtil.ExtraFilePseudoField);
+        availableColumnsProperty.getValue().removeIf(field -> field instanceof FieldsUtil.ExtraFilePseudoField);
+    }
+
+    public void insertColumnInList() {
+        if (addColumnProperty.getValue() == null) {
+            return;
+        }
+
+        if (columnsListProperty.getValue().stream().filter(item -> item.getField().equals(addColumnProperty.getValue())).findAny().isEmpty()) {
+            columnsListProperty.add(new TableColumnsItemModel(addColumnProperty.getValue()));
+            addColumnProperty.setValue(null);
+        }
+    }
+
+    public void removeColumn(TableColumnsItemModel column) {
+        columnsListProperty.remove(column);
+    }
+
+    public void moveColumnUp() {
+        TableColumnsItemModel selectedColumn = selectedColumnModelProperty.getValue().getSelectedItem();
+        int row = columnsListProperty.getValue().indexOf(selectedColumn);
+        if (selectedColumn == null || row < 1) {
+            return;
+        }
+
+        columnsListProperty.remove(selectedColumn);
+        columnsListProperty.add(row - 1, selectedColumn);
+        selectedColumnModelProperty.getValue().clearAndSelect(row - 1);
+    }
+
+    public void moveColumnDown() {
+        TableColumnsItemModel selectedColumn = selectedColumnModelProperty.getValue().getSelectedItem();
+        int row = columnsListProperty.getValue().indexOf(selectedColumn);
+        if (selectedColumn == null || row > columnsListProperty.getValue().size() - 2) {
+            return;
+        }
+
+        columnsListProperty.remove(selectedColumn);
+        columnsListProperty.add(row + 1, selectedColumn);
+        selectedColumnModelProperty.getValue().clearAndSelect(row + 1);
+    }
+
+    @Override
+    public void storeSettings() {
+        List<String> columnNames = columnsListProperty.stream()
+                .map(item -> item.getField().getName()).collect(Collectors.toList());
+
+        // for each column get either actual width or - if it does not exist - default value
+        Map<String,Double> columnWidths = new HashMap<>();
+        columnNames.forEach(field -> columnWidths.put(field,columnPreferences.getColumnWidth(field)));
+
+        ColumnPreferences newColumnPreferences = new ColumnPreferences(
+                showFileColumnProperty.getValue(),
+                showUrlColumnProperty.getValue(),
+                preferDoiProperty.getValue(),
+                showEPrintColumnProperty.getValue(),
+                columnNames,
+                specialFieldsEnabledProperty.getValue(),
+                specialFieldsSyncKeywordsProperty.getValue(),
+                specialFieldsSerializeProperty.getValue(),
+                extraFileColumnsEnabledProperty.getValue(),
+                columnWidths,
+                columnPreferences.getSortTypesForColumns()
+        );
+
+        if (columnPreferences.getAutoSyncSpecialFieldsToKeyWords() != newColumnPreferences.getAutoSyncSpecialFieldsToKeyWords()) {
+            restartWarnings.add(Localization.lang("Synchronize special fields to keywords"));
+        }
+
+        if (columnPreferences.getSerializeSpecialFields() != newColumnPreferences.getSerializeSpecialFields()) {
+            restartWarnings.add(Localization.lang("Serialize special fields"));
+        }
+
+        preferences.storeColumnPreferences(newColumnPreferences);
+    }
+
+    ValidationStatus columnsListValidationStatus() {
+        return columnsNotEmptyValidator.getValidationStatus();
+    }
+
+    @Override
+    public boolean validateSettings() {
+        ValidationStatus status = columnsListValidationStatus();
+        if (!status.isValid() && status.getHighestMessage().isPresent()) {
+            dialogService.showErrorDialogAndWait(status.getHighestMessage().get().getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return restartWarnings;
+    }
+
+    public ListProperty<TableColumnsItemModel> columnsListProperty() { return this.columnsListProperty; }
+
+    public ObjectProperty<SelectionModel<TableColumnsItemModel>> selectedColumnModelProperty() { return selectedColumnModelProperty; }
+
+    public ListProperty<Field> availableColumnsProperty() { return this.availableColumnsProperty; }
+
+    public ObjectProperty<Field> addColumnProperty() { return this.addColumnProperty; }
+
+    public BooleanProperty showFileColumnProperty() { return this.showFileColumnProperty; }
+
+    public BooleanProperty showUrlColumnProperty() { return this.showUrlColumnProperty; }
+
+    public BooleanProperty preferUrlProperty() { return this.preferUrlProperty; }
+
+    public BooleanProperty preferDoiProperty() { return this.preferDoiProperty; }
+
+    public BooleanProperty specialFieldsEnabledProperty() { return this.specialFieldsEnabledProperty; }
+
+    public BooleanProperty specialFieldsSyncKeywordsProperty() { return this.specialFieldsSyncKeywordsProperty; }
+
+    public BooleanProperty specialFieldsSerializeProperty() { return this.specialFieldsSerializeProperty; }
+
+    public BooleanProperty showEPrintColumnProperty() { return this.showEPrintColumnProperty; }
+
+    public BooleanProperty extraFileColumnsEnabledProperty() { return this.extraFileColumnsEnabledProperty; }
+
+}
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
index ad9d5b7445f..4730f86e715 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
@@ -42,7 +42,7 @@ public class XmpPrivacyTabViewModel implements PreferenceTabViewModel {
                 xmpFilterListProperty,
                 input -> input.size() > 0,
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("xmp-metadata"),
+                        Localization.lang("XMP-metadata"),
                         Localization.lang("Filter List"),
                         Localization.lang("List must not be empty."))));
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 5d732e43703..ff513a46f3a 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -100,7 +100,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
-import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;
@@ -207,7 +206,6 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String KEYWORD_SEPARATOR = "groupKeywordSeparator";
     public static final String AUTO_ASSIGN_GROUP = "autoAssignGroup";
-    public static final String LIST_OF_FILE_COLUMNS = "listOfFileColumns";
     public static final String EXTRA_FILE_COLUMNS = "extraFileColumns";
     public static final String ARXIV_COLUMN = "arxivColumn";
     public static final String FILE_COLUMN = "fileColumn";
@@ -340,17 +338,10 @@ public class JabRefPreferences implements PreferencesService {
     public static final String STYLES_POS_Y = "stylesPosY";
     public static final String STYLES_POS_X = "stylesPosX";
     // Special field preferences
-    public static final String SHOWCOLUMN_RELEVANCE = "showRelevanceColumn";
-    public static final String SHOWCOLUMN_READ = "showReadColumn";
-    public static final String SHOWCOLUMN_RANKING = "showRankingColumn";
-    public static final String SHOWCOLUMN_QUALITY = "showQualityColumn";
-    public static final String SHOWCOLUMN_PRIORITY = "showPriorityColumn";
-    public static final String SHOWCOLUMN_PRINTED = "showPrintedColumn";
     public static final String SPECIALFIELDSENABLED = "specialFieldsEnabled";
     // The choice between AUTOSYNCSPECIALFIELDSTOKEYWORDS and SERIALIZESPECIALFIELDS is mutually exclusive
-    public static final String SERIALIZESPECIALFIELDS = "serializeSpecialFields";
-    // The choice between AUTOSYNCSPECIALFIELDSTOKEYWORDS and SERIALIZESPECIALFIELDS is mutually exclusive
     // At least in the settings, not in the implementation. But having both confused the users, therefore, having activated both options at the same time has been disabled
+    public static final String SERIALIZESPECIALFIELDS = "serializeSpecialFields";
     public static final String AUTOSYNCSPECIALFIELDSTOKEYWORDS = "autoSyncSpecialFieldsToKeywords";
     // Prefs node for BibtexKeyPatterns
     public static final String BIBTEX_KEY_PATTERNS_NODE = "bibtexkeypatterns";
@@ -618,7 +609,6 @@ private JabRefPreferences() {
         defaults.put(ARXIV_COLUMN, Boolean.FALSE);
 
         defaults.put(EXTRA_FILE_COLUMNS, Boolean.FALSE);
-        defaults.put(LIST_OF_FILE_COLUMNS, "");
 
         defaults.put(PROTECTED_TERMS_ENABLED_INTERNAL, convertListToString(ProtectedTermsLoader.getInternalLists()));
         defaults.put(PROTECTED_TERMS_DISABLED_INTERNAL, "");
@@ -651,12 +641,6 @@ private JabRefPreferences() {
         defaults.put(STYLES_SIZE_Y, 400);
 
         defaults.put(SPECIALFIELDSENABLED, Boolean.TRUE);
-        defaults.put(SHOWCOLUMN_PRIORITY, Boolean.FALSE);
-        defaults.put(SHOWCOLUMN_QUALITY, Boolean.FALSE);
-        defaults.put(SHOWCOLUMN_RANKING, Boolean.FALSE);
-        defaults.put(SHOWCOLUMN_RELEVANCE, Boolean.FALSE);
-        defaults.put(SHOWCOLUMN_PRINTED, Boolean.FALSE);
-        defaults.put(SHOWCOLUMN_READ, Boolean.FALSE);
         defaults.put(AUTOSYNCSPECIALFIELDSTOKEYWORDS, Boolean.TRUE);
         defaults.put(SERIALIZESPECIALFIELDS, Boolean.FALSE);
 
@@ -1869,44 +1853,6 @@ public void storeSidePanePreferredPositions(Map<SidePaneType, Integer> preferred
         putStringList(SIDE_PANE_COMPONENT_PREFERRED_POSITIONS, positions);
     }
 
-    private List<String> createExtraFileColumns() {
-        if (getBoolean(EXTRA_FILE_COLUMNS)) {
-            return getStringList(LIST_OF_FILE_COLUMNS);
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    private List<SpecialField> createSpecialFieldColumns() {
-        if (getBoolean(SPECIALFIELDSENABLED)) {
-            List<SpecialField> fieldsToShow = new ArrayList<>();
-            if (getBoolean(SHOWCOLUMN_RANKING)) {
-                fieldsToShow.add(SpecialField.RANKING);
-            }
-            if (getBoolean(SHOWCOLUMN_RELEVANCE)) {
-                fieldsToShow.add(SpecialField.RELEVANCE);
-            }
-            if (getBoolean(SHOWCOLUMN_QUALITY)) {
-                fieldsToShow.add(SpecialField.QUALITY);
-            }
-
-            if (getBoolean(SHOWCOLUMN_PRIORITY)) {
-                fieldsToShow.add(SpecialField.PRIORITY);
-            }
-
-            if (getBoolean(SHOWCOLUMN_PRINTED)) {
-                fieldsToShow.add(SpecialField.PRINTED);
-            }
-
-            if (getBoolean(SHOWCOLUMN_READ)) {
-                fieldsToShow.add(SpecialField.READ_STATUS);
-            }
-            return fieldsToShow;
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
     private Map<String, Double> createColumnWidths() {
         List<String> columns = getStringList(COLUMN_NAMES);
         List<Double> widths = getStringList(COLUMN_WIDTHS)
@@ -1930,15 +1876,36 @@ private Map<String, Double> createColumnWidths() {
 
     public ColumnPreferences getColumnPreferences() {
         return new ColumnPreferences(
-                                     getBoolean(FILE_COLUMN),
-                                     getBoolean(URL_COLUMN),
-                                     getBoolean(PREFER_URL_DOI),
-                                     getBoolean(ARXIV_COLUMN),
-                                     getStringList(COLUMN_NAMES),
-                                     createSpecialFieldColumns(),
-                                     createExtraFileColumns(),
-                                     createColumnWidths(),
-                                     getMainTableColumnSortTypes());
+                getBoolean(FILE_COLUMN),
+                getBoolean(URL_COLUMN),
+                getBoolean(PREFER_URL_DOI),
+                getBoolean(ARXIV_COLUMN),
+                getStringList(COLUMN_NAMES),
+                getBoolean(SPECIALFIELDSENABLED),
+                getBoolean(AUTOSYNCSPECIALFIELDSTOKEYWORDS),
+                getBoolean(SERIALIZESPECIALFIELDS),
+                getBoolean(EXTRA_FILE_COLUMNS),
+                createColumnWidths(),
+                getMainTableColumnSortTypes());
+    }
+
+    public void storeColumnPreferences(ColumnPreferences columnPreferences) {
+        putBoolean(FILE_COLUMN, columnPreferences.showFileColumn());
+        putBoolean(URL_COLUMN, columnPreferences.showUrlColumn());
+        putBoolean(PREFER_URL_DOI, columnPreferences.preferDoiOverUrl());
+        putBoolean(ARXIV_COLUMN, columnPreferences.showEprintColumn());
+        putStringList(COLUMN_NAMES, columnPreferences.getColumnNames());
+
+        putBoolean(SPECIALFIELDSENABLED, columnPreferences.getSpecialFieldsEnabled());
+        putBoolean(AUTOSYNCSPECIALFIELDSTOKEYWORDS, columnPreferences.getAutoSyncSpecialFieldsToKeyWords());
+        putBoolean(SERIALIZESPECIALFIELDS, columnPreferences.getSerializeSpecialFields());
+        putBoolean(EXTRA_FILE_COLUMNS, columnPreferences.getExtraFileColumnsEnabled());
+
+        List<String> columnWidthsInOrder = new ArrayList<>();
+        columnPreferences.getColumnNames().forEach(name -> columnWidthsInOrder.add(columnPreferences.getColumnWidths().get(name).toString()));
+        putStringList(COLUMN_WIDTHS, columnWidthsInOrder);
+
+        setMainTableColumnSortType(columnPreferences.getSortTypesForColumns());
     }
 
     public MainTablePreferences getMainTablePreferences() {
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 639970999d2..869ce55ca17 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -878,8 +878,6 @@ Some\ appearance\ settings\ you\ changed\ require\ to\ restart\ JabRef\ to\ come
 source\ edit=source edit
 Special\ name\ formatters=Special name formatters
 
-Special\ table\ columns=Special table columns
-
 Statically\ group\ entries\ by\ manual\ assignment=Statically group entries by manual assignment
 
 Status=Status
@@ -1227,7 +1225,6 @@ Select\ files=Select files
 BibTeX\ entry\ creation=BibTeX entry creation
 Unable\ to\ connect\ to\ FreeCite\ online\ service.=Unable to connect to FreeCite online service.
 BibTeX\ key\ patterns=BibTeX key patterns
-Changed\ special\ field\ settings=Changed special field settings
 Clear\ priority=Clear priority
 Clear\ rank=Clear rank
 Enable\ special\ fields=Enable special fields
@@ -1252,10 +1249,6 @@ Relevance=Relevance
 Set\ priority\ to\ high=Set priority to high
 Set\ priority\ to\ low=Set priority to low
 Set\ priority\ to\ medium=Set priority to medium
-Show\ priority=Show priority
-Show\ quality=Show quality
-Show\ rank=Show rank
-Show\ relevance=Show relevance
 Synchronize\ with\ keywords=Synchronize with keywords
 Synchronized\ special\ fields\ based\ on\ keywords=Synchronized special fields based on keywords
 Toggle\ relevance=Toggle relevance
@@ -1263,7 +1256,6 @@ Toggle\ quality\ assured=Toggle quality assured
 Toggle\ print\ status=Toggle print status
 Update\ keywords=Update keywords
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Write values of special fields as separate fields to BibTeX
-You\ have\ changed\ settings\ for\ special\ fields.=You have changed settings for special fields.
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Connection to OpenOffice/LibreOffice has been lost. Please make sure OpenOffice/LibreOffice is running, and try to reconnect.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef will send at least one request per entry to a publisher.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Correct the entry, and reopen editor to display/edit source.
@@ -1347,9 +1339,6 @@ Set\ read\ status\ to\ read=Set read status to read
 Set\ read\ status\ to\ skimmed=Set read status to skimmed
 Show\ deprecated\ BibTeX\ fields=Show deprecated BibTeX fields
 
-Show\ printed\ status=Show printed status
-Show\ read\ status=Show read status
-
 Opens\ JabRef's\ GitHub\ page=Opens JabRef's GitHub page
 Opens\ JabRef's\ Twitter\ page=Opens JabRef's Twitter page
 Opens\ JabRef's\ Facebook\ page=Opens JabRef's Facebook page
@@ -2113,12 +2102,21 @@ Import\ entries\ from\ LaTeX\ files=Import entries from LaTeX files
 Import\ new\ entries=Import new entries
 Group\ color=Group color
 
-Add\ field\ to\ filter\ list=Add field to filter list
-Add\ formatter\ to\ list=Add formatter to list
+Columns=Columns
+File\ type=File type
 IEEE=IEEE
 Internal=Internal
 Special=Special
-File\ type=File type
-Filter\ List=Filter List
+Remove\ column=Remove column
+Add\ custom\ column=Add custom column
+Update\ to\ current\ column\ order=Update to current column order
+Sort\ column\ one\ step\ upwards=Sort column one step upwards
+Sort\ column\ one\ step\ downwards=Sort column one step downwards
+Synchronize\ special\ fields\ to\ keywords=Synchronize special fields to keywords
+Serialize\ special\ fields=Serialize special fields
 List\ must\ not\ be\ empty.=List must not be empty.
-xmp-metadata=xmp-metadata
+
+Add\ field\ to\ filter\ list=Add field to filter list
+Add\ formatter\ to\ list=Add formatter to list
+Filter\ List=Filter List
+New\ column=New column