diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 1ed71abcf22..3126b44d09d 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 341b935f05f..19b168c4bd1 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -227,4 +227,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index be23699f380..5637c633c17 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -240,4 +240,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index bc80914a8ce..1799fc95e6a 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index 99b5f706d3f..d36cb5e0239 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index 531dd8fa3e3..89063f42a85 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -241,4 +241,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index 52c81415360..67434c92dfa 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -229,4 +229,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index a65e9fa2b2d..869d392698b 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index fa3b9569c27..8fa4fdb16b9 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -240,4 +240,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc
index c60e249083a..3c63f52646c 100644
--- a/dll/win32/syssetup/lang/fr-FR.rc
+++ b/dll/win32/syssetup/lang/fr-FR.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index c62d47b2a0f..23b21f19107 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index 65a1be8532b..8ff1a8f9658 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -229,4 +229,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc
index 323f8182349..7c6ede2ab42 100644
--- a/dll/win32/syssetup/lang/hu-HU.rc
+++ b/dll/win32/syssetup/lang/hu-HU.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc
index d6cfa7337b7..67817b8a3d4 100644
--- a/dll/win32/syssetup/lang/id-ID.rc
+++ b/dll/win32/syssetup/lang/id-ID.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index 9e999a0ae01..42245fa4d3f 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index 3ef3bec17c0..c97f23cb631 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index 817a01bd616..746edf2f922 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -240,4 +240,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index 57f7aea1dce..4a102aba649 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index 0d2ce426778..308ff05f31d 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc
index e942a82d61a..444fa201823 100644
--- a/dll/win32/syssetup/lang/pl-PL.rc
+++ b/dll/win32/syssetup/lang/pl-PL.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index 9857df3dea9..f05f86df16b 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -221,4 +221,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index d7f82b3f165..28f3dcdd7c6 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -230,4 +230,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index a2cd4fde35f..85a6e682060 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -223,4 +223,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index 1f6198f9697..6e05e47811a 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -227,4 +227,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index 60fbbbd3c6b..a3c978732bf 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -240,4 +240,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index a1609d3007a..fbeb8789c4e 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -240,4 +240,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 5ae89a6edb9..f4a44348eb1 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -240,4 +240,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc
index ee17829e908..43b8930a315 100644
--- a/dll/win32/syssetup/lang/tr-TR.rc
+++ b/dll/win32/syssetup/lang/tr-TR.rc
@@ -223,4 +223,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc
index 0c9ffb6f653..d92fbdd4f8e 100644
--- a/dll/win32/syssetup/lang/uk-UA.rc
+++ b/dll/win32/syssetup/lang/uk-UA.rc
@@ -229,4 +229,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index 515e594111c..e2adecc3fdc 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -226,4 +226,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index 6da4da44373..39a6148f3e4 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -248,4 +248,5 @@ STRINGTABLE
 BEGIN
     IDS_CLASSIC "Classic"
     IDS_LAUTUS "Lautus"
+    IDS_LUNAR "Lunar"
 END
diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h
index 030a5c2eed5..2578f5ccdaa 100644
--- a/dll/win32/syssetup/resource.h
+++ b/dll/win32/syssetup/resource.h
@@ -22,6 +22,7 @@
 #define IDB_HEADER    101
 #define IDB_CLASSIC   102
 #define IDB_LAUTUS    103
+#define IDB_LUNAR     104
 
 #define IDI_ICON1 10
 #define IDI_ICON2 11
@@ -141,5 +142,6 @@
 
 #define IDS_CLASSIC 3800
 #define IDS_LAUTUS  3801
+#define IDS_LUNAR   3802
 
 #define IDR_GPL 4000
diff --git a/dll/win32/syssetup/resources/thmlunar.bmp b/dll/win32/syssetup/resources/thmlunar.bmp
new file mode 100644
index 00000000000..bd4358f209b
Binary files /dev/null and b/dll/win32/syssetup/resources/thmlunar.bmp differ
diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc
index 800d4d2ce67..57137d8ef1a 100644
--- a/dll/win32/syssetup/syssetup.rc
+++ b/dll/win32/syssetup/syssetup.rc
@@ -20,6 +20,7 @@ IDB_WATERMARK BITMAP "resources/watermark.bmp"
 IDB_HEADER BITMAP "resources/header.bmp"
 IDB_CLASSIC BITMAP "resources/thmclassic.bmp"
 IDB_LAUTUS BITMAP "resources/thmlautus.bmp"
+IDB_LUNAR BITMAP "resources/thmlunar.bmp"
 
 IDI_ICON1 ICON "resources/1.ico"
 IDI_ICON2 ICON "resources/2.ico"
diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c
index 5255b82a0c3..45f13947817 100644
--- a/dll/win32/syssetup/wizard.c
+++ b/dll/win32/syssetup/wizard.c
@@ -1602,6 +1602,7 @@ static struct ThemeInfo
 } Themes[] = {
     { MAKEINTRESOURCE(IDB_CLASSIC), IDS_CLASSIC, NULL },
     { MAKEINTRESOURCE(IDB_LAUTUS), IDS_LAUTUS, L"themes\\lautus\\lautus.msstyles" },
+    { MAKEINTRESOURCE(IDB_LUNAR), IDS_LUNAR, L"themes\\lunar\\lunar.msstyles" },
 };
 
 static INT_PTR CALLBACK