diff --git a/.github/workflows/initializr-cn1-version-pr.yml b/.github/workflows/initializr-cn1-version-pr.yml
index 85f2d59d86..f56ab2c92b 100644
--- a/.github/workflows/initializr-cn1-version-pr.yml
+++ b/.github/workflows/initializr-cn1-version-pr.yml
@@ -3,8 +3,10 @@ name: Initializr CN1 Version PR
 on:
   push:
     tags:
-      - "v*"
-      - "[0-9]*"
+      - "*"
+  release:
+    types:
+      - published
 
 permissions:
   contents: write
@@ -18,21 +20,22 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Update Initializr Codename One versions
-        run: ./scripts/initializr/update-cn1-version.sh "${GITHUB_REF_NAME}"
+        run: ./scripts/initializr/update-cn1-version.sh "${{ github.event.release.tag_name || github.ref_name }}"
 
       - name: Create pull request
         uses: peter-evans/create-pull-request@v6
         with:
-          commit-message: "scripts/initializr: bump Codename One versions to ${{ github.ref_name }}"
-          title: "scripts/initializr: bump Codename One versions to ${{ github.ref_name }}"
+          commit-message: "scripts/initializr: bump Codename One versions to ${{ github.event.release.tag_name || github.ref_name }}"
+          title: "scripts/initializr: bump Codename One versions to ${{ github.event.release.tag_name || github.ref_name }}"
           body: |
-            Automated update of Codename One versions in `scripts/initializr` after release `${{ github.ref_name }}`.
+            Automated update of Codename One versions in `scripts/initializr` after release `${{ github.event.release.tag_name || github.ref_name }}`.
 
             Updated:
             - All `scripts/initializr/**/pom.xml` files containing `cn1.plugin.version`
             - `scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java`
             - `scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java`
-          branch: automation/initializr-cn1-version-${{ github.ref_name }}
+            - Embedded root `pom.xml` in `scripts/initializr/common/src/main/resources/common.zip`
+          branch: automation/initializr-cn1-version-${{ github.event.release.tag_name || github.ref_name }}
           delete-branch: true
           labels: |
             automation
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 6a3f57813c..05b87661ef 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -13,6 +13,7 @@ on:
       - '**/*.md'
       - '.github/workflows/developer-guide-docs.yml'
       - '.github/workflows/website-docs.yml'
+      - '.github/workflows/initializr-cn1-version-pr.yml'
       - 'CodenameOneDesigner/**'
       - 'Ports/IOSPort/**'
   push:
@@ -27,6 +28,7 @@ on:
       - '**/*.md'
       - '.github/workflows/developer-guide-docs.yml'
       - '.github/workflows/website-docs.yml'
+      - '.github/workflows/initializr-cn1-version-pr.yml'
       - 'CodenameOneDesigner/**'
       - 'Ports/IOSPort/**'
 
diff --git a/.github/workflows/website-docs.yml b/.github/workflows/website-docs.yml
index f79b69b4d1..5c1331c3da 100644
--- a/.github/workflows/website-docs.yml
+++ b/.github/workflows/website-docs.yml
@@ -5,12 +5,14 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'docs/website/**'
+      - 'scripts/initializr/**'
       - 'scripts/website/**'
       - '.github/workflows/website-docs.yml'
   push:
     branches: [main, master]
     paths:
       - 'docs/website/**'
+      - 'scripts/initializr/**'
       - 'scripts/website/**'
       - '.github/workflows/website-docs.yml'
   workflow_dispatch:
diff --git a/docs/website/layouts/_default/initializr.html b/docs/website/layouts/_default/initializr.html
index 57a0a739cc..59020568bb 100644
--- a/docs/website/layouts/_default/initializr.html
+++ b/docs/website/layouts/_default/initializr.html
@@ -20,12 +20,30 @@
 </section>
 
 <style>
