From c660795a959a1decdec09bb60f54722cf0653272 Mon Sep 17 00:00:00 2001
From: dave <dave@nutricherry.com>
Date: Sat, 7 Sep 2024 12:57:02 +0100
Subject: [PATCH] #506 #504 Remove all usage of STR template, store last import
 location

---
 .idea/dataSources.xml                         | 15 ++--
 .idea/misc.xml                                |  3 +-
 .../TcMenuDesigner_Single_Test.xml            |  4 +-
 embeddedJavaExample/pom.xml                   |  4 +-
 tcMenuGenerator/pom.xml                       |  2 +-
 .../menu/editorui/MenuEditorApp.java          |  8 +-
 .../editorui/cli/CodeGeneratorCommand.java    |  2 +-
 .../menu/editorui/cli/StartUICommand.java     |  2 +-
 .../generator/CodeGeneratorSupplier.java      |  2 +-
 .../generator/core/CoreCodeGenerator.java     |  6 +-
 .../gfxui/CreateBitmapWidgetController.java   | 25 +++---
 .../gfxui/CreateBitmapWidgetToolDialog.java   | 11 +--
 .../gfxui/CreateFontUtilityController.java    | 42 ++++-----
 .../gfxui/CreateFontUtilityDialog.java        | 11 +--
 .../gfxui/NativeFreeFontGlyphGenerator.java   |  4 +-
 .../editorui/gfxui/font/EmbeddedFont.java     |  4 +-
 .../gfxui/font/EmbeddedFontExporter.java      | 34 ++++----
 .../gfxui/font/EmbeddedFontGlyph.java         |  2 +-
 .../gfxui/font/FontCreationController.java    |  2 +-
 .../gfxui/imgedit/SimpleImageEditor.java      |  6 +-
 .../gfxui/imgedit/SimpleImagePane.java        |  2 +-
 .../storage/ConfigurationStorage.java         |  8 +-
 .../storage/JdbcTcMenuConfigurationStore.java | 85 +++++++++++++------
 .../storage/PrefsConfigurationStorage.java    | 22 ++---
 .../menu/editorui/storage/TcConfigEntry.java  | 63 ++++++++++++++
 .../editorui/storage/TcConfigEntryType.java   | 22 +++++
 .../uimodel/CurrentProjectEditorUIImpl.java   |  4 +-
 27 files changed, 268 insertions(+), 127 deletions(-)
 create mode 100644 tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntry.java
 create mode 100644 tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntryType.java

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 52f58f0a..8bf0e160 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="tcDataStore.db" uuid="a25c125e-f8b4-47e0-a67a-56502891f995">
-      <driver-ref>sqlite.xerial</driver-ref>
+    <data-source source="LOCAL" name="h2db" uuid="691949fe-89d0-4a69-80d5-4a84810b5d54">
+      <driver-ref>hsqldb.local</driver-ref>
       <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$USER_HOME$/.tcmenu/tcDataStore.db</jdbc-url>
+      <jdbc-driver>org.hsqldb.jdbc.JDBCDriver</jdbc-driver>
+      <jdbc-url>jdbc:hsqldb:file:$USER_HOME$/.tcmenu/h2db/tcmenuConfig;ifexists=true</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+      </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
-    <data-source source="LOCAL" name="h2db" uuid="691949fe-89d0-4a69-80d5-4a84810b5d54">
+    <data-source source="LOCAL" name="h2db ec blank" uuid="147cef7b-41da-4ed4-8c2d-cf84b4776668">
       <driver-ref>hsqldb.local</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.hsqldb.jdbc.JDBCDriver</jdbc-driver>
-      <jdbc-url>jdbc:hsqldb:file:$USER_HOME$/.tcmenu/h2db/tcmenuConfig;ifexists=true</jdbc-url>
+      <jdbc-url>jdbc:hsqldb:file:$USER_HOME$/temp/bug/h2db/tcmenuConfig;ifexists=true</jdbc-url>
       <jdbc-additional-properties>
         <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
       </jdbc-additional-properties>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 84b6f935..5200a038 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="2">
@@ -28,5 +27,5 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" project-jdk-name="22" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" project-jdk-name="temurin-22" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TcMenuDesigner_Single_Test.xml b/.idea/runConfigurations/TcMenuDesigner_Single_Test.xml
index 4516863f..22f141e5 100644
--- a/.idea/runConfigurations/TcMenuDesigner_Single_Test.xml
+++ b/.idea/runConfigurations/TcMenuDesigner_Single_Test.xml
@@ -9,8 +9,8 @@
       </pattern>
     </extension>
     <option name="ALTERNATIVE_JRE_PATH" value="liberica-20" />
-    <option name="PACKAGE_NAME" value="com.thecoderscorner.menu.editorint.uitests.uimenuitem" />
-    <option name="MAIN_CLASS_NAME" value="com.thecoderscorner.menu.editorint.uitests.uimenuitem.UIRuntimeListMenuItemTest" />
+    <option name="PACKAGE_NAME" value="com.thecoderscorner.menu.editorint.uitests" />
+    <option name="MAIN_CLASS_NAME" value="com.thecoderscorner.menu.editorint.uitests.MenuEditorTestCases" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="class" />
     <option name="VM_PARAMETERS" value="-ea --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" />
diff --git a/embeddedJavaExample/pom.xml b/embeddedJavaExample/pom.xml
index d1181304..f2ee6106 100644
--- a/embeddedJavaExample/pom.xml
+++ b/embeddedJavaExample/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- it is safe to edit this file, it will not be replaced by TcMenu designer unless you delete it --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.thecoderscorner.menuexample</groupId>
-    <artifactId>EmbeddedJavaDemo</artifactId>
-    <name>EmbeddedJavaDemo</name>
+    <artifactId>embeddedJavaExample</artifactId>
+    <name>embeddedJavaExample</name>
     <description>An application built with TcMenu Designer</description>
     <version>0.0.1-SNAPSHOT</version>
 
