diff --git a/AssetSrc/deckbuilderbg.afphoto b/AssetSrc/deckbuilderbg.afphoto
index 81a6f0d..8cbc752 100644
Binary files a/AssetSrc/deckbuilderbg.afphoto and b/AssetSrc/deckbuilderbg.afphoto differ
diff --git a/AssetSrc/draftbg.afphoto b/AssetSrc/draftbg.afphoto
new file mode 100644
index 0000000..2c1f342
Binary files /dev/null and b/AssetSrc/draftbg.afphoto differ
diff --git a/AssetSrc/icons.afphoto b/AssetSrc/icons.afphoto
new file mode 100644
index 0000000..c2ae9ca
Binary files /dev/null and b/AssetSrc/icons.afphoto differ
diff --git a/AssetSrc/races.afphoto b/AssetSrc/races.afphoto
new file mode 100644
index 0000000..b09828f
Binary files /dev/null and b/AssetSrc/races.afphoto differ
diff --git a/MLPAssets/Background/deckbuilderbg.png b/MLPAssets/Background/deckbuilderbg.png
index 78cbc6b..e56f6a7 100644
Binary files a/MLPAssets/Background/deckbuilderbg.png and b/MLPAssets/Background/deckbuilderbg.png differ
diff --git a/MLPAssets/Background/hall.png b/MLPAssets/Background/hall.png
new file mode 100644
index 0000000..b013ca7
Binary files /dev/null and b/MLPAssets/Background/hall.png differ
diff --git a/MLPAssets/Icons/Races/race-ally.png.import b/MLPAssets/Background/hall.png.import
similarity index 68%
rename from MLPAssets/Icons/Races/race-ally.png.import
rename to MLPAssets/Background/hall.png.import
index 99a7e3a..08d6cb8 100644
--- a/MLPAssets/Icons/Races/race-ally.png.import
+++ b/MLPAssets/Background/hall.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/race-ally.png-5d358c96e8d74382fa7a61d961bd1f51.stex"
+path="res://.import/hall.png-ab06c7a881e71434043816d73db7a17c.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://MLPAssets/Icons/Races/race-ally.png"
-dest_files=[ "res://.import/race-ally.png-5d358c96e8d74382fa7a61d961bd1f51.stex" ]
+source_file="res://MLPAssets/Background/hall.png"
+dest_files=[ "res://.import/hall.png-ab06c7a881e71434043816d73db7a17c.stex" ]
 
 [params]
 
diff --git a/MLPAssets/Icons/CardType/type-troublemaker.png b/MLPAssets/Icons/CardType/type-troublemaker.png
new file mode 100644
index 0000000..02c1167
Binary files /dev/null and b/MLPAssets/Icons/CardType/type-troublemaker.png differ
diff --git a/MLPAssets/Icons/Elements/Generosity_Symbol.png.import b/MLPAssets/Icons/CardType/type-troublemaker.png.import
similarity index 66%
rename from MLPAssets/Icons/Elements/Generosity_Symbol.png.import
rename to MLPAssets/Icons/CardType/type-troublemaker.png.import
index ab47020..86bd0fa 100644
--- a/MLPAssets/Icons/Elements/Generosity_Symbol.png.import
+++ b/MLPAssets/Icons/CardType/type-troublemaker.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Generosity_Symbol.png-36f38666d9559e86136c3a2fa5c4828e.stex"
+path="res://.import/type-troublemaker.png-135d0f7b0908dc45bf220c73620f5a00.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://MLPAssets/Icons/Elements/Generosity_Symbol.png"
-dest_files=[ "res://.import/Generosity_Symbol.png-36f38666d9559e86136c3a2fa5c4828e.stex" ]
+source_file="res://MLPAssets/Icons/CardType/type-troublemaker.png"
+dest_files=[ "res://.import/type-troublemaker.png-135d0f7b0908dc45bf220c73620f5a00.stex" ]
 
 [params]
 
diff --git a/MLPAssets/Icons/Elements.png b/MLPAssets/Icons/Elements.png
new file mode 100644
index 0000000..e6563be
Binary files /dev/null and b/MLPAssets/Icons/Elements.png differ
diff --git a/MLPAssets/Icons/Races/race-alicorn.png.import b/MLPAssets/Icons/Elements.png.import
similarity index 62%
rename from MLPAssets/Icons/Races/race-alicorn.png.import
rename to MLPAssets/Icons/Elements.png.import
index 2811a5e..e6d3650 100644
--- a/MLPAssets/Icons/Races/race-alicorn.png.import
+++ b/MLPAssets/Icons/Elements.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/race-alicorn.png-f05bea165abb58c5864208516d677a1b.stex"
+path="res://.import/Elements.png-d45cb501e3e6ea76339ca9ce3a10d3fd.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://MLPAssets/Icons/Races/race-alicorn.png"
-dest_files=[ "res://.import/race-alicorn.png-f05bea165abb58c5864208516d677a1b.stex" ]
+source_file="res://MLPAssets/Icons/Elements.png"
+dest_files=[ "res://.import/Elements.png-d45cb501e3e6ea76339ca9ce3a10d3fd.stex" ]
 
 [params]
 
