diff --git a/com.archimatetool.editor.themes/plugin.xml b/com.archimatetool.editor.themes/plugin.xml
index 6d259afc8..ad31e16a8 100644
--- a/com.archimatetool.editor.themes/plugin.xml
+++ b/com.archimatetool.editor.themes/plugin.xml
@@ -84,6 +84,12 @@
                 refid="org.eclipse.e4.ui.css.theme.e4_classic">
           </themeid>
        </stylesheet>
+       <stylesheet
+             uri="themes/eclipse/css/archi-high-contrast.css">
+          <themeid
+                refid="org.eclipse.e4.ui.css.theme.high-contrast">
+          </themeid>
+       </stylesheet>
        <stylesheet
              uri="themes/eclipse/css/dark/archi-dark-styling.css">
           <themeid
diff --git a/com.archimatetool.editor.themes/themes/eclipse/css/archi-high-contrast.css b/com.archimatetool.editor.themes/themes/eclipse/css/archi-high-contrast.css
new file mode 100644
index 000000000..4b0972092
--- /dev/null
+++ b/com.archimatetool.editor.themes/themes/eclipse/css/archi-high-contrast.css
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Styling for Archi that over-rides some Eclipse stylings
+ *******************************************************************************/
+
+@import url("platform:/plugin/com.archimatetool.editor.themes/themes/archi/css/common/archi-globalstyle.css");
+
+/* Theme colors */
+
+ColorDefinition#com-archimatetool-editor-VIEW_BACKGROUND {
+    color: '#COLOR_WIDGET_BACKGROUND';
+}
+
+ColorDefinition#com-archimatetool-editor-VISUALISER_BACKGROUND {
+    color: '#COLOR_WIDGET_BACKGROUND';
+}
+
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java
index 205fc8cd2..fd4c0bbf5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -99,13 +98,7 @@ FontData getDefaultFontData() {
         }
         
         void performOK() {
-            // Our font definitions are global to all themes so just write directly to the store
-            if(Objects.equals(getFontData(), getSystemFontData())) {
-                getPreferenceStore().setToDefault(fontDefinitionId);
-            }
-            else {
-                getPreferenceStore().setValue(fontDefinitionId, getFontData().toString());
-            }
+            ThemeUtils.setCurrentThemeFont(fontDefinitionId, getFontData(), getSystemFontData());
         }
 
         FontData getSystemFontData() {
@@ -126,10 +119,10 @@ void performDefault() {
             // If on Mac we need to temporarily apply the value of the scaling checkbox in preferences
             // so that we can get the default scaled font size.
             if(fScaleFontsButton != null) {
-                boolean currentValue = ArchiPlugin.PREFERENCES.getBoolean(FONT_SCALING); // save this
-                ArchiPlugin.PREFERENCES.setValue(FONT_SCALING, fScaleFontsButton.getSelection()); // apply setting
+                boolean currentValue = getPreferenceStore().getBoolean(FONT_SCALING); // save this
+                getPreferenceStore().setValue(FONT_SCALING, fScaleFontsButton.getSelection()); // apply setting
                 fontData = getDefaultFontData(); // get font data
-                ArchiPlugin.PREFERENCES.setValue(FONT_SCALING, currentValue); // apply previous value
+                getPreferenceStore().setValue(FONT_SCALING, currentValue); // apply previous value
             }
             else {
                 fontData = getDefaultFontData();
@@ -140,7 +133,7 @@ void performDefault() {
         FontData getFontData() {
             // Get font data from Preferences store
             if(fontData == null) {
-                String fontDetails = ArchiPlugin.PREFERENCES.getString(fontDefinitionId);
+                String fontDetails = getPreferenceStore().getString(fontDefinitionId);
                 if(StringUtils.isSet(fontDetails)) {
                     fontData = getSafeFontData(fontDetails);
                 }
@@ -155,7 +148,7 @@ FontData getFontData() {
         @Override
         FontData getDefaultFontData() {
             // Get default font data from Archi Preferences store (this could be in a suppplied preference file)
-            String fontDetails = ArchiPlugin.PREFERENCES.getDefaultString(fontDefinitionId);
+            String fontDetails = getPreferenceStore().getDefaultString(fontDefinitionId);
             if(StringUtils.isSet(fontDetails)) {
                 return getSafeFontData(fontDetails);
             }
@@ -200,7 +193,7 @@ FontData getSafeFontData(String fontDetails) {
     private IWorkbench workbench;
     
     public FontsPreferencePage() {
-        setPreferenceStore(PrefUtil.getInternalPreferenceStore());
+        setPreferenceStore(ArchiPlugin.PREFERENCES);
         // This is now shown in a label
         //setDescription(Messages.FontsPreferencePage_21);
     }
@@ -224,7 +217,7 @@ public Composite createContents(Composite parent) {
             fScaleFontsButton = new Button(client, SWT.CHECK);
             fScaleFontsButton.setText(Messages.FontsPreferencePage_22);
             fScaleFontsButton.setToolTipText(Messages.FontsPreferencePage_23);
-            fScaleFontsButton.setSelection(ArchiPlugin.PREFERENCES.getBoolean(FONT_SCALING));
+            fScaleFontsButton.setSelection(getPreferenceStore().getBoolean(FONT_SCALING));
             fScaleFontsButton.setLayoutData(GridDataFactory.defaultsFor(fScaleFontsButton).span(2, 1).create());
             // When button is selected apply default font and update table
             fScaleFontsButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
@@ -468,7 +461,7 @@ private FontData openFontDialog(FontInfo fontInfo) {
     @Override
     public void performDefaults() {
         if(fScaleFontsButton != null) {
-            fScaleFontsButton.setSelection(ArchiPlugin.PREFERENCES.getDefaultBoolean(FONT_SCALING));
+            fScaleFontsButton.setSelection(getPreferenceStore().getDefaultBoolean(FONT_SCALING));
         }
         
         for(FontInfo info : fontInfos) {
@@ -488,7 +481,7 @@ public void performDefaults() {
     @Override
     public boolean performOk() {
         if(fScaleFontsButton != null) {
-            ArchiPlugin.PREFERENCES.setValue(FONT_SCALING, fScaleFontsButton.getSelection());
+            getPreferenceStore().setValue(FONT_SCALING, fScaleFontsButton.getSelection());
         }
         
         for(FontInfo info : fontInfos) {
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/ui/ThemeUtils.java b/com.archimatetool.editor/src/com/archimatetool/editor/ui/ThemeUtils.java
index 0699697a7..777fce4b6 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/ui/ThemeUtils.java
+++ b/com.archimatetool.editor/src/com/archimatetool/editor/ui/ThemeUtils.java
@@ -23,6 +23,7 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.themes.ColorDefinition;
+import org.eclipse.ui.internal.themes.FontDefinition;
 import org.eclipse.ui.internal.themes.IThemeRegistry;
 import org.eclipse.ui.internal.themes.ThemeElementDefinition;
 import org.eclipse.ui.internal.themes.ThemeElementHelper;
@@ -251,6 +252,32 @@ public static void setBackgroundColorIfCssThemingDisabled(Control control, Strin
     // Font Definitions
     // ===============================================
     
+    
+    /**
+     * Set theme font definition value for current theme.
+     * Some of this code inspired by {@link org.eclipse.ui.internal.themes.ColorsAndFontsPreferencePage}
+     */
+    public static void setCurrentThemeFont(String fontDefinitionId, FontData fontData, FontData defaultFontData) {
+        if(!PlatformUI.isWorkbenchRunning() || fontData == null) {
+            return;
+        }
+        
+        // Get the font definition from the registry
+        FontDefinition fontDef = getThemeRegistry().findFont(fontDefinitionId);
+        if(fontDef == null) {
+            return;
+        }
+        
+        // Write FontData to workbench preference file at .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
+        String preferenceKey = createPreferenceKey(fontDef);
+        if(Objects.equals(fontData, defaultFontData)) { // If it's the default, remove it
+            PrefUtil.getInternalPreferenceStore().setToDefault(preferenceKey);
+        }
+        else {
+            PrefUtil.getInternalPreferenceStore().setValue(preferenceKey, fontData.toString());
+        }
+    }
+    
     /**
      * Get the FontData in the current theme for a font definition or null
      */