diff --git a/systems/gb/daedalian_opus/daedelian_opus.xcf b/systems/gb/_finished/_printed/daedalian_opus/daedelian_opus.xcf
similarity index 100%
rename from systems/gb/daedalian_opus/daedelian_opus.xcf
rename to systems/gb/_finished/_printed/daedalian_opus/daedelian_opus.xcf
diff --git a/systems/gb/daedalian_opus/screenshots/371876.jpg b/systems/gb/_finished/_printed/daedalian_opus/screenshots/371876.jpg
similarity index 100%
rename from systems/gb/daedalian_opus/screenshots/371876.jpg
rename to systems/gb/_finished/_printed/daedalian_opus/screenshots/371876.jpg
diff --git a/systems/gb/daedalian_opus/screenshots/371877.jpg b/systems/gb/_finished/_printed/daedalian_opus/screenshots/371877.jpg
similarity index 100%
rename from systems/gb/daedalian_opus/screenshots/371877.jpg
rename to systems/gb/_finished/_printed/daedalian_opus/screenshots/371877.jpg
diff --git a/systems/gb/daedalian_opus/screenshots/371880.jpg b/systems/gb/_finished/_printed/daedalian_opus/screenshots/371880.jpg
similarity index 100%
rename from systems/gb/daedalian_opus/screenshots/371880.jpg
rename to systems/gb/_finished/_printed/daedalian_opus/screenshots/371880.jpg
diff --git a/systems/gb/daedalian_opus/screenshots/titlescreen.jpg b/systems/gb/_finished/_printed/daedalian_opus/screenshots/titlescreen.jpg
similarity index 100%
rename from systems/gb/daedalian_opus/screenshots/titlescreen.jpg
rename to systems/gb/_finished/_printed/daedalian_opus/screenshots/titlescreen.jpg
diff --git a/systems/gb/daedalian_opus/src/coverart.jpg b/systems/gb/_finished/_printed/daedalian_opus/src/coverart.jpg
similarity index 100%
rename from systems/gb/daedalian_opus/src/coverart.jpg
rename to systems/gb/_finished/_printed/daedalian_opus/src/coverart.jpg
diff --git a/systems/gb/daedalian_opus/src/logo_w_alpha.png b/systems/gb/_finished/_printed/daedalian_opus/src/logo_w_alpha.png
similarity index 100%
rename from systems/gb/daedalian_opus/src/logo_w_alpha.png
rename to systems/gb/_finished/_printed/daedalian_opus/src/logo_w_alpha.png
diff --git a/systems/gb/marioandyoshi/marioandyoshi.xcf b/systems/gb/_finished/_printed/marioandyoshi/marioandyoshi.xcf
similarity index 100%
rename from systems/gb/marioandyoshi/marioandyoshi.xcf
rename to systems/gb/_finished/_printed/marioandyoshi/marioandyoshi.xcf
diff --git a/systems/gb/marioandyoshi/screenshots/472628.jpg b/systems/gb/_finished/_printed/marioandyoshi/screenshots/472628.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/screenshots/472628.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/screenshots/472628.jpg
diff --git a/systems/gb/marioandyoshi/screenshots/71086.jpg b/systems/gb/_finished/_printed/marioandyoshi/screenshots/71086.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/screenshots/71086.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/screenshots/71086.jpg
diff --git a/systems/gb/marioandyoshi/screenshots/71087.jpg b/systems/gb/_finished/_printed/marioandyoshi/screenshots/71087.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/screenshots/71087.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/screenshots/71087.jpg
diff --git a/systems/gb/marioandyoshi/screenshots/cutscene.jpg b/systems/gb/_finished/_printed/marioandyoshi/screenshots/cutscene.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/screenshots/cutscene.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/screenshots/cutscene.jpg
diff --git a/systems/gb/marioandyoshi/screenshots/lowres1.jpg b/systems/gb/_finished/_printed/marioandyoshi/screenshots/lowres1.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/screenshots/lowres1.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/screenshots/lowres1.jpg
diff --git a/systems/gb/marioandyoshi/screenshots/titlescreen.jpg b/systems/gb/_finished/_printed/marioandyoshi/screenshots/titlescreen.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/screenshots/titlescreen.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/screenshots/titlescreen.jpg
diff --git a/systems/gb/marioandyoshi/src/boxart.jpg b/systems/gb/_finished/_printed/marioandyoshi/src/boxart.jpg
similarity index 100%
rename from systems/gb/marioandyoshi/src/boxart.jpg
rename to systems/gb/_finished/_printed/marioandyoshi/src/boxart.jpg
diff --git a/systems/gb/future ressources/groudon_w_alpha.png b/systems/gb/_future ressources/groudon_w_alpha.png
similarity index 100%
rename from systems/gb/future ressources/groudon_w_alpha.png
rename to systems/gb/_future ressources/groudon_w_alpha.png
diff --git a/systems/gb/future ressources/kirbysdreamland2_coverart.jpg b/systems/gb/_future ressources/kirbysdreamland2_coverart.jpg
similarity index 100%
rename from systems/gb/future ressources/kirbysdreamland2_coverart.jpg
rename to systems/gb/_future ressources/kirbysdreamland2_coverart.jpg
diff --git a/systems/gb/future ressources/kyogre_w_alpha.png b/systems/gb/_future ressources/kyogre_w_alpha.png
similarity index 100%
rename from systems/gb/future ressources/kyogre_w_alpha.png
rename to systems/gb/_future ressources/kyogre_w_alpha.png
diff --git a/systems/gb/future ressources/pokemon_logo_w_alpha.png b/systems/gb/_future ressources/pokemon_logo_w_alpha.png
similarity index 100%
rename from systems/gb/future ressources/pokemon_logo_w_alpha.png
rename to systems/gb/_future ressources/pokemon_logo_w_alpha.png
diff --git a/systems/gb/future ressources/pokémon_emerald/src/pokemon_logo_w_alpha.png b/systems/gb/_future ressources/pokémon_emerald/src/pokemon_logo_w_alpha.png
similarity index 100%
rename from systems/gb/future ressources/pokémon_emerald/src/pokemon_logo_w_alpha.png
rename to systems/gb/_future ressources/pokémon_emerald/src/pokemon_logo_w_alpha.png
diff --git a/systems/gb/future ressources/pokémon_emerald/src/rayquaza_w_alpha.png b/systems/gb/_future ressources/pokémon_emerald/src/rayquaza_w_alpha.png
similarity index 100%
rename from systems/gb/future ressources/pokémon_emerald/src/rayquaza_w_alpha.png
rename to systems/gb/_future ressources/pokémon_emerald/src/rayquaza_w_alpha.png
diff --git a/systems/gb/template/gb_box_template_srgb.xcf b/systems/gb/_template/gb_box_template_srgb.xcf
similarity index 100%
rename from systems/gb/template/gb_box_template_srgb.xcf
rename to systems/gb/_template/gb_box_template_srgb.xcf
diff --git a/systems/gb/_default/src/Nintendo EU Official Seal of Quality.png b/systems/gb/_template/src/Nintendo EU Official Seal of Quality.png
similarity index 100%
rename from systems/gb/_default/src/Nintendo EU Official Seal of Quality.png
rename to systems/gb/_template/src/Nintendo EU Official Seal of Quality.png
diff --git a/systems/gb/_default/src/boxart_template.png b/systems/gb/_template/src/boxart_template.png
similarity index 100%
rename from systems/gb/_default/src/boxart_template.png
rename to systems/gb/_template/src/boxart_template.png
diff --git a/systems/gb/_default/src/game-boy_logo.svg b/systems/gb/_template/src/game-boy_logo.svg
similarity index 100%
rename from systems/gb/_default/src/game-boy_logo.svg
rename to systems/gb/_template/src/game-boy_logo.svg
diff --git a/systems/gb/_default/src/game-boy_logo_w_nintendo.svg b/systems/gb/_template/src/game-boy_logo_w_nintendo.svg
similarity index 100%
rename from systems/gb/_default/src/game-boy_logo_w_nintendo.svg
rename to systems/gb/_template/src/game-boy_logo_w_nintendo.svg
diff --git a/systems/gb/_default/src/nintendo_logo.svg b/systems/gb/_template/src/nintendo_logo.svg
similarity index 100%
rename from systems/gb/_default/src/nintendo_logo.svg
rename to systems/gb/_template/src/nintendo_logo.svg
diff --git a/systems/gba/legendofzelda_minishcap/legendofzelda_minishcap.xcf b/systems/gba/_finished/legendofzelda_minishcap/legendofzelda_minishcap.xcf
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/legendofzelda_minishcap.xcf
rename to systems/gba/_finished/legendofzelda_minishcap/legendofzelda_minishcap.xcf
diff --git a/systems/gba/legendofzelda_minishcap/screenshots/241814.jpg b/systems/gba/_finished/legendofzelda_minishcap/screenshots/241814.jpg
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/screenshots/241814.jpg
rename to systems/gba/_finished/legendofzelda_minishcap/screenshots/241814.jpg
diff --git a/systems/gba/legendofzelda_minishcap/screenshots/241816.jpg b/systems/gba/_finished/legendofzelda_minishcap/screenshots/241816.jpg
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/screenshots/241816.jpg
rename to systems/gba/_finished/legendofzelda_minishcap/screenshots/241816.jpg
diff --git a/systems/gba/legendofzelda_minishcap/screenshots/241818.jpg b/systems/gba/_finished/legendofzelda_minishcap/screenshots/241818.jpg
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/screenshots/241818.jpg
rename to systems/gba/_finished/legendofzelda_minishcap/screenshots/241818.jpg
diff --git a/systems/gba/legendofzelda_minishcap/screenshots/titlescreen.jpg b/systems/gba/_finished/legendofzelda_minishcap/screenshots/titlescreen.jpg
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/screenshots/titlescreen.jpg
rename to systems/gba/_finished/legendofzelda_minishcap/screenshots/titlescreen.jpg
diff --git a/systems/gba/legendofzelda_minishcap/src/coverart.jpg b/systems/gba/_finished/legendofzelda_minishcap/src/coverart.jpg
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/src/coverart.jpg
rename to systems/gba/_finished/legendofzelda_minishcap/src/coverart.jpg
diff --git a/systems/gba/legendofzelda_minishcap/src/logo_w_alpha.png b/systems/gba/_finished/legendofzelda_minishcap/src/logo_w_alpha.png
similarity index 100%
rename from systems/gba/legendofzelda_minishcap/src/logo_w_alpha.png
rename to systems/gba/_finished/legendofzelda_minishcap/src/logo_w_alpha.png
diff --git a/systems/gba/template/gba_box_template_srgb.xcf b/systems/gba/_template/gba_box_template_srgb.xcf
similarity index 100%
rename from systems/gba/template/gba_box_template_srgb.xcf
rename to systems/gba/_template/gba_box_template_srgb.xcf
diff --git a/systems/gba/template/src/advance_logo_color.png b/systems/gba/_template/src/advance_logo_color.png
similarity index 100%
rename from systems/gba/template/src/advance_logo_color.png
rename to systems/gba/_template/src/advance_logo_color.png
diff --git a/systems/gba/template/src/advance_logo_sw.png b/systems/gba/_template/src/advance_logo_sw.png
similarity index 100%
rename from systems/gba/template/src/advance_logo_sw.png
rename to systems/gba/_template/src/advance_logo_sw.png
diff --git a/systems/gba/template/src/full logo_color.png b/systems/gba/_template/src/full logo_color.png
similarity index 100%
rename from systems/gba/template/src/full logo_color.png
rename to systems/gba/_template/src/full logo_color.png
diff --git a/systems/gba/template/src/full logo_sw.png b/systems/gba/_template/src/full logo_sw.png
similarity index 100%
rename from systems/gba/template/src/full logo_sw.png
rename to systems/gba/_template/src/full logo_sw.png
diff --git a/systems/gbc/_template/gbc_box_template_cmyk.psd b/systems/gbc/_template/gbc_box_template_cmyk.psd
deleted file mode 100644
index 622fc6c..0000000
Binary files a/systems/gbc/_template/gbc_box_template_cmyk.psd and /dev/null differ
diff --git a/systems/gbc/_template/gbc_box_template_srgb.psd b/systems/gbc/_template/gbc_box_template_srgb.psd
deleted file mode 100644
index 8748f44..0000000
Binary files a/systems/gbc/_template/gbc_box_template_srgb.psd and /dev/null differ
diff --git a/systems/gbc/_template/gbc_rumble_box_template_cmyk.psd b/systems/gbc/_template/gbc_rumble_box_template_cmyk.psd
deleted file mode 100644
index e829c29..0000000
Binary files a/systems/gbc/_template/gbc_rumble_box_template_cmyk.psd and /dev/null differ
diff --git a/systems/gbc/_default/src/Game_Boy_Color_logo.svg.png b/systems/gbc/_template/src/Game_Boy_Color_logo.svg.png
similarity index 100%
rename from systems/gbc/_default/src/Game_Boy_Color_logo.svg.png
rename to systems/gbc/_template/src/Game_Boy_Color_logo.svg.png
diff --git a/systems/gbc_hybrid/_template/gb_box_template_srgb.xcf b/systems/gbc_hybrid/_template/gb_box_template_srgb.xcf
new file mode 100644
index 0000000..858c562
Binary files /dev/null and b/systems/gbc_hybrid/_template/gb_box_template_srgb.xcf differ
diff --git a/systems/gbc_hybrid/_template/src/Nintendo EU Official Seal of Quality.png b/systems/gbc_hybrid/_template/src/Nintendo EU Official Seal of Quality.png
new file mode 100644
index 0000000..acc9f7f
Binary files /dev/null and b/systems/gbc_hybrid/_template/src/Nintendo EU Official Seal of Quality.png differ
diff --git a/systems/gbc_hybrid/_template/src/boxart_template.png b/systems/gbc_hybrid/_template/src/boxart_template.png
new file mode 100644
index 0000000..513f804
Binary files /dev/null and b/systems/gbc_hybrid/_template/src/boxart_template.png differ
diff --git a/systems/gbc_hybrid/_template/src/game-boy_logo.svg b/systems/gbc_hybrid/_template/src/game-boy_logo.svg
new file mode 100644
index 0000000..6f545b5
--- /dev/null
+++ b/systems/gbc_hybrid/_template/src/game-boy_logo.svg
@@ -0,0 +1,81 @@
+
+
diff --git a/systems/gbc_hybrid/_template/src/game-boy_logo_w_nintendo.svg b/systems/gbc_hybrid/_template/src/game-boy_logo_w_nintendo.svg
new file mode 100644
index 0000000..939f3f2
--- /dev/null
+++ b/systems/gbc_hybrid/_template/src/game-boy_logo_w_nintendo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/systems/gbc_hybrid/_template/src/nintendo_logo.svg b/systems/gbc_hybrid/_template/src/nintendo_logo.svg
new file mode 100644
index 0000000..700a41b
--- /dev/null
+++ b/systems/gbc_hybrid/_template/src/nintendo_logo.svg
@@ -0,0 +1,91 @@
+
+
diff --git a/systems/n64/template/n64_box_template_srgb.xcf b/systems/n64/_template/n64_box_template_srgb.xcf
similarity index 100%
rename from systems/n64/template/n64_box_template_srgb.xcf
rename to systems/n64/_template/n64_box_template_srgb.xcf