diff --git a/megameklab/src/megameklab/ui/MenuBar.java b/megameklab/src/megameklab/ui/MenuBar.java
index 832cd34b9..126231515 100644
--- a/megameklab/src/megameklab/ui/MenuBar.java
+++ b/megameklab/src/megameklab/ui/MenuBar.java
@@ -17,6 +17,7 @@
 import megamek.client.ui.dialogs.BVDisplayDialog;
 import megamek.client.ui.dialogs.CostDisplayDialog;
 import megamek.client.ui.dialogs.WeightDisplayDialog;
+import megamek.client.ui.swing.GUIPreferences;
 import megamek.client.ui.swing.UnitLoadingDialog;
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
@@ -595,6 +596,9 @@ private JMenu createThemesMenu() {
         themesMenu.setMnemonic(KeyEvent.VK_T);
 
         for (final LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+            if (!GUIPreferences.isSupportedLookAndFeel(laf)) {
+                continue;
+            }
             final JCheckBoxMenuItem miLookAndFeel = new JCheckBoxMenuItem(laf.getName());
             miLookAndFeel.setName("miLookAndFeel");
             miLookAndFeel.setSelected(laf.getName().equalsIgnoreCase(UIManager.getLookAndFeel().getName()));
diff --git a/megameklab/src/megameklab/util/CConfig.java b/megameklab/src/megameklab/util/CConfig.java
index 1d884480b..35ff6dc38 100644
--- a/megameklab/src/megameklab/util/CConfig.java
+++ b/megameklab/src/megameklab/util/CConfig.java
@@ -118,6 +118,7 @@ public final class CConfig {
      */
     private static Properties getDefaults() {
         Properties defaults = new Properties();
+        defaults.setProperty(GUI_PLAF, "com.formdev.flatlaf.FlatDarculaLaf");
         defaults.setProperty(GUI_FULLSCREEN, Boolean.toString(false));
         defaults.setProperty(MISC_SUMMARY_FORMAT_TRO, Boolean.toString(true));
         defaults.setProperty(MISC_SKIP_SAFETY_PROMPTS, Boolean.toString(false));