diff --git a/.idea/misc.xml b/.idea/misc.xml
index 72be14a..64c32f6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,7 +13,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml
new file mode 100644
index 0000000..362dcdf
--- /dev/null
+++ b/.idea/resourceBundles.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ResourceBundleManager">
+    <custom-resource-bundle>
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_de.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_es.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_fr.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_it.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_nl.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_zh.properties" />
+      <base-name>localization</base-name>
+    </custom-resource-bundle>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/org/toop/app/menu/MainMenu.java b/app/src/main/java/org/toop/app/menu/MainMenu.java
index 7d1d2d0..68f58a6 100644
--- a/app/src/main/java/org/toop/app/menu/MainMenu.java
+++ b/app/src/main/java/org/toop/app/menu/MainMenu.java
@@ -12,9 +12,10 @@ import java.util.Locale;
 import org.toop.framework.asset.AssetManager;
 import org.toop.framework.asset.resources.CssAsset;
 import org.toop.framework.asset.resources.ImageAsset;
+import org.toop.local.AppContext;
 
 public final class MainMenu extends Menu {
-	private final Locale currentLocale = Locale.of("nl");
+	private final Locale currentLocale = AppContext.getLocale();
 	private final LocalizationAsset loc = AssetManager.get("localization.properties");
 
     public MainMenu() {
diff --git a/app/src/main/resources/Localization.properties b/app/src/main/resources/Localization.properties
deleted file mode 100644
index 9718bf0..0000000
--- a/app/src/main/resources/Localization.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Window title
-windowTitle=ISY Games Selector
-
-# Main Menu buttons
-mainMenuSelectTicTacToe=Tic Tac Toe
-mainMenuSelectReversi=Reversi
-mainMenuSelectSudoku=Sudoku
-mainMenuSelectBattleship=Battleship
-mainMenuSelectOther=Other
-mainMenuSelectCredits=Credits
-mainMenuSelectOptions=Options
-mainMenuSelectQuit=Quit
-
-# Quit Menu text and buttons
-quitMenuTextSure=Are you sure?
-quitMenuButtonYes=Yes
-quitMenuButtonNo=No
\ No newline at end of file
diff --git a/app/src/main/resources/Localization_nl.properties b/app/src/main/resources/Localization_nl.properties
deleted file mode 100644
index 4c3eb30..0000000
--- a/app/src/main/resources/Localization_nl.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Window title
-windowTitle=ISY Spellen Kiezer
-
-# Main Menu buttons
-mainMenuSelectTicTacToe=Boter Kaas En Eieren
-mainMenuSelectReversi=Reversi
-mainMenuSelectSudoku=Sudoku
-mainMenuSelectBattleship=Zeeslag
-mainMenuSelectOther=Anders
-mainMenuSelectCredits=Credits
-mainMenuSelectOptions=Opties
-mainMenuSelectQuit=Afsluiten
-
-# Quit Menu text and buttons
-quitMenuTextSure=Weet je het zeker?
-quitMenuButtonYes=Ja
-quitMenuButtonNo=Nee
\ No newline at end of file
diff --git a/app/src/main/resources/assets/localization/localization.properties b/app/src/main/resources/assets/localization/localization.properties
index 9718bf0..fcbc8ac 100644
--- a/app/src/main/resources/assets/localization/localization.properties
+++ b/app/src/main/resources/assets/localization/localization.properties
@@ -2,8 +2,8 @@
 windowTitle=ISY Games Selector
 
 # Main Menu buttons
-mainMenuSelectTicTacToe=Tic Tac Toe
-mainMenuSelectReversi=Reversi
+mainMenuSelectTicTacToe=Tic Tac Toe\u5426
+mainMenuSelectReversi=Reversi\u5426
 mainMenuSelectSudoku=Sudoku
 mainMenuSelectBattleship=Battleship
 mainMenuSelectOther=Other
diff --git a/app/src/main/resources/assets/localization/localization_de.properties b/app/src/main/resources/assets/localization/localization_de.properties
new file mode 100644
index 0000000..dc46278
--- /dev/null
+++ b/app/src/main/resources/assets/localization/localization_de.properties
@@ -0,0 +1,17 @@
+# Window title
+windowTitle=ISY Spiele-Auswahl
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Tic Tac Toe
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Flottenman\u00F6ver
+mainMenuSelectOther=Andere
+mainMenuSelectCredits=Credits
+mainMenuSelectOptions=Optionen
+mainMenuSelectQuit=Beenden
+
+# Quit Menu text and buttons
+quitMenuTextSure=Bist du sicher?
+quitMenuButtonYes=Ja
+quitMenuButtonNo=Nein
\ No newline at end of file
diff --git a/app/src/main/resources/assets/localization/localization_es.properties b/app/src/main/resources/assets/localization/localization_es.properties
new file mode 100644
index 0000000..60439ab
--- /dev/null
+++ b/app/src/main/resources/assets/localization/localization_es.properties
@@ -0,0 +1,17 @@
+# Window title
+windowTitle=Selector de juegos ISY
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Tres en raya
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Batalla naval
+mainMenuSelectOther=Otros
+mainMenuSelectCredits=Cr\u00E9ditos
+mainMenuSelectOptions=Opciones
+mainMenuSelectQuit=Salir
+
+# Quit Menu text and buttons
+quitMenuTextSure=\u00BFEst\u00E1s seguro?
+quitMenuButtonYes=S\u00ED
+quitMenuButtonNo=No
\ No newline at end of file
diff --git a/app/src/main/resources/assets/localization/localization_fr.properties b/app/src/main/resources/assets/localization/localization_fr.properties
new file mode 100644
index 0000000..75d9f4a
--- /dev/null
+++ b/app/src/main/resources/assets/localization/localization_fr.properties
@@ -0,0 +1,17 @@
+# Window title
+windowTitle=S\u00E9lecteur de jeux ISY
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Morpion
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Bataille navale
+mainMenuSelectOther=Autres
+mainMenuSelectCredits=Cr\u00E9dits
+mainMenuSelectOptions=Options
+mainMenuSelectQuit=Quitter
+
+# Quit Menu text and buttons
+quitMenuTextSure=\u00CAtes-vous s\u00FBr?
+quitMenuButtonYes=Oui
+quitMenuButtonNo=Non
\ No newline at end of file
diff --git a/app/src/main/resources/assets/localization/localization_it.properties b/app/src/main/resources/assets/localization/localization_it.properties
new file mode 100644
index 0000000..75a8896
--- /dev/null
+++ b/app/src/main/resources/assets/localization/localization_it.properties
@@ -0,0 +1,17 @@
+# Window title
+windowTitle=Selettore giochi ISY
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Tris
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Battaglia navale
+mainMenuSelectOther=Altro
+mainMenuSelectCredits=Crediti
+mainMenuSelectOptions=Opzioni
+mainMenuSelectQuit=Esci
+
+# Quit Menu text and buttons
+quitMenuTextSure=Sei sicuro?
+quitMenuButtonYes=S\u00EC
+quitMenuButtonNo=No
\ No newline at end of file
diff --git a/app/src/main/resources/assets/localization/localization_zh.properties b/app/src/main/resources/assets/localization/localization_zh.properties
new file mode 100644
index 0000000..f703670
--- /dev/null
+++ b/app/src/main/resources/assets/localization/localization_zh.properties
@@ -0,0 +1,30 @@
+# suppress inspection "LossyEncoding" for whole file
+# Window title
+windowTitle=ISY \u6E38\u620F\u9009\u62E9\u5668
+# ?????
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=\u4E95\u5B57\u68CB
+# ???
+mainMenuSelectReversi=\u9ED1\u767D\u68CB
+# ???
+mainMenuSelectSudoku=\u6570\u72EC
+# ??
+mainMenuSelectBattleship=\u6D77\u6218\u68CB
+# ???
+mainMenuSelectOther=\u5176\u4ED6
+# ??
+mainMenuSelectCredits=\u5236\u4F5C\u4EBA\u5458
+# ????
+mainMenuSelectOptions=\u9009\u9879
+# ??
+mainMenuSelectQuit=\u9000\u51FA
+# ??
+
+# Quit Menu text and buttons
+quitMenuTextSure=\u4F60\u786E\u5B9A\u5417\uFF1F
+# ?????
+quitMenuButtonYes=\u662F
+# ?
+quitMenuButtonNo=\u5426
+# ?
\ No newline at end of file