diff --git a/scripts/initializr/common/src/main/java/com/codename1/initializr/ui/TemplatePreviewPanel.java b/scripts/initializr/common/src/main/java/com/codename1/initializr/ui/TemplatePreviewPanel.java
index 647e1ebdc6..74d83ce090 100644
--- a/scripts/initializr/common/src/main/java/com/codename1/initializr/ui/TemplatePreviewPanel.java
+++ b/scripts/initializr/common/src/main/java/com/codename1/initializr/ui/TemplatePreviewPanel.java
@@ -2,6 +2,7 @@
 
 import com.codename1.components.ImageViewer;
 import com.codename1.initializr.model.ProjectOptions;
+import com.codename1.initializr.model.ProjectOptions.PreviewLanguage;
 import com.codename1.initializr.model.Template;
 import com.codename1.io.Log;
 import com.codename1.io.Properties;
@@ -96,12 +97,12 @@ private void installBundle(ProjectOptions options) {
         UIManager.getInstance().setBundle(bundle);
     }
 
-    private Hashtable<String, String> findBundle(ProjectOptions.PreviewLanguage language) {
+    private Hashtable<String, String> findBundle(PreviewLanguage language) {
         if (language == null) {
             return null;
         }
         Resources resources = Resources.getGlobalResources();
-        if (resources != null) {
+        if (resources != null && language != PreviewLanguage.ENGLISH) {
             try {
                 Hashtable<String, String> exact = resources.getL10N("messages", language.bundleSuffix);
                 if (exact != null) {
diff --git a/scripts/initializr/common/src/main/l10n/messages.properties b/scripts/initializr/common/src/main/l10n/messages.properties
new file mode 100644
index 0000000000..4f24396858
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages.properties
@@ -0,0 +1,7 @@
+Hi\ World=Hi World
+Hello\ World=Hello World
+Hello\ Command=Hello Command
+Hello\ Codename\ One=Hello Codename One
+Welcome\ to\ Codename\ One=Welcome to Codename One
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=Side menu is not available in embedded preview mode.
diff --git a/scripts/initializr/common/src/main/l10n/messages_ar.properties b/scripts/initializr/common/src/main/l10n/messages_ar.properties
new file mode 100644
index 0000000000..1a073b345b
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_ar.properties
@@ -0,0 +1,8 @@
+@rtl=true
+Hi\ World=مرحبا بالعالم
+Hello\ World=مرحبا بالعالم
+Hello\ Command=أمر الترحيب
+Hello\ Codename\ One=مرحبًا كودنيم ون
+Welcome\ to\ Codename\ One=مرحبًا بك في كودنيم ون
+OK=موافق
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=القائمة الجانبية غير متاحة في المعاينة المضمنة.
diff --git a/scripts/initializr/common/src/main/l10n/messages_de.properties b/scripts/initializr/common/src/main/l10n/messages_de.properties
new file mode 100644
index 0000000000..8e1fe6a6bd
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_de.properties
@@ -0,0 +1,7 @@
+Hi\ World=Hallo Welt
+Hello\ World=Hallo Welt
+Hello\ Command=Hallo-Befehl
+Hello\ Codename\ One=Hallo Codename One
+Welcome\ to\ Codename\ One=Willkommen bei Codename One
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=Das Seitenmenü ist in der eingebetteten Vorschau nicht verfügbar.
diff --git a/scripts/initializr/common/src/main/l10n/messages_es.properties b/scripts/initializr/common/src/main/l10n/messages_es.properties
new file mode 100644
index 0000000000..d1e9a6a4b7
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_es.properties
@@ -0,0 +1,7 @@
+Hi\ World=Hola Mundo
+Hello\ World=Hola Mundo
+Hello\ Command=Comando Hola
+Hello\ Codename\ One=Hola Codename One
+Welcome\ to\ Codename\ One=Bienvenido a Codename One
+OK=Aceptar
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=El menú lateral no está disponible en el modo de vista previa incrustada.
diff --git a/scripts/initializr/common/src/main/l10n/messages_fr.properties b/scripts/initializr/common/src/main/l10n/messages_fr.properties
new file mode 100644
index 0000000000..4277cf51f0
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_fr.properties
@@ -0,0 +1,7 @@
+Hi\ World=Bonjour le monde
+Hello\ World=Bonjour le monde
+Hello\ Command=Commande Bonjour
+Hello\ Codename\ One=Bonjour Codename One
+Welcome\ to\ Codename\ One=Bienvenue dans Codename One
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=Le menu latéral n'est pas disponible en mode aperçu intégré.
diff --git a/scripts/initializr/common/src/main/l10n/messages_he.properties b/scripts/initializr/common/src/main/l10n/messages_he.properties
new file mode 100644
index 0000000000..e89af5e3f0
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_he.properties
@@ -0,0 +1,8 @@
+@rtl=true
+Hi\ World=שלום עולם
+Hello\ World=שלום עולם
+Hello\ Command=פקודת שלום
+Hello\ Codename\ One=שלום קודניים וואן
+Welcome\ to\ Codename\ One=ברוכים הבאים לקודניים וואן
+OK=אישור
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=תפריט הצד לא זמין במצב תצוגה מקדימה מוטמע.
diff --git a/scripts/initializr/common/src/main/l10n/messages_it.properties b/scripts/initializr/common/src/main/l10n/messages_it.properties
new file mode 100644
index 0000000000..fa2b26835c
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_it.properties
@@ -0,0 +1,7 @@
+Hi\ World=Ciao Mondo
+Hello\ World=Ciao Mondo
+Hello\ Command=Comando Ciao
+Hello\ Codename\ One=Ciao Codename One
+Welcome\ to\ Codename\ One=Benvenuto in Codename One
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=Il menu laterale non è disponibile nella modalità anteprima incorporata.
diff --git a/scripts/initializr/common/src/main/l10n/messages_ja.properties b/scripts/initializr/common/src/main/l10n/messages_ja.properties
new file mode 100644
index 0000000000..4dc228115f
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_ja.properties
@@ -0,0 +1,7 @@
+Hi\ World=こんにちは世界
+Hello\ World=こんにちは世界
+Hello\ Command=挨拶コマンド
+Hello\ Codename\ One=こんにちは Codename One
+Welcome\ to\ Codename\ One=Codename Oneへようこそ
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=埋め込みプレビューではサイドメニューを利用できません。
diff --git a/scripts/initializr/common/src/main/l10n/messages_ko.properties b/scripts/initializr/common/src/main/l10n/messages_ko.properties
new file mode 100644
index 0000000000..d4a22b6eb7
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_ko.properties
@@ -0,0 +1,7 @@
+Hi\ World=안녕하세요 세계
+Hello\ World=안녕하세요 세계
+Hello\ Command=인사 명령
+Hello\ Codename\ One=안녕하세요 Codename One
+Welcome\ to\ Codename\ One=Codename One에 오신 것을 환영합니다
+OK=확인
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=임베디드 미리보기에서는 사이드 메뉴를 사용할 수 없습니다.
diff --git a/scripts/initializr/common/src/main/l10n/messages_nl.properties b/scripts/initializr/common/src/main/l10n/messages_nl.properties
new file mode 100644
index 0000000000..549d678403
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_nl.properties
@@ -0,0 +1,7 @@
+Hi\ World=Hallo Wereld
+Hello\ World=Hallo Wereld
+Hello\ Command=Hallo-opdracht
+Hello\ Codename\ One=Hallo Codename One
+Welcome\ to\ Codename\ One=Welkom bij Codename One
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=Het zijmenu is niet beschikbaar in ingesloten voorbeeldmodus.
diff --git a/scripts/initializr/common/src/main/l10n/messages_pt.properties b/scripts/initializr/common/src/main/l10n/messages_pt.properties
new file mode 100644
index 0000000000..76a3a3e53f
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_pt.properties
@@ -0,0 +1,7 @@
+Hi\ World=Olá Mundo
+Hello\ World=Olá Mundo
+Hello\ Command=Comando Olá
+Hello\ Codename\ One=Olá Codename One
+Welcome\ to\ Codename\ One=Bem-vindo ao Codename One
+OK=OK
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=O menu lateral não está disponível no modo de pré-visualização incorporado.
diff --git a/scripts/initializr/common/src/main/l10n/messages_zh_CN.properties b/scripts/initializr/common/src/main/l10n/messages_zh_CN.properties
new file mode 100644
index 0000000000..281c557008
--- /dev/null
+++ b/scripts/initializr/common/src/main/l10n/messages_zh_CN.properties
@@ -0,0 +1,7 @@
+Hi\ World=你好，世界
+Hello\ World=你好，世界
+Hello\ Command=问候命令
+Hello\ Codename\ One=你好 Codename One
+Welcome\ to\ Codename\ One=欢迎使用 Codename One
+OK=确定
+Side\ menu\ is\ not\ available\ in\ embedded\ preview\ mode.=嵌入式预览模式下侧边菜单不可用。
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
index ef20ccf70d..261e7381fc 100644
--- a/scripts/initializr/javase/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java
+++ b/scripts/initializr/javase/src/main/java/com/codename1/initializr/WebsiteThemeNativeImpl.java
@@ -8,5 +8,6 @@ public boolean isDarkMode() {
     public boolean isSupported() {
         return false;
     }
+    public void notifyUiReady() {}
 
 }