diff --git a/tcMenuGenerator/pom.xml b/tcMenuGenerator/pom.xml
index 10411fa5..cd37a65f 100644
--- a/tcMenuGenerator/pom.xml
+++ b/tcMenuGenerator/pom.xml
@@ -166,7 +166,7 @@
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
+                    <!--compilerArgs>enable-preview</compilerArgs-->
                 </configuration>
             </plugin>
             <plugin>
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/MenuEditorApp.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/MenuEditorApp.java
index 97d14795..52a86bbe 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/MenuEditorApp.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/MenuEditorApp.java
@@ -75,9 +75,15 @@ public void start(Stage primaryStage) throws Exception {
             appContext = new MenuEditorConfig();
             INSTANCE = this;
         } catch(Exception ex) {
+            String msg;
+            if(ex.getMessage().contains("Database lock acquisition failure")) {
+                msg = "Please check if designer is already running, or you have opened the database in the .tcmenu directory.";
+            } else {
+                msg = "App did not start due to " + ex.getMessage() + ". See log for more details.";
+            }
             System.getLogger(MenuEditorApp.class.getSimpleName()).log(ERROR, "Failed loading config", ex);
             AlertUtil.showAlertAndWait(AlertType.ERROR,"Could not load designer",
-                    "App did not start due to " + ex.getMessage() + ". See log for more details.",
+                    msg,
                     ButtonType.CLOSE);
             primaryStage.close(); // make sure the app closes here.
             return;
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/CodeGeneratorCommand.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/CodeGeneratorCommand.java
index 0bf109e8..46e4069d 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/CodeGeneratorCommand.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/CodeGeneratorCommand.java
@@ -103,7 +103,7 @@ public Integer call() {
                         .map(form -> getFirstByNameAndUuid(appContext.getEcDataStore(), project, form)).toList();
             } catch(Exception ex) {
                 enabledFormObjects = List.of();
-                System.err.println(STR."WARNING: Forms \{project.getOptions().getListOfEmbeddedForms()} didn't load");
+                System.err.printf("WARNING: Forms %s didn't load\n", project.getOptions().getListOfEmbeddedForms());
                 System.err.println("IMPORTANT: Conversion will continue but forms will be missing from the build");
                 if(verbose) {
                     ex.printStackTrace();
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/StartUICommand.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/StartUICommand.java
index 9f0697fa..513d953a 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/StartUICommand.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/StartUICommand.java
@@ -38,7 +38,7 @@ public static String userSelectedProject() {
 
     public static void userDidSelectProject(File projectFile) {
         userSelectedProject.set(projectFile.getAbsolutePath());
-        System.out.println(STR."Designer is starting with project \{userSelectedProject.get()}");
+        System.out.println("Designer is starting with project " + userSelectedProject.get());
 
     }
 
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/CodeGeneratorSupplier.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/CodeGeneratorSupplier.java
index 6868118a..336fedf2 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/CodeGeneratorSupplier.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/CodeGeneratorSupplier.java
@@ -32,7 +32,7 @@ public CodeGenerator getCodeGeneratorFor(EmbeddedPlatform platform, CodeGenerato
         } else if (javaPlatforms.contains(platform)) {
             return new EmbeddedJavaGenerator(configStorage, platform);
         } else {
-            throw new IllegalArgumentException(STR."No such board type: \{platform}");
+            throw new IllegalArgumentException("No such board type: " + platform);
         }
     }
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/core/CoreCodeGenerator.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/core/CoreCodeGenerator.java
index d7ca22f1..dc829f84 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/core/CoreCodeGenerator.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/core/CoreCodeGenerator.java
@@ -110,7 +110,7 @@ public boolean startConversion(Path directory, List<CodePluginItem> codeGenerato
         this.localeHandler = handler;
         namingGenerator = new VariableNameGenerator(menuTree, options.isNamingRecursive());
         this.previousPluginFiles = previousPluginFiles;
-        logLine(INFO, STR."Starting \{embeddedPlatform.getBoardId()} generate into : \{directory}");
+        logLine(INFO, "Starting " + embeddedPlatform.getBoardId() + " generate into : " + directory);
 
         hasRemotePlugins = codeGenerators.stream()
                 .anyMatch(p -> p.getSubsystem() == SubSystem.REMOTE && !p.getId().equals(NO_REMOTE_ID));
@@ -381,7 +381,7 @@ private String toEmbeddedCppValue(MenuItem item, Object defaultValue) throws TcM
                 return toEmbeddedCppTextValue(tmi, s);
             }
             case String _ -> {
-                return STR."\"\{defaultValue}\"";
+                return "\"" + defaultValue + "\"";
             }
             case PortableColor c when item instanceof Rgb32MenuItem rgbItem -> {
                 if (rgbItem.isIncludeAlphaChannel()) {
@@ -474,7 +474,7 @@ protected void generateSource(List<CodePluginItem> generators, String cppFile,
             logLine(INFO, "Writing out source CPP file: " + cppFile);
 
             writer.write(COMMENT_HEADER);
-            writer.write(STR."// Generated for \{embeddedPlatform} by TcMenu \{configStore.getVersion()} on \{ISO_INSTANT.format(clock.instant())}.");
+            writer.write("// Generated for %s by TcMenu %s on %s.".formatted(embeddedPlatform, configStore.getVersion(), ISO_INSTANT.format(clock.instant())));
             writer.append(TWO_LINES);
 
             writer.write("#include <tcMenu.h>" + LINE_BREAK);
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetController.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetController.java
index 570f83cf..9cf39d53 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetController.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetController.java
@@ -6,6 +6,7 @@
 import com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImageEditor;
 import com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImagePane;
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.*;
+import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import com.thecoderscorner.menu.editorui.uimodel.CurrentProjectEditorUI;
 import com.thecoderscorner.menu.editorui.util.SafeNavigator;
 import javafx.event.ActionEvent;
@@ -30,6 +31,7 @@
 import java.util.Optional;
 
 import static com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImageEditor.EditingMode.BITMAP_EDITOR;
+import static com.thecoderscorner.menu.editorui.storage.ConfigurationStorage.ConfigImportType;
 import static com.thecoderscorner.menu.editorui.util.AlertUtil.showAlertAndWait;
 
 public class CreateBitmapWidgetController {
@@ -45,12 +47,12 @@ public class CreateBitmapWidgetController {
     public GridPane imageGridPane;
 
     private CurrentProjectEditorUI editorUI;
-    private String homeDirectory;
     private final List<LoadedImage> loadedImages = new ArrayList<>();
+    private ConfigurationStorage storage;
 
-    public void initialise(CurrentProjectEditorUI editorUI, String homeDirectory) {
+    public void initialise(CurrentProjectEditorUI editorUI, ConfigurationStorage storage) {
         this.editorUI = editorUI;
-        this.homeDirectory = homeDirectory;
+        this.storage = storage;
 
         variableField.textProperty().addListener((_, _, _) -> refreshButtonStates());
 
@@ -169,8 +171,9 @@ public void onLoadImage(ActionEvent ignoredActionEvent) {
             try(var is = new BufferedInputStream(new FileInputStream(maybeFile.get()))) {
                 Image img = new Image(is);
                 putImageIntoAvailableSlot(img);
+                storage.setImportDirectory(ConfigImportType.BITMAP, Path.of(maybeFile.get()).getParent().toString());
             } catch (Exception ex) {
-                logger.log(System.Logger.Level.ERROR, STR."Image load from file failure \{maybeFile.get()}", ex);
+                logger.log(System.Logger.Level.ERROR, "Image load from file failure " + maybeFile.get(), ex);
                 editorUI.alertOnError("Error loading image", ex.getMessage());
             }
         }
@@ -185,7 +188,7 @@ public void onCreateWidget(ActionEvent ignoredActionEvent) {
             }
             catch (Exception e) {
                 logger.log(System.Logger.Level.ERROR, "Could not put file content on clipboard", e);
-                editorUI.alertOnError("Not exported to Clipboard", STR."Not exported to Clipboard \{e.getMessage()}");
+                editorUI.alertOnError("Not exported to Clipboard", "Not exported to Clipboard " + e.getMessage());
             }
             return;
         }
@@ -196,7 +199,7 @@ public void onCreateWidget(ActionEvent ignoredActionEvent) {
                 exportSuccessful(maybeName.get());
             } catch (Exception e) {
                 logger.log(System.Logger.Level.ERROR, "File could not be written", e);
-                editorUI.alertOnError("Not exported to file", STR."Not exported to file \{e.getMessage()}");
+                editorUI.alertOnError("Not exported to file", "Not exported to file " + e.getMessage());
             }
         }
     }
@@ -229,7 +232,7 @@ public void onCreateBitmaps(ActionEvent ignoredActionEvent) {
             }
             catch (Exception e) {
                 logger.log(System.Logger.Level.ERROR, "Could not put file content on clipboard", e);
-                editorUI.alertOnError("Not exported to Clipboard", STR."Not exported to Clipboard \{e.getMessage()}");
+                editorUI.alertOnError("Not exported to Clipboard", "Not exported to Clipboard " + e.getMessage());
             }
             return;
         }
@@ -240,22 +243,22 @@ public void onCreateBitmaps(ActionEvent ignoredActionEvent) {
                 exportSuccessful(maybeName.get());
             } catch (Exception e) {
                 logger.log(System.Logger.Level.ERROR, "File could not be written", e);
-                editorUI.alertOnError("File not written", STR."Error while writing file \{e.getMessage()}");
+                editorUI.alertOnError("File not written", "Error while writing file " + e.getMessage());
             }
         }
     }
 
     private Optional<Path> getInitialDir() {
         if(editorUI.getCurrentProject().getFileName().equals("New")) {
-            return Optional.of(Path.of(homeDirectory));
+            return Optional.of(Path.of(storage.getImportDirectory(ConfigImportType.BITMAP)));
         } else {
             return Optional.of(Path.of(editorUI.getCurrentProject().getFileName()).getParent());
         }
     }
 
     private void exportSuccessful(String where) {
-        showAlertAndWait(Alert.AlertType.INFORMATION, STR."\{variableField.getText()} successfully exported",
-                STR."\{variableField.getText()} was successfully exported to \{where}", ButtonType.CLOSE);
+        showAlertAndWait(Alert.AlertType.INFORMATION, variableField.getText() + " successfully exported",
+                "%s was successfully exported to %s".formatted(variableField.getText(), where), ButtonType.CLOSE);
     }
 
     LoadedImage createBitmap(BitmapImportPopup popup) {
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetToolDialog.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetToolDialog.java
index 46ad3135..f2621c92 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetToolDialog.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetToolDialog.java
@@ -1,21 +1,22 @@
 package com.thecoderscorner.menu.editorui.gfxui;
 
 import com.thecoderscorner.menu.editorui.dialog.BaseDialogSupport;
+import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import com.thecoderscorner.menu.editorui.uimodel.CurrentProjectEditorUI;
 import javafx.stage.Stage;
 
 public class CreateBitmapWidgetToolDialog extends BaseDialogSupport<CreateBitmapWidgetController> {
-    private final String homeDirectory;
-    private CurrentProjectEditorUI editorUI;
+    private final CurrentProjectEditorUI editorUI;
+    private final ConfigurationStorage storage;
 
-    public CreateBitmapWidgetToolDialog(Stage mainStage, CurrentProjectEditorUI editorUI, String homeDirectory) {
+    public CreateBitmapWidgetToolDialog(Stage mainStage, CurrentProjectEditorUI editorUI, ConfigurationStorage storage) {
         this.editorUI = editorUI;
-        this.homeDirectory = homeDirectory;
+        this.storage = storage;
         tryAndCreateDialog(mainStage, "/ui/ImageToNativeBitmapConverter.fxml", bundle.getString("bitmap.create.title"), true, 0.96);
     }
 
     @Override
     protected void initialiseController(CreateBitmapWidgetController controller) throws Exception {
-        controller.initialise(editorUI, homeDirectory);
+        controller.initialise(editorUI, storage);
     }
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java
index 2b526af4..10ce2851 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java
@@ -13,6 +13,7 @@
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.BmpDataManager;
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.NativeBmpBitPacker;
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.NativePixelFormat;
+import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import com.thecoderscorner.menu.editorui.uimodel.CurrentProjectEditorUI;
 import com.thecoderscorner.menu.editorui.util.SafeNavigator;
 import javafx.event.ActionEvent;
@@ -37,6 +38,7 @@
 import static com.thecoderscorner.menu.domain.util.PortablePalette.PaletteMode;
 import static com.thecoderscorner.menu.editorui.gfxui.font.EmbeddedFontExporter.FontFormat;
 import static com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImageEditor.EditingMode.FONT_EDITOR;
+import static com.thecoderscorner.menu.editorui.storage.ConfigurationStorage.ConfigImportType;
 import static java.lang.System.Logger.Level.ERROR;
 import static java.lang.System.Logger.Level.INFO;
 
@@ -51,7 +53,7 @@ public class CreateFontUtilityController {
     public Label fontSizeField;
     public MenuButton generateButton;
     private CurrentProjectEditorUI editorUI;
-    private String homeDirectory;
+    private ConfigurationStorage storage;
     private Path currentDir;
     private Set<UnicodeBlockMapping> chosenMappings = new HashSet<>(Set.of(UnicodeBlockMapping.BASIC_LATIN));
     private final Map<UnicodeBlockMapping,List<FontGlyphDataControl>> controlsByBlock = new HashMap<>();
@@ -61,11 +63,11 @@ public class CreateFontUtilityController {
     private boolean clipboardExport = false;
     private Path lastExportDir;
 
-    public void initialise(CurrentProjectEditorUI editorUI, String homeDirectory) {
+    public void initialise(CurrentProjectEditorUI editorUI, ConfigurationStorage storage) {
         this.editorUI = editorUI;
-        this.homeDirectory = homeDirectory;
+        this.storage = storage;
         var fileName = editorUI.getCurrentProject().getFileName();
-        currentDir = (fileName.equals("New")) ? Path.of(homeDirectory) : Path.of(fileName).getParent();
+        currentDir = (fileName.equals("New")) ? Path.of(storage.getImportDirectory(ConfigImportType.FONT)) : Path.of(fileName).getParent();
         lastExportDir = currentDir;
 
         var clipboardItem = new CheckMenuItem(bundle.getString("core.to.clip"));
@@ -83,7 +85,7 @@ public void initialise(CurrentProjectEditorUI editorUI, String homeDirectory) {
 
     private void internalGenerate(FontEncoder.FontFormat format) {
         if(clipboardExport) {
-            logger.log(INFO, STR."Convert font \{format}, to clipboard");
+            logger.log(INFO, "Convert font {} to clipboard", format);
             try(var outStream = new ByteArrayOutputStream()) {
                 EmbeddedFontExporter exporter = new EmbeddedFontExporter(embeddedFont, outputStructNameField.getText());
                 exporter.encodeFontToStream(outStream, format);
@@ -92,7 +94,7 @@ private void internalGenerate(FontEncoder.FontFormat format) {
                 content.putString(outStream.toString());
                 clipboard.setContent(content);
             } catch (Exception ex) {
-                editorUI.alertOnError("Clipboard export failed", STR."The font was not converted due to the following. \{ex.getMessage()}");
+                editorUI.alertOnError("Clipboard export failed", "The font was not converted due to the following." + ex.getMessage());
             }
         } else {
             logger.log(INFO, "Show font conversion save dialog");
@@ -100,12 +102,12 @@ private void internalGenerate(FontEncoder.FontFormat format) {
             if (maybeOutFile.isEmpty()) return;
             String outputFile = maybeOutFile.get();
             lastExportDir = Path.of(outputFile).getParent();
-            logger.log(INFO, STR."Convert font \{format}, name \{outputFile}");
+            logger.log(INFO, "Convert font {}, name {}", format, outputFile);
             try (var outStream = new FileOutputStream(outputFile)) {
                 EmbeddedFontExporter exporter = new EmbeddedFontExporter(embeddedFont, outputStructNameField.getText());
                 exporter.encodeFontToStream(outStream, format);
             } catch (Exception ex) {
-                editorUI.alertOnError("File export failed ", STR."The font was not converted due to the following. \{ex.getMessage()}");
+                editorUI.alertOnError("File export failed ", "The font was not converted due to the following. " + ex.getMessage());
             }
         }
     }
@@ -126,7 +128,7 @@ public void onOpenExistingFont(ActionEvent ignoredEvent) {
                 embeddedFont = new EmbeddedFont(path);
                 recalcFont();
             } catch (Exception e) {
-                editorUI.alertOnError("File load problem", STR."The font file was not loaded - \{e}");
+                editorUI.alertOnError("File load problem", "The font file was not loaded - " + e);
             }
         });
     }
@@ -150,11 +152,12 @@ public void saveFont(ActionEvent ignored) {
     public void importFont(ActionEvent ignoredActionEvent) {
         if(!shouldOverwrite()) return;
         var createFontDlg = new FontCreationController();
-        var p = (embeddedFont.getFontPath() != null) ? embeddedFont.getFontPath().getParent() : currentDir;
+        var p = Path.of(storage.getImportDirectory(ConfigImportType.FONT));
         var font = createFontDlg.createDialog((Stage)fontFileField.getScene().getWindow(), p, editorUI);
         if(font.isEmpty()) return;
         embeddedFont = font.get();
         chosenMappings = createFontDlg.getChosenMappings();
+        storage.setImportDirectory(ConfigImportType.FONT, embeddedFont.getFontPath().getParent().toString());
         recalcFont();
         checkButtons();
     }
@@ -168,7 +171,7 @@ private void recalcFont() {
 
             Label title = new Label(blockRange.toString());
             title.setPadding(new Insets(15, 0, 6, 0));
-            title.setStyle(STR."-fx-font-size: \{GlobalSettings.defaultFontSize() * 2};");
+            title.setStyle(String.format("-fx-font-size: %d;", GlobalSettings.defaultFontSize() * 2));
             fontRenderArea.add(title, 0, gridRow, 5, 1);
             CheckBox selAllCheck = new CheckBox("Select/Clear All");
             selAllCheck.setOnAction(_ -> {
@@ -186,7 +189,7 @@ private void recalcFont() {
             fontRenderArea.add(selAllCheck, 6, gridRow, 2, 1);
             fontRenderArea.add(preview, 8, gridRow);
 
-            fontFileField.setText(STR."\{embeddedFont.getFontType()} \{embeddedFont.getFontPath()}");
+            fontFileField.setText("%s %s".formatted(embeddedFont.getFontType(), embeddedFont.getFontPath()));
             outputStructNameField.setText(embeddedFont.getDefaultFontVariableName());
 
             gridRow++;
@@ -206,7 +209,7 @@ private void recalcFont() {
                         gridRow++;
                     }
                 } catch(Exception ex) {
-                    logger.log(ERROR, STR."Create control has failed at \{new String(Character.toChars(glyph.code()))} \{glyph}", ex);
+                    logger.log(ERROR, "Create control has failed at %s %s".formatted(new String(Character.toChars(glyph.code())), glyph), ex);
                 }
             }
             gridRow++;
@@ -258,12 +261,12 @@ private void previewNativeFont(UnicodeBlockMapping mapping, List<FontGlyphDataCo
 
         var popup = new Popup();
         var vbox = new VBox(4);
-        vbox.setStyle(STR."-fx-background-color: #1f1a1a;-fx-border-style: solid;-fx-border-color: black;-fx-border-width: 2;-fx-background-insets: 6;-fx-padding: 10;-fx-font-size: \{GlobalSettings.defaultFontSize()}");
+        vbox.setStyle("-fx-background-color: #1f1a1a;-fx-border-style: solid;-fx-border-color: black;-fx-border-width: 2;-fx-background-insets: 6;-fx-padding: 10;-fx-font-size: " + GlobalSettings.defaultFontSize());
 
         e.setPrefWidth(640);
         e.setPrefHeight(maxHeight * 2);
 
-        var title = new Label(STR."Glyphs in \{mapping.name()} range \{mapping.getStartingCode()}-\{mapping.getEndingCode()}");
+        var title = new Label("Glyphs in %s range %d-%d".formatted(mapping.name(), mapping.getStartingCode(), mapping.getEndingCode()));
         var closeBtn = new Button("Close");
         closeBtn.setMaxWidth(99999);
         closeBtn.setOnAction(_ -> popup.hide());
@@ -310,7 +313,8 @@ public BmpDataManager getData() {
 
         private void setFooterText(BorderPane pane) {
             var strSel = glyph.selected() ? "[X] " : "[ ]";
-            pane.setBottom(new Label(STR."\{strSel}U\{glyph.code()} : \{new String(Character.toChars(glyph.code()))}"));
+            char[] theChar = Character.toChars(glyph.code());
+            pane.setBottom(new Label("%sU%d : %s".formatted(strSel, glyph.code(), new String(theChar))));
         }
 
         public void setSelected(boolean selected) {
@@ -331,8 +335,8 @@ private void imgViewMouseClick(MouseEvent mouseEvent) {
 
             var box = new VBox(4);
             box.setFillWidth(true);
-            box.setStyle(STR."-fx-font-size: \{GlobalSettings.defaultFontSize()}");
-            var editButton = new Button(STR."Edit Glyph U\{glyph.code()}");
+            box.setStyle("-fx-font-size: " + GlobalSettings.defaultFontSize());
+            var editButton = new Button("Edit Glyph U" + glyph.code());
             editButton.setMaxWidth(99999);
             editButton.setOnAction(_ -> {
                 var editor = new SimpleImageEditor(glyph.data(), NativePixelFormat.MONO_BITMAP, FONT_PALETTE, FONT_EDITOR);
@@ -355,7 +359,7 @@ private void imgViewMouseClick(MouseEvent mouseEvent) {
             var closeButton = new Button("Close");
             closeButton.setMaxWidth(99999);
             closeButton.setOnAction(_ -> popup.hide());
-            box.setStyle(STR."-fx-background-color: #1f1a1a;-fx-border-style: solid;-fx-border-color: black;-fx-border-width: 2;-fx-background-insets: 6;-fx-padding: 10;-fx-font-size: \{GlobalSettings.defaultFontSize()}");
+            box.setStyle("-fx-background-color: #1f1a1a;-fx-border-style: solid;-fx-border-color: black;-fx-border-width: 2;-fx-background-insets: 6;-fx-padding: 10;-fx-font-size: " + GlobalSettings.defaultFontSize());
             box.getChildren().addAll(selectButton, editButton, closeButton);
             popup.getContent().add(box);
             popup.show(pane.getScene().getWindow());
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityDialog.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityDialog.java
index 9956591b..5c00151c 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityDialog.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityDialog.java
@@ -1,21 +1,22 @@
 package com.thecoderscorner.menu.editorui.gfxui;
 
 import com.thecoderscorner.menu.editorui.dialog.BaseDialogSupport;
+import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import com.thecoderscorner.menu.editorui.uimodel.CurrentProjectEditorUI;
 import javafx.stage.Stage;
 
 public class CreateFontUtilityDialog extends BaseDialogSupport<CreateFontUtilityController> {
-    private final String homeDirectory;
-    private CurrentProjectEditorUI editorUI;
+    private final CurrentProjectEditorUI editorUI;
+    private final ConfigurationStorage storage;
 
-    public CreateFontUtilityDialog(Stage mainStage, CurrentProjectEditorUI editorUI, String homeDirectory) {
+    public CreateFontUtilityDialog(Stage mainStage, CurrentProjectEditorUI editorUI, ConfigurationStorage storage) {
         this.editorUI = editorUI;
-        this.homeDirectory = homeDirectory;
+        this.storage = storage;
         tryAndCreateDialog(mainStage, "/ui/createFontPanel.fxml", bundle.getString("font.create.title"), true, .95);
     }
 
     @Override
     protected void initialiseController(CreateFontUtilityController controller) throws Exception {
-        controller.initialise(editorUI, homeDirectory);
+        controller.initialise(editorUI, storage);
     }
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontGlyphGenerator.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontGlyphGenerator.java
index f2ed2e77..cac7112b 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontGlyphGenerator.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontGlyphGenerator.java
@@ -39,7 +39,7 @@ public NativeFreeFontGlyphGenerator(Path path, int dpi) {
         fontPath = path;
         fontHandle = 0;
 
-        try (Arena arena = Arena.ofConfined()) {
+        try (Arena _ = Arena.ofConfined()) {
             logger.log(INFO, "Trying to initialise the library");
             int retCode = (int)tcNative.getFontLibInit().invoke();
             if(retCode != 0) throw new IllegalArgumentException("Font Library init failed");
@@ -138,7 +138,7 @@ public boolean canDisplay(int code) {
     @Override
     public void deriveFont(int size, Set<UnicodeBlockMapping> newMappings, AntiAliasMode aliasMode) {
         try(Arena arena = Arena.ofConfined()) {
-            logger.log(INFO, STR."Derive font size \{size} mappings \{newMappings.size()} path \{fontPath}");
+            logger.log(INFO, "Derive font size %d mappings %d path %s".formatted(size, newMappings.size(), fontPath));
             if(fontHandle != 0) {
                 tcNative.getFontClose().invoke(fontHandle);
             }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFont.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFont.java
index 38e94876..3f6eacaa 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFont.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFont.java
@@ -113,7 +113,7 @@ public EmbeddedFont(Path pathName) throws Exception {
         for(var glyph : glyphs) {
             var bm = findUnicodeBlockMapping(glyph);
             if (bm.isEmpty()) {
-                logger.log(WARNING, STR."Corrupt font, no block mapping for \{glyph.code()} so skipping.");
+                logger.log(WARNING, "Corrupt font, no block mapping for %d so skipping.".formatted(glyph.code()));
                 continue;
             }
             var list = mapBlockToGlyph.computeIfAbsent(bm.get(), _ -> new ArrayList<>(256));
@@ -275,7 +275,7 @@ public String getDefaultFontVariableName() {
         if(extensionIndex != -1) {
             file = file.substring(0, extensionIndex);
         }
-        var outputName = STR."\{file}_\{size}pt";
+        var outputName = "%s_%dpt".formatted(file, size);
         return VariableNameGenerator.makeNameFromVariable(outputName);
     }
 
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontExporter.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontExporter.java
index c6c95fe7..8e753d49 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontExporter.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontExporter.java
@@ -67,11 +67,11 @@ List<TcUnicodeFontGlyph> glyphsFromAllBlocks() {
     public void encodeFontToStream(OutputStream stream, FontFormat fmt) {
         var ps = new PrintStream(stream);
         ps.println("// Font file generated by theCodersCorner.com Font Generator");
-        ps.println(STR."// Format:           \{fmt}");
-        ps.println(STR."// Approximate size: \{font.fontSizeInBytes(fmt)} bytes");
-        ps.println(STR."// Source file:      \{font.getFontName()}");
-        ps.println(STR."// Point size:       \{font.getSize()}pt");
-        ps.println(STR."// Variable name:    \{variableName}");
+        ps.printf("// Format:           %s%n", fmt);
+        ps.printf("// Approximate size: %d bytes%n", font.fontSizeInBytes(fmt));
+        ps.printf("// Source file:      %s%n", font.getFontName());
+        ps.printf("// Point size:       %dpt%n", font.getSize());
+        ps.printf("// Variable name:    %s%n", variableName);
         ps.println();
         switch (fmt) {
             case ADAFRUIT -> encodeAdafruit(ps);
@@ -80,13 +80,13 @@ public void encodeFontToStream(OutputStream stream, FontFormat fmt) {
     }
 
     private void encodeAdafruit(PrintStream ps) {
-        ps.println(STR."const uint8_t \{variableName }Bitmaps[] PROGMEM = {");
+        ps.printf("const uint8_t %sBitmaps[] PROGMEM = {%n", variableName);
         List<TcUnicodeFontGlyph> allGlyphs = glyphsFromAllBlocks();
         printByteArray(ps, allGlyphs);
         ps.println("};");
         ps.println();
 
-        ps.println(STR."const GFXglyph \{variableName }Glyphs[] PROGMEM = {");
+        ps.println("const GFXglyph %sGlyphs[] PROGMEM = {".formatted(variableName));
         int min = allGlyphs.getFirst().charNum();
         int max = allGlyphs.stream().map(TcUnicodeFontGlyph::charNum).reduce(0, Integer::max);
 
@@ -113,11 +113,11 @@ private void encodeAdafruit(PrintStream ps) {
         ps.println();
         ps.println("};");
         ps.println();
-        ps.println(STR."const GFXfont \{variableName } PROGMEM = {");
-        ps.println(STR."    (uint8_t*)\{variableName }Bitmaps,");
-        ps.println(STR."    (GFXglyph*)\{variableName }Glyphs,");
-        ps.println(STR."    \{min}, \{max},");
-        ps.println(STR."    \{yAdvance}");
+        ps.printf("const GFXfont %s PROGMEM = {%n", variableName);
+        ps.printf("    (uint8_t*)%sBitmaps,%n", variableName);
+        ps.printf("    (GFXglyph*)%sGlyphs,%n", variableName);
+        ps.printf("    %d, %d,%n", min, max);
+        ps.printf("    %d%n", yAdvance);
         ps.println("};");
     }
 
@@ -131,7 +131,7 @@ private void encodeTcUnicode(PrintStream ps) {
                 .toList();
 
         for (var block : sortedBlocks) {
-            ps.println(STR."// Bitmaps for \{block.mapping()}");
+            ps.println("// Bitmaps for "+ block.mapping());
             ps.printf("const uint8_t %sBitmaps_%d[] PROGMEM = {", variableName, block.mapping().ordinal());
             ps.println();
             printByteArray(ps, block.glyphs());
@@ -142,7 +142,7 @@ private void encodeTcUnicode(PrintStream ps) {
                     block.mapping().getStartingCode(), variableName, block.mapping().ordinal(),
                     block.mapping().getEndingCode() - block.mapping().getStartingCode(), block.mapping()));
 
-            ps.println(STR."// Glyphs for \{block.mapping()}");
+            ps.println("// Glyphs for " + block.mapping());
             ps.printf("const UnicodeFontGlyph %sGlyphs_%d[] PROGMEM = {", variableName, block.mapping().ordinal());
             ps.println();
 
@@ -165,12 +165,12 @@ private void encodeTcUnicode(PrintStream ps) {
             ps.println();
         }
 
-        ps.println(STR."const UnicodeFontBlock \{variableName }Blocks[] PROGMEM = {");
+        ps.printf("const UnicodeFontBlock %sBlocks[] PROGMEM = {%n", variableName);
         ps.println(blockData.stream().collect(Collectors.joining("," + LINE_BREAK)));
         ps.println("};");
         ps.println();
 
-        ps.printf(STR."const UnicodeFont \{variableName }[] PROGMEM = { {%sBlocks, %d, %d, TCFONT_ONE_BIT_PER_PIXEL} };", variableName, blocks.size(), yAdvance);
+        ps.printf("const UnicodeFont %s[] PROGMEM = { {%sBlocks, %d, %d, TCFONT_ONE_BIT_PER_PIXEL} };", variableName, variableName, blocks.size(), yAdvance);
         ps.println();
     }
 
@@ -207,7 +207,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return STR."EmbeddedFontExporter[font=\{font}, blocks=\{blocks}, yAdvance=\{yAdvance}\{']'}";
+        return "EmbeddedFontExporter[font=%s, blocks=%s, yAdvance=%d]".formatted(font, blocks, yAdvance);
     }
 
 
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontGlyph.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontGlyph.java
index 6cecb608..69a0fade 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontGlyph.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/EmbeddedFontGlyph.java
@@ -105,7 +105,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return STR."ConvertedFontGlyph[code=\{code}, fontDims=\{fontDims}, data=\{data}, toBaseLine=\{toBaseLine}, belowBaseline=\{belowBaseline}, totalWidth=\{totalWidth}, selected=\{selected}\{']'}";
+        return "ConvertedFontGlyph[code=%d, fontDims=%s, data=%s, toBaseLine=%d, belowBaseline=%d, totalWidth=%d, selected=%s]".formatted(code, fontDims, data, toBaseLine, belowBaseline, totalWidth, selected);
     }
 
     /**
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/FontCreationController.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/FontCreationController.java
index 4e81cbeb..df0897c3 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/FontCreationController.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/font/FontCreationController.java
@@ -50,7 +50,7 @@ public Optional<EmbeddedFont> createDialog(Stage stage, Path startingDir, Curren
 
         int row = 0;
         var grid = new GridPane(4, 4);
-        grid.setStyle(STR."-fx-font-size: \{GlobalSettings.defaultFontSize()}");
+        grid.setStyle("-fx-font-size: " + GlobalSettings.defaultFontSize());
         grid.getColumnConstraints().addAll(
             priorityColConstraint(Priority.NEVER),
             priorityColConstraint(Priority.SOMETIMES),
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImageEditor.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImageEditor.java
index 1dbf12b9..ad1efdff 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImageEditor.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImageEditor.java
@@ -97,7 +97,7 @@ public boolean presentUI(CurrentProjectEditorUI editorUI) {
             ((Stage)canvas.getScene().getWindow()).close();
         });
         var xyLabel = new Label("");
-        canvas.setPositionUpdateListener((x, y) -> xyLabel.setText(STR."X=\{x}, Y=\{y}"));
+        canvas.setPositionUpdateListener((x, y) -> xyLabel.setText("X=%d, Y=%d".formatted(x, y)));
         hbox.getChildren().addAll(cutButton, copyButton, pasteButton, saveButton, closeButton, xyLabel);
 
         canvas.widthProperty().bind(pane.widthProperty());
@@ -108,7 +108,7 @@ public boolean presentUI(CurrentProjectEditorUI editorUI) {
 
         pane.setCenter(canvas);
         pane.getStyleClass().add("background");
-        pane.setStyle(STR."-fx-font-size: \{GlobalSettings.defaultFontSize()}");
+        pane.setStyle("-fx-font-size: " + GlobalSettings.defaultFontSize());
 
         Scene scene = new Scene(pane);
 
@@ -145,7 +145,7 @@ else if(ke.getCode().getCode() >= KeyCode.DIGIT0.getCode() && ke.getCode().getCo
         stage.setWidth(800);
         stage.setWidth(600);
         stage.setScene(scene);
-        stage.setTitle(STR."Bitmap Editor \{shortFmtText(format)} \{bitmap.getPixelWidth()} x \{bitmap.getPixelHeight()}");
+        stage.setTitle("Bitmap Editor %s %d x %d".formatted(shortFmtText(format), bitmap.getPixelWidth(), bitmap.getPixelHeight()));
         BaseDialogSupport.getJMetro().setScene(scene);
         stage.setOnCloseRequest(_ -> {
             if(editingMode == EditingMode.BITMAP_EDITOR && canvas.isDirty()) {
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImagePane.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImagePane.java
index 1c4d7c24..49bc8597 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImagePane.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImagePane.java
@@ -28,7 +28,7 @@ public SimpleImagePane(BmpDataManager bitmap, NativePixelFormat format, boolean
 
         this.setCenter(canvas);
         var hbox = new HBox(4);
-        hbox.getChildren().add(new Label(STR."\{shortFmtText(format)}: \{image.getWidth()} x \{image.getHeight()}"));
+        hbox.getChildren().add(new Label("%s: %s x %s".formatted(shortFmtText(format), image.getWidth(), image.getHeight())));
         hbox.getChildren().addAll(actionButtons);
         this.setTop(hbox);
 
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/ConfigurationStorage.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/ConfigurationStorage.java
index 409e1373..a2573084 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/ConfigurationStorage.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/ConfigurationStorage.java
@@ -29,6 +29,8 @@ enum TcMenuReleaseType {
         BETA, REGULAR, SUPPORTED
     }
 
+    enum ConfigImportType { BITMAP, FONT }
+
     List<String> loadRecents();
     void saveUniqueRecents(List<String> recents);
 
@@ -74,8 +76,8 @@ enum TcMenuReleaseType {
     void setLastLoadedProject(String absolutePath);
     void emptyLastLoadedProject();
 
-    ReleaseType getReleaseStream();
-    void setReleaseStream(ReleaseType releaseStream);
-
     void addArduinoDirectoryChangeListener(ArduinoDirectoryChangeListener directoryChangeListener);
+
+    String getImportDirectory(ConfigImportType importMode);
+    void setImportDirectory(ConfigImportType  importMode, String directory);
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/JdbcTcMenuConfigurationStore.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/JdbcTcMenuConfigurationStore.java
index 596761ba..676178c1 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/JdbcTcMenuConfigurationStore.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/JdbcTcMenuConfigurationStore.java
@@ -18,6 +18,8 @@
 
 import static com.thecoderscorner.menu.editorui.storage.PrefsConfigurationStorage.BUILD_TIMESTAMP_KEY;
 import static com.thecoderscorner.menu.editorui.storage.PrefsConfigurationStorage.BUILD_VERSION_KEY;
+import static com.thecoderscorner.menu.editorui.storage.TcConfigEntryType.DEFAULT_BMP_IMPORT_DIR;
+import static com.thecoderscorner.menu.editorui.storage.TcConfigEntryType.DEFAULT_FONT_IMPORT_DIR;
 import static java.lang.System.Logger.Level.*;
 
 public class JdbcTcMenuConfigurationStore implements ConfigurationStorage {
@@ -43,6 +45,9 @@ PLUGIN_PATH VARCHAR(255),
     private ArduinoDirectoryChangeListener arduinoChangeListener = null;
     private LinkedList<RecentlyUsedItem> recentItems = new LinkedList<>();
     private ApplicationThemeManager applicationThemeManager;
+    private List<TcConfigEntry> configEntries;
+    private String defaultFontImportDirectory;
+    private String defaultBitmapImportDirectory;
 
     public JdbcTcMenuConfigurationStore(TccDatabaseUtilities databaseUtilities, ApplicationThemeManager themeManager) {
         this.applicationThemeManager = themeManager;
@@ -54,10 +59,13 @@ public JdbcTcMenuConfigurationStore(TccDatabaseUtilities databaseUtilities, Appl
             boolean firstStart = !databaseUtilities.checkTableExists("TC_MENU_SETTINGS");
             // once we've determined that, let the database utilities get the DB in the right state
             databaseUtilities.ensureTableFormatCorrect(LoadedConfiguration.class);
+            databaseUtilities.ensureTableFormatCorrect(TcConfigEntry.class);
+
             // and if not started before, on the first attempt, we try and copy from preferences or default.
             if(firstStart) createIfNeeded();
             // and lastly load the configuration
             loaded = databaseUtilities.queryPrimaryKey(LoadedConfiguration.class, 0).orElse(makeDefaultConfig());
+            loadAllConfigEntriesIntoMap(databaseUtilities);
 
             var r = databaseUtilities.queryStrings("SELECT RECENT_FILE FROM TC_MENU_RECENTS ORDER BY RECENT_IDX");
             recentItems = r.stream().map(rec -> new RecentlyUsedItem(Paths.get(rec).getFileName().toString(), rec))
@@ -72,6 +80,29 @@ public JdbcTcMenuConfigurationStore(TccDatabaseUtilities databaseUtilities, Appl
         logger.log(INFO, "Loaded initial designer settings as" + loadedConfig);
     }
 
+    private void loadAllConfigEntriesIntoMap(TccDatabaseUtilities databaseUtilities) throws DataException {
+        configEntries = databaseUtilities.queryRecords(TcConfigEntry.class, "ACTIVE = 1");
+        defaultFontImportDirectory = fromConfigEntry(DEFAULT_FONT_IMPORT_DIR, System.getProperty("user.home"));
+        defaultBitmapImportDirectory = fromConfigEntry(DEFAULT_BMP_IMPORT_DIR, System.getProperty("user.home"));
+    }
+
+    private String fromConfigEntry(TcConfigEntryType key, String def) {
+        return configEntries.stream().filter(e -> e.getParamKey().equals(key))
+                .map(TcConfigEntry::getParamVal).findFirst()
+                .orElseGet(() -> {
+                    try {
+                        databaseUtilities.updateRecord(TcConfigEntry.class, new TcConfigEntry(key, def));
+                    } catch (DataException e) {
+                        logger.log(ERROR, "Could not write default value for " + key, e);
+                    }
+                    return def;
+                });
+    }
+
+    private int fromConfigEntry(TcConfigEntryType key, int def) {
+        return Integer.parseInt(fromConfigEntry(key, Integer.toString(def)));
+    }
+
     private LoadedConfiguration makeDefaultConfig() {
         var lc = new LoadedConfiguration();
         lc.setUsingArduinoIDE(true);
@@ -122,7 +153,6 @@ private void createIfNeeded() {
             lc.setProjectMaxLevel(prefs.getMenuProjectMaxLevel());
             lc.setNumberBackups(prefs.getNumBackupItems());
             lc.setRegisteredKey(prefs.getRegisteredKey());
-            lc.setReleaseStream(ReleaseType.STABLE);
             lc.setCurrentTheme(lastTheme);
         }
 
@@ -172,10 +202,17 @@ public void setRegisteredKey(String registeredKey) {
     }
 
     private void saveIfNeeded() {
-        if(autoCommit && loadedConfig.isChanged()) {
+        boolean anyTcEntryChange = configEntries.stream().anyMatch(TcConfigEntry::isChanged);
+        if(autoCommit && (loadedConfig.isChanged() || anyTcEntryChange)) {
             logger.log(INFO, "Saving designer settings" + loadedConfig);
             try {
                 databaseUtilities.updateRecord(LoadedConfiguration.class, loadedConfig);
+
+                var changedEntries = configEntries.stream().filter(TcConfigEntry::isChanged).toList();
+                for(var ce : changedEntries) {
+                    databaseUtilities.updateRecord(TcConfigEntry.class, ce);
+                    ce.saved();
+                }
             } catch (DataException e) {
                 logger.log(ERROR, "Could not save configuration", e);
             }
@@ -381,6 +418,28 @@ public void addArduinoDirectoryChangeListener(ArduinoDirectoryChangeListener dir
         arduinoChangeListener = directoryChangeListener;
     }
 
+    @Override
+    public String getImportDirectory(ConfigImportType importMode) {
+        return importMode == ConfigImportType.FONT ? defaultFontImportDirectory : defaultBitmapImportDirectory;
+    }
+
+    @Override
+    public void setImportDirectory(ConfigImportType importMode, String directory) {
+        if(importMode == ConfigImportType.FONT) {
+            this.defaultFontImportDirectory = directory;
+            getConfigEntry(DEFAULT_FONT_IMPORT_DIR).setParamVal(directory);
+        } else {
+            this.defaultBitmapImportDirectory = directory;
+            getConfigEntry(DEFAULT_BMP_IMPORT_DIR).setParamVal(directory);
+        }
+        saveIfNeeded();
+    }
+
+    private TcConfigEntry getConfigEntry(TcConfigEntryType ty) {
+        return configEntries.stream().filter(ce -> ce.getParamKey() == ty)
+                .findFirst().orElseThrow();
+    }
+
     public void setAutoCommit(boolean autoCommit) {
         if(!this.autoCommit && autoCommit) {
             this.autoCommit = true;
@@ -390,15 +449,6 @@ public void setAutoCommit(boolean autoCommit) {
         }
     }
 
-    public ReleaseType getReleaseStream() {
-        return loadedConfig.getReleaseStream();
-    }
-
-    public void setReleaseStream(ReleaseType stream) {
-        loadedConfig.setReleaseStream(stream);
-        saveIfNeeded();
-    }
-
     public void setCurrentTheme(String theme) {
         loadedConfig.setCurrentTheme(theme);
         applicationThemeManager.setThemeName(theme);
@@ -450,8 +500,6 @@ public static class LoadedConfiguration {
         private boolean eepromSized;
         @FieldMapping(fieldName = "USING_ARDUINO_IDE", fieldType = FieldType.BOOLEAN)
         private boolean usingArduinoIDE;
-        @FieldMapping(fieldName = "RELEASE_STREAM", fieldType = FieldType.ENUM)
-        private ReleaseType releaseStream;
         @FieldMapping(fieldName = "CURRENT_THEME", fieldType = FieldType.VARCHAR)
         private String currentTheme;
 
@@ -469,7 +517,6 @@ public LoadedConfiguration() {
             saveToSrc = false;
             eepromSized = true;
             usingArduinoIDE = true;
-            releaseStream = ReleaseType.STABLE;
         }
 
         public boolean isChanged() {
@@ -588,15 +635,6 @@ public void setLocale(String locale) {
             this.changed = true;
         }
 
-        public ReleaseType getReleaseStream() {
-            return releaseStream;
-        }
-
-        public void setReleaseStream(ReleaseType releaseStream) {
-            this.changed = releaseStream != this.releaseStream;
-            this.releaseStream = releaseStream;
-        }
-
         public String getCurrentTheme() {
             return currentTheme;
         }
@@ -622,7 +660,6 @@ public String toString() {
                     ", saveToSrc=" + saveToSrc +
                     ", eepromSized=" + eepromSized +
                     ", usingArduinoIDE=" + usingArduinoIDE +
-                    ", releaseStream=" + releaseStream +
                     ", currentTheme='" + currentTheme + '\'' +
                     '}';
         }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/PrefsConfigurationStorage.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/PrefsConfigurationStorage.java
index 44485121..9d59a58d 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/PrefsConfigurationStorage.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/PrefsConfigurationStorage.java
@@ -1,9 +1,9 @@
 package com.thecoderscorner.menu.editorui.storage;
 
 import com.thecoderscorner.menu.editorui.controller.MenuEditorController;
+import com.thecoderscorner.menu.editorui.util.StringHelper;
 import com.thecoderscorner.menu.persist.ReleaseType;
 import com.thecoderscorner.menu.persist.VersionInfo;
-import com.thecoderscorner.menu.editorui.util.StringHelper;
 
 import java.io.InputStream;
 import java.util.*;
@@ -160,6 +160,16 @@ public void addArduinoDirectoryChangeListener(ArduinoDirectoryChangeListener dir
         directoryChangeListeners.add(directoryChangeListener);
     }
 
+    @Override
+    public String getImportDirectory(ConfigImportType importMode) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setImportDirectory(ConfigImportType ty, String directory) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void setArduinoOverrideDirectory(String overrideDirectory) {
         Preferences prefs = Preferences.userNodeForPackage(MenuEditorController.class);
@@ -296,14 +306,4 @@ public void emptyLastLoadedProject() {
         Preferences prefs = Preferences.userNodeForPackage(MenuEditorController.class);
         prefs.remove(LAST_LOADED_PROJ);
     }
-
-    @Override
-    public ReleaseType getReleaseStream() {
-        return ReleaseType.STABLE;
-    }
-
-    @Override
-    public void setReleaseStream(ReleaseType releaseStream) {
-        // ignored in this implementation
-    }
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntry.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntry.java
new file mode 100644
index 00000000..b376a315
--- /dev/null
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntry.java
@@ -0,0 +1,63 @@
+package com.thecoderscorner.menu.editorui.storage;
+
+import com.thecoderscorner.embedcontrol.core.util.FieldMapping;
+import com.thecoderscorner.embedcontrol.core.util.FieldType;
+import com.thecoderscorner.embedcontrol.core.util.TableMapping;
+
+import java.time.LocalDateTime;
+
+@TableMapping(tableName = "TC_CONFIG_ENTRY", uniqueKeyField = "PARAM_KEY")
+public class TcConfigEntry {
+    private boolean changed = false;
+
+    @FieldMapping(fieldName = "PRIMARY_ID", primaryKey = true, fieldType = FieldType.INTEGER)
+    private int primaryId;
+    @FieldMapping(fieldName = "PARAM_KEY", fieldType = FieldType.ENUM)
+    private TcConfigEntryType paramKey;
+    @FieldMapping(fieldName = "PARAM_VAL", fieldType = FieldType.VARCHAR)
+    private String paramVal;
+    @FieldMapping(fieldName = "LAST_MOD", fieldType = FieldType.ISO_DATE)
+    private LocalDateTime lastMod;
+    @FieldMapping(fieldName = "ACTIVE", fieldType = FieldType.BOOLEAN)
+    private boolean active;
+
+    public TcConfigEntry() {
+    }
+
+    public TcConfigEntry(TcConfigEntryType paramKey, String paramVal) {
+        this.paramKey = paramKey;
+        this.primaryId = paramKey.getPk();
+        this.paramVal = paramVal;
+        this.active = true;
+        this.lastMod = LocalDateTime.now();
+    }
+
+    public TcConfigEntryType getParamKey() {
+        return paramKey;
+    }
+
+    public String getParamVal() {
+        return paramVal;
+    }
+
+    public void setParamVal(String paramVal) {
+        changed = paramVal.equals(this.paramVal);
+        this.paramVal = paramVal;
+    }
+
+    public LocalDateTime getLastMod() {
+        return lastMod;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    void saved() {
+        changed = false;
+    }
+
+    public boolean isChanged() {
+        return changed;
+    }
+}
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntryType.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntryType.java
new file mode 100644
index 00000000..4317bbee
--- /dev/null
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/storage/TcConfigEntryType.java
@@ -0,0 +1,22 @@
+package com.thecoderscorner.menu.editorui.storage;
+
+public enum TcConfigEntryType {
+        DEFAULT_FONT_IMPORT_DIR("FONT_IMPORT_DIR", 1),
+        DEFAULT_BMP_IMPORT_DIR("BMP_IMPORT_DIR", 2);
+
+        private final String key;
+        private final int pk;
+
+        TcConfigEntryType(String key, int pk) {
+            this.key = key;
+            this.pk = pk;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public int getPk() {
+            return pk;
+        }
+    }
\ No newline at end of file
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/uimodel/CurrentProjectEditorUIImpl.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/uimodel/CurrentProjectEditorUIImpl.java
index 4d6fc06a..5249ef5a 100644
--- a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/uimodel/CurrentProjectEditorUIImpl.java
+++ b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/uimodel/CurrentProjectEditorUIImpl.java
@@ -334,12 +334,12 @@ public List<EmbeddedPlatform> getEmbeddedPlatforms() {
 
     @Override
     public void showCreateFontUtility() {
-        new CreateFontUtilityDialog(mainStage, this, homeDirectory);
+        new CreateFontUtilityDialog(mainStage, this, configStore);
     }
 
     @Override
     public void showBitmapEditorUtility() {
-        new CreateBitmapWidgetToolDialog(mainStage, this, homeDirectory);
+        new CreateBitmapWidgetToolDialog(mainStage, this, configStore);
     }
 
     @Override