diff --git a/BUILDING.md b/BUILDING.md
index fc9cde3c..9c1e730b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -80,7 +80,7 @@ or even do nothing at all. In such cases you should use `python rg_tool.py ...`
 
 
 ## Changing the launcher's images
-All images used by the launcher (headers, logos) are located in `launcher/main/images`. If you edit them you must run the `tools/gen_images.py` script to regenerate `launcher/main/images.c`. Refer to [THEMING.md](THEMING.md) for details about the image format.
+All images used by the launcher (headers, logos) are located in `themes/default`. If you edit them you must run the `tools/gen_images.py` script to regenerate `launcher/main/images.c`. Refer to [THEMING.md](THEMING.md) for details about the image format.
 
 
 ## Updating translations
diff --git a/themes/default/README.md b/themes/default/README.md
index cef3559b..f6c6c7fc 100644
--- a/themes/default/README.md
+++ b/themes/default/README.md
@@ -2,7 +2,6 @@ At this time the default theme is hardcoded in retro-go. You can find some of it
 
 - `components/retro-go/rg_gui.c`
 - `launcher/main/gui.c`
-- `launcher/main/images/`
 
 At some point all of that stuff will be moved here...
 
diff --git a/launcher/main/images/background_2600.png b/themes/default/background_2600.png
similarity index 100%
rename from launcher/main/images/background_2600.png
rename to themes/default/background_2600.png
diff --git a/launcher/main/images/background_col.png b/themes/default/background_col.png
similarity index 100%
rename from launcher/main/images/background_col.png
rename to themes/default/background_col.png
diff --git a/launcher/main/images/background_collections.png b/themes/default/background_collections.png
similarity index 100%
rename from launcher/main/images/background_collections.png
rename to themes/default/background_collections.png
diff --git a/launcher/main/images/background_doom.png b/themes/default/background_doom.png
similarity index 100%
rename from launcher/main/images/background_doom.png
rename to themes/default/background_doom.png
diff --git a/launcher/main/images/background_favorite.png b/themes/default/background_favorite.png
similarity index 100%
rename from launcher/main/images/background_favorite.png
rename to themes/default/background_favorite.png
diff --git a/launcher/main/images/background_gb.png b/themes/default/background_gb.png
similarity index 100%
rename from launcher/main/images/background_gb.png
rename to themes/default/background_gb.png
diff --git a/launcher/main/images/background_gbc.png b/themes/default/background_gbc.png
similarity index 100%
rename from launcher/main/images/background_gbc.png
rename to themes/default/background_gbc.png
diff --git a/launcher/main/images/background_gg.png b/themes/default/background_gg.png
similarity index 100%
rename from launcher/main/images/background_gg.png
rename to themes/default/background_gg.png
diff --git a/launcher/main/images/background_gw.png b/themes/default/background_gw.png
similarity index 100%
rename from launcher/main/images/background_gw.png
rename to themes/default/background_gw.png
diff --git a/launcher/main/images/background_lnx.png b/themes/default/background_lnx.png
similarity index 100%
rename from launcher/main/images/background_lnx.png
rename to themes/default/background_lnx.png
diff --git a/launcher/main/images/background_md.png b/themes/default/background_md.png
similarity index 100%
rename from launcher/main/images/background_md.png
rename to themes/default/background_md.png
diff --git a/launcher/main/images/background_msx.png b/themes/default/background_msx.png
similarity index 100%
rename from launcher/main/images/background_msx.png
rename to themes/default/background_msx.png
diff --git a/launcher/main/images/background_nes.png b/themes/default/background_nes.png
similarity index 100%
rename from launcher/main/images/background_nes.png
rename to themes/default/background_nes.png
diff --git a/launcher/main/images/background_pce.png b/themes/default/background_pce.png
similarity index 100%
rename from launcher/main/images/background_pce.png
rename to themes/default/background_pce.png
diff --git a/launcher/main/images/background_recent.png b/themes/default/background_recent.png
similarity index 100%
rename from launcher/main/images/background_recent.png
rename to themes/default/background_recent.png
diff --git a/launcher/main/images/background_sms.png b/themes/default/background_sms.png
similarity index 100%
rename from launcher/main/images/background_sms.png
rename to themes/default/background_sms.png
diff --git a/launcher/main/images/background_snes.png b/themes/default/background_snes.png
similarity index 100%
rename from launcher/main/images/background_snes.png
rename to themes/default/background_snes.png
diff --git a/launcher/main/images/banner_col.png b/themes/default/banner_col.png
similarity index 100%
rename from launcher/main/images/banner_col.png
rename to themes/default/banner_col.png
diff --git a/launcher/main/images/banner_doom.png b/themes/default/banner_doom.png
similarity index 100%
rename from launcher/main/images/banner_doom.png
rename to themes/default/banner_doom.png
diff --git a/launcher/main/images/banner_favorite.png b/themes/default/banner_favorite.png
similarity index 100%
rename from launcher/main/images/banner_favorite.png
rename to themes/default/banner_favorite.png
diff --git a/launcher/main/images/banner_gb.png b/themes/default/banner_gb.png
similarity index 100%
rename from launcher/main/images/banner_gb.png
rename to themes/default/banner_gb.png
diff --git a/launcher/main/images/banner_gbc.png b/themes/default/banner_gbc.png
similarity index 100%
rename from launcher/main/images/banner_gbc.png
rename to themes/default/banner_gbc.png
diff --git a/launcher/main/images/banner_gg.png b/themes/default/banner_gg.png
similarity index 100%
rename from launcher/main/images/banner_gg.png
rename to themes/default/banner_gg.png
diff --git a/launcher/main/images/banner_gw.png b/themes/default/banner_gw.png
similarity index 100%
rename from launcher/main/images/banner_gw.png
rename to themes/default/banner_gw.png
diff --git a/launcher/main/images/banner_lnx.png b/themes/default/banner_lnx.png
similarity index 100%
rename from launcher/main/images/banner_lnx.png
rename to themes/default/banner_lnx.png
diff --git a/launcher/main/images/banner_md.png b/themes/default/banner_md.png
similarity index 100%
rename from launcher/main/images/banner_md.png
rename to themes/default/banner_md.png
diff --git a/launcher/main/images/banner_nes.png b/themes/default/banner_nes.png
similarity index 100%
rename from launcher/main/images/banner_nes.png
rename to themes/default/banner_nes.png
diff --git a/launcher/main/images/banner_ngp.png b/themes/default/banner_ngp.png
similarity index 100%
rename from launcher/main/images/banner_ngp.png
rename to themes/default/banner_ngp.png
diff --git a/launcher/main/images/banner_pce.png b/themes/default/banner_pce.png
similarity index 100%
rename from launcher/main/images/banner_pce.png
rename to themes/default/banner_pce.png
diff --git a/launcher/main/images/banner_recent.png b/themes/default/banner_recent.png
similarity index 100%
rename from launcher/main/images/banner_recent.png
rename to themes/default/banner_recent.png
diff --git a/launcher/main/images/banner_sms.png b/themes/default/banner_sms.png
similarity index 100%
rename from launcher/main/images/banner_sms.png
rename to themes/default/banner_sms.png
diff --git a/launcher/main/images/banner_snes.png b/themes/default/banner_snes.png
similarity index 100%
rename from launcher/main/images/banner_snes.png
rename to themes/default/banner_snes.png
diff --git a/launcher/main/images/logo_col.png b/themes/default/logo_col.png
similarity index 100%
rename from launcher/main/images/logo_col.png
rename to themes/default/logo_col.png
diff --git a/launcher/main/images/logo_doom.png b/themes/default/logo_doom.png
similarity index 100%
rename from launcher/main/images/logo_doom.png
rename to themes/default/logo_doom.png
diff --git a/launcher/main/images/logo_favorite.png b/themes/default/logo_favorite.png
similarity index 100%
rename from launcher/main/images/logo_favorite.png
rename to themes/default/logo_favorite.png
diff --git a/launcher/main/images/logo_gb.png b/themes/default/logo_gb.png
similarity index 100%
rename from launcher/main/images/logo_gb.png
rename to themes/default/logo_gb.png
diff --git a/launcher/main/images/logo_gbc.png b/themes/default/logo_gbc.png
similarity index 100%
rename from launcher/main/images/logo_gbc.png
rename to themes/default/logo_gbc.png
diff --git a/launcher/main/images/logo_gg.png b/themes/default/logo_gg.png
similarity index 100%
rename from launcher/main/images/logo_gg.png
rename to themes/default/logo_gg.png
diff --git a/launcher/main/images/logo_gw.png b/themes/default/logo_gw.png
similarity index 100%
rename from launcher/main/images/logo_gw.png
rename to themes/default/logo_gw.png
diff --git a/launcher/main/images/logo_lnx.png b/themes/default/logo_lnx.png
similarity index 100%
rename from launcher/main/images/logo_lnx.png
rename to themes/default/logo_lnx.png
diff --git a/launcher/main/images/logo_md.png b/themes/default/logo_md.png
similarity index 100%
rename from launcher/main/images/logo_md.png
rename to themes/default/logo_md.png
diff --git a/launcher/main/images/logo_msx.png b/themes/default/logo_msx.png
similarity index 100%
rename from launcher/main/images/logo_msx.png
rename to themes/default/logo_msx.png
diff --git a/launcher/main/images/logo_nes.png b/themes/default/logo_nes.png
similarity index 100%
rename from launcher/main/images/logo_nes.png
rename to themes/default/logo_nes.png
diff --git a/launcher/main/images/logo_ngp.png b/themes/default/logo_ngp.png
similarity index 100%
rename from launcher/main/images/logo_ngp.png
rename to themes/default/logo_ngp.png
diff --git a/launcher/main/images/logo_pce.png b/themes/default/logo_pce.png
similarity index 100%
rename from launcher/main/images/logo_pce.png
rename to themes/default/logo_pce.png
diff --git a/launcher/main/images/logo_recent.png b/themes/default/logo_recent.png
similarity index 100%
rename from launcher/main/images/logo_recent.png
rename to themes/default/logo_recent.png
diff --git a/launcher/main/images/logo_sms.png b/themes/default/logo_sms.png
similarity index 100%
rename from launcher/main/images/logo_sms.png
rename to themes/default/logo_sms.png
diff --git a/launcher/main/images/logo_snes.png b/themes/default/logo_snes.png
similarity index 100%
rename from launcher/main/images/logo_snes.png
rename to themes/default/logo_snes.png
diff --git a/tools/gen_images.py b/tools/gen_images.py
index 12f8a864..b13a50e1 100644
--- a/tools/gen_images.py
+++ b/tools/gen_images.py
@@ -7,7 +7,7 @@ import os, sys, glob, textwrap
 output = '#include "gui.h"\n\n'
 refs = ""
 
-for file in sorted(glob.glob("launcher/main/images/*.png")):
+for file in sorted(glob.glob("themes/default/*.png")):
     with open(file, "rb") as f:
         data = f.read()
         size = len(data)