diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58afba0d..abd53b74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,6 +50,8 @@ jobs:
       with:
         toolchain: stable-i686-pc-windows-gnu
     - uses: actions/checkout@v2
+      with:
+        submodules: true
     - name: Build and package
       shell: msys2 {0}
       run: cd windows && python build.py --rustup="C:/Rust/.cargo/bin/rustup.exe" $RELEASE
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..f1e8d80d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "windows/themes/Windows-10-Dark"]
+	path = windows/themes/Windows-10-Dark
+	url = https://github.com/B00merang-Project/Windows-10-Dark
+[submodule "windows/themes/Windows-10"]
+	path = windows/themes/Windows-10
+	url = https://github.com/B00merang-Project/Windows-10
diff --git a/windows/build.py b/windows/build.py
index dd7a3e54..258a1db9 100644
--- a/windows/build.py
+++ b/windows/build.py
@@ -93,6 +93,18 @@ def find_depends(exe):
         shutil.copy(src, dest)
 subprocess.check_call(["glib-compile-schemas", "out/share/glib-2.0/schemas"])
 
+# Copy themes, and set default
+# Based on https://www.gtk.org/docs/installations/windows#building-and-distributing-your-application
+os.makedirs("out/share/themes/Windows10")
+os.makedirs("out/share/themes/Windows10-dark")
+os.makedirs("out/etc/gtk-3.0")
+print("Copy themes/Windows-10/gtk-3.20 -> out/share/themes/Windows10/gtk-3.0")
+shutil.copytree("themes/Windows-10/gtk-3.20", "out/share/themes/Windows10/gtk-3.0")
+print("Copy themes/Windows-10-dark/gtk-3.20 -> out/share/themes/Windows10-dark/gtk-3.0")
+shutil.copytree("themes/Windows-10-dark/gtk-3.20", "out/share/themes/Windows10-dark/gtk-3.0")
+with open("out/etc/gtk-3.0/settings.ini", "w") as f:
+    f.write("[Settings]\ngtk-theme-name=Windows10\ngtk-font-name=Segoe UI 9\n")
+
 # Extract crate version from cargo
 meta_str = subprocess.check_output(CARGO + ["metadata", "--format-version", "1", "--no-deps"])
 meta = json.loads(meta_str)
diff --git a/windows/themes/Windows-10 b/windows/themes/Windows-10
new file mode 160000
index 00000000..06dd5b87
--- /dev/null
+++ b/windows/themes/Windows-10
@@ -0,0 +1 @@
+Subproject commit 06dd5b87781908ca0448d4577142d50796557dee
diff --git a/windows/themes/Windows-10-Dark b/windows/themes/Windows-10-Dark
new file mode 160000
index 00000000..6f3e063e
--- /dev/null
+++ b/windows/themes/Windows-10-Dark
@@ -0,0 +1 @@
+Subproject commit 6f3e063e271029ddd9159bc1020d81de055155ea