diff --git a/data/images/expedition/expeditionAFull.png b/data/images/expedition/expeditionAFull.png
new file mode 100644
index 00000000..9274b36a
Binary files /dev/null and b/data/images/expedition/expeditionAFull.png differ
diff --git a/data/images/expedition/expeditionBFull.png b/data/images/expedition/expeditionBFull.png
new file mode 100644
index 00000000..39fa92ac
Binary files /dev/null and b/data/images/expedition/expeditionBFull.png differ
diff --git a/data/images/expedition/expeditionCFull.png b/data/images/expedition/expeditionCFull.png
new file mode 100644
index 00000000..9da9424e
Binary files /dev/null and b/data/images/expedition/expeditionCFull.png differ
diff --git a/data/images/expedition/expeditionCSV.csv b/data/images/expedition/expeditionCSV.csv
new file mode 100644
index 00000000..24c7a0d4
--- /dev/null
+++ b/data/images/expedition/expeditionCSV.csv
@@ -0,0 +1,16 @@
+displayName,imagePath,maskOptions,framePickerOptions
+White,expedition/expeditionWFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Blue,expedition/expeditionUFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Black,expedition/expeditionBFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Red,expedition/expeditionRFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Green,expedition/expeditionGFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Multicolored,expedition/expeditionMFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Artifact,expedition/expeditionAFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+Colorless,expedition/expeditionCFull.png,Full-0-0-744-1039;Title Expedition-0-0-744-1039;Type Expedition-0-0-744-1039;Pinline Expedition-0-0-744-1039;Rules Text Expedition-0-0-744-1039,Expedition
+White PT,m15WPT.png,Full-567-921-140-81,Expedition
+Blue PT,m15UPT.png,Full-567-921-140-81,Expedition
+Black PT,m15BPT.png,Full-567-921-140-81,Expedition
+Red PT,m15RPT.png,Full-567-921-140-81,Expedition
+Green PT,m15GPT.png,Full-567-921-140-81,Expedition
+Multicolored PT,m15MPT.png,Full-567-921-140-81,Expedition
+Artifact PT,m15APT.png,Full-567-921-140-81,Expedition
\ No newline at end of file
diff --git a/data/images/expedition/expeditionGFull.png b/data/images/expedition/expeditionGFull.png
new file mode 100644
index 00000000..68ef7de3
Binary files /dev/null and b/data/images/expedition/expeditionGFull.png differ
diff --git a/data/images/expedition/expeditionMFull.png b/data/images/expedition/expeditionMFull.png
new file mode 100644
index 00000000..182d12c8
Binary files /dev/null and b/data/images/expedition/expeditionMFull.png differ
diff --git a/data/images/expedition/expeditionRFull.png b/data/images/expedition/expeditionRFull.png
new file mode 100644
index 00000000..841297bc
Binary files /dev/null and b/data/images/expedition/expeditionRFull.png differ
diff --git a/data/images/expedition/expeditionUFull.png b/data/images/expedition/expeditionUFull.png
new file mode 100644
index 00000000..1e8b4c64
Binary files /dev/null and b/data/images/expedition/expeditionUFull.png differ
diff --git a/data/images/expedition/expeditionWFull.png b/data/images/expedition/expeditionWFull.png
new file mode 100644
index 00000000..cbc8671a
Binary files /dev/null and b/data/images/expedition/expeditionWFull.png differ
diff --git a/data/images/m15Extras/darkGrayFull.png b/data/images/m15Extras/darkGrayFull.png
new file mode 100644
index 00000000..4bb6d7c0
Binary files /dev/null and b/data/images/m15Extras/darkGrayFull.png differ
diff --git a/data/images/m15Extras/m15ExtrasCSV.csv b/data/images/m15Extras/m15ExtrasCSV.csv
new file mode 100644
index 00000000..3f8dfa7c
--- /dev/null
+++ b/data/images/m15Extras/m15ExtrasCSV.csv
@@ -0,0 +1,3 @@
+displayName,imagePath,maskOptions,framePickerOptions
+Midnight,m15Extras/midnightFull.png,Full-0-0-744-1039;Title-0-0-744-1039;Type-0-0-744-1039;Rules Text-0-0-744-1039;Pinline-0-0-744-1039;Frame-0-0-744-1039;Box Topper-0-0-744-1039,Regular
+Dark Gray,m15Extras/darkGrayFull.png,Full-0-0-744-1039;Title-0-0-744-1039;Type-0-0-744-1039;Rules Text-0-0-744-1039;Pinline-0-0-744-1039;Frame-0-0-744-1039;Box Topper-0-0-744-1039,Regular
\ No newline at end of file
diff --git a/data/images/m15Extras/midnightFull.png b/data/images/m15Extras/midnightFull.png
new file mode 100644
index 00000000..9f74a32b
Binary files /dev/null and b/data/images/m15Extras/midnightFull.png differ
diff --git a/data/images/masks/PinlineExpedition.png b/data/images/masks/PinlineExpedition.png
new file mode 100644
index 00000000..164c8889
Binary files /dev/null and b/data/images/masks/PinlineExpedition.png differ
diff --git a/data/images/masks/RulesTextExpedition.png b/data/images/masks/RulesTextExpedition.png
new file mode 100644
index 00000000..25215edc
Binary files /dev/null and b/data/images/masks/RulesTextExpedition.png differ
diff --git a/data/images/masks/TitleExpedition.png b/data/images/masks/TitleExpedition.png
new file mode 100644
index 00000000..80b31f6d
Binary files /dev/null and b/data/images/masks/TitleExpedition.png differ
diff --git a/data/images/masks/TypeExpedition.png b/data/images/masks/TypeExpedition.png
new file mode 100644
index 00000000..d187b7c7
Binary files /dev/null and b/data/images/masks/TypeExpedition.png differ
diff --git a/data/images/nyxCSV.csv b/data/images/nyxCSV.csv
deleted file mode 100644
index be06e8c9..00000000
--- a/data/images/nyxCSV.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-displayName,imagePath,maskOptions,framePickerOptions
-White Nyx,m15WNyx.png,Full-0-0-744-1039;Frame-0-0-744-1039;BoxTopper-0-0-744-1039,Nyx
-Blue Nyx,m15UNyx.png,Full-0-0-744-1039;Frame-0-0-744-1039;BoxTopper-0-0-744-1039,Nyx
-Black Nyx,m15BNyx.png,Full-0-0-744-1039;Frame-0-0-744-1039;BoxTopper-0-0-744-1039,Nyx
-Red Nyx,m15RNyx.png,Full-0-0-744-1039;Frame-0-0-744-1039;BoxTopper-0-0-744-1039,Nyx
-Green Nyx,m15GNyx.png,Full-0-0-744-1039;Frame-0-0-744-1039;BoxTopper-0-0-744-1039,Nyx
\ No newline at end of file
diff --git a/data/images/old/imageCSV.csv b/data/images/old/imageCSV.csv
deleted file mode 100644
index ba52ca09..00000000
--- a/data/images/old/imageCSV.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-displayName,imagePath,maskOptions
-White,m15WFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Blue,m15UFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Black,m15BFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Red,m15RFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Green,m15GFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Multicolored,m15MFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Artifact,m15AFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Colorless,m15CFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Vehicle,m15VFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-White Land,m15WLFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Blue Land,m15ULFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Black Land,m15BLFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Red Land,m15RLFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Green Land,m15GLFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Multicolored Land,m15MLFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-Colorless Land,m15CLFull.png,Full-0-0-750-1050;Title-0-0-750-1050;Type-0-0-750-1050;Rules Text-0-0-750-1050;Pinline-0-0-750-1050;Frame-0-0-750-1050
-White PT,m15WPT.png,Full-570-934-137-77
-Blue PT,m15UPT.png,Full-570-934-137-77
-Black PT,m15BPT.png,Full-570-934-137-77
-Red PT,m15RPT.png,Full-570-934-137-77
-Green PT,m15GPT.png,Full-570-934-137-77
-Multicolored PT,m15MPT.png,Full-570-934-137-77
-Artifact PT,m15APT.png,Full-570-934-137-77
-Colorless PT,m15CPT.png,Full-570-934-137-77
-Vehicle PT,m15VPT.png,Full-570-934-137-77
-White Legendary,m15WLegendary.png,Full-20-20-714-186
-Blue Legendary,m15ULegendary.png,Full-20-20-714-186
-Black Legendary,m15BLegendary.png,Full-20-20-714-186
-Red Legendary,m15RLegendary.png,Full-20-20-714-186
-Green Legendary,m15GLegendary.png,Full-20-20-714-186
-Multicolored Legendary,m15MLegendary.png,Full-20-20-714-186
-Artifact Legendary,m15ALegendary.png,Full-20-20-714-186
-Colorless Legendary,m15CLegendary.png,Full-20-20-714-186
-White Rare Stamp,m15WRareStamp.png,Full-329-949-90-50
-Blue Rare Stamp,m15URareStamp.png,Full-329-949-90-50
-Black Rare Stamp,m15BRareStamp.png,Full-329-949-90-50
-Red Rare Stamp,m15RRareStamp.png,Full-329-949-90-50
-Green Rare Stamp,m15GRareStamp.png,Full-329-949-90-50
-Multicolored Rare Stamp,m15MRareStamp.png,Full-329-949-90-50
-Artifact Rare Stamp,m15ARareStamp.png,Full-329-949-90-50
-Colorless Rare Stamp,m15CRareStamp.png,Full-329-949-90-50
-Holo Stamp,stamp.png,Full-340-965-70-38
-Black Border,masks/Border.png,Full-0-0-750-1050
-White Miracle,m15WMiracle.png,Full-30-30-690-511
-Blue Miracle,m15UMiracle.png,Full-30-30-690-511
-Black Miracle,m15BMiracle.png,Full-30-30-690-511
-Red Miracle,m15RMiracle.png,Full-30-30-690-511
-Green Miracle,m15GMiracle.png,Full-30-30-690-511
-Multicolored Miracle,m15MMiracle.png,Full-30-30-690-511
-Artifact Miracle,m15AMiracle.png,Full-30-30-690-511
-Colorless Miracle,m15CMiracle.png,Full-30-30-690-511
-White Nyx,m15WNyx.png,Full-30-30-690-586
-Blue Nyx,m15UNyx.png,Full-30-30-690-586
-Black Nyx,m15BNyx.png,Full-30-30-690-586
-Red Nyx,m15RNyx.png,Full-30-30-690-586
-Green Nyx,m15GNyx.png,Full-30-30-690-586
-Multicolored Nyx,m15MNyx.png,Full-30-30-690-586
-Artifact Nyx,m15ANyx.png,Full-30-30-690-586
-Colorless Nyx,m15CNyx.png,Full-30-30-690-586
-White Land Nyx,m15WLNyx.png,Full-30-30-690-586
-Blue Land Nyx,m15ULNyx.png,Full-30-30-690-586
-Black Land Nyx,m15BLNyx.png,Full-30-30-690-586
-Red Land Nyx,m15RLNyx.png,Full-30-30-690-586
-Green Land Nyx,m15GLNyx.png,Full-30-30-690-586
-Multicolored Land Nyx,m15MLNyx.png,Full-30-30-690-586
-Colorless Land Nyx,m15CLNyx.png,Full-30-30-690-586
\ No newline at end of file
diff --git a/data/images/old/m15ADFull.png b/data/images/old/m15ADFull.png
deleted file mode 100644
index 838ad815..00000000
Binary files a/data/images/old/m15ADFull.png and /dev/null differ
diff --git a/data/images/old/m15ADPT.png b/data/images/old/m15ADPT.png
deleted file mode 100644
index 1ed50325..00000000
Binary files a/data/images/old/m15ADPT.png and /dev/null differ
diff --git a/data/images/old/m15AFlipCircle.png b/data/images/old/m15AFlipCircle.png
deleted file mode 100644
index af3a0d2a..00000000
Binary files a/data/images/old/m15AFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15AFlipPT.png b/data/images/old/m15AFlipPT.png
deleted file mode 100644
index 279dd50c..00000000
Binary files a/data/images/old/m15AFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15AFull.png b/data/images/old/m15AFull.png
deleted file mode 100644
index 8fa95d51..00000000
Binary files a/data/images/old/m15AFull.png and /dev/null differ
diff --git a/data/images/old/m15ALegendary.png b/data/images/old/m15ALegendary.png
deleted file mode 100644
index ef0cbfce..00000000
Binary files a/data/images/old/m15ALegendary.png and /dev/null differ
diff --git a/data/images/old/m15AMiracle.png b/data/images/old/m15AMiracle.png
deleted file mode 100644
index 730d5013..00000000
Binary files a/data/images/old/m15AMiracle.png and /dev/null differ
diff --git a/data/images/old/m15ANyx.png b/data/images/old/m15ANyx.png
deleted file mode 100644
index 22a2b300..00000000
Binary files a/data/images/old/m15ANyx.png and /dev/null differ
diff --git a/data/images/old/m15APT.png b/data/images/old/m15APT.png
deleted file mode 100644
index 15d680e6..00000000
Binary files a/data/images/old/m15APT.png and /dev/null differ
diff --git a/data/images/old/m15ARareStamp.png b/data/images/old/m15ARareStamp.png
deleted file mode 100644
index 99a1fb1d..00000000
Binary files a/data/images/old/m15ARareStamp.png and /dev/null differ
diff --git a/data/images/old/m15ArtifactFlipIcon.png b/data/images/old/m15ArtifactFlipIcon.png
deleted file mode 100644
index 44fdac90..00000000
Binary files a/data/images/old/m15ArtifactFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15BDFull.png b/data/images/old/m15BDFull.png
deleted file mode 100644
index 30deaa06..00000000
Binary files a/data/images/old/m15BDFull.png and /dev/null differ
diff --git a/data/images/old/m15BDPT.png b/data/images/old/m15BDPT.png
deleted file mode 100644
index 273ecca8..00000000
Binary files a/data/images/old/m15BDPT.png and /dev/null differ
diff --git a/data/images/old/m15BFlipCircle.png b/data/images/old/m15BFlipCircle.png
deleted file mode 100644
index 7f191549..00000000
Binary files a/data/images/old/m15BFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15BFlipPT.png b/data/images/old/m15BFlipPT.png
deleted file mode 100644
index 5e85eb26..00000000
Binary files a/data/images/old/m15BFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15BFull.png b/data/images/old/m15BFull.png
deleted file mode 100644
index f5bc1d60..00000000
Binary files a/data/images/old/m15BFull.png and /dev/null differ
diff --git a/data/images/old/m15BLDFull.png b/data/images/old/m15BLDFull.png
deleted file mode 100644
index f394d9d3..00000000
Binary files a/data/images/old/m15BLDFull.png and /dev/null differ
diff --git a/data/images/old/m15BLFlipPT.png b/data/images/old/m15BLFlipPT.png
deleted file mode 100644
index 40fad918..00000000
Binary files a/data/images/old/m15BLFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15BLFull.png b/data/images/old/m15BLFull.png
deleted file mode 100644
index 7740dbf3..00000000
Binary files a/data/images/old/m15BLFull.png and /dev/null differ
diff --git a/data/images/old/m15BLNyx.png b/data/images/old/m15BLNyx.png
deleted file mode 100644
index 5cf62019..00000000
Binary files a/data/images/old/m15BLNyx.png and /dev/null differ
diff --git a/data/images/old/m15BLegendary.png b/data/images/old/m15BLegendary.png
deleted file mode 100644
index 97090d6c..00000000
Binary files a/data/images/old/m15BLegendary.png and /dev/null differ
diff --git a/data/images/old/m15BMiracle.png b/data/images/old/m15BMiracle.png
deleted file mode 100644
index 5855c9aa..00000000
Binary files a/data/images/old/m15BMiracle.png and /dev/null differ
diff --git a/data/images/old/m15BNyx.png b/data/images/old/m15BNyx.png
deleted file mode 100644
index 8696544e..00000000
Binary files a/data/images/old/m15BNyx.png and /dev/null differ
diff --git a/data/images/old/m15BPT.png b/data/images/old/m15BPT.png
deleted file mode 100644
index f4cbdac8..00000000
Binary files a/data/images/old/m15BPT.png and /dev/null differ
diff --git a/data/images/old/m15BRareStamp.png b/data/images/old/m15BRareStamp.png
deleted file mode 100644
index eb8a2458..00000000
Binary files a/data/images/old/m15BRareStamp.png and /dev/null differ
diff --git a/data/images/old/m15BlankFlipIcon.png b/data/images/old/m15BlankFlipIcon.png
deleted file mode 100644
index 0ac01337..00000000
Binary files a/data/images/old/m15BlankFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15CDFull.png b/data/images/old/m15CDFull.png
deleted file mode 100644
index 1934be8e..00000000
Binary files a/data/images/old/m15CDFull.png and /dev/null differ
diff --git a/data/images/old/m15CDPT.png b/data/images/old/m15CDPT.png
deleted file mode 100644
index 7d779e01..00000000
Binary files a/data/images/old/m15CDPT.png and /dev/null differ
diff --git a/data/images/old/m15CFlipCircle.png b/data/images/old/m15CFlipCircle.png
deleted file mode 100644
index 19e286a6..00000000
Binary files a/data/images/old/m15CFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15CFlipPT.png b/data/images/old/m15CFlipPT.png
deleted file mode 100644
index d1b7f621..00000000
Binary files a/data/images/old/m15CFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15CFull.png b/data/images/old/m15CFull.png
deleted file mode 100644
index e37fce1e..00000000
Binary files a/data/images/old/m15CFull.png and /dev/null differ
diff --git a/data/images/old/m15CLDFull.png b/data/images/old/m15CLDFull.png
deleted file mode 100644
index 6e8410e3..00000000
Binary files a/data/images/old/m15CLDFull.png and /dev/null differ
diff --git a/data/images/old/m15CLFlipPT.png b/data/images/old/m15CLFlipPT.png
deleted file mode 100644
index 9b0b7d51..00000000
Binary files a/data/images/old/m15CLFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15CLFull.png b/data/images/old/m15CLFull.png
deleted file mode 100644
index 081d9513..00000000
Binary files a/data/images/old/m15CLFull.png and /dev/null differ
diff --git a/data/images/old/m15CLNyx.png b/data/images/old/m15CLNyx.png
deleted file mode 100644
index 4b66cc1f..00000000
Binary files a/data/images/old/m15CLNyx.png and /dev/null differ
diff --git a/data/images/old/m15CLegendary.png b/data/images/old/m15CLegendary.png
deleted file mode 100644
index fca09182..00000000
Binary files a/data/images/old/m15CLegendary.png and /dev/null differ
diff --git a/data/images/old/m15CMiracle.png b/data/images/old/m15CMiracle.png
deleted file mode 100644
index 56a495e3..00000000
Binary files a/data/images/old/m15CMiracle.png and /dev/null differ
diff --git a/data/images/old/m15CNyx.png b/data/images/old/m15CNyx.png
deleted file mode 100644
index 7b257a8d..00000000
Binary files a/data/images/old/m15CNyx.png and /dev/null differ
diff --git a/data/images/old/m15CPT.png b/data/images/old/m15CPT.png
deleted file mode 100644
index 4fa6c833..00000000
Binary files a/data/images/old/m15CPT.png and /dev/null differ
diff --git a/data/images/old/m15CRareStamp.png b/data/images/old/m15CRareStamp.png
deleted file mode 100644
index ca5bfbfd..00000000
Binary files a/data/images/old/m15CRareStamp.png and /dev/null differ
diff --git a/data/images/old/m15CompassFlipIcon.png b/data/images/old/m15CompassFlipIcon.png
deleted file mode 100644
index 6280e620..00000000
Binary files a/data/images/old/m15CompassFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15CreatureFlipIcon.png b/data/images/old/m15CreatureFlipIcon.png
deleted file mode 100644
index 3aabf62a..00000000
Binary files a/data/images/old/m15CreatureFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15DayFlipIcon.png b/data/images/old/m15DayFlipIcon.png
deleted file mode 100644
index 71189d94..00000000
Binary files a/data/images/old/m15DayFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15DefaultBorder.png b/data/images/old/m15DefaultBorder.png
deleted file mode 100644
index ba340487..00000000
Binary files a/data/images/old/m15DefaultBorder.png and /dev/null differ
diff --git a/data/images/old/m15EldraziFlipIcon.png b/data/images/old/m15EldraziFlipIcon.png
deleted file mode 100644
index 6dbb1bc2..00000000
Binary files a/data/images/old/m15EldraziFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15EnchantmentFlipIcon.png b/data/images/old/m15EnchantmentFlipIcon.png
deleted file mode 100644
index 9dddf8f6..00000000
Binary files a/data/images/old/m15EnchantmentFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15GDFull.png b/data/images/old/m15GDFull.png
deleted file mode 100644
index 7a2ed415..00000000
Binary files a/data/images/old/m15GDFull.png and /dev/null differ
diff --git a/data/images/old/m15GDPT.png b/data/images/old/m15GDPT.png
deleted file mode 100644
index aa712323..00000000
Binary files a/data/images/old/m15GDPT.png and /dev/null differ
diff --git a/data/images/old/m15GFlipPT.png b/data/images/old/m15GFlipPT.png
deleted file mode 100644
index fc76e395..00000000
Binary files a/data/images/old/m15GFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15GFliptCircle.png b/data/images/old/m15GFliptCircle.png
deleted file mode 100644
index 42449035..00000000
Binary files a/data/images/old/m15GFliptCircle.png and /dev/null differ
diff --git a/data/images/old/m15GFull.png b/data/images/old/m15GFull.png
deleted file mode 100644
index cdf92e69..00000000
Binary files a/data/images/old/m15GFull.png and /dev/null differ
diff --git a/data/images/old/m15GLDFull.png b/data/images/old/m15GLDFull.png
deleted file mode 100644
index c016688d..00000000
Binary files a/data/images/old/m15GLDFull.png and /dev/null differ
diff --git a/data/images/old/m15GLFlipPT.png b/data/images/old/m15GLFlipPT.png
deleted file mode 100644
index 470e1078..00000000
Binary files a/data/images/old/m15GLFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15GLFull.png b/data/images/old/m15GLFull.png
deleted file mode 100644
index 33d0343d..00000000
Binary files a/data/images/old/m15GLFull.png and /dev/null differ
diff --git a/data/images/old/m15GLNyx.png b/data/images/old/m15GLNyx.png
deleted file mode 100644
index 5ebabdb5..00000000
Binary files a/data/images/old/m15GLNyx.png and /dev/null differ
diff --git a/data/images/old/m15GLegendary.png b/data/images/old/m15GLegendary.png
deleted file mode 100644
index 18a1128e..00000000
Binary files a/data/images/old/m15GLegendary.png and /dev/null differ
diff --git a/data/images/old/m15GMiracle.png b/data/images/old/m15GMiracle.png
deleted file mode 100644
index e35be73c..00000000
Binary files a/data/images/old/m15GMiracle.png and /dev/null differ
diff --git a/data/images/old/m15GNyx.png b/data/images/old/m15GNyx.png
deleted file mode 100644
index cf49bf89..00000000
Binary files a/data/images/old/m15GNyx.png and /dev/null differ
diff --git a/data/images/old/m15GPT.png b/data/images/old/m15GPT.png
deleted file mode 100644
index f553b708..00000000
Binary files a/data/images/old/m15GPT.png and /dev/null differ
diff --git a/data/images/old/m15GRareStamp.png b/data/images/old/m15GRareStamp.png
deleted file mode 100644
index 3e4cd6cd..00000000
Binary files a/data/images/old/m15GRareStamp.png and /dev/null differ
diff --git a/data/images/old/m15InstantFlipIcon.png b/data/images/old/m15InstantFlipIcon.png
deleted file mode 100644
index 834033d2..00000000
Binary files a/data/images/old/m15InstantFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15LandFlipIcon.png b/data/images/old/m15LandFlipIcon.png
deleted file mode 100644
index 74a74eab..00000000
Binary files a/data/images/old/m15LandFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15MDFull.png b/data/images/old/m15MDFull.png
deleted file mode 100644
index 2c064674..00000000
Binary files a/data/images/old/m15MDFull.png and /dev/null differ
diff --git a/data/images/old/m15MDPT.png b/data/images/old/m15MDPT.png
deleted file mode 100644
index 34779881..00000000
Binary files a/data/images/old/m15MDPT.png and /dev/null differ
diff --git a/data/images/old/m15MFlipCircle.png b/data/images/old/m15MFlipCircle.png
deleted file mode 100644
index 400d9a3c..00000000
Binary files a/data/images/old/m15MFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15MFlipPT.png b/data/images/old/m15MFlipPT.png
deleted file mode 100644
index 6d2fae05..00000000
Binary files a/data/images/old/m15MFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15MFull.png b/data/images/old/m15MFull.png
deleted file mode 100644
index 28c4ff65..00000000
Binary files a/data/images/old/m15MFull.png and /dev/null differ
diff --git a/data/images/old/m15MLDFull.png b/data/images/old/m15MLDFull.png
deleted file mode 100644
index 97eb94b3..00000000
Binary files a/data/images/old/m15MLDFull.png and /dev/null differ
diff --git a/data/images/old/m15MLFlipPT.png b/data/images/old/m15MLFlipPT.png
deleted file mode 100644
index bd0a8d41..00000000
Binary files a/data/images/old/m15MLFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15MLFull.png b/data/images/old/m15MLFull.png
deleted file mode 100644
index 4cf8044c..00000000
Binary files a/data/images/old/m15MLFull.png and /dev/null differ
diff --git a/data/images/old/m15MLNyx.png b/data/images/old/m15MLNyx.png
deleted file mode 100644
index 3f9cca87..00000000
Binary files a/data/images/old/m15MLNyx.png and /dev/null differ
diff --git a/data/images/old/m15MLegendary.png b/data/images/old/m15MLegendary.png
deleted file mode 100644
index 6d5e4a2f..00000000
Binary files a/data/images/old/m15MLegendary.png and /dev/null differ
diff --git a/data/images/old/m15MMiracle.png b/data/images/old/m15MMiracle.png
deleted file mode 100644
index 9de82474..00000000
Binary files a/data/images/old/m15MMiracle.png and /dev/null differ
diff --git a/data/images/old/m15MNyx.png b/data/images/old/m15MNyx.png
deleted file mode 100644
index 24000574..00000000
Binary files a/data/images/old/m15MNyx.png and /dev/null differ
diff --git a/data/images/old/m15MPT.png b/data/images/old/m15MPT.png
deleted file mode 100644
index 163d7330..00000000
Binary files a/data/images/old/m15MPT.png and /dev/null differ
diff --git a/data/images/old/m15MRareStamp.png b/data/images/old/m15MRareStamp.png
deleted file mode 100644
index 63313a57..00000000
Binary files a/data/images/old/m15MRareStamp.png and /dev/null differ
diff --git a/data/images/old/m15MoonFlipIcon.png b/data/images/old/m15MoonFlipIcon.png
deleted file mode 100644
index 3774d5cf..00000000
Binary files a/data/images/old/m15MoonFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15MultitypeFlipIcon.png b/data/images/old/m15MultitypeFlipIcon.png
deleted file mode 100644
index 48cfa783..00000000
Binary files a/data/images/old/m15MultitypeFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15NightFlipIcon.png b/data/images/old/m15NightFlipIcon.png
deleted file mode 100644
index dab6f4bf..00000000
Binary files a/data/images/old/m15NightFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15PlaneshiftFlipIcon.png b/data/images/old/m15PlaneshiftFlipIcon.png
deleted file mode 100644
index bf1a14cb..00000000
Binary files a/data/images/old/m15PlaneshiftFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15PlaneswalkerFlipIcon.png b/data/images/old/m15PlaneswalkerFlipIcon.png
deleted file mode 100644
index becc1933..00000000
Binary files a/data/images/old/m15PlaneswalkerFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15RDFull.png b/data/images/old/m15RDFull.png
deleted file mode 100644
index 54cdf04c..00000000
Binary files a/data/images/old/m15RDFull.png and /dev/null differ
diff --git a/data/images/old/m15RDPT.png b/data/images/old/m15RDPT.png
deleted file mode 100644
index 46495d99..00000000
Binary files a/data/images/old/m15RDPT.png and /dev/null differ
diff --git a/data/images/old/m15RFlipCircle.png b/data/images/old/m15RFlipCircle.png
deleted file mode 100644
index 2dfa1b66..00000000
Binary files a/data/images/old/m15RFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15RFlipPT.png b/data/images/old/m15RFlipPT.png
deleted file mode 100644
index 233c39e3..00000000
Binary files a/data/images/old/m15RFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15RFull.png b/data/images/old/m15RFull.png
deleted file mode 100644
index 8e6a1956..00000000
Binary files a/data/images/old/m15RFull.png and /dev/null differ
diff --git a/data/images/old/m15RLDFull.png b/data/images/old/m15RLDFull.png
deleted file mode 100644
index 55c7356e..00000000
Binary files a/data/images/old/m15RLDFull.png and /dev/null differ
diff --git a/data/images/old/m15RLFlipPT.png b/data/images/old/m15RLFlipPT.png
deleted file mode 100644
index a3d73ee4..00000000
Binary files a/data/images/old/m15RLFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15RLFull.png b/data/images/old/m15RLFull.png
deleted file mode 100644
index feb21e20..00000000
Binary files a/data/images/old/m15RLFull.png and /dev/null differ
diff --git a/data/images/old/m15RLNyx.png b/data/images/old/m15RLNyx.png
deleted file mode 100644
index e4cc2d45..00000000
Binary files a/data/images/old/m15RLNyx.png and /dev/null differ
diff --git a/data/images/old/m15RLegendary.png b/data/images/old/m15RLegendary.png
deleted file mode 100644
index 40a2dc81..00000000
Binary files a/data/images/old/m15RLegendary.png and /dev/null differ
diff --git a/data/images/old/m15RMiracle.png b/data/images/old/m15RMiracle.png
deleted file mode 100644
index 0201c4d4..00000000
Binary files a/data/images/old/m15RMiracle.png and /dev/null differ
diff --git a/data/images/old/m15RNyx.png b/data/images/old/m15RNyx.png
deleted file mode 100644
index 03917c2c..00000000
Binary files a/data/images/old/m15RNyx.png and /dev/null differ
diff --git a/data/images/old/m15RPT.png b/data/images/old/m15RPT.png
deleted file mode 100644
index 255cf8b8..00000000
Binary files a/data/images/old/m15RPT.png and /dev/null differ
diff --git a/data/images/old/m15RRareStamp.png b/data/images/old/m15RRareStamp.png
deleted file mode 100644
index 3430bf60..00000000
Binary files a/data/images/old/m15RRareStamp.png and /dev/null differ
diff --git a/data/images/old/m15SorceryFlipIcon.png b/data/images/old/m15SorceryFlipIcon.png
deleted file mode 100644
index 24d3a40f..00000000
Binary files a/data/images/old/m15SorceryFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15StructureFlipIcon.png b/data/images/old/m15StructureFlipIcon.png
deleted file mode 100644
index 89ed9a4e..00000000
Binary files a/data/images/old/m15StructureFlipIcon.png and /dev/null differ
diff --git a/data/images/old/m15UDFull.png b/data/images/old/m15UDFull.png
deleted file mode 100644
index 8449f14f..00000000
Binary files a/data/images/old/m15UDFull.png and /dev/null differ
diff --git a/data/images/old/m15UDPT.png b/data/images/old/m15UDPT.png
deleted file mode 100644
index e7f6da44..00000000
Binary files a/data/images/old/m15UDPT.png and /dev/null differ
diff --git a/data/images/old/m15UFlipCircle.png b/data/images/old/m15UFlipCircle.png
deleted file mode 100644
index 775d2fc6..00000000
Binary files a/data/images/old/m15UFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15UFlipPT.png b/data/images/old/m15UFlipPT.png
deleted file mode 100644
index ae2e90c1..00000000
Binary files a/data/images/old/m15UFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15UFull.png b/data/images/old/m15UFull.png
deleted file mode 100644
index 3b4ef97d..00000000
Binary files a/data/images/old/m15UFull.png and /dev/null differ
diff --git a/data/images/old/m15ULDFull.png b/data/images/old/m15ULDFull.png
deleted file mode 100644
index 033fa138..00000000
Binary files a/data/images/old/m15ULDFull.png and /dev/null differ
diff --git a/data/images/old/m15ULFlipPT.png b/data/images/old/m15ULFlipPT.png
deleted file mode 100644
index abbc5fca..00000000
Binary files a/data/images/old/m15ULFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15ULFull.png b/data/images/old/m15ULFull.png
deleted file mode 100644
index 3d8b5bbe..00000000
Binary files a/data/images/old/m15ULFull.png and /dev/null differ
diff --git a/data/images/old/m15ULNyx.png b/data/images/old/m15ULNyx.png
deleted file mode 100644
index dc16994b..00000000
Binary files a/data/images/old/m15ULNyx.png and /dev/null differ
diff --git a/data/images/old/m15ULegendary.png b/data/images/old/m15ULegendary.png
deleted file mode 100644
index bf110216..00000000
Binary files a/data/images/old/m15ULegendary.png and /dev/null differ
diff --git a/data/images/old/m15UMiracle.png b/data/images/old/m15UMiracle.png
deleted file mode 100644
index a6e8603d..00000000
Binary files a/data/images/old/m15UMiracle.png and /dev/null differ
diff --git a/data/images/old/m15UNyx.png b/data/images/old/m15UNyx.png
deleted file mode 100644
index 06f224d0..00000000
Binary files a/data/images/old/m15UNyx.png and /dev/null differ
diff --git a/data/images/old/m15UPT.png b/data/images/old/m15UPT.png
deleted file mode 100644
index e9f38eea..00000000
Binary files a/data/images/old/m15UPT.png and /dev/null differ
diff --git a/data/images/old/m15URareStamp.png b/data/images/old/m15URareStamp.png
deleted file mode 100644
index f7ea61ae..00000000
Binary files a/data/images/old/m15URareStamp.png and /dev/null differ
diff --git a/data/images/old/m15VFull.png b/data/images/old/m15VFull.png
deleted file mode 100644
index 61b7da99..00000000
Binary files a/data/images/old/m15VFull.png and /dev/null differ
diff --git a/data/images/old/m15VPT.png b/data/images/old/m15VPT.png
deleted file mode 100644
index 218ae720..00000000
Binary files a/data/images/old/m15VPT.png and /dev/null differ
diff --git a/data/images/old/m15WDFull.png b/data/images/old/m15WDFull.png
deleted file mode 100644
index 4ee3066d..00000000
Binary files a/data/images/old/m15WDFull.png and /dev/null differ
diff --git a/data/images/old/m15WDPT.png b/data/images/old/m15WDPT.png
deleted file mode 100644
index 74820584..00000000
Binary files a/data/images/old/m15WDPT.png and /dev/null differ
diff --git a/data/images/old/m15WFlipCircle.png b/data/images/old/m15WFlipCircle.png
deleted file mode 100644
index fc7241f5..00000000
Binary files a/data/images/old/m15WFlipCircle.png and /dev/null differ
diff --git a/data/images/old/m15WFlipPT.png b/data/images/old/m15WFlipPT.png
deleted file mode 100644
index acb76fea..00000000
Binary files a/data/images/old/m15WFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15WFull.png b/data/images/old/m15WFull.png
deleted file mode 100644
index 55129369..00000000
Binary files a/data/images/old/m15WFull.png and /dev/null differ
diff --git a/data/images/old/m15WLDFull.png b/data/images/old/m15WLDFull.png
deleted file mode 100644
index 9f169b17..00000000
Binary files a/data/images/old/m15WLDFull.png and /dev/null differ
diff --git a/data/images/old/m15WLFlipPT.png b/data/images/old/m15WLFlipPT.png
deleted file mode 100644
index 8000d62c..00000000
Binary files a/data/images/old/m15WLFlipPT.png and /dev/null differ
diff --git a/data/images/old/m15WLFull.png b/data/images/old/m15WLFull.png
deleted file mode 100644
index 3e1014e9..00000000
Binary files a/data/images/old/m15WLFull.png and /dev/null differ
diff --git a/data/images/old/m15WLNyx.png b/data/images/old/m15WLNyx.png
deleted file mode 100644
index a98474b0..00000000
Binary files a/data/images/old/m15WLNyx.png and /dev/null differ
diff --git a/data/images/old/m15WLegendary.png b/data/images/old/m15WLegendary.png
deleted file mode 100644
index 12127180..00000000
Binary files a/data/images/old/m15WLegendary.png and /dev/null differ
diff --git a/data/images/old/m15WMiracle.png b/data/images/old/m15WMiracle.png
deleted file mode 100644
index 3ab228b0..00000000
Binary files a/data/images/old/m15WMiracle.png and /dev/null differ
diff --git a/data/images/old/m15WNyx.png b/data/images/old/m15WNyx.png
deleted file mode 100644
index 420291cb..00000000
Binary files a/data/images/old/m15WNyx.png and /dev/null differ
diff --git a/data/images/old/m15WPT.png b/data/images/old/m15WPT.png
deleted file mode 100644
index 6480a390..00000000
Binary files a/data/images/old/m15WPT.png and /dev/null differ
diff --git a/data/images/old/m15WRareStamp.png b/data/images/old/m15WRareStamp.png
deleted file mode 100644
index bd677a7d..00000000
Binary files a/data/images/old/m15WRareStamp.png and /dev/null differ
diff --git a/data/images/old/stamp.png b/data/images/old/stamp.png
deleted file mode 100644
index e0561ee3..00000000
Binary files a/data/images/old/stamp.png and /dev/null differ
diff --git a/data/scripts/main.js b/data/scripts/main.js
index e20cde18..bb53a3c2 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -887,9 +887,9 @@ loadSampleImages()
-function loadPlaneswalkerFrames() {
- changeVersionTo("planeswalker");
-}
+//function loadPlaneswalkerFrames() {
+// changeVersionTo("planeswalker");
+//}
function filterFramePicker(classToShow) {
var framePickerList = document.getElementsByClassName("frameOption")
@@ -925,7 +925,18 @@ function loadSampleImages() {
-
+function toggleFrameOptionVisibility() {
+ var frameOptionList = document.getElementsByClassName("frameOption")
+ if (document.getElementById("inputCheckboxHideFrames").checked) {
+ for (var i = 0; i < frameOptionList.length; i ++) {
+ frameOptionList[i].classList.remove("visibilityOverride");
+ }
+ } else {
+ for (var i = 0; i < frameOptionList.length; i ++) {
+ frameOptionList[i].classList.add("visibilityOverride");
+ }
+ }
+}
diff --git a/data/site/styles.css b/data/site/styles.css
index ef84df02..2fc084e2 100644
--- a/data/site/styles.css
+++ b/data/site/styles.css
@@ -173,7 +173,7 @@ canvas {
/*General modifications*/
-.hidden {
+.hidden:not(.visibilityOverride) {
display: none;
}
.visible {
@@ -480,4 +480,3 @@ input[type="checkbox"], .frameOption, .maskOption, .button {
-
diff --git a/data/versions/expedition.js b/data/versions/expedition.js
new file mode 100644
index 00000000..6ab915ae
--- /dev/null
+++ b/data/versions/expedition.js
@@ -0,0 +1,34 @@
+//============================================//
+// Card Conjurer, by Kyle Burton //
+//============================================//
+version.currentVersion = "expedition"
+version.artX = scale(58)
+version.artY = scale(118)
+version.setSymbolRight = scale(687)
+version.setSymbolVertical = scale(872)
+version.setSymbolWidth = scale(90)
+version.setSymbolHeight = scale(42)
+version.bottomInfoFunction = "m15BottomInfo"
+version.manaCostX = scale(653)
+version.manaCostY = scale(54)
+version.manaCostDiameter = scale(34)
+version.manaCostDistance = scale(-38)
+version.manaCostDirection = "horizontal"
+version.watermarkWidth = scale(520)
+version.watermarkHeight = scale(250)
+version.watermarkY = scale(800)
+version.masksToAdd = ["Title Expedition", "Type Expedition", "Rules Text Expedition", "Pinline Expedition"]
+filterFramePicker("frameClassExpedition")
+//Name, text, x, y, width, height, font, size, color, other, alternative-function
+version.textList = [
+ ["Title", "", scale(64), scale(77), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],
+ ["Type", "", scale(64), scale(875), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],
+ ["Rules Text", "", scale(64), scale(729), scale(616), scale(0), "mplantin", 38, "black", "lineSpace=0.97"]/*,
+ ["Power Toughness", "", scale(587), scale(958), scale(110), 0, "belerenb", 38, "black", "oneLine=true,textAlign='center'"]*/
+]
+if (!version.addedExpedition) {
+ version.addedExpedition = true
+}
+
+m15BottomInfo()
+finishChangingVersion("data/images/expedition/expeditionCSV.csv")
diff --git a/data/versions/m15extras.js b/data/versions/m15extras.js
new file mode 100644
index 00000000..95305c0a
--- /dev/null
+++ b/data/versions/m15extras.js
@@ -0,0 +1,31 @@
+//============================================//
+// Card Conjurer, by Kyle Burton //
+//============================================//
+version.currentVersion = "m15"
+version.artX = scale(58)
+version.artY = scale(118)
+version.setSymbolRight = scale(684)
+version.setSymbolVertical = scale(614)
+version.setSymbolWidth = scale(90)
+version.setSymbolHeight = scale(40)
+version.bottomInfoFunction = "m15BottomInfo"
+version.manaCostX = scale(653)
+version.manaCostY = scale(60)
+version.manaCostDiameter = scale(34)
+version.manaCostDistance = scale(-38)
+version.manaCostDirection = "horizontal"
+version.watermarkWidth = scale(520)
+version.watermarkHeight = scale(250)
+version.watermarkY = scale(800)
+version.masksToAdd = []
+//Name, text, x, y, width, height, font, size, color, other
+version.textList = [
+ ["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],
+ ["Type", "", scale(64), scale(615), scale(630), 0, "belerenb", 33, "black", "oneLine=true"],
+ ["Rules Text", "", scale(64), scale(662), scale(616), scale(292), "mplantin", 38, "black", "lineSpace=0.97"],
+ ["Power Toughness", "", scale(587), scale(958), scale(110), 0, "belerenb", 38, "black", "oneLine=true,textAlign='center'"]/*,
+ ["Flip PT", "", scale(588), scale(902), scale(100), 0, "belerenb", 28, "#666", "oneLine=true,textAlign='right'"]*/
+]
+m15BottomInfo()
+finishChangingVersion("data/images/m15Extras/m15ExtrasCSV.csv")
+
diff --git a/disclaimer.html b/disclaimer.html
index 5abb2698..2e306c92 100644
--- a/disclaimer.html
+++ b/disclaimer.html
@@ -22,7 +22,7 @@
Most of the card frames were created by the following:
- Kentu, Narb777, CXA26843, FPM, Xander, Chrome Kaldra, CBG, Trancebam, Larme, RoblinTheGoblin, and White Dragon.
+ Kentu, Narb777, CXA26843, FPM, Xander, Chrome Kaldra, CBG, Trancebam, Larme, RoblinTheGoblin, White Dragon, and Timmy XD69.