+:root {
+  --cn1-initializr-bg: #eef3ff;
+  --cn1-initializr-loader-bg: #eef3ff;
+  --cn1-initializr-loader-text: #1d2638;
+  --cn1-initializr-loader-progress-bg: rgba(255, 255, 255, 0.72);
+  --cn1-initializr-loader-progress-border: rgba(49, 105, 230, 0.25);
+}
+
+body.dark,
+body.cn1-initializr-dark {
+  --cn1-initializr-bg: #0a111d;
+  --cn1-initializr-loader-bg: #0a111d;
+  --cn1-initializr-loader-text: #d8e4ff;
+  --cn1-initializr-loader-progress-bg: rgba(10, 18, 31, 0.86);
+  --cn1-initializr-loader-progress-border: rgba(84, 128, 221, 0.45);
+}
+
 .cn1-initializr-page {
   height: 100%;
   width: 100%;
   margin: 0;
   padding: 0;
   box-sizing: border-box;
+  background: var(--cn1-initializr-bg);
 }
 
 .cn1-initializr-shell {
@@ -34,7 +52,7 @@
   overflow: hidden;
   border: 0;
   border-radius: 0;
-  background: transparent;
+  background: var(--cn1-initializr-bg);
   box-shadow: none;
 }
 
@@ -48,8 +66,9 @@
     z-index: 2;
     text-align: center;
     padding: 2rem;
-    color: #1d2638;
-    background:
+    color: var(--cn1-initializr-loader-text);
+    background-color: var(--cn1-initializr-loader-bg);
+    background-image:
       radial-gradient(1000px 420px at 20% 0%, rgba(99, 142, 255, 0.22), rgba(99, 142, 255, 0) 65%),
       radial-gradient(720px 360px at 100% 100%, rgba(60, 173, 216, 0.2), rgba(60, 173, 216, 0) 65%);
     transition: opacity 220ms ease-out, visibility 220ms ease-out;
@@ -60,8 +79,11 @@
     visibility: hidden;
   }
 