@@ -21,7 +21,7 @@ compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
 flags/srgb=2
 process/fix_alpha_border=true
@@ -30,5 +30,5 @@ process/HDR_as_SRGB=false
 process/invert_color=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Generosity_Power_Icon.png b/MLPAssets/Icons/Elements/Generosity_Power_Icon.png
deleted file mode 100644
index 0596a1e..0000000
Binary files a/MLPAssets/Icons/Elements/Generosity_Power_Icon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Generosity_Power_Icon.png.import b/MLPAssets/Icons/Elements/Generosity_Power_Icon.png.import
deleted file mode 100644
index 7efff67..0000000
--- a/MLPAssets/Icons/Elements/Generosity_Power_Icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Generosity_Power_Icon.png-6a00e0a199f44405c844dd9b79597da8.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Generosity_Power_Icon.png"
-dest_files=[ "res://.import/Generosity_Power_Icon.png-6a00e0a199f44405c844dd9b79597da8.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Generosity_Symbol.png b/MLPAssets/Icons/Elements/Generosity_Symbol.png
deleted file mode 100644
index 0cb7bb2..0000000
Binary files a/MLPAssets/Icons/Elements/Generosity_Symbol.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Honesty_Power_Icon.png b/MLPAssets/Icons/Elements/Honesty_Power_Icon.png
deleted file mode 100644
index 7199f8f..0000000
Binary files a/MLPAssets/Icons/Elements/Honesty_Power_Icon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Honesty_Power_Icon.png.import b/MLPAssets/Icons/Elements/Honesty_Power_Icon.png.import
deleted file mode 100644
index 075744a..0000000
--- a/MLPAssets/Icons/Elements/Honesty_Power_Icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Honesty_Power_Icon.png-710516fd973d27bd184fa6d6fb571eaa.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Honesty_Power_Icon.png"
-dest_files=[ "res://.import/Honesty_Power_Icon.png-710516fd973d27bd184fa6d6fb571eaa.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Honesty_Symbol.png b/MLPAssets/Icons/Elements/Honesty_Symbol.png
deleted file mode 100644
index a1ab937..0000000
Binary files a/MLPAssets/Icons/Elements/Honesty_Symbol.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Honesty_Symbol.png.import b/MLPAssets/Icons/Elements/Honesty_Symbol.png.import
deleted file mode 100644
index 37a09f0..0000000
--- a/MLPAssets/Icons/Elements/Honesty_Symbol.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Honesty_Symbol.png-2c209dcbc79868ac421ca41b5b9b51df.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Honesty_Symbol.png"
-dest_files=[ "res://.import/Honesty_Symbol.png-2c209dcbc79868ac421ca41b5b9b51df.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Kindness_Power_Icon.png b/MLPAssets/Icons/Elements/Kindness_Power_Icon.png
deleted file mode 100644
index 5a0a545..0000000
Binary files a/MLPAssets/Icons/Elements/Kindness_Power_Icon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Kindness_Power_Icon.png.import b/MLPAssets/Icons/Elements/Kindness_Power_Icon.png.import
deleted file mode 100644
index 3d61900..0000000
--- a/MLPAssets/Icons/Elements/Kindness_Power_Icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Kindness_Power_Icon.png-b25e6d7ce502d8bf1c0501d266540d72.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Kindness_Power_Icon.png"
-dest_files=[ "res://.import/Kindness_Power_Icon.png-b25e6d7ce502d8bf1c0501d266540d72.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Kindness_Symbol.png b/MLPAssets/Icons/Elements/Kindness_Symbol.png
deleted file mode 100644
index 55ab097..0000000
Binary files a/MLPAssets/Icons/Elements/Kindness_Symbol.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Kindness_Symbol.png.import b/MLPAssets/Icons/Elements/Kindness_Symbol.png.import
deleted file mode 100644
index f3f89b9..0000000
--- a/MLPAssets/Icons/Elements/Kindness_Symbol.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Kindness_Symbol.png-923a34d7ed3784eb0d406cab1bccf2f4.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Kindness_Symbol.png"
-dest_files=[ "res://.import/Kindness_Symbol.png-923a34d7ed3784eb0d406cab1bccf2f4.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Laughter_Power_Icon.png b/MLPAssets/Icons/Elements/Laughter_Power_Icon.png
deleted file mode 100644
index 0e36a22..0000000
Binary files a/MLPAssets/Icons/Elements/Laughter_Power_Icon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Laughter_Power_Icon.png.import b/MLPAssets/Icons/Elements/Laughter_Power_Icon.png.import
deleted file mode 100644
index 3c5860e..0000000
--- a/MLPAssets/Icons/Elements/Laughter_Power_Icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Laughter_Power_Icon.png-751d2376c98f0ba50a774005ae7ee45c.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Laughter_Power_Icon.png"
-dest_files=[ "res://.import/Laughter_Power_Icon.png-751d2376c98f0ba50a774005ae7ee45c.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Laughter_Symbol.png b/MLPAssets/Icons/Elements/Laughter_Symbol.png
deleted file mode 100644
index 95a2aed..0000000
Binary files a/MLPAssets/Icons/Elements/Laughter_Symbol.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Laughter_Symbol.png.import b/MLPAssets/Icons/Elements/Laughter_Symbol.png.import
deleted file mode 100644
index 3e8667c..0000000
--- a/MLPAssets/Icons/Elements/Laughter_Symbol.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Laughter_Symbol.png-1fc4b1daad70dbf0ba325b0211aada22.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Laughter_Symbol.png"
-dest_files=[ "res://.import/Laughter_Symbol.png-1fc4b1daad70dbf0ba325b0211aada22.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Loyalty_Power_Icon.png b/MLPAssets/Icons/Elements/Loyalty_Power_Icon.png
deleted file mode 100644
index f44dbd9..0000000
Binary files a/MLPAssets/Icons/Elements/Loyalty_Power_Icon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Loyalty_Power_Icon.png.import b/MLPAssets/Icons/Elements/Loyalty_Power_Icon.png.import
deleted file mode 100644
index f2daf74..0000000
--- a/MLPAssets/Icons/Elements/Loyalty_Power_Icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Loyalty_Power_Icon.png-18f43e09481a90d424318b90679b4b01.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Loyalty_Power_Icon.png"
-dest_files=[ "res://.import/Loyalty_Power_Icon.png-18f43e09481a90d424318b90679b4b01.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Loyalty_Symbol.png b/MLPAssets/Icons/Elements/Loyalty_Symbol.png
deleted file mode 100644
index cc1e50d..0000000
Binary files a/MLPAssets/Icons/Elements/Loyalty_Symbol.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Loyalty_Symbol.png.import b/MLPAssets/Icons/Elements/Loyalty_Symbol.png.import
deleted file mode 100644
index a228963..0000000
--- a/MLPAssets/Icons/Elements/Loyalty_Symbol.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Loyalty_Symbol.png-6c620fee51100554aca0a7c3fa34af6f.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Loyalty_Symbol.png"
-dest_files=[ "res://.import/Loyalty_Symbol.png-6c620fee51100554aca0a7c3fa34af6f.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Magic_Power_Icon.png b/MLPAssets/Icons/Elements/Magic_Power_Icon.png
deleted file mode 100644
index 22688f6..0000000
Binary files a/MLPAssets/Icons/Elements/Magic_Power_Icon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Magic_Power_Icon.png.import b/MLPAssets/Icons/Elements/Magic_Power_Icon.png.import
deleted file mode 100644
index 2811618..0000000
--- a/MLPAssets/Icons/Elements/Magic_Power_Icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Magic_Power_Icon.png-2ef58c3f57ee80424c3eb7466c9eda47.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Magic_Power_Icon.png"
-dest_files=[ "res://.import/Magic_Power_Icon.png-2ef58c3f57ee80424c3eb7466c9eda47.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Elements/Magic_Symbol.png b/MLPAssets/Icons/Elements/Magic_Symbol.png
deleted file mode 100644
index c37504a..0000000
Binary files a/MLPAssets/Icons/Elements/Magic_Symbol.png and /dev/null differ
diff --git a/MLPAssets/Icons/Elements/Magic_Symbol.png.import b/MLPAssets/Icons/Elements/Magic_Symbol.png.import
deleted file mode 100644
index 1763894..0000000
--- a/MLPAssets/Icons/Elements/Magic_Symbol.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Magic_Symbol.png-a14b173e4e6b989dcc38390e2d841d0b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Elements/Magic_Symbol.png"
-dest_files=[ "res://.import/Magic_Symbol.png-a14b173e4e6b989dcc38390e2d841d0b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Races/race-alicorn.png b/MLPAssets/Icons/Races/race-alicorn.png
deleted file mode 100644
index 836f7f1..0000000
Binary files a/MLPAssets/Icons/Races/race-alicorn.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-ally.png b/MLPAssets/Icons/Races/race-ally.png
deleted file mode 100644
index 96d4d35..0000000
Binary files a/MLPAssets/Icons/Races/race-ally.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-critter.png b/MLPAssets/Icons/Races/race-critter.png
deleted file mode 100644
index 58c50c0..0000000
Binary files a/MLPAssets/Icons/Races/race-critter.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-critter.png.import b/MLPAssets/Icons/Races/race-critter.png.import
deleted file mode 100644
index e5c7a4c..0000000
--- a/MLPAssets/Icons/Races/race-critter.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/race-critter.png-7a314d4df7f5f776dc925fc33b76bd34.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Races/race-critter.png"
-dest_files=[ "res://.import/race-critter.png-7a314d4df7f5f776dc925fc33b76bd34.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Races/race-dragon.png b/MLPAssets/Icons/Races/race-dragon.png
deleted file mode 100644
index 22e73ba..0000000
Binary files a/MLPAssets/Icons/Races/race-dragon.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-earthpony.png b/MLPAssets/Icons/Races/race-earthpony.png
deleted file mode 100644
index aae2537..0000000
Binary files a/MLPAssets/Icons/Races/race-earthpony.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-earthpony.png.import b/MLPAssets/Icons/Races/race-earthpony.png.import
deleted file mode 100644
index 034005f..0000000
--- a/MLPAssets/Icons/Races/race-earthpony.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/race-earthpony.png-df4da6e787db0f5509283ca95aa52579.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Races/race-earthpony.png"
-dest_files=[ "res://.import/race-earthpony.png-df4da6e787db0f5509283ca95aa52579.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Races/race-pegasus.png b/MLPAssets/Icons/Races/race-pegasus.png
deleted file mode 100644
index 53dbc5b..0000000
Binary files a/MLPAssets/Icons/Races/race-pegasus.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-pegasus.png.import b/MLPAssets/Icons/Races/race-pegasus.png.import
deleted file mode 100644
index 514bcb0..0000000
--- a/MLPAssets/Icons/Races/race-pegasus.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/race-pegasus.png-fb3b30815350ffc4ed1803cac3818372.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Races/race-pegasus.png"
-dest_files=[ "res://.import/race-pegasus.png-fb3b30815350ffc4ed1803cac3818372.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Races/race-unicorn.png b/MLPAssets/Icons/Races/race-unicorn.png
deleted file mode 100644
index 0e549ce..0000000
Binary files a/MLPAssets/Icons/Races/race-unicorn.png and /dev/null differ
diff --git a/MLPAssets/Icons/Races/race-unicorn.png.import b/MLPAssets/Icons/Races/race-unicorn.png.import
deleted file mode 100644
index 39594a9..0000000
--- a/MLPAssets/Icons/Races/race-unicorn.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/race-unicorn.png-16a9663603a93d93ac59ce1f905fcea3.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://MLPAssets/Icons/Races/race-unicorn.png"
-dest_files=[ "res://.import/race-unicorn.png-16a9663603a93d93ac59ce1f905fcea3.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/MLPAssets/Icons/Sets/MarksinTimeSymbol.png b/MLPAssets/Icons/Sets/MarksinTimeSymbol.png
index a8c7662..9356aeb 100644
Binary files a/MLPAssets/Icons/Sets/MarksinTimeSymbol.png and b/MLPAssets/Icons/Sets/MarksinTimeSymbol.png differ
diff --git a/MLPAssets/Icons/races.png b/MLPAssets/Icons/races.png
new file mode 100644
index 0000000..71936df
Binary files /dev/null and b/MLPAssets/Icons/races.png differ
diff --git a/MLPAssets/Icons/Races/race-dragon.png.import b/MLPAssets/Icons/races.png.import
similarity index 68%
rename from MLPAssets/Icons/Races/race-dragon.png.import
rename to MLPAssets/Icons/races.png.import
index 837ebcc..526f7d6 100644
--- a/MLPAssets/Icons/Races/race-dragon.png.import
+++ b/MLPAssets/Icons/races.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/race-dragon.png-49a10be879ec7fddaa5d4fcaab67a2f6.stex"
+path="res://.import/races.png-55f079546b9dbd0271c82f56257b7a2e.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://MLPAssets/Icons/Races/race-dragon.png"
-dest_files=[ "res://.import/race-dragon.png-49a10be879ec7fddaa5d4fcaab67a2f6.stex" ]
+source_file="res://MLPAssets/Icons/races.png"
+dest_files=[ "res://.import/races.png-55f079546b9dbd0271c82f56257b7a2e.stex" ]
 
 [params]
 
diff --git a/Scenes/UI/BGMusic.tscn b/Scenes/BGMusic.tscn
similarity index 61%
rename from Scenes/UI/BGMusic.tscn
rename to Scenes/BGMusic.tscn
index 763cfa6..7e4c10b 100644
--- a/Scenes/UI/BGMusic.tscn
+++ b/Scenes/BGMusic.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://Scenes/UI/BGMusic.gd" type="Script" id=1]
+[ext_resource path="res://Scenes/Scripts/BGMusic.gd" type="Script" id=1]
 
 [node name="BGM" type="AudioStreamPlayer"]
 bus = "BGM"
diff --git a/Scenes/Board.tscn b/Scenes/Board.tscn
index 53237c7..2e96968 100644
--- a/Scenes/Board.tscn
+++ b/Scenes/Board.tscn
@@ -4,7 +4,7 @@
 [ext_resource path="res://Scenes/Scripts/Camera.gd" type="Script" id=2]
 [ext_resource path="res://MLPAssets/Background/boardbg.jpg" type="Texture" id=3]
 [ext_resource path="res://Scenes/BoardUI.tscn" type="PackedScene" id=4]
-[ext_resource path="res://Scenes/Components/Stack.tscn" type="PackedScene" id=5]
+[ext_resource path="res://Scenes/Board/Stack.tscn" type="PackedScene" id=5]
 
 [sub_resource type="SpatialMaterial" id=1]
 flags_unshaded = true
diff --git a/Scenes/Components/Card.gd b/Scenes/Board/Card.gd
similarity index 100%
rename from Scenes/Components/Card.gd
rename to Scenes/Board/Card.gd
diff --git a/Scenes/Components/Card.tscn b/Scenes/Board/Card.tscn
similarity index 99%
rename from Scenes/Components/Card.tscn
rename to Scenes/Board/Card.tscn
index b015780..4d7e358 100644
--- a/Scenes/Components/Card.tscn
+++ b/Scenes/Board/Card.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=18 format=2]
 
-[ext_resource path="res://Scenes/Components/Card.gd" type="Script" id=1]
+[ext_resource path="res://Scenes/Board/Card.gd" type="Script" id=1]
 [ext_resource path="res://MLPAssets/Models/cardborder.obj" type="ArrayMesh" id=2]
 [ext_resource path="res://MLPAssets/Models/cardborder.material" type="Material" id=3]
 [ext_resource path="res://MLPAssets/Placeholders/CardMat.tres" type="Material" id=4]
diff --git a/Scenes/Components/Stack.gd b/Scenes/Board/Stack.gd
similarity index 100%
rename from Scenes/Components/Stack.gd
rename to Scenes/Board/Stack.gd
diff --git a/Scenes/Components/Stack.tscn b/Scenes/Board/Stack.tscn
similarity index 97%
rename from Scenes/Components/Stack.tscn
rename to Scenes/Board/Stack.tscn
index 1113901..7917c02 100644
--- a/Scenes/Components/Stack.tscn
+++ b/Scenes/Board/Stack.tscn
@@ -1,6 +1,7 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://Scenes/Components/Stack.gd" type="Script" id=1]
+[ext_resource path="res://Scenes/Board/Stack.gd" type="Script" id=1]
+
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.424389, 0.0827175, 0.546632 )
diff --git a/Scenes/UI/PhaseIcon.gd b/Scenes/Board/UI/PhaseIcon.gd
similarity index 100%
rename from Scenes/UI/PhaseIcon.gd
rename to Scenes/Board/UI/PhaseIcon.gd
diff --git a/Scenes/UI/PhaseIcon.tscn b/Scenes/Board/UI/PhaseIcon.tscn
similarity index 86%
rename from Scenes/UI/PhaseIcon.tscn
rename to Scenes/Board/UI/PhaseIcon.tscn
index 58cb0f2..03f5428 100644
--- a/Scenes/UI/PhaseIcon.tscn
+++ b/Scenes/Board/UI/PhaseIcon.tscn
@@ -1,7 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://UIAssets/GameBar/phase-icons.png" type="Texture" id=1]
-[ext_resource path="res://Scenes/UI/PhaseIcon.gd" type="Script" id=2]
+[ext_resource path="res://Scenes/Board/UI/PhaseIcon.gd" type="Script" id=2]
+
 
 [sub_resource type="AtlasTexture" id=1]
 flags = 4
diff --git a/Scenes/BoardUI.tscn b/Scenes/BoardUI.tscn
index 80367ca..8bb1019 100644
--- a/Scenes/BoardUI.tscn
+++ b/Scenes/BoardUI.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Scenes/Scripts/BoardUI.gd" type="Script" id=1]
-[ext_resource path="res://Scenes/UI/PhaseIcon.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Scenes/Board/UI/PhaseIcon.tscn" type="PackedScene" id=2]
 [ext_resource path="res://MLPAssets/Placeholders/unknowncard.jpg" type="Texture" id=3]
 
 [sub_resource type="Animation" id=1]
diff --git a/Scenes/DeckBuilder.tscn b/Scenes/DeckBuilder.tscn
index df9812b..7433094 100644
--- a/Scenes/DeckBuilder.tscn
+++ b/Scenes/DeckBuilder.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Scenes/Scripts/DeckBuilder.gd" type="Script" id=1]
-[ext_resource path="res://MLPAssets/Background/library.webp" type="Texture" id=2]
+[ext_resource path="res://MLPAssets/Background/deckbuilderbg.png" type="Texture" id=2]
 
 [node name="DeckBuilder" type="Control"]
 anchor_right = 1.0
diff --git a/Scenes/Draft.tscn b/Scenes/Draft.tscn
new file mode 100644
index 0000000..903623a
--- /dev/null
+++ b/Scenes/Draft.tscn
@@ -0,0 +1,317 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://MLPAssets/Background/hall.png" type="Texture" id=1]
+[ext_resource path="res://Scenes/Draft/CardListItem.tscn" type="PackedScene" id=2]
+[ext_resource path="res://MLPAssets/Placeholders/unknowncard.jpg" type="Texture" id=3]
+
+[node name="Control" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+
+[node name="hall" type="TextureRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+texture = ExtResource( 1 )
+expand = true
+stretch_mode = 6
+
+[node name="Drafted" type="GridContainer" parent="."]
+margin_left = 122.0
+margin_top = 591.0
+margin_right = 1158.0
+margin_bottom = 780.0
+columns = 2
+
+[node name="CardLabel" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_right = 200.0
+margin_bottom = 23.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 )
+}
+color = "pink"
+
+[node name="CardLabel3" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 204.0
+margin_right = 404.0
+margin_bottom = 23.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+
+[node name="CardLabel6" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 27.0
+margin_right = 200.0
+margin_bottom = 50.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "purple"
+
+[node name="CardLabel2" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 204.0
+margin_top = 27.0
+margin_right = 404.0
+margin_bottom = 50.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "yellow"
+
+[node name="CardLabel7" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 54.0
+margin_right = 200.0
+margin_bottom = 77.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "blue"
+
+[node name="CardLabel5" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 204.0
+margin_top = 54.0
+margin_right = 404.0
+margin_bottom = 77.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "orange"
+
+[node name="CardLabel8" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 81.0
+margin_right = 200.0
+margin_bottom = 104.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "white"
+
+[node name="CardLabel4" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 204.0
+margin_top = 81.0
+margin_right = 404.0
+margin_bottom = 104.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "multi|yellow+blue"
+
+[node name="CardLabel9" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 108.0
+margin_right = 200.0
+margin_bottom = 131.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "multi|orange+blue"
+
+[node name="CardLabel10" parent="Drafted" instance=ExtResource( 2 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 204.0
+margin_top = 108.0
+margin_right = 404.0
+margin_bottom = 131.0
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+color = "multi|orange+white+pink"
+
+[node name="Cards" type="GridContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 112.358
+margin_top = 73.0827
+margin_right = 916.358
+margin_bottom = 237.083
+grow_horizontal = 2
+grow_vertical = 2
+rect_scale = Vector2( 0.5, 0.5 )
+columns = 6
+
+[node name="unknowncard" type="TextureRect" parent="Cards"]
+margin_right = 344.0
+margin_bottom = 480.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard8" type="TextureRect" parent="Cards"]
+margin_left = 348.0
+margin_right = 692.0
+margin_bottom = 480.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard4" type="TextureRect" parent="Cards"]
+margin_left = 696.0
+margin_right = 1040.0
+margin_bottom = 480.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard10" type="TextureRect" parent="Cards"]
+margin_left = 1044.0
+margin_right = 1388.0
+margin_bottom = 480.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard2" type="TextureRect" parent="Cards"]
+margin_left = 1392.0
+margin_right = 1736.0
+margin_bottom = 480.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard7" type="TextureRect" parent="Cards"]
+margin_left = 1740.0
+margin_right = 2084.0
+margin_bottom = 480.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard5" type="TextureRect" parent="Cards"]
+margin_top = 484.0
+margin_right = 344.0
+margin_bottom = 964.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard12" type="TextureRect" parent="Cards"]
+margin_left = 348.0
+margin_top = 484.0
+margin_right = 692.0
+margin_bottom = 964.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard3" type="TextureRect" parent="Cards"]
+margin_left = 696.0
+margin_top = 484.0
+margin_right = 1040.0
+margin_bottom = 964.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard9" type="TextureRect" parent="Cards"]
+margin_left = 1044.0
+margin_top = 484.0
+margin_right = 1388.0
+margin_bottom = 964.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard6" type="TextureRect" parent="Cards"]
+margin_left = 1392.0
+margin_top = 484.0
+margin_right = 1736.0
+margin_bottom = 964.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
+
+[node name="unknowncard11" type="TextureRect" parent="Cards"]
+margin_left = 1740.0
+margin_top = 484.0
+margin_right = 2084.0
+margin_bottom = 964.0
+rect_min_size = Vector2( 344, 480 )
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 6
diff --git a/Scenes/Draft/CardListItem.gd b/Scenes/Draft/CardListItem.gd
new file mode 100644
index 0000000..134b843
--- /dev/null
+++ b/Scenes/Draft/CardListItem.gd
@@ -0,0 +1,27 @@
+extends Panel
+
+export var barColors: Dictionary = {}
+export var color: String = "none"
+
+func _ready():
+	if color.begins_with("multi|"):
+		make_gradient(color.trim_prefix("multi|").split("+"))
+	else:
+		if not barColors.has(color):
+			color = "none"
+		$ColorIndicator.color = barColors[color]
+
+func make_gradient(colors: Array):
+	var gradient := Gradient.new()
+	var step = 1.0/(colors.size() - 1.0)
+	var i = 0
+	gradient.colors = PoolColorArray([])
+	gradient.offsets = PoolRealArray([])
+	for color in colors:
+		var offset: float = i*step
+		gradient.add_point(offset, barColors[color])
+		i += 1
+	var texture := GradientTexture.new()
+	texture.gradient = gradient
+	$ColorIndicator/TextureRect.texture = texture
+	$ColorIndicator/TextureRect.visible = true 
\ No newline at end of file
diff --git a/Scenes/Draft/CardListItem.tscn b/Scenes/Draft/CardListItem.tscn
new file mode 100644
index 0000000..28dc9ec
--- /dev/null
+++ b/Scenes/Draft/CardListItem.tscn
@@ -0,0 +1,71 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://Scenes/Draft/CardListItem.gd" type="Script" id=1]
+[ext_resource path="res://UIAssets/Fonts/Catamaran-Bold.ttf" type="DynamicFontData" id=2]
+[ext_resource path="res://UIAssets/Fonts/Catamaran-Light.ttf" type="DynamicFontData" id=3]
+
+[sub_resource type="DynamicFont" id=1]
+size = 12
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 2 )
+
+[sub_resource type="DynamicFont" id=2]
+size = 12
+font_data = ExtResource( 3 )
+
+[node name="CardLabel" type="Panel"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = -1080.0
+margin_bottom = -777.0
+rect_min_size = Vector2( 200, 23 )
+script = ExtResource( 1 )
+barColors = {
+"blue": Color( 0.286275, 0.635294, 0.72549, 1 ),
+"none": Color( 0.247059, 0.54902, 0.4, 1 ),
+"orange": Color( 0.74902, 0.321569, 0.133333, 1 ),
+"pink": Color( 0.870588, 0.34902, 0.705882, 1 ),
+"purple": Color( 0.670588, 0.34902, 0.870588, 1 ),
+"white": Color( 0.698039, 0.698039, 0.698039, 1 ),
+"yellow": Color( 0.788235, 0.792157, 0.431373, 1 )
+}
+
+[node name="ColorIndicator" type="ColorRect" parent="."]
+anchor_bottom = 1.0
+margin_right = 2.0
+rect_min_size = Vector2( 3, 0 )
+
+[node name="TextureRect" type="TextureRect" parent="ColorIndicator"]
+visible = false
+margin_left = 3.0
+margin_right = 26.0
+margin_bottom = 3.0
+rect_rotation = 89.9999
+expand = true
+
+[node name="NameBlock" type="HBoxContainer" parent="."]
+anchor_right = 1.0
+margin_left = 8.0
+margin_top = 2.0
+margin_right = -4.0
+margin_bottom = 2.0
+size_flags_horizontal = 3
+
+[node name="Name" type="Label" parent="NameBlock"]
+margin_right = 85.0
+margin_bottom = 21.0
+custom_fonts/font = SubResource( 1 )
+text = "Twilight Sparkle"
+valign = 1
+
+[node name="Subname" type="Label" parent="NameBlock"]
+modulate = Color( 1, 1, 1, 0.666667 )
+margin_left = 89.0
+margin_right = 188.0
+margin_bottom = 21.0
+size_flags_horizontal = 3
+custom_fonts/font = SubResource( 2 )
+text = "Princess of friendship"
+valign = 1
+clip_text = true
diff --git a/Scenes/UI/BGMusic.gd b/Scenes/Scripts/BGMusic.gd
similarity index 100%
rename from Scenes/UI/BGMusic.gd
rename to Scenes/Scripts/BGMusic.gd
diff --git a/Scenes/Scripts/Board.gd b/Scenes/Scripts/Board.gd
index 9d2f442..637c8a1 100644
--- a/Scenes/Scripts/Board.gd
+++ b/Scenes/Scripts/Board.gd
@@ -4,7 +4,7 @@ class_name Board
 
 signal loaded()
 
-onready var CardTemplate := preload("res://Scenes/Components/Card.tscn")
+onready var CardTemplate := preload("res://Scenes/Board/Card.tscn")
 
 onready var camera := $Camera
 onready var hand := $Camera/PlayerHand
@@ -35,7 +35,7 @@ onready var zones: Dictionary = {
 
 func _ready():
 	# Load bgm
-	BGM.load_music("ingame1")
+	BGM.load_music("ingame3")
 	# Sample deck
 	var deck = [
 		"pr10","pr11","pr12","pr13","pr14","pr15","pr16","pr12","pr13","pr14",
diff --git a/UIAssets/Fonts/Catamaran-Light.ttf b/UIAssets/Fonts/Catamaran-Light.ttf
new file mode 100644
index 0000000..0f809c5
Binary files /dev/null and b/UIAssets/Fonts/Catamaran-Light.ttf differ
diff --git a/default_bus_layout.tres b/default_bus_layout.tres
index 00781e9..280b4dc 100644
--- a/default_bus_layout.tres
+++ b/default_bus_layout.tres
@@ -11,7 +11,7 @@ bus/1/name = "BGM"
 bus/1/solo = false
 bus/1/mute = false
 bus/1/bypass_fx = false
-bus/1/volume_db = -9.4
+bus/1/volume_db = -8.5
 bus/1/send = "Master"
 bus/1/effect/0/effect = SubResource( 1 )
 bus/1/effect/0/enabled = true
diff --git a/project.godot b/project.godot
index 0601962..5d0a19b 100644
--- a/project.godot
+++ b/project.godot
@@ -17,7 +17,7 @@ _global_script_classes=[ {
 "base": "Area",
 "class": "Card",
 "language": "GDScript",
-"path": "res://Scenes/Components/Card.gd"
+"path": "res://Scenes/Board/Card.gd"
 }, {
 "base": "Reference",
 "class": "Resources",
@@ -32,7 +32,7 @@ _global_script_classes=[ {
 "base": "Area",
 "class": "Stack",
 "language": "GDScript",
-"path": "res://Scenes/Components/Stack.gd"
+"path": "res://Scenes/Board/Stack.gd"
 } ]
 _global_script_class_icons={
 "Board": "",
@@ -47,6 +47,7 @@ _global_script_class_icons={
 config/name="MLP CARD GAME"
 run/main_scene="res://Scenes/SplashScreen.tscn"
 run/low_processor_mode=true
+boot_splash/bg_color=Color( 0.156863, 0.156863, 0.156863, 1 )
 config/icon="res://icon.png"
 
 [autoload]
@@ -54,7 +55,7 @@ config/icon="res://icon.png"
 Remote="*res://Scenes/Global/Remote.tscn"
 Mods="*res://Scenes/Global/Mods.tscn"
 Loader="*res://Scenes/Global/Loader.tscn"
-BGM="*res://Scenes/UI/BGMusic.tscn"
+BGM="*res://Scenes/BGMusic.tscn"
 
 [debug]
 
@@ -101,5 +102,6 @@ vram_compression/import_etc=true
 quality/shadows/filter_mode=0
 quality/reflections/texture_array_reflections=false
 quality/reflections/high_quality_ggx=false
+environment/default_clear_color=Color( 0.156863, 0.156863, 0.156863, 1 )
 quality/depth/hdr=false
 environment/default_environment="res://default_env.tres"