diff --git a/projects/mtg/bin/Res/themes/Classic_/artifact.jpg b/projects/mtg/bin/Res/themes/Classic/artifact.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/artifact.jpg
rename to projects/mtg/bin/Res/themes/Classic/artifact.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/artifact_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/artifact_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/artifact_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/artifact_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar.jpg b/projects/mtg/bin/Res/themes/Classic/avatar.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar1.jpg b/projects/mtg/bin/Res/themes/Classic/avatar1.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar1.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar1.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar2.jpg b/projects/mtg/bin/Res/themes/Classic/avatar2.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar2.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar2.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar3.jpg b/projects/mtg/bin/Res/themes/Classic/avatar3.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar3.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar3.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar4.jpg b/projects/mtg/bin/Res/themes/Classic/avatar4.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar4.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar4.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar5.jpg b/projects/mtg/bin/Res/themes/Classic/avatar5.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar5.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar5.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/avatar6.jpg b/projects/mtg/bin/Res/themes/Classic/avatar6.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/avatar6.jpg
rename to projects/mtg/bin/Res/themes/Classic/avatar6.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/back.jpg b/projects/mtg/bin/Res/themes/Classic/back.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/back.jpg
rename to projects/mtg/bin/Res/themes/Classic/back.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/back_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/back_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/back_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/back_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/backdrop.jpg b/projects/mtg/bin/Res/themes/Classic/backdrop.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/backdrop.jpg
rename to projects/mtg/bin/Res/themes/Classic/backdrop.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/baka.jpg b/projects/mtg/bin/Res/themes/Classic/baka.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/baka.jpg
rename to projects/mtg/bin/Res/themes/Classic/baka.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/black.jpg b/projects/mtg/bin/Res/themes/Classic/black.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/black.jpg
rename to projects/mtg/bin/Res/themes/Classic/black.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/black_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/black_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/black_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/black_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/blue.jpg b/projects/mtg/bin/Res/themes/Classic/blue.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/blue.jpg
rename to projects/mtg/bin/Res/themes/Classic/blue.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/blue_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/blue_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/blue_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/blue_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/f3.dat b/projects/mtg/bin/Res/themes/Classic/f3.dat
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/f3.dat
rename to projects/mtg/bin/Res/themes/Classic/f3.dat
diff --git a/projects/mtg/bin/Res/themes/Classic_/f3.png b/projects/mtg/bin/Res/themes/Classic/f3.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/f3.png
rename to projects/mtg/bin/Res/themes/Classic/f3.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/gold.jpg b/projects/mtg/bin/Res/themes/Classic/gold.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/gold.jpg
rename to projects/mtg/bin/Res/themes/Classic/gold.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/gold.png b/projects/mtg/bin/Res/themes/Classic/gold.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/gold.png
rename to projects/mtg/bin/Res/themes/Classic/gold.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/gold_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/gold_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/gold_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/gold_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/goldglow.png b/projects/mtg/bin/Res/themes/Classic/goldglow.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/goldglow.png
rename to projects/mtg/bin/Res/themes/Classic/goldglow.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/green.jpg b/projects/mtg/bin/Res/themes/Classic/green.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/green.jpg
rename to projects/mtg/bin/Res/themes/Classic/green.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/green_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/green_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/green_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/green_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/handback.png b/projects/mtg/bin/Res/themes/Classic/handback.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/handback.png
rename to projects/mtg/bin/Res/themes/Classic/handback.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/land.jpg b/projects/mtg/bin/Res/themes/Classic/land.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/land.jpg
rename to projects/mtg/bin/Res/themes/Classic/land.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/land_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/land_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/land_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/land_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/magic.dat b/projects/mtg/bin/Res/themes/Classic/magic.dat
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/magic.dat
rename to projects/mtg/bin/Res/themes/Classic/magic.dat
diff --git a/projects/mtg/bin/Res/themes/Classic_/magic.png b/projects/mtg/bin/Res/themes/Classic/magic.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/magic.png
rename to projects/mtg/bin/Res/themes/Classic/magic.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/menuicons.png b/projects/mtg/bin/Res/themes/Classic/menuicons.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/menuicons.png
rename to projects/mtg/bin/Res/themes/Classic/menuicons.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/menuside.png b/projects/mtg/bin/Res/themes/Classic/menuside.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/menuside.png
rename to projects/mtg/bin/Res/themes/Classic/menuside.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/menuside2.png b/projects/mtg/bin/Res/themes/Classic/menuside2.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/menuside2.png
rename to projects/mtg/bin/Res/themes/Classic/menuside2.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/menutitle.png b/projects/mtg/bin/Res/themes/Classic/menutitle.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/menutitle.png
rename to projects/mtg/bin/Res/themes/Classic/menutitle.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/phasebar.png b/projects/mtg/bin/Res/themes/Classic/phasebar.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/phasebar.png
rename to projects/mtg/bin/Res/themes/Classic/phasebar.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/preview.png b/projects/mtg/bin/Res/themes/Classic/preview.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/preview.png
rename to projects/mtg/bin/Res/themes/Classic/preview.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/red.jpg b/projects/mtg/bin/Res/themes/Classic/red.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/red.jpg
rename to projects/mtg/bin/Res/themes/Classic/red.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/red_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/red_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/red_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/red_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/simon.dat b/projects/mtg/bin/Res/themes/Classic/simon.dat
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/simon.dat
rename to projects/mtg/bin/Res/themes/Classic/simon.dat
diff --git a/projects/mtg/bin/Res/themes/Classic_/simon.png b/projects/mtg/bin/Res/themes/Classic/simon.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/simon.png
rename to projects/mtg/bin/Res/themes/Classic/simon.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/spade_ul.png b/projects/mtg/bin/Res/themes/Classic/spade_ul.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/spade_ul.png
rename to projects/mtg/bin/Res/themes/Classic/spade_ul.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/spade_ur.png b/projects/mtg/bin/Res/themes/Classic/spade_ur.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/spade_ur.png
rename to projects/mtg/bin/Res/themes/Classic/spade_ur.png
diff --git a/projects/mtg/bin/Res/themes/Classic_/themeinfo.txt b/projects/mtg/bin/Res/themes/Classic/themeinfo.txt
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/themeinfo.txt
rename to projects/mtg/bin/Res/themes/Classic/themeinfo.txt
diff --git a/projects/mtg/bin/Res/themes/Classic_/white.jpg b/projects/mtg/bin/Res/themes/Classic/white.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/white.jpg
rename to projects/mtg/bin/Res/themes/Classic/white.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/white_thumb.jpg b/projects/mtg/bin/Res/themes/Classic/white_thumb.jpg
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/white_thumb.jpg
rename to projects/mtg/bin/Res/themes/Classic/white_thumb.jpg
diff --git a/projects/mtg/bin/Res/themes/Classic_/wood.png b/projects/mtg/bin/Res/themes/Classic/wood.png
similarity index 100%
rename from projects/mtg/bin/Res/themes/Classic_/wood.png
rename to projects/mtg/bin/Res/themes/Classic/wood.png