-  body.dark .cn1-initializr-loader {
-    color: #d8e4ff;
+  body.dark .cn1-initializr-loader,
+  body.cn1-initializr-dark .cn1-initializr-loader {
+    background-image:
+      radial-gradient(1000px 420px at 20% 0%, rgba(80, 120, 216, 0.26), rgba(80, 120, 216, 0) 65%),
+      radial-gradient(720px 360px at 100% 100%, rgba(52, 168, 196, 0.24), rgba(52, 168, 196, 0) 65%);
   }
 
   .cn1-initializr-loader .icon {
@@ -85,8 +107,8 @@
     height: 9px;
     border-radius: 999px;
     overflow: hidden;
-    border: 1px solid rgba(49, 105, 230, 0.25);
-    background: rgba(255, 255, 255, 0.7);
+    border: 1px solid var(--cn1-initializr-loader-progress-border);
+    background: var(--cn1-initializr-loader-progress-bg);
   }
 
   .cn1-loader-progress-bar {
@@ -110,7 +132,7 @@
     width: 100%;
     height: 100%;
     border: 0;
-    background: transparent;
+    background: var(--cn1-initializr-bg);
   }
 
   @keyframes cn1-spin {
@@ -143,15 +165,51 @@
   var frame = document.getElementById("cn1-initializr-frame");
   var loader = document.getElementById("cn1-initializr-loader");
   var siteHeader = document.querySelector(".header");
+  var mediaQuery = window.matchMedia ? window.matchMedia("(prefers-color-scheme: dark)") : null;
 
   function syncHeight() {
     var h = siteHeader ? siteHeader.offsetHeight : 76;
     root.style.setProperty("--cn1-initializr-header-height", h + "px");
   }
 
+  function syncInitializrTheme() {
+    var pref = "";
+    var dark = false;
+    try {
+      pref = localStorage.getItem("pref-theme") || "";
+    } catch (e) {
+      pref = "";
+    }
+    if (pref === "dark") {
+      dark = true;
+    } else if (pref === "light") {
+      dark = false;
+    } else {
+      dark = body.classList.contains("dark") || !!(mediaQuery && mediaQuery.matches);
+    }
+    body.classList.toggle("cn1-initializr-dark", dark);
+  }
+
   body.classList.add("cn1-initializr-page-body");
   syncHeight();
+  syncInitializrTheme();
   window.addEventListener("resize", syncHeight);
+  document.addEventListener("click", function (evt) {
+    if (evt.target && evt.target.id === "theme-toggle") {
+      window.requestAnimationFrame(syncInitializrTheme);
+    }
+  });
+  if (mediaQuery && mediaQuery.addEventListener) {
+    mediaQuery.addEventListener("change", syncInitializrTheme);
+  } else if (mediaQuery && mediaQuery.addListener) {
+    mediaQuery.addListener(syncInitializrTheme);
+  }
+  if (window.MutationObserver) {
+    new MutationObserver(syncInitializrTheme).observe(body, {
+      attributes: true,
+      attributeFilter: ["class"]
+    });
+  }
 
   if (frame && loader) {
     frame.addEventListener("load", function () {
diff --git a/scripts/initializr/android/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java b/scripts/initializr/android/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java
new file mode 100644
index 0000000000..de0d0b8e78
--- /dev/null
+++ b/scripts/initializr/android/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java
@@ -0,0 +1,12 @@
+package com.codename1.initializr;
+
+public class WebsiteThemeNativeImpl {
+    public boolean isDarkMode() {
+        return false;
+    }
+
+    public boolean isSupported() {
+        return false;
+    }
+
+}
diff --git a/scripts/initializr/common/src/main/css/theme.css b/scripts/initializr/common/src/main/css/theme.css
index 1020586938..5c8a96d9e4 100644
--- a/scripts/initializr/common/src/main/css/theme.css
+++ b/scripts/initializr/common/src/main/css/theme.css
@@ -57,22 +57,42 @@ InitializrForm {
     background-color: #f3f6fb;
 }
 
+InitializrFormDark {
+    background-color: #0f172a;
+}
+
 InitializrRoot {
     padding: 2.2mm;
 }
 
+InitializrRootDark {
+    padding: 2.2mm;
+}
+
 InitializrHeaderCard {
     background-color: #eaf2ff;
     padding: 2.5mm;
     margin: 1.2mm;
 }
 
+InitializrHeaderCardDark {
+    background-color: #1e293b;
+    padding: 2.5mm;
+    margin: 1.2mm;
+}
+
 InitializrCard {
     background-color: #ffffff;
     padding: 2.5mm;
     margin: 1.2mm;
 }
 
+InitializrCardDark {
+    background-color: #111827;
+    padding: 2.5mm;
+    margin: 1.2mm;
+}
+
 InitializrHeroTitle {
     color: #0d1b2a;
     font-family: "native:MainBold";
@@ -80,12 +100,25 @@ InitializrHeroTitle {
     padding: 0 0 1mm 0;
 }
 
+InitializrHeroTitleDark {
+    color: #e2e8f0;
+    font-family: "native:MainBold";
+    font-size: 4.5mm;
+    padding: 0 0 1mm 0;
+}
+
 InitializrHeroSubtitle {
     color: #4a5568;
     font-family: "native:MainRegular";
     font-size: 2.8mm;
 }
 
+InitializrHeroSubtitleDark {
+    color: #94a3b8;
+    font-family: "native:MainRegular";
+    font-size: 2.8mm;
+}
+
 InitializrSectionTitle {
     color: #1f2937;
     font-family: "native:MainBold";
@@ -93,6 +126,13 @@ InitializrSectionTitle {
     padding: 0 0 1.2mm 0;
 }
 
+InitializrSectionTitleDark {
+    color: #e2e8f0;
+    font-family: "native:MainBold";
+    font-size: 3.4mm;
+    padding: 0 0 1.2mm 0;
+}
+
 InitializrFieldLabel {
     color: #475569;
     font-family: "native:MainRegular";
@@ -100,6 +140,13 @@ InitializrFieldLabel {
     padding: 0.4mm 0;
 }
 
+InitializrFieldLabelDark {
+    color: #cbd5e1;
+    font-family: "native:MainRegular";
+    font-size: 2.4mm;
+    padding: 0.4mm 0;
+}
+
 InitializrField, InitializrFieldHint {
     color: #1f2937;
     font-family: "native:MainRegular";
@@ -110,10 +157,55 @@ InitializrField, InitializrFieldHint {
     margin: 0 0 1.4mm 0;
 }
 
+InitializrFieldDark, InitializrFieldHintDark {
+    color: #e2e8f0;
+    font-family: "native:MainRegular";
+    font-size: 2.8mm;
+    background-color: #0f172a;
+    border: 1px solid #334155;
+    padding: 1.1mm;
+    margin: 0 0 1.4mm 0;
+}
+
 InitializrChoicesGrid {
     margin: 0 0 1.2mm 0;
 }
 
+AccordionItemDark {
+    cn1-derive: Button;
+    color: #e2e8f0;
+    background-color: #1f2937;
+    border: 1px solid #334155;
+    margin: 0.6mm 0;
+    padding: 1.2mm;
+}
+
+AccordionItemDark.pressed {
+    cn1-derive: Button;
+    color: #f8fafc;
+    background-color: #334155;
+    border: 1px solid #475569;
+}
+
+AccordionContentDark {
+    cn1-derive: Container;
+    background-color: #111827;
+    border: 1px solid #334155;
+    padding: 1.2mm;
+}
+
+AccordionArrowDark {
+    cn1-derive: AccordionArrow;
+    color: #e2e8f0;
+    background-color: #1f2937;
+}
+
+AccordionOpenCloseIconDark {
+    cn1-derive: AccordionOpenCloseIcon;
+    color: #cbd5e1;
+    background-color: transparent;
+}
+
 InitializrChoice {
     color: #1f2937;
     background-color: #eef4ff;
@@ -132,6 +224,24 @@ InitializrChoice.pressed {
     text-align: center;
 }
 
+InitializrChoiceDark {
+    color: #e2e8f0;
+    background-color: #1f2937;
+    font-family: "native:MainRegular";
+    font-size: 2.6mm;
+    border: 1px solid #334155;
+    margin: 0.7mm;
+    padding: 1.1mm;
+    text-align: center;
+}
+
+InitializrChoiceDark.pressed {
+    color: #ffffff;
+    background-color: #0f766e;
+    border: 1px solid #0f766e;
+    text-align: center;
+}
+
 InitializrSummary {
     color: #1f2937;
     font-family: "native:MainRegular";
@@ -142,6 +252,16 @@ InitializrSummary {
     margin: 0 0 1.4mm 0;
 }
 
+InitializrSummaryDark {
+    color: #e2e8f0;
+    font-family: "native:MainRegular";
+    font-size: 2.7mm;
+    background-color: #0f172a;
+    border: 1px solid #334155;
+    padding: 1.4mm;
+    margin: 0 0 1.4mm 0;
+}
+
 InitializrTip {
     color: #5f6b7a;
     font-family: "native:MainRegular";
@@ -149,6 +269,13 @@ InitializrTip {
     padding: 0 0 1.2mm 0;
 }
 
+InitializrTipDark {
+    color: #94a3b8;
+    font-family: "native:MainRegular";
+    font-size: 2.4mm;
+    padding: 0 0 1.2mm 0;
+}
+
 InitializrValidationError {
     color: #b42318;
     font-family: "native:MainRegular";
@@ -156,6 +283,13 @@ InitializrValidationError {
     padding: 0 0 0.8mm 0;
 }
 
+InitializrValidationErrorDark {
+    color: #f87171;
+    font-family: "native:MainRegular";
+    font-size: 2.2mm;
+    padding: 0 0 0.8mm 0;
+}
+
 InitializrHelpButton {
     cn1-derive: Button;
     color: #64748b;
@@ -165,6 +299,15 @@ InitializrHelpButton {
     padding: 0.2mm;
 }
 
+InitializrHelpButtonDark {
+    cn1-derive: Button;
+    color: #94a3b8;
+    background-color: transparent;
+    border: none;
+    margin: 0;
+    padding: 0.2mm;
+}
+
 Images {
     background-image: url(images/grub.png),
         url(images/tweet.png);
diff --git a/scripts/initializr/common/src/main/java/com/codename1/initializr/Initializr.java b/scripts/initializr/common/src/main/java/com/codename1/initializr/Initializr.java
index d009c10567..0c9e460a5a 100644
--- a/scripts/initializr/common/src/main/java/com/codename1/initializr/Initializr.java
+++ b/scripts/initializr/common/src/main/java/com/codename1/initializr/Initializr.java
@@ -11,6 +11,7 @@
 import com.codename1.initializr.model.Template;
 import com.codename1.initializr.ui.TemplatePreviewPanel;
 import com.codename1.system.Lifecycle;
+import com.codename1.system.NativeLookup;
 import com.codename1.ui.Button;
 import com.codename1.ui.ButtonGroup;
 import com.codename1.ui.CheckBox;
@@ -25,11 +26,15 @@
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.BoxLayout;
 import com.codename1.ui.layouts.GridLayout;
+import com.codename1.ui.util.UITimer;
 import com.codename1.util.StringUtil;
 
 public class Initializr extends Lifecycle {
+    private boolean websiteDarkMode;
+
     @Override
     public void runApp() {
+        setProperty("platformHint.javascript.beforeUnloadMessage", null);
         final Form form = new Form("", new BorderLayout());
         form.setUIID("InitializrForm");
 
@@ -132,6 +137,7 @@ public void run() {
         appNameField.addDataChangedListener((type, index) -> refresh.run());
         packageField.addDataChangedListener((type, index) -> refresh.run());
         refresh.run();
+        initWebsiteThemeSync(form);
         form.show();
     }
 
@@ -324,6 +330,101 @@ private boolean supportsLivePreview(Template template) {
         return template == Template.BAREBONES || template == Template.KOTLIN;
     }
 
+    private void initWebsiteThemeSync(Form form) {
+        WebsiteThemeNative websiteThemeNative = NativeLookup.create(WebsiteThemeNative.class);
+        if (websiteThemeNative == null || !websiteThemeNative.isSupported()) {
+            return;
+        }
+        websiteDarkMode = websiteThemeNative.isDarkMode();
+        applyWebsiteTheme(form, websiteDarkMode);
+        form.refreshTheme();
+        UITimer.timer(900, true, form, () -> {
+            boolean dark = websiteThemeNative.isDarkMode();
+            if (dark != websiteDarkMode) {
+                websiteDarkMode = dark;
+                applyWebsiteTheme(form, dark);
+                form.refreshTheme();
+            }
+        });
+    }
+
+    private void applyWebsiteTheme(Component component, boolean dark) {
+        String uiid = component.getUIID();
+        String themed = themedUiid(uiid, dark);
+        if (!uiid.equals(themed)) {
+            component.setUIID(themed);
+        }
+        if (component instanceof Container) {
+            Container cnt = (Container) component;
+            for (int i = 0; i < cnt.getComponentCount(); i++) {
+                applyWebsiteTheme(cnt.getComponentAt(i), dark);
+            }
+        }
+    }
+
+    private String themedUiid(String uiid, boolean dark) {
+        if (uiid == null || uiid.length() == 0) {
+            return uiid;
+        }
+        if (dark) {
+            if (uiid.endsWith("Dark")) {
+                return uiid;
+            }
+            switch (uiid) {
+                case "InitializrForm":
+                case "InitializrRoot":
+                case "InitializrHeaderCard":
+                case "InitializrCard":
+                case "InitializrHeroTitle":
+                case "InitializrHeroSubtitle":
+                case "InitializrSectionTitle":
+                case "InitializrFieldLabel":
+                case "InitializrField":
+                case "InitializrFieldHint":
+                case "InitializrChoice":
+                case "InitializrSummary":
+                case "InitializrTip":
+                case "InitializrValidationError":
+                case "InitializrHelpButton":
+                case "AccordionItem":
+                case "AccordionContent":
+                case "AccordionArrow":
+                case "AccordionOpenCloseIcon":
+                    return uiid + "Dark";
+                default:
+                    return uiid;
+            }
+        }
+        if (!uiid.endsWith("Dark")) {
+            return uiid;
+        }
+        String base = uiid.substring(0, uiid.length() - "Dark".length());
+        switch (base) {
+            case "InitializrForm":
+            case "InitializrRoot":
+            case "InitializrHeaderCard":
+            case "InitializrCard":
+            case "InitializrHeroTitle":
+            case "InitializrHeroSubtitle":
+            case "InitializrSectionTitle":
+            case "InitializrFieldLabel":
+            case "InitializrField":
+            case "InitializrFieldHint":
+            case "InitializrChoice":
+            case "InitializrSummary":
+            case "InitializrTip":
+            case "InitializrValidationError":
+            case "InitializrHelpButton":
+            case "AccordionItem":
+            case "AccordionContent":
+            case "AccordionArrow":
+            case "AccordionOpenCloseIcon":
+                return base;
+            default:
+                return uiid;
+        }
+    }
+
     private void setEnabledRecursive(Component component, boolean enabled) {
         component.setEnabled(enabled);
         if (component instanceof Container) {
diff --git a/scripts/initializr/common/src/main/java/com/codename1/initializr/WebsiteThemeNative.java b/scripts/initializr/common/src/main/java/com/codename1/initializr/WebsiteThemeNative.java
new file mode 100644
index 0000000000..29f98d572c
--- /dev/null
+++ b/scripts/initializr/common/src/main/java/com/codename1/initializr/WebsiteThemeNative.java
@@ -0,0 +1,7 @@
+package com.codename1.initializr;
+
+import com.codename1.system.NativeInterface;
+
+public interface WebsiteThemeNative extends NativeInterface {
+    boolean isDarkMode();
+}
diff --git a/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java b/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java
index 4acbb788d3..a618f0c61c 100644
--- a/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java
+++ b/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java
@@ -18,7 +18,7 @@
 import static com.codename1.ui.CN.*;
 
 public class GeneratorModel {
-    private static final String CN1_PLUGIN_VERSION = "7.0.224";
+    private static final String CN1_PLUGIN_VERSION = "7.0.250";
     private static final String GENERATED_GITIGNORE =
             "**/target/\n" +
             ".idea/\n" +
diff --git a/scripts/initializr/common/src/main/resources/common.zip b/scripts/initializr/common/src/main/resources/common.zip
index 1c1a3431a3..f6da65b787 100644
Binary files a/scripts/initializr/common/src/main/resources/common.zip and b/scripts/initializr/common/src/main/resources/common.zip differ
diff --git a/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java b/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java
index 778a412518..a15128c5ff 100644
--- a/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java
+++ b/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java
@@ -91,7 +91,7 @@ private void assertRootPom(Map<String, byte[]> entries, String packageName, Stri
         String pom = getText(entries, "pom.xml");
         assertContains(pom, packageName, "Root pom should include package as groupId");
         assertContains(pom, mainClassName.toLowerCase(), "Root pom should include app artifact/name");
-        assertContains(pom, "<cn1.plugin.version>7.0.224</cn1.plugin.version>", "Root pom should use current CN1 plugin version");
+        assertContains(pom, "<cn1.plugin.version>7.0.250</cn1.plugin.version>", "Root pom should use current CN1 plugin version");
         assertFalse(pom.indexOf("com.example.myapp") >= 0, "Root pom still contains placeholder package");
         assertFalse(pom.indexOf("myappname") >= 0, "Root pom still contains placeholder app name");
     }
diff --git a/scripts/initializr/ios/src/main/objectivec/com_codename1_initializr_WebsiteThemeNativeImpl.h b/scripts/initializr/ios/src/main/objectivec/com_codename1_initializr_WebsiteThemeNativeImpl.h
new file mode 100644
index 0000000000..543895f815
--- /dev/null
+++ b/scripts/initializr/ios/src/main/objectivec/com_codename1_initializr_WebsiteThemeNativeImpl.h
@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+@interface com_codename1_initializr_WebsiteThemeNativeImpl : NSObject {
+}
+
+-(BOOL)isDarkMode;
+-(BOOL)isSupported;
+@end
diff --git a/scripts/initializr/ios/src/main/objectivec/com_codename1_initializr_WebsiteThemeNativeImpl.m b/scripts/initializr/ios/src/main/objectivec/com_codename1_initializr_WebsiteThemeNativeImpl.m
new file mode 100644
index 0000000000..ff46faea86
--- /dev/null
+++ b/scripts/initializr/ios/src/main/objectivec/com_codename1_initializr_WebsiteThemeNativeImpl.m
@@ -0,0 +1,13 @@
+#import "com_codename1_initializr_WebsiteThemeNativeImpl.h"
+
+@implementation com_codename1_initializr_WebsiteThemeNativeImpl
+
+-(BOOL)isDarkMode{
+    return NO;
+}
+
+-(BOOL)isSupported{
+    return NO;
+}
+
+@end
diff --git a/scripts/initializr/javascript/src/main/javascript/com_codename1_initializr_WebsiteThemeNative.js b/scripts/initializr/javascript/src/main/javascript/com_codename1_initializr_WebsiteThemeNative.js
new file mode 100644
index 0000000000..ca1014e911
--- /dev/null
+++ b/scripts/initializr/javascript/src/main/javascript/com_codename1_initializr_WebsiteThemeNative.js
@@ -0,0 +1,38 @@
+(function(exports){
+
+var o = {};
+
+    o.isDarkMode_ = function(callback) {
+        var dark = false;
+        var hasExplicitPreference = false;
+        try {
+            var parentDoc = (window.parent && window.parent.document) ? window.parent.document : null;
+            if (parentDoc && parentDoc.body && parentDoc.body.classList) {
+                dark = parentDoc.body.classList.contains("dark") || parentDoc.body.classList.contains("cn1-initializr-dark");
+            }
+            if (!dark && window.parent && window.parent.localStorage) {
+                var pref = window.parent.localStorage.getItem("pref-theme");
+                if (pref === "dark") {
+                    dark = true;
+                    hasExplicitPreference = true;
+                } else if (pref === "light") {
+                    dark = false;
+                    hasExplicitPreference = true;
+                }
+            }
+        } catch (ignored) {
+            // Ignore parent access failures and fallback below.
+        }
+        if (!hasExplicitPreference && !dark && window.matchMedia) {
+            dark = window.matchMedia("(prefers-color-scheme: dark)").matches;
+        }
+        callback.complete(!!dark);
+    };
+
+    o.isSupported_ = function(callback) {
+        callback.complete(true);
+    };
+
+exports.com_codename1_initializr_WebsiteThemeNative= o;
+
+})(cn1_get_native_interfaces());
diff --git a/scripts/initializr/javase/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java b/scripts/initializr/javase/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java
new file mode 100644
index 0000000000..ef20ccf70d
--- /dev/null
+++ b/scripts/initializr/javase/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java
@@ -0,0 +1,12 @@
+package com.codename1.initializr;
+
+public class WebsiteThemeNativeImpl implements com.codename1.initializr.WebsiteThemeNative{
+    public boolean isDarkMode() {
+        return false;
+    }
+
+    public boolean isSupported() {
+        return false;
+    }
+
+}
diff --git a/scripts/initializr/pom.xml b/scripts/initializr/pom.xml
index fa708616b9..a109eb8959 100644
--- a/scripts/initializr/pom.xml
+++ b/scripts/initializr/pom.xml
@@ -19,7 +19,7 @@
 <module>common</module>
 </modules>
   <properties>
-    <cn1.plugin.version>7.0.224</cn1.plugin.version>
+    <cn1.plugin.version>7.0.225</cn1.plugin.version>
     <cn1.version>LATEST</cn1.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
diff --git a/scripts/initializr/update-cn1-version.sh b/scripts/initializr/update-cn1-version.sh
index 22f01160a6..e0699a2466 100755
--- a/scripts/initializr/update-cn1-version.sh
+++ b/scripts/initializr/update-cn1-version.sh
@@ -6,12 +6,16 @@ if [ $# -ne 1 ]; then
   exit 1
 fi
 
-VERSION="$1"
-VERSION="${VERSION#refs/tags/}"
-VERSION="${VERSION#v}"
-
-if [[ ! "$VERSION" =~ ^[0-9]+(\.[0-9A-Za-z-]+)+$ ]]; then
-  echo "Invalid Codename One version: $VERSION" >&2
+RAW_VERSION="$1"
+RAW_VERSION="${RAW_VERSION#refs/tags/}"
+VERSION=""
+if [[ "$RAW_VERSION" =~ ^v?([0-9]+\.[0-9]+\.[0-9]+([.-][0-9A-Za-z]+)*)$ ]]; then
+  VERSION="${BASH_REMATCH[1]}"
+elif [[ "$RAW_VERSION" =~ ([0-9]+\.[0-9]+\.[0-9]+([.-][0-9A-Za-z]+)*) ]]; then
+  VERSION="${BASH_REMATCH[1]}"
+fi
+if [ -z "$VERSION" ]; then
+  echo "Invalid Codename One version/tag: $RAW_VERSION" >&2
   exit 1
 fi
 
@@ -27,6 +31,7 @@ replace_file() {
 ROOT_INITIALIZR_DIR="$ROOT_DIR/scripts/initializr"
 GENERATOR_MODEL="$ROOT_DIR/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java"
 MATRIX_TEST="$ROOT_DIR/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java"
+COMMON_ZIP="$ROOT_DIR/scripts/initializr/common/src/main/resources/common.zip"
 
 while IFS= read -r pom; do
   replace_file "$pom" "s|<cn1\\.plugin\\.version>[^<]+</cn1\\.plugin\\.version>|<cn1.plugin.version>$VERSION</cn1.plugin.version>|g;"
@@ -35,4 +40,17 @@ done < <(find "$ROOT_INITIALIZR_DIR" -name pom.xml -type f)
 replace_file "$GENERATOR_MODEL" "s|private static final String CN1_PLUGIN_VERSION = \\\"[^\\\"]+\\\";|private static final String CN1_PLUGIN_VERSION = \\\"$VERSION\\\";|g;"
 replace_file "$MATRIX_TEST" "s|<cn1\\.plugin\\.version>[^<]+</cn1\\.plugin\\.version>|<cn1.plugin.version>$VERSION</cn1.plugin.version>|g;"
 
+if unzip -p "$COMMON_ZIP" pom.xml | grep -q "<cn1.plugin.version>$VERSION</cn1.plugin.version>"; then
+  :
+else
+  TMP_DIR="$(mktemp -d)"
+  unzip -q "$COMMON_ZIP" -d "$TMP_DIR"
+  replace_file "$TMP_DIR/pom.xml" "s|<cn1\\.plugin\\.version>[^<]+</cn1\\.plugin\\.version>|<cn1.plugin.version>$VERSION</cn1.plugin.version>|g;"
+  (
+    cd "$TMP_DIR"
+    zip -q -X -r "$COMMON_ZIP" .
+  )
+  rm -rf "$TMP_DIR"
+fi
+
 echo "Updated Initializr Codename One versions to $VERSION"
diff --git a/scripts/initializr/win/src/main/csharp/com/codename1/initializr/WebsiteThemeNativeImpl.cs b/scripts/initializr/win/src/main/csharp/com/codename1/initializr/WebsiteThemeNativeImpl.cs
new file mode 100644
index 0000000000..9eb6430956
--- /dev/null
+++ b/scripts/initializr/win/src/main/csharp/com/codename1/initializr/WebsiteThemeNativeImpl.cs
@@ -0,0 +1,14 @@
+namespace com.codename1.initializr{
+
+
+public class WebsiteThemeNativeImpl : IWebsiteThemeNativeImpl {
+    public bool isDarkMode() {
+        return false;
+    }
+
+    public bool isSupported() {
+        return false;
+    }
+
+}
+}
diff --git a/scripts/website/build.sh b/scripts/website/build.sh
index 359367145f..e52955576a 100755
--- a/scripts/website/build.sh
+++ b/scripts/website/build.sh
@@ -481,13 +481,13 @@ build_initializr_for_site() {
 
     # Ensure attached classifier artifact initializr-ZipSupport:jar:common is present
     # in the local Maven repo before building modules that depend on it (e.g. initializr-common).
-    run_initializr_mvn -q -pl cn1libs/ZipSupport -am \
+    run_initializr_mvn -q -U -pl cn1libs/ZipSupport -am \
       -DskipTests \
       -Dcodename1.platform=javascript \
       install
 
     if [ -n "${CN1_USER}" ] && [ -n "${CN1_TOKEN}" ]; then
-      if ! run_initializr_mvn -q -pl javascript -am \
+      if ! run_initializr_mvn -q -U -pl javascript -am \
         cn1:set-user-token \
         -Dcodename1.platform=javascript \
         -Duser="${CN1_USER}" \
@@ -517,7 +517,7 @@ JAVA
       echo "CN1_USER/CN1_TOKEN not provided; building Initializr JavaScript without setting token." >&2
     fi
 
-    run_initializr_mvn -q -pl javascript -am \
+    run_initializr_mvn -q -U -pl javascript -am \
       -DskipTests \
       -Dautomated=true \
       -Dcodename1.platform=javascript \