diff --git a/projects/mtg/bin/Res/graphics/DeckMenuBackdrop.png b/projects/mtg/bin/Res/graphics/DeckMenuBackdrop.png index a9d4a2881..4f6b0c377 100644 Binary files a/projects/mtg/bin/Res/graphics/DeckMenuBackdrop.png and b/projects/mtg/bin/Res/graphics/DeckMenuBackdrop.png differ diff --git a/projects/mtg/bin/Res/graphics/avatarholder.png b/projects/mtg/bin/Res/graphics/avatarholder.png new file mode 100644 index 000000000..9b741da4b Binary files /dev/null and b/projects/mtg/bin/Res/graphics/avatarholder.png differ diff --git a/projects/mtg/bin/Res/graphics/awardback.jpg b/projects/mtg/bin/Res/graphics/awardback.jpg index 038f95a40..edb2effad 100644 Binary files a/projects/mtg/bin/Res/graphics/awardback.jpg and b/projects/mtg/bin/Res/graphics/awardback.jpg differ diff --git a/projects/mtg/bin/Res/graphics/f3.dat b/projects/mtg/bin/Res/graphics/f3.dat index 0f3cc9280..84028acaa 100644 Binary files a/projects/mtg/bin/Res/graphics/f3.dat and b/projects/mtg/bin/Res/graphics/f3.dat differ diff --git a/projects/mtg/bin/Res/graphics/f3.png b/projects/mtg/bin/Res/graphics/f3.png index d0831e8c6..2ffd8af68 100644 Binary files a/projects/mtg/bin/Res/graphics/f3.png and b/projects/mtg/bin/Res/graphics/f3.png differ diff --git a/projects/mtg/bin/Res/graphics/magic.dat b/projects/mtg/bin/Res/graphics/magic.dat index 82f350da0..f75c8c5f4 100644 Binary files a/projects/mtg/bin/Res/graphics/magic.dat and b/projects/mtg/bin/Res/graphics/magic.dat differ diff --git a/projects/mtg/bin/Res/graphics/magic.png b/projects/mtg/bin/Res/graphics/magic.png index 49e9d11db..31fd5d96f 100644 Binary files a/projects/mtg/bin/Res/graphics/magic.png and b/projects/mtg/bin/Res/graphics/magic.png differ diff --git a/projects/mtg/bin/Res/graphics/menuholder.png b/projects/mtg/bin/Res/graphics/menuholder.png new file mode 100644 index 000000000..fd34271ad Binary files /dev/null and b/projects/mtg/bin/Res/graphics/menuholder.png differ diff --git a/projects/mtg/bin/Res/graphics/menuicons.png b/projects/mtg/bin/Res/graphics/menuicons.png index e95ea6d2d..f35cef8fb 100644 Binary files a/projects/mtg/bin/Res/graphics/menuicons.png and b/projects/mtg/bin/Res/graphics/menuicons.png differ diff --git a/projects/mtg/bin/Res/graphics/menupanel.jpg b/projects/mtg/bin/Res/graphics/menupanel.jpg new file mode 100644 index 000000000..d9b5492da Binary files /dev/null and b/projects/mtg/bin/Res/graphics/menupanel.jpg differ diff --git a/projects/mtg/bin/Res/graphics/menutitle.png b/projects/mtg/bin/Res/graphics/menutitle.png index a193c63bd..de0df7492 100644 Binary files a/projects/mtg/bin/Res/graphics/menutitle.png and b/projects/mtg/bin/Res/graphics/menutitle.png differ diff --git a/projects/mtg/bin/Res/graphics/miconslarge.png b/projects/mtg/bin/Res/graphics/miconslarge.png index 0bc690c76..11651f4c6 100644 Binary files a/projects/mtg/bin/Res/graphics/miconslarge.png and b/projects/mtg/bin/Res/graphics/miconslarge.png differ diff --git a/projects/mtg/bin/Res/graphics/new.png b/projects/mtg/bin/Res/graphics/new.png index 32f8beca9..dd2c1f222 100644 Binary files a/projects/mtg/bin/Res/graphics/new.png and b/projects/mtg/bin/Res/graphics/new.png differ diff --git a/projects/mtg/bin/Res/graphics/simon.png b/projects/mtg/bin/Res/graphics/simon.png index 5bb3ce01f..c27788b3c 100644 Binary files a/projects/mtg/bin/Res/graphics/simon.png and b/projects/mtg/bin/Res/graphics/simon.png differ diff --git a/projects/mtg/bin/Res/graphics/textscroller.png b/projects/mtg/bin/Res/graphics/textscroller.png new file mode 100644 index 000000000..9497424aa Binary files /dev/null and b/projects/mtg/bin/Res/graphics/textscroller.png differ diff --git a/projects/mtg/bin/Res/graphics/textscrollershadow.png b/projects/mtg/bin/Res/graphics/textscrollershadow.png new file mode 100644 index 000000000..3c7e47cc1 Binary files /dev/null and b/projects/mtg/bin/Res/graphics/textscrollershadow.png differ diff --git a/projects/mtg/bin/Res/graphics/trophy.png b/projects/mtg/bin/Res/graphics/trophy.png index c5b83654a..669dbf89e 100644 Binary files a/projects/mtg/bin/Res/graphics/trophy.png and b/projects/mtg/bin/Res/graphics/trophy.png differ diff --git a/projects/mtg/bin/Res/graphics/trophy_prx_eviltwin.png b/projects/mtg/bin/Res/graphics/trophy_prx_eviltwin.png index 2e5f068c2..02aa17107 100644 Binary files a/projects/mtg/bin/Res/graphics/trophy_prx_eviltwin.png and b/projects/mtg/bin/Res/graphics/trophy_prx_eviltwin.png differ diff --git a/projects/mtg/bin/Res/graphics/trophy_prx_handler.png b/projects/mtg/bin/Res/graphics/trophy_prx_handler.png index 847943b2f..7bd0c6aba 100644 Binary files a/projects/mtg/bin/Res/graphics/trophy_prx_handler.png and b/projects/mtg/bin/Res/graphics/trophy_prx_handler.png differ diff --git a/projects/mtg/bin/Res/graphics/trophy_prx_rimom.png b/projects/mtg/bin/Res/graphics/trophy_prx_rimom.png index d1b596032..6fbb8908a 100644 Binary files a/projects/mtg/bin/Res/graphics/trophy_prx_rimom.png and b/projects/mtg/bin/Res/graphics/trophy_prx_rimom.png differ diff --git a/projects/mtg/bin/Res/graphics/trophy_prx_rnddeck.png b/projects/mtg/bin/Res/graphics/trophy_prx_rnddeck.png index 75785f98b..8176d0a2e 100644 Binary files a/projects/mtg/bin/Res/graphics/trophy_prx_rnddeck.png and b/projects/mtg/bin/Res/graphics/trophy_prx_rnddeck.png differ diff --git a/projects/mtg/bin/Res/graphics/trophy_set.png b/projects/mtg/bin/Res/graphics/trophy_set.png index 57a43b24a..8a2b0a7be 100644 Binary files a/projects/mtg/bin/Res/graphics/trophy_set.png and b/projects/mtg/bin/Res/graphics/trophy_set.png differ diff --git a/projects/mtg/bin/Res/themes/Christmas/artifact_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/artifact_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/artifact_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/artifact_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/back.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/back.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/back.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/back.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/back_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/back_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/back_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/back_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/backdrop.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/backdrop.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/backdrop.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/backdrop.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/black_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/black_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/black_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/black_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/blue_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/blue_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/blue_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/blue_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/gold_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/gold_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/gold_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/gold_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/green_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/green_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/green_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/green_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/handback.png b/projects/mtg/bin/Res/oldthemes/Christmas/handback.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/handback.png rename to projects/mtg/bin/Res/oldthemes/Christmas/handback.png diff --git a/projects/mtg/bin/Res/themes/Christmas/land_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/land_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/land_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/land_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/menuicons.png b/projects/mtg/bin/Res/oldthemes/Christmas/menuicons.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/menuicons.png rename to projects/mtg/bin/Res/oldthemes/Christmas/menuicons.png diff --git a/projects/mtg/bin/Res/themes/Christmas/menuside.png b/projects/mtg/bin/Res/oldthemes/Christmas/menuside.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/menuside.png rename to projects/mtg/bin/Res/oldthemes/Christmas/menuside.png diff --git a/projects/mtg/bin/Res/themes/Christmas/menutitle.png b/projects/mtg/bin/Res/oldthemes/Christmas/menutitle.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/menutitle.png rename to projects/mtg/bin/Res/oldthemes/Christmas/menutitle.png diff --git a/projects/mtg/bin/Res/themes/Christmas/particles.png b/projects/mtg/bin/Res/oldthemes/Christmas/particles.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/particles.png rename to projects/mtg/bin/Res/oldthemes/Christmas/particles.png diff --git a/projects/mtg/bin/Res/themes/Christmas/preview.png b/projects/mtg/bin/Res/oldthemes/Christmas/preview.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/preview.png rename to projects/mtg/bin/Res/oldthemes/Christmas/preview.png diff --git a/projects/mtg/bin/Res/themes/Christmas/red_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/red_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/red_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/red_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/shop.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/shop.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/shop.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/shop.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/shop_aliasing.png b/projects/mtg/bin/Res/oldthemes/Christmas/shop_aliasing.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/shop_aliasing.png rename to projects/mtg/bin/Res/oldthemes/Christmas/shop_aliasing.png diff --git a/projects/mtg/bin/Res/themes/Christmas/shop_light.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/shop_light.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/shop_light.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/shop_light.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/spade_ul.png b/projects/mtg/bin/Res/oldthemes/Christmas/spade_ul.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/spade_ul.png rename to projects/mtg/bin/Res/oldthemes/Christmas/spade_ul.png diff --git a/projects/mtg/bin/Res/themes/Christmas/spade_ur.png b/projects/mtg/bin/Res/oldthemes/Christmas/spade_ur.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/spade_ur.png rename to projects/mtg/bin/Res/oldthemes/Christmas/spade_ur.png diff --git a/projects/mtg/bin/Res/themes/Christmas/themeinfo.txt b/projects/mtg/bin/Res/oldthemes/Christmas/themeinfo.txt similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/themeinfo.txt rename to projects/mtg/bin/Res/oldthemes/Christmas/themeinfo.txt diff --git a/projects/mtg/bin/Res/themes/Christmas/white_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Christmas/white_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/white_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Christmas/white_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Christmas/wood.png b/projects/mtg/bin/Res/oldthemes/Christmas/wood.png similarity index 100% rename from projects/mtg/bin/Res/themes/Christmas/wood.png rename to projects/mtg/bin/Res/oldthemes/Christmas/wood.png diff --git a/projects/mtg/bin/Res/themes/Classic/artifact.jpg b/projects/mtg/bin/Res/oldthemes/Classic/artifact.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/artifact.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/artifact.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/artifact_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/artifact_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/artifact_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/artifact_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar1.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar1.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar1.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar1.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar2.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar2.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar2.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar2.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar3.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar3.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar3.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar3.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar4.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar4.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar4.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar4.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar5.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar5.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar5.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar5.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/avatar6.jpg b/projects/mtg/bin/Res/oldthemes/Classic/avatar6.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/avatar6.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/avatar6.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/awardback.jpg b/projects/mtg/bin/Res/oldthemes/Classic/awardback.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/awardback.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/awardback.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/back.jpg b/projects/mtg/bin/Res/oldthemes/Classic/back.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/back.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/back.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/back_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/back_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/back_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/back_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/backdrop.jpg b/projects/mtg/bin/Res/oldthemes/Classic/backdrop.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/backdrop.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/backdrop.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/baka.jpg b/projects/mtg/bin/Res/oldthemes/Classic/baka.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/baka.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/baka.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/black.jpg b/projects/mtg/bin/Res/oldthemes/Classic/black.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/black.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/black.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/black_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/black_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/black_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/black_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/blue.jpg b/projects/mtg/bin/Res/oldthemes/Classic/blue.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/blue.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/blue.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/blue_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/blue_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/blue_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/blue_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/eviltwin_unlocked.png b/projects/mtg/bin/Res/oldthemes/Classic/eviltwin_unlocked.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/eviltwin_unlocked.png rename to projects/mtg/bin/Res/oldthemes/Classic/eviltwin_unlocked.png diff --git a/projects/mtg/bin/Res/themes/Classic/f3.dat b/projects/mtg/bin/Res/oldthemes/Classic/f3.dat similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/f3.dat rename to projects/mtg/bin/Res/oldthemes/Classic/f3.dat diff --git a/projects/mtg/bin/Res/themes/Classic/f3.png b/projects/mtg/bin/Res/oldthemes/Classic/f3.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/f3.png rename to projects/mtg/bin/Res/oldthemes/Classic/f3.png diff --git a/projects/mtg/bin/Res/themes/Classic/gold.jpg b/projects/mtg/bin/Res/oldthemes/Classic/gold.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/gold.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/gold.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/gold.png b/projects/mtg/bin/Res/oldthemes/Classic/gold.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/gold.png rename to projects/mtg/bin/Res/oldthemes/Classic/gold.png diff --git a/projects/mtg/bin/Res/themes/Classic/gold_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/gold_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/gold_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/gold_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/goldglow.png b/projects/mtg/bin/Res/oldthemes/Classic/goldglow.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/goldglow.png rename to projects/mtg/bin/Res/oldthemes/Classic/goldglow.png diff --git a/projects/mtg/bin/Res/themes/Classic/green.jpg b/projects/mtg/bin/Res/oldthemes/Classic/green.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/green.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/green.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/green_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/green_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/green_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/green_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/handback.png b/projects/mtg/bin/Res/oldthemes/Classic/handback.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/handback.png rename to projects/mtg/bin/Res/oldthemes/Classic/handback.png diff --git a/projects/mtg/bin/Res/themes/Classic/land.jpg b/projects/mtg/bin/Res/oldthemes/Classic/land.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/land.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/land.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/land_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/land_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/land_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/land_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/magic.dat b/projects/mtg/bin/Res/oldthemes/Classic/magic.dat similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/magic.dat rename to projects/mtg/bin/Res/oldthemes/Classic/magic.dat diff --git a/projects/mtg/bin/Res/themes/Classic/magic.png b/projects/mtg/bin/Res/oldthemes/Classic/magic.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/magic.png rename to projects/mtg/bin/Res/oldthemes/Classic/magic.png diff --git a/projects/mtg/bin/Res/themes/Classic/menuicons.png b/projects/mtg/bin/Res/oldthemes/Classic/menuicons.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/menuicons.png rename to projects/mtg/bin/Res/oldthemes/Classic/menuicons.png diff --git a/projects/mtg/bin/Res/themes/Classic/menuside.png b/projects/mtg/bin/Res/oldthemes/Classic/menuside.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/menuside.png rename to projects/mtg/bin/Res/oldthemes/Classic/menuside.png diff --git a/projects/mtg/bin/Res/themes/Classic/menuside2.png b/projects/mtg/bin/Res/oldthemes/Classic/menuside2.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/menuside2.png rename to projects/mtg/bin/Res/oldthemes/Classic/menuside2.png diff --git a/projects/mtg/bin/Res/themes/Classic/menutitle.png b/projects/mtg/bin/Res/oldthemes/Classic/menutitle.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/menutitle.png rename to projects/mtg/bin/Res/oldthemes/Classic/menutitle.png diff --git a/projects/mtg/bin/Res/themes/Classic/momir_unlocked.png b/projects/mtg/bin/Res/oldthemes/Classic/momir_unlocked.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/momir_unlocked.png rename to projects/mtg/bin/Res/oldthemes/Classic/momir_unlocked.png diff --git a/projects/mtg/bin/Res/themes/Classic/phasebar.png b/projects/mtg/bin/Res/oldthemes/Classic/phasebar.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/phasebar.png rename to projects/mtg/bin/Res/oldthemes/Classic/phasebar.png diff --git a/projects/mtg/bin/Res/themes/Classic/preview.png b/projects/mtg/bin/Res/oldthemes/Classic/preview.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/preview.png rename to projects/mtg/bin/Res/oldthemes/Classic/preview.png diff --git a/projects/mtg/bin/Res/themes/Classic/randomdeck_unlocked.png b/projects/mtg/bin/Res/oldthemes/Classic/randomdeck_unlocked.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/randomdeck_unlocked.png rename to projects/mtg/bin/Res/oldthemes/Classic/randomdeck_unlocked.png diff --git a/projects/mtg/bin/Res/themes/Classic/red.jpg b/projects/mtg/bin/Res/oldthemes/Classic/red.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/red.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/red.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/red_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/red_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/red_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/red_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/set_unlocked.png b/projects/mtg/bin/Res/oldthemes/Classic/set_unlocked.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/set_unlocked.png rename to projects/mtg/bin/Res/oldthemes/Classic/set_unlocked.png diff --git a/projects/mtg/bin/Res/themes/Classic/simon.dat b/projects/mtg/bin/Res/oldthemes/Classic/simon.dat similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/simon.dat rename to projects/mtg/bin/Res/oldthemes/Classic/simon.dat diff --git a/projects/mtg/bin/Res/themes/Classic/simon.png b/projects/mtg/bin/Res/oldthemes/Classic/simon.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/simon.png rename to projects/mtg/bin/Res/oldthemes/Classic/simon.png diff --git a/projects/mtg/bin/Res/themes/Classic/spade_ul.png b/projects/mtg/bin/Res/oldthemes/Classic/spade_ul.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/spade_ul.png rename to projects/mtg/bin/Res/oldthemes/Classic/spade_ul.png diff --git a/projects/mtg/bin/Res/themes/Classic/spade_ur.png b/projects/mtg/bin/Res/oldthemes/Classic/spade_ur.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/spade_ur.png rename to projects/mtg/bin/Res/oldthemes/Classic/spade_ur.png diff --git a/projects/mtg/bin/Res/themes/Classic/themeinfo.txt b/projects/mtg/bin/Res/oldthemes/Classic/themeinfo.txt similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/themeinfo.txt rename to projects/mtg/bin/Res/oldthemes/Classic/themeinfo.txt diff --git a/projects/mtg/bin/Res/themes/Classic/trophy.png b/projects/mtg/bin/Res/oldthemes/Classic/trophy.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/trophy.png rename to projects/mtg/bin/Res/oldthemes/Classic/trophy.png diff --git a/projects/mtg/bin/Res/themes/Classic/trophy_prx_eviltwin.png b/projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_eviltwin.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/trophy_prx_eviltwin.png rename to projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_eviltwin.png diff --git a/projects/mtg/bin/Res/themes/Classic/trophy_prx_handler.png b/projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_handler.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/trophy_prx_handler.png rename to projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_handler.png diff --git a/projects/mtg/bin/Res/themes/Classic/trophy_prx_rimom.png b/projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_rimom.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/trophy_prx_rimom.png rename to projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_rimom.png diff --git a/projects/mtg/bin/Res/themes/Classic/trophy_prx_rnddeck.png b/projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_rnddeck.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/trophy_prx_rnddeck.png rename to projects/mtg/bin/Res/oldthemes/Classic/trophy_prx_rnddeck.png diff --git a/projects/mtg/bin/Res/themes/Classic/trophy_set.png b/projects/mtg/bin/Res/oldthemes/Classic/trophy_set.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/trophy_set.png rename to projects/mtg/bin/Res/oldthemes/Classic/trophy_set.png diff --git a/projects/mtg/bin/Res/themes/Classic/unlocked.png b/projects/mtg/bin/Res/oldthemes/Classic/unlocked.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/unlocked.png rename to projects/mtg/bin/Res/oldthemes/Classic/unlocked.png diff --git a/projects/mtg/bin/Res/themes/Classic/white.jpg b/projects/mtg/bin/Res/oldthemes/Classic/white.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/white.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/white.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/white_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Classic/white_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/white_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Classic/white_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Classic/wood.png b/projects/mtg/bin/Res/oldthemes/Classic/wood.png similarity index 100% rename from projects/mtg/bin/Res/themes/Classic/wood.png rename to projects/mtg/bin/Res/oldthemes/Classic/wood.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_black.jpg b/projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_black.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/backdrop_black.jpg rename to projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_black.jpg diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_blue.jpg b/projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_blue.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/backdrop_blue.jpg rename to projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_blue.jpg diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_green.jpg b/projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_green.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/backdrop_green.jpg rename to projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_green.jpg diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_red.jpg b/projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_red.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/backdrop_red.jpg rename to projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_red.jpg diff --git a/projects/mtg/bin/Res/themes/Gemstones/backdrop_white.jpg b/projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_white.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/backdrop_white.jpg rename to projects/mtg/bin/Res/oldthemes/Gemstones/backdrop_white.jpg diff --git a/projects/mtg/bin/Res/themes/Gemstones/gold.png b/projects/mtg/bin/Res/oldthemes/Gemstones/gold.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/gold.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/gold.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/goldglow.png b/projects/mtg/bin/Res/oldthemes/Gemstones/goldglow.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/goldglow.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/goldglow.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/handback.png b/projects/mtg/bin/Res/oldthemes/Gemstones/handback.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/handback.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/handback.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/handback_white.png b/projects/mtg/bin/Res/oldthemes/Gemstones/handback_white.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/handback_white.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/handback_white.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/menutitle.png b/projects/mtg/bin/Res/oldthemes/Gemstones/menutitle.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/menutitle.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/menutitle.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/menutitle_black.png b/projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_black.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/menutitle_black.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_black.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/menutitle_blue.png b/projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_blue.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/menutitle_blue.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_blue.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/menutitle_green.png b/projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_green.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/menutitle_green.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_green.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/menutitle_red.png b/projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_red.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/menutitle_red.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_red.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/menutitle_white.png b/projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_white.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/menutitle_white.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/menutitle_white.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/phasebar_black.png b/projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_black.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/phasebar_black.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_black.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/phasebar_blue.png b/projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_blue.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/phasebar_blue.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_blue.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/phasebar_green.png b/projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_green.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/phasebar_green.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_green.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/phasebar_red.png b/projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_red.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/phasebar_red.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_red.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/phasebar_white.png b/projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_white.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/phasebar_white.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/phasebar_white.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/preview.png b/projects/mtg/bin/Res/oldthemes/Gemstones/preview.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/preview.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/preview.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/style.txt b/projects/mtg/bin/Res/oldthemes/Gemstones/style.txt similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/style.txt rename to projects/mtg/bin/Res/oldthemes/Gemstones/style.txt diff --git a/projects/mtg/bin/Res/themes/Gemstones/themeinfo.txt b/projects/mtg/bin/Res/oldthemes/Gemstones/themeinfo.txt similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/themeinfo.txt rename to projects/mtg/bin/Res/oldthemes/Gemstones/themeinfo.txt diff --git a/projects/mtg/bin/Res/themes/Gemstones/wood_black.png b/projects/mtg/bin/Res/oldthemes/Gemstones/wood_black.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/wood_black.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/wood_black.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/wood_blue.png b/projects/mtg/bin/Res/oldthemes/Gemstones/wood_blue.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/wood_blue.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/wood_blue.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/wood_green.png b/projects/mtg/bin/Res/oldthemes/Gemstones/wood_green.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/wood_green.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/wood_green.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/wood_red.png b/projects/mtg/bin/Res/oldthemes/Gemstones/wood_red.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/wood_red.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/wood_red.png diff --git a/projects/mtg/bin/Res/themes/Gemstones/wood_white.png b/projects/mtg/bin/Res/oldthemes/Gemstones/wood_white.png similarity index 100% rename from projects/mtg/bin/Res/themes/Gemstones/wood_white.png rename to projects/mtg/bin/Res/oldthemes/Gemstones/wood_white.png diff --git a/projects/mtg/bin/Res/themes/Green/back.jpg b/projects/mtg/bin/Res/oldthemes/Green/back.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Green/back.jpg rename to projects/mtg/bin/Res/oldthemes/Green/back.jpg diff --git a/projects/mtg/bin/Res/themes/Green/back_thumb.jpg b/projects/mtg/bin/Res/oldthemes/Green/back_thumb.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Green/back_thumb.jpg rename to projects/mtg/bin/Res/oldthemes/Green/back_thumb.jpg diff --git a/projects/mtg/bin/Res/themes/Green/backdrop.jpg b/projects/mtg/bin/Res/oldthemes/Green/backdrop.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/Green/backdrop.jpg rename to projects/mtg/bin/Res/oldthemes/Green/backdrop.jpg diff --git a/projects/mtg/bin/Res/themes/Green/preview.png b/projects/mtg/bin/Res/oldthemes/Green/preview.png similarity index 100% rename from projects/mtg/bin/Res/themes/Green/preview.png rename to projects/mtg/bin/Res/oldthemes/Green/preview.png diff --git a/projects/mtg/bin/Res/themes/Green/themeinfo.txt b/projects/mtg/bin/Res/oldthemes/Green/themeinfo.txt similarity index 100% rename from projects/mtg/bin/Res/themes/Green/themeinfo.txt rename to projects/mtg/bin/Res/oldthemes/Green/themeinfo.txt diff --git a/projects/mtg/bin/Res/themes/Inverted/manablack.psi b/projects/mtg/bin/Res/oldthemes/Inverted/manablack.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/manablack.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/manablack.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/manablue.psi b/projects/mtg/bin/Res/oldthemes/Inverted/manablue.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/manablue.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/manablue.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/managreen.psi b/projects/mtg/bin/Res/oldthemes/Inverted/managreen.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/managreen.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/managreen.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/manared.psi b/projects/mtg/bin/Res/oldthemes/Inverted/manared.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/manared.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/manared.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/manawhite.psi b/projects/mtg/bin/Res/oldthemes/Inverted/manawhite.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/manawhite.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/manawhite.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/menuicons.png b/projects/mtg/bin/Res/oldthemes/Inverted/menuicons.png similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/menuicons.png rename to projects/mtg/bin/Res/oldthemes/Inverted/menuicons.png diff --git a/projects/mtg/bin/Res/themes/Inverted/menutitle.png b/projects/mtg/bin/Res/oldthemes/Inverted/menutitle.png similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/menutitle.png rename to projects/mtg/bin/Res/oldthemes/Inverted/menutitle.png diff --git a/projects/mtg/bin/Res/themes/Inverted/particle1.psi b/projects/mtg/bin/Res/oldthemes/Inverted/particle1.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/particle1.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/particle1.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/particle2.psi b/projects/mtg/bin/Res/oldthemes/Inverted/particle2.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/particle2.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/particle2.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/particle3.psi b/projects/mtg/bin/Res/oldthemes/Inverted/particle3.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/particle3.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/particle3.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/particle4.psi b/projects/mtg/bin/Res/oldthemes/Inverted/particle4.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/particle4.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/particle4.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/particle5.psi b/projects/mtg/bin/Res/oldthemes/Inverted/particle5.psi similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/particle5.psi rename to projects/mtg/bin/Res/oldthemes/Inverted/particle5.psi diff --git a/projects/mtg/bin/Res/themes/Inverted/preview.png b/projects/mtg/bin/Res/oldthemes/Inverted/preview.png similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/preview.png rename to projects/mtg/bin/Res/oldthemes/Inverted/preview.png diff --git a/projects/mtg/bin/Res/themes/Inverted/themeinfo.txt b/projects/mtg/bin/Res/oldthemes/Inverted/themeinfo.txt similarity index 100% rename from projects/mtg/bin/Res/themes/Inverted/themeinfo.txt rename to projects/mtg/bin/Res/oldthemes/Inverted/themeinfo.txt diff --git a/projects/mtg/bin/Res/themes/White Shrine/back.jpg b/projects/mtg/bin/Res/oldthemes/White Shrine/back.jpg similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/back.jpg rename to projects/mtg/bin/Res/oldthemes/White Shrine/back.jpg diff --git a/projects/mtg/bin/Res/themes/White Shrine/back_thumb.JPG b/projects/mtg/bin/Res/oldthemes/White Shrine/back_thumb.JPG similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/back_thumb.JPG rename to projects/mtg/bin/Res/oldthemes/White Shrine/back_thumb.JPG diff --git a/projects/mtg/bin/Res/themes/White Shrine/backdrop.JPG b/projects/mtg/bin/Res/oldthemes/White Shrine/backdrop.JPG similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/backdrop.JPG rename to projects/mtg/bin/Res/oldthemes/White Shrine/backdrop.JPG diff --git a/projects/mtg/bin/Res/themes/White Shrine/handback.png b/projects/mtg/bin/Res/oldthemes/White Shrine/handback.png similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/handback.png rename to projects/mtg/bin/Res/oldthemes/White Shrine/handback.png diff --git a/projects/mtg/bin/Res/themes/White Shrine/preview.png b/projects/mtg/bin/Res/oldthemes/White Shrine/preview.png similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/preview.png rename to projects/mtg/bin/Res/oldthemes/White Shrine/preview.png diff --git a/projects/mtg/bin/Res/themes/White Shrine/themeinfo.txt b/projects/mtg/bin/Res/oldthemes/White Shrine/themeinfo.txt similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/themeinfo.txt rename to projects/mtg/bin/Res/oldthemes/White Shrine/themeinfo.txt diff --git a/projects/mtg/bin/Res/themes/White Shrine/wood.png b/projects/mtg/bin/Res/oldthemes/White Shrine/wood.png similarity index 100% rename from projects/mtg/bin/Res/themes/White Shrine/wood.png rename to projects/mtg/bin/Res/oldthemes/White Shrine/wood.png diff --git a/projects/mtg/bin/Res/oldthemes/readme.txt b/projects/mtg/bin/Res/oldthemes/readme.txt new file mode 100644 index 000000000..9162b7ddf --- /dev/null +++ b/projects/mtg/bin/Res/oldthemes/readme.txt @@ -0,0 +1 @@ +here are the old themes. diff --git a/projects/mtg/bin/Res/themes/readme.txt b/projects/mtg/bin/Res/themes/readme.txt new file mode 100644 index 000000000..760c3f833 --- /dev/null +++ b/projects/mtg/bin/Res/themes/readme.txt @@ -0,0 +1 @@ +put new themes prior to the new changes on default theme... diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index 7d32a4727..68d06fdae 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -97,13 +97,13 @@ JGuiController(JGE::GetInstance(), id, listener), fontId(fontId), mShowDetailsSc stars = NEW hgeParticleSystem(WResourceManager::Instance()->RetrievePSI("stars.psi", WResourceManager::Instance()->GetQuad("stars").get())); stars->FireAt(mX, mY); - const string detailedInfoString = _("Detailed Info"); + const string detailedInfoString = _("info"); WFont *descriptionFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT); float stringWidth = descriptionFont->GetStringWidth(detailedInfoString.c_str()); float boxStartX = detailedInfoBoxX - stringWidth / 2 + 20; - - dismissButton = NEW InteractiveButton( this, DeckMenuConst::kDetailedInfoButtonId, Fonts::MAIN_FONT, detailedInfoString, boxStartX, detailedInfoBoxY, JGE_BTN_CANCEL); + //dismiss button? + dismissButton = NEW InteractiveButton( this, DeckMenuConst::kDetailedInfoButtonId, Fonts::MAIN_FONT, detailedInfoString, boxStartX+30, detailedInfoBoxY+4.5f, JGE_BTN_CANCEL); JGuiController::Add(dismissButton, true); updateScroller(); @@ -117,20 +117,23 @@ void DeckMenu::RenderDeckManaColors() bool displayDeckMana = backgroundName.find("DeckMenuBackdrop") != string::npos; // current set of coordinates puts the mana symbols to the right of the last stat info in the upper right // box of the deck selection screen. - float manaIconX = 398; - float manaIconY = 55; + //float manaIconX = 398; + //float manaIconY = 55; + float manaIconX = 288; + float manaIconY = 248; if (mSelectedDeck &&displayDeckMana) { string deckManaColors = mSelectedDeck->getColorIndex().c_str(); if (deckManaColors.size() >= 6) { // due to space constraints don't display icons for colorless mana. - for( int colorIdx = Constants::MTG_COLOR_GREEN; colorIdx < Constants::MTG_COLOR_WASTE; ++colorIdx ) + for( int colorIdx = Constants::MTG_COLOR_ARTIFACT; colorIdx < Constants::MTG_COLOR_WASTE; ++colorIdx ) { if ( (deckManaColors.at(colorIdx) == '1') != 0) { - JRenderer::GetInstance()->RenderQuad(manaIcons[colorIdx].get(), manaIconX, manaIconY, 0, 0.5f, 0.5f); - manaIconX += 15; + //JRenderer::GetInstance()->FillCircle(manaIconX,manaIconY,8.5f,ARGB(240,255,255,5)); + JRenderer::GetInstance()->RenderQuad(manaIcons[colorIdx].get(), manaIconX, manaIconY, 0, 0.6f, 0.6f); + manaIconX += 26; } } } @@ -230,6 +233,21 @@ void DeckMenu::Render() { JRenderer * renderer = JRenderer::GetInstance(); float height = mHeight; + JQuadPtr avatarholder; + JQuadPtr menupanel; + JQuadPtr menuholder; + avatarholder = WResourceManager::Instance()->RetrieveTempQuad("avatarholder.png");//new graphics avatarholder + menupanel = WResourceManager::Instance()->RetrieveTempQuad("menupanel.jpg");//new graphics menupanel + menuholder = WResourceManager::Instance()->RetrieveTempQuad("menuholder.png");//new graphics menuholder + bool inDeckMenu = backgroundName.find("DeckMenuBackdrop") != string::npos; + float modAvatarX = 0.f; + float modAvatarY = 0.f; + + if(inDeckMenu) + { + modAvatarX =26.f; + modAvatarY =1.f; + } if (!menuInitialized) { @@ -238,7 +256,12 @@ void DeckMenu::Render() timeOpen = 0; menuInitialized = true; } - + if (avatarholder.get() && menupanel.get() && inDeckMenu)//bg panel + renderer->RenderQuad(menupanel.get(), 225.f, 0, 0 ,SCREEN_WIDTH_F / avatarholder.get()->mWidth, SCREEN_HEIGHT_F / avatarholder.get()->mHeight); + RenderBackground();//background deck menu + if (menuholder.get() && inDeckMenu)//menuholder + renderer->RenderQuad(menuholder.get(), 0, 0, 0 ,SCREEN_WIDTH_F / menuholder.get()->mWidth, SCREEN_HEIGHT_F / menuholder.get()->mHeight); + if (timeOpen < 1) height *= timeOpen > 0 ? timeOpen : -timeOpen; for (int i = startId; i < startId + maxItems; i++) @@ -268,7 +291,7 @@ void DeckMenu::Render() else { dismissButton->setIsSelectionValid(false); - } + }//detailed info??? // display the avatar image string currentAvatarImageName = currentMenuItem->getImageFilename(); if (currentAvatarImageName.size() > 0) @@ -276,17 +299,25 @@ void DeckMenu::Render() JQuadPtr quad = WResourceManager::Instance()->RetrieveTempQuad(currentAvatarImageName, TEXTURE_SUB_AVATAR); if(quad.get()) { - quad->mWidth = 35.f; - quad->mHeight = 50.f; + float xscale = 37.f / quad->mWidth;//orig 35.f + float yscale = 50.f / quad->mHeight; if (currentMenuItem->getText() == "Evil Twin") { JQuad * evil = quad.get(); evil->SetHFlip(true); - renderer->RenderQuad(quad.get(), avatarX, avatarY); + if (avatarholder.get() && inDeckMenu) + renderer->RenderQuad(avatarholder.get(), 0, 0, 0 ,SCREEN_WIDTH_F / avatarholder.get()->mWidth, SCREEN_HEIGHT_F / avatarholder.get()->mHeight); + renderer->RenderQuad(quad.get(), avatarX+modAvatarX, avatarY+modAvatarY, 0, xscale, yscale); + renderer->DrawRect(avatarX+modAvatarX, avatarY+modAvatarY,37.f,50.f,ARGB(200,3,3,3)); evil = NULL; } else - renderer->RenderQuad(quad.get(), avatarX, avatarY); + { + if (avatarholder.get() && inDeckMenu) + renderer->RenderQuad(avatarholder.get(), 0, 0, 0 ,SCREEN_WIDTH_F / avatarholder.get()->mWidth, SCREEN_HEIGHT_F / avatarholder.get()->mHeight); + renderer->RenderQuad(quad.get(), avatarX+modAvatarX, avatarY+modAvatarY, 0, xscale, yscale); + renderer->DrawRect(avatarX+modAvatarX, avatarY+modAvatarY,37.f,50.f,ARGB(200,3,3,3)); + } } } @@ -302,7 +333,7 @@ void DeckMenu::Render() oss << _("Deck: ") << currentMenuItem->getDeckName() << endl; oss << currentMenuItem->getDeckStatsSummary(); descriptionFont->SetColor(ARGB(255,255,255,255)); - descriptionFont->DrawString(oss.str(), statsX, statsY); + descriptionFont->DrawString(oss.str(), statsX+2, statsY-2); } // change the font color of the current menu item @@ -314,15 +345,14 @@ void DeckMenu::Render() } } + mScroller->Render(); + RenderDeckManaColors(); + if (!title.empty()) { mFont->SetColor(ARGB(255,255,255,255)); mFont->DrawString(title.c_str(), titleX, titleY, JGETEXT_CENTER); } - - mScroller->Render(); - RenderBackground(); - RenderDeckManaColors(); renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); stars->Render(); diff --git a/projects/mtg/src/DeckMenuItem.cpp b/projects/mtg/src/DeckMenuItem.cpp index d44e4725d..cd37be3d4 100644 --- a/projects/mtg/src/DeckMenuItem.cpp +++ b/projects/mtg/src/DeckMenuItem.cpp @@ -112,10 +112,10 @@ void DeckMenuItem::RenderWithOffset(float yOffset) JTexture * tex = WResourceManager::Instance()->RetrieveTexture("new.png"); if (tex) { - JQuadPtr quad = WResourceManager::Instance()->RetrieveQuad("new.png", 2.0f, 2.0f, tex->mWidth - 4.0f, tex->mHeight - 4.0f); //avoids weird rectangle aroudn the texture because of bilinear filtering + JQuadPtr quad = WResourceManager::Instance()->RetrieveQuad("new.png", 2.0f, 2.0f, tex->mWidth - 0.0f, tex->mHeight - 0.0f); //avoids weird rectangle aroudn the texture because of bilinear filtering quad->SetHotSpot(quad->mWidth/2.0f, quad->mHeight/2.0f); float x = mX + min(ITEM_PX_WIDTH - quad->mWidth, getWidth() )/2 + quad->mWidth/2; - if (quad) JRenderer::GetInstance()->RenderQuad(quad.get(), x , mY + yOffset + quad->mHeight/2, 0.5); + if (quad) JRenderer::GetInstance()->RenderQuad(quad.get(), x , mY + yOffset + quad->mHeight/2, 0, 16.f / quad->mWidth, 12.f / quad->mHeight); } } mFont->SetScale(SCALE_NORMAL); diff --git a/projects/mtg/src/GameStateAwards.cpp b/projects/mtg/src/GameStateAwards.cpp index d973d69d9..daad1011c 100644 --- a/projects/mtg/src/GameStateAwards.cpp +++ b/projects/mtg/src/GameStateAwards.cpp @@ -148,7 +148,7 @@ void GameStateAwards::Render() JQuadPtr background = WResourceManager::Instance()->RetrieveTempQuad("awardback.jpg", TEXTURE_SUB_5551); if (background.get()) - r->RenderQuad(background.get(), 0, 0); + r->RenderQuad(background.get(), 0, 0, 0, SCREEN_WIDTH_F / background->mWidth, SCREEN_HEIGHT_F / background->mHeight); switch (mState) { diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index 98baeddf1..71369ce24 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -1165,7 +1165,7 @@ void GameStateDuel::Render() opponentMenu->Render(); // display the selected player deck name too string selectedPlayerDeckName = _("Player Deck: ").c_str() + game->players[0]->deckName; - mFont->DrawString( selectedPlayerDeckName.c_str(), 30, 40); + mFont->DrawString( selectedPlayerDeckName.c_str(), (SCREEN_WIDTH / 4) - (mFont->GetStringWidth(selectedPlayerDeckName.c_str())/2)-3, 32); } else if (deckmenu && !deckmenu->isClosed()) deckmenu->Render(); diff --git a/projects/mtg/src/InteractiveButton.cpp b/projects/mtg/src/InteractiveButton.cpp index b86524204..fd1c0e6df 100644 --- a/projects/mtg/src/InteractiveButton.cpp +++ b/projects/mtg/src/InteractiveButton.cpp @@ -68,15 +68,16 @@ void InteractiveButton::Render() float stringWidth = mainFont->GetStringWidth(detailedInfoString.c_str()); float pspIconsSize = 0.5; float mainFontHeight = mainFont->GetHeight(); - float boxStartX = getX() - 5; + float boxStartX = getX() - 4; mXOffset = 0; mYOffset = 0; #ifndef TOUCH_ENABLED renderer->FillRoundRect(boxStartX, getY(), stringWidth - 3, mainFontHeight - 9, 5, ARGB(0, 0, 0, 0)); #else - renderer->FillRoundRect(boxStartX, getY(), stringWidth - 3, mainFontHeight - 5, 5, ARGB(255, 192, 172, 119)); - renderer->DrawRoundRect(boxStartX, getY(), stringWidth - 3, mainFontHeight - 5, 5, ARGB(255, 255, 255, 255)); + renderer->FillRoundRect(boxStartX+1, getY()+1, stringWidth - 3, mainFontHeight - 4, 5, ARGB(220, 5, 5, 5)); + renderer->FillRoundRect(boxStartX, getY(), stringWidth - 3, mainFontHeight - 4, 5, ARGB(255, 140, 23, 23)); + renderer->DrawRoundRect(boxStartX, getY(), stringWidth - 3, mainFontHeight - 4, 5, ARGB(255, 5, 5, 5)); mYOffset += 2; #endif @@ -86,7 +87,7 @@ void InteractiveButton::Render() { renderer->RenderQuad(buttonImage.get(), buttonXOffset - buttonImage.get()->mWidth/2, buttonYOffset + mainFontHeight/2, 0, pspIconsSize, pspIconsSize); } - mainFont->SetColor(ARGB(255, 0, 0, 0)); + //mainFont->SetColor(ARGB(255, 0, 0, 0)); mainFont->DrawString(detailedInfoString, buttonXOffset, buttonYOffset); } diff --git a/projects/mtg/src/TextScroller.cpp b/projects/mtg/src/TextScroller.cpp index e539831e4..dc98af964 100644 --- a/projects/mtg/src/TextScroller.cpp +++ b/projects/mtg/src/TextScroller.cpp @@ -157,5 +157,15 @@ void VerticalTextScroller::Update(float dt) void VerticalTextScroller::Render() { WFont * mFont = WResourceManager::Instance()->GetWFont(fontId); + JQuadPtr textscroller; + JQuadPtr textscrollershadow; + textscroller = WResourceManager::Instance()->RetrieveTempQuad("textscroller.png");//new graphics textscroller + textscrollershadow = WResourceManager::Instance()->RetrieveTempQuad("textscrollershadow.png");//new graphics textscroller shadow + if(!mText.empty() && mText.length() > 1) + if (textscrollershadow.get()) + JRenderer::GetInstance()->RenderQuad(textscrollershadow.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscrollershadow->mWidth, SCREEN_HEIGHT_F / textscrollershadow->mHeight); mFont->DrawString(mText.c_str(), mX, mY); + if(!mText.empty() && mText.length() > 1) + if (textscroller.get()) + JRenderer::GetInstance()->RenderQuad(textscroller.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscroller->mWidth, SCREEN_HEIGHT_F / textscroller->mHeight); } diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index 9069d92b9..6221ce187 100644 --- a/projects/mtg/src/WGui.cpp +++ b/projects/mtg/src/WGui.cpp @@ -1330,7 +1330,14 @@ void WGuiAward::Underlay() if (trophy.get()) { - JRenderer::GetInstance()->RenderQuad(trophy.get(), 0, SCREEN_HEIGHT - trophy->mHeight); + trophy->SetHotSpot(0,trophy->mHeight); + if(trophy->mHeight == 268.f && trophy->mWidth == 203.f) + { + trophy->SetHotSpot(0,0); + JRenderer::GetInstance()->RenderQuad(trophy.get(), 0, SCREEN_HEIGHT-trophy->mHeight); + } + else + JRenderer::GetInstance()->RenderQuad(trophy.get(), 0, SCREEN_HEIGHT, 0, 171.f / trophy->mWidth, 192.f / trophy->mHeight); } }