diff --git a/data/borders/fullArtLandUnstable/border.js b/data/borders/fullArtLandUnstable/border.js
index 013378cc..375fd7fd 100644
--- a/data/borders/fullArtLandUnstable/border.js
+++ b/data/borders/fullArtLandUnstable/border.js
@@ -1,54 +1,14 @@
-//Unstable Full Art Basic Land Border
-//Anything to do with...
-//Loading Images
-imgFrameMask.src = borderPath + "frameMask.png"
-imgBorderMask.src = borderPath + "borderMask.png"
-//Card Title
-document.getElementById("inputTitleColor").value = "#ffffff"
-var titleFont = "40px belerenb"
-var titleFontSpacing = "0.1px"
-var titleX = cardWidth / 2
-var titleY = 17
-var titleAlign = "center"
-//Mana Cost
-var manaCostRadius = 17.5
-var manaCostX = 657
-var manaCostY = 17
-//Card Type
-var typeFont = "33.5px belerenb"
-var typeFontSpacing = "0.05px"
-var typeX = cardWidth / 2
-var typeY = 1000
-var typeAlign = "center"
-//Rules/Flavor Text
-var textFont = "px mplantin"
-var textFontSpacing = 0.7
-var textX = 89
-var textY = 123
-var textWidth = 660
-//Bottom Info
-var infoY = 999
-//Set Symbol
-var setSymbolY = 82
-var setSymbolRight = cardWidth / 2
-var setSymbolWidth = 66
-var setSymbolHeight = 44
-var centerSetSymbol = 2
-//Watermark
-var watermarkWidth = 520
-var watermarkHeight = 250
-var watermarkY = 805
-//Color Options
-loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,colorless-Colorless")
-document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
-//Other
-var thirdBorder = false
-var creatureBorder = false
-var stampBorder = true
-var transparentBorder = true
-var artX = 0
-var artY = 0
-//With all the new values in place, the program will update it's border images
-finishTemplate()
-//Any special functions go at the bottom
-var uniqueFunctionName = "bottomInfoM15"
\ No newline at end of file
+//============================================//
+//                 M15 Border                 //
+//============================================//
+//Restores default values
+cardData = defaultCardData
+//Restores default masks
+for (var i = 0; i < frameMaskList.length; i++) {
+	if (window[frameMaskList[i]].src.includes("data/borders/m15/" + frameMaskList[i] + ".png") == false) {
+		window[frameMaskList[i]].load("data/borders/m15/" + frameMaskList[i] + ".png")
+	}
+}
+//Loads the colors
+loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless,vehicle-Vehicle,clear-Clear,whiteLand-White Land,blueLand-Blue Land,blackLand-Black Land,redLand-Red Land,greenLand-Green Land,goldLand-Gold Land,colorlessLand-Colorless Land")
+//Changes anything needed to be changed
\ No newline at end of file
diff --git a/data/borders/fullArtLandUnstable/imgArtMask.png b/data/borders/fullArtLandUnstable/imgArtMask.png
new file mode 100644
index 00000000..25e0793e
Binary files /dev/null and b/data/borders/fullArtLandUnstable/imgArtMask.png differ
diff --git a/data/borders/fullArtLandUnstable/imgBorderMask.png b/data/borders/fullArtLandUnstable/imgBorderMask.png
new file mode 100644
index 00000000..c86b31c8
Binary files /dev/null and b/data/borders/fullArtLandUnstable/imgBorderMask.png differ
diff --git a/data/borders/fullArtLandUnstable/imgFrameMask.png b/data/borders/fullArtLandUnstable/imgFrameMask.png
new file mode 100644
index 00000000..d322726b
Binary files /dev/null and b/data/borders/fullArtLandUnstable/imgFrameMask.png differ
diff --git a/data/borders/fullArtLandUnstable/imgPinlineMask.png b/data/borders/fullArtLandUnstable/imgPinlineMask.png
new file mode 100644
index 00000000..dfc09863
Binary files /dev/null and b/data/borders/fullArtLandUnstable/imgPinlineMask.png differ
diff --git a/data/borders/bar.png b/data/borders/imgBar.png
similarity index 100%
rename from data/borders/bar.png
rename to data/borders/imgBar.png
diff --git a/data/borders/imgWhite.png b/data/borders/imgWhite.png
new file mode 100644
index 00000000..dc5a130e
Binary files /dev/null and b/data/borders/imgWhite.png differ
diff --git a/data/borders/m15old/artifact/frame.png b/data/borders/m15/artifact/frame.png
similarity index 100%
rename from data/borders/m15old/artifact/frame.png
rename to data/borders/m15/artifact/frame.png
diff --git a/data/borders/m15old/artifact/legendary.png b/data/borders/m15/artifact/legendary.png
similarity index 100%
rename from data/borders/m15old/artifact/legendary.png
rename to data/borders/m15/artifact/legendary.png
diff --git a/data/borders/m15old/artifact/miracle.png b/data/borders/m15/artifact/miracle.png
similarity index 100%
rename from data/borders/m15old/artifact/miracle.png
rename to data/borders/m15/artifact/miracle.png
diff --git a/data/borders/m15old/artifact/nyx.png b/data/borders/m15/artifact/nyx.png
similarity index 100%
rename from data/borders/m15old/artifact/nyx.png
rename to data/borders/m15/artifact/nyx.png
diff --git a/data/borders/m15old/artifact/pt.png b/data/borders/m15/artifact/pt.png
similarity index 100%
rename from data/borders/m15old/artifact/pt.png
rename to data/borders/m15/artifact/pt.png
diff --git a/data/borders/m15old/artifact/stamp.png b/data/borders/m15/artifact/stamp.png
similarity index 100%
rename from data/borders/m15old/artifact/stamp.png
rename to data/borders/m15/artifact/stamp.png
diff --git a/data/borders/m15/black/frame.png b/data/borders/m15/black/frame.png
index 4e197eb0..f5bc1d60 100644
Binary files a/data/borders/m15/black/frame.png and b/data/borders/m15/black/frame.png differ
diff --git a/data/borders/m15old/black/legendary.png b/data/borders/m15/black/legendary.png
similarity index 100%
rename from data/borders/m15old/black/legendary.png
rename to data/borders/m15/black/legendary.png
diff --git a/data/borders/m15old/blackLand/miracle.png b/data/borders/m15/black/miracle.png
similarity index 100%
rename from data/borders/m15old/blackLand/miracle.png
rename to data/borders/m15/black/miracle.png
diff --git a/data/borders/m15old/blackLand/nyx.png b/data/borders/m15/black/nyx.png
similarity index 100%
rename from data/borders/m15old/blackLand/nyx.png
rename to data/borders/m15/black/nyx.png
diff --git a/data/borders/m15old/black/pt.png b/data/borders/m15/black/pt.png
similarity index 100%
rename from data/borders/m15old/black/pt.png
rename to data/borders/m15/black/pt.png
diff --git a/data/borders/m15old/blackLand/stamp.png b/data/borders/m15/black/stamp.png
similarity index 100%
rename from data/borders/m15old/blackLand/stamp.png
rename to data/borders/m15/black/stamp.png
diff --git a/data/borders/m15old/blackLand/frame.png b/data/borders/m15/blackLand/frame.png
similarity index 100%
rename from data/borders/m15old/blackLand/frame.png
rename to data/borders/m15/blackLand/frame.png
diff --git a/data/borders/m15old/blackLand/legendary.png b/data/borders/m15/blackLand/legendary.png
similarity index 100%
rename from data/borders/m15old/blackLand/legendary.png
rename to data/borders/m15/blackLand/legendary.png
diff --git a/data/borders/m15/blackLand/miracle.png b/data/borders/m15/blackLand/miracle.png
new file mode 100644
index 00000000..5855c9aa
Binary files /dev/null and b/data/borders/m15/blackLand/miracle.png differ
diff --git a/data/borders/m15/blackLand/nyx.png b/data/borders/m15/blackLand/nyx.png
new file mode 100644
index 00000000..5cf62019
Binary files /dev/null and b/data/borders/m15/blackLand/nyx.png differ
diff --git a/data/borders/m15old/blackLand/pt.png b/data/borders/m15/blackLand/pt.png
similarity index 100%
rename from data/borders/m15old/blackLand/pt.png
rename to data/borders/m15/blackLand/pt.png
diff --git a/data/borders/m15/blackLand/stamp.png b/data/borders/m15/blackLand/stamp.png
new file mode 100644
index 00000000..eb8a2458
Binary files /dev/null and b/data/borders/m15/blackLand/stamp.png differ
diff --git a/data/borders/m15/blue/frame.png b/data/borders/m15/blue/frame.png
index ed6a39d0..3b4ef97d 100644
Binary files a/data/borders/m15/blue/frame.png and b/data/borders/m15/blue/frame.png differ
diff --git a/data/borders/m15old/blue/legendary.png b/data/borders/m15/blue/legendary.png
similarity index 100%
rename from data/borders/m15old/blue/legendary.png
rename to data/borders/m15/blue/legendary.png
diff --git a/data/borders/m15old/blue/miracle.png b/data/borders/m15/blue/miracle.png
similarity index 100%
rename from data/borders/m15old/blue/miracle.png
rename to data/borders/m15/blue/miracle.png
diff --git a/data/borders/m15old/blue/nyx.png b/data/borders/m15/blue/nyx.png
similarity index 100%
rename from data/borders/m15old/blue/nyx.png
rename to data/borders/m15/blue/nyx.png
diff --git a/data/borders/m15old/blue/pt.png b/data/borders/m15/blue/pt.png
similarity index 100%
rename from data/borders/m15old/blue/pt.png
rename to data/borders/m15/blue/pt.png
diff --git a/data/borders/m15old/blue/stamp.png b/data/borders/m15/blue/stamp.png
similarity index 100%
rename from data/borders/m15old/blue/stamp.png
rename to data/borders/m15/blue/stamp.png
diff --git a/data/borders/m15old/blueLand/frame.png b/data/borders/m15/blueLand/frame.png
similarity index 100%
rename from data/borders/m15old/blueLand/frame.png
rename to data/borders/m15/blueLand/frame.png
diff --git a/data/borders/m15old/blueLand/legendary.png b/data/borders/m15/blueLand/legendary.png
similarity index 100%
rename from data/borders/m15old/blueLand/legendary.png
rename to data/borders/m15/blueLand/legendary.png
diff --git a/data/borders/m15old/blueLand/miracle.png b/data/borders/m15/blueLand/miracle.png
similarity index 100%
rename from data/borders/m15old/blueLand/miracle.png
rename to data/borders/m15/blueLand/miracle.png
diff --git a/data/borders/m15old/blueLand/nyx.png b/data/borders/m15/blueLand/nyx.png
similarity index 100%
rename from data/borders/m15old/blueLand/nyx.png
rename to data/borders/m15/blueLand/nyx.png
diff --git a/data/borders/m15old/blueLand/pt.png b/data/borders/m15/blueLand/pt.png
similarity index 100%
rename from data/borders/m15old/blueLand/pt.png
rename to data/borders/m15/blueLand/pt.png
diff --git a/data/borders/m15old/blueLand/stamp.png b/data/borders/m15/blueLand/stamp.png
similarity index 100%
rename from data/borders/m15old/blueLand/stamp.png
rename to data/borders/m15/blueLand/stamp.png
diff --git a/data/borders/m15/border.js b/data/borders/m15/border.js
new file mode 100644
index 00000000..375fd7fd
--- /dev/null
+++ b/data/borders/m15/border.js
@@ -0,0 +1,14 @@
+//============================================//
+//                 M15 Border                 //
+//============================================//
+//Restores default values
+cardData = defaultCardData
+//Restores default masks
+for (var i = 0; i < frameMaskList.length; i++) {
+	if (window[frameMaskList[i]].src.includes("data/borders/m15/" + frameMaskList[i] + ".png") == false) {
+		window[frameMaskList[i]].load("data/borders/m15/" + frameMaskList[i] + ".png")
+	}
+}
+//Loads the colors
+loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless,vehicle-Vehicle,clear-Clear,whiteLand-White Land,blueLand-Blue Land,blackLand-Black Land,redLand-Red Land,greenLand-Green Land,goldLand-Gold Land,colorlessLand-Colorless Land")
+//Changes anything needed to be changed
\ No newline at end of file
diff --git a/data/borders/m15old/clear/frame.png b/data/borders/m15/clear/frame.png
similarity index 100%
rename from data/borders/m15old/clear/frame.png
rename to data/borders/m15/clear/frame.png
diff --git a/data/borders/m15old/clear/legendary.png b/data/borders/m15/clear/legendary.png
similarity index 100%
rename from data/borders/m15old/clear/legendary.png
rename to data/borders/m15/clear/legendary.png
diff --git a/data/borders/m15old/clear/miracle.png b/data/borders/m15/clear/miracle.png
similarity index 100%
rename from data/borders/m15old/clear/miracle.png
rename to data/borders/m15/clear/miracle.png
diff --git a/data/borders/m15old/clear/nyx.png b/data/borders/m15/clear/nyx.png
similarity index 100%
rename from data/borders/m15old/clear/nyx.png
rename to data/borders/m15/clear/nyx.png
diff --git a/data/borders/m15old/clear/pt.png b/data/borders/m15/clear/pt.png
similarity index 100%
rename from data/borders/m15old/clear/pt.png
rename to data/borders/m15/clear/pt.png
diff --git a/data/borders/m15old/clear/stamp.png b/data/borders/m15/clear/stamp.png
similarity index 100%
rename from data/borders/m15old/clear/stamp.png
rename to data/borders/m15/clear/stamp.png
diff --git a/data/borders/m15old/colorless/frame.png b/data/borders/m15/colorless/frame.png
similarity index 100%
rename from data/borders/m15old/colorless/frame.png
rename to data/borders/m15/colorless/frame.png
diff --git a/data/borders/m15old/colorless/legendary.png b/data/borders/m15/colorless/legendary.png
similarity index 100%
rename from data/borders/m15old/colorless/legendary.png
rename to data/borders/m15/colorless/legendary.png
diff --git a/data/borders/m15old/colorless/miracle.png b/data/borders/m15/colorless/miracle.png
similarity index 100%
rename from data/borders/m15old/colorless/miracle.png
rename to data/borders/m15/colorless/miracle.png
diff --git a/data/borders/m15old/colorless/nyx.png b/data/borders/m15/colorless/nyx.png
similarity index 100%
rename from data/borders/m15old/colorless/nyx.png
rename to data/borders/m15/colorless/nyx.png
diff --git a/data/borders/m15old/colorless/pt.png b/data/borders/m15/colorless/pt.png
similarity index 100%
rename from data/borders/m15old/colorless/pt.png
rename to data/borders/m15/colorless/pt.png
diff --git a/data/borders/m15old/colorless/stamp.png b/data/borders/m15/colorless/stamp.png
similarity index 100%
rename from data/borders/m15old/colorless/stamp.png
rename to data/borders/m15/colorless/stamp.png
diff --git a/data/borders/m15old/colorlessLand/frame.png b/data/borders/m15/colorlessLand/frame.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/frame.png
rename to data/borders/m15/colorlessLand/frame.png
diff --git a/data/borders/m15old/colorlessLand/legendary.png b/data/borders/m15/colorlessLand/legendary.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/legendary.png
rename to data/borders/m15/colorlessLand/legendary.png
diff --git a/data/borders/m15old/colorlessLand/miracle.png b/data/borders/m15/colorlessLand/miracle.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/miracle.png
rename to data/borders/m15/colorlessLand/miracle.png
diff --git a/data/borders/m15old/colorlessLand/nyx.png b/data/borders/m15/colorlessLand/nyx.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/nyx.png
rename to data/borders/m15/colorlessLand/nyx.png
diff --git a/data/borders/m15old/colorlessLand/pt.png b/data/borders/m15/colorlessLand/pt.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/pt.png
rename to data/borders/m15/colorlessLand/pt.png
diff --git a/data/borders/m15old/colorlessLand/stamp.png b/data/borders/m15/colorlessLand/stamp.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/stamp.png
rename to data/borders/m15/colorlessLand/stamp.png
diff --git a/data/borders/m15old/gold/frame.png b/data/borders/m15/gold/frame.png
similarity index 100%
rename from data/borders/m15old/gold/frame.png
rename to data/borders/m15/gold/frame.png
diff --git a/data/borders/m15old/gold/legendary.png b/data/borders/m15/gold/legendary.png
similarity index 100%
rename from data/borders/m15old/gold/legendary.png
rename to data/borders/m15/gold/legendary.png
diff --git a/data/borders/m15old/gold/miracle.png b/data/borders/m15/gold/miracle.png
similarity index 100%
rename from data/borders/m15old/gold/miracle.png
rename to data/borders/m15/gold/miracle.png
diff --git a/data/borders/m15old/gold/nyx.png b/data/borders/m15/gold/nyx.png
similarity index 100%
rename from data/borders/m15old/gold/nyx.png
rename to data/borders/m15/gold/nyx.png
diff --git a/data/borders/m15old/gold/pt.png b/data/borders/m15/gold/pt.png
similarity index 100%
rename from data/borders/m15old/gold/pt.png
rename to data/borders/m15/gold/pt.png
diff --git a/data/borders/m15old/gold/stamp.png b/data/borders/m15/gold/stamp.png
similarity index 100%
rename from data/borders/m15old/gold/stamp.png
rename to data/borders/m15/gold/stamp.png
diff --git a/data/borders/m15old/goldLand/frame.png b/data/borders/m15/goldLand/frame.png
similarity index 100%
rename from data/borders/m15old/goldLand/frame.png
rename to data/borders/m15/goldLand/frame.png
diff --git a/data/borders/m15/goldLand/legendary.png b/data/borders/m15/goldLand/legendary.png
new file mode 100644
index 00000000..c6328cdf
Binary files /dev/null and b/data/borders/m15/goldLand/legendary.png differ
diff --git a/data/borders/m15old/goldLand/miracle.png b/data/borders/m15/goldLand/miracle.png
similarity index 100%
rename from data/borders/m15old/goldLand/miracle.png
rename to data/borders/m15/goldLand/miracle.png
diff --git a/data/borders/m15old/goldLand/nyx.png b/data/borders/m15/goldLand/nyx.png
similarity index 100%
rename from data/borders/m15old/goldLand/nyx.png
rename to data/borders/m15/goldLand/nyx.png
diff --git a/data/borders/m15old/goldLand/pt.png b/data/borders/m15/goldLand/pt.png
similarity index 100%
rename from data/borders/m15old/goldLand/pt.png
rename to data/borders/m15/goldLand/pt.png
diff --git a/data/borders/m15old/goldLand/stamp.png b/data/borders/m15/goldLand/stamp.png
similarity index 100%
rename from data/borders/m15old/goldLand/stamp.png
rename to data/borders/m15/goldLand/stamp.png
diff --git a/data/borders/m15/green/frame.png b/data/borders/m15/green/frame.png
index 4994ffe2..cdf92e69 100644
Binary files a/data/borders/m15/green/frame.png and b/data/borders/m15/green/frame.png differ
diff --git a/data/borders/m15old/green/legendary.png b/data/borders/m15/green/legendary.png
similarity index 100%
rename from data/borders/m15old/green/legendary.png
rename to data/borders/m15/green/legendary.png
diff --git a/data/borders/m15old/green/miracle.png b/data/borders/m15/green/miracle.png
similarity index 100%
rename from data/borders/m15old/green/miracle.png
rename to data/borders/m15/green/miracle.png
diff --git a/data/borders/m15old/green/nyx.png b/data/borders/m15/green/nyx.png
similarity index 100%
rename from data/borders/m15old/green/nyx.png
rename to data/borders/m15/green/nyx.png
diff --git a/data/borders/m15old/green/pt.png b/data/borders/m15/green/pt.png
similarity index 100%
rename from data/borders/m15old/green/pt.png
rename to data/borders/m15/green/pt.png
diff --git a/data/borders/m15old/green/stamp.png b/data/borders/m15/green/stamp.png
similarity index 100%
rename from data/borders/m15old/green/stamp.png
rename to data/borders/m15/green/stamp.png
diff --git a/data/borders/m15old/greenLand/frame.png b/data/borders/m15/greenLand/frame.png
similarity index 100%
rename from data/borders/m15old/greenLand/frame.png
rename to data/borders/m15/greenLand/frame.png
diff --git a/data/borders/m15/greenLand/legendary.png b/data/borders/m15/greenLand/legendary.png
new file mode 100644
index 00000000..a37d48fd
Binary files /dev/null and b/data/borders/m15/greenLand/legendary.png differ
diff --git a/data/borders/m15old/greenLand/miracle.png b/data/borders/m15/greenLand/miracle.png
similarity index 100%
rename from data/borders/m15old/greenLand/miracle.png
rename to data/borders/m15/greenLand/miracle.png
diff --git a/data/borders/m15old/greenLand/nyx.png b/data/borders/m15/greenLand/nyx.png
similarity index 100%
rename from data/borders/m15old/greenLand/nyx.png
rename to data/borders/m15/greenLand/nyx.png
diff --git a/data/borders/m15old/greenLand/pt.png b/data/borders/m15/greenLand/pt.png
similarity index 100%
rename from data/borders/m15old/greenLand/pt.png
rename to data/borders/m15/greenLand/pt.png
diff --git a/data/borders/m15old/greenLand/stamp.png b/data/borders/m15/greenLand/stamp.png
similarity index 100%
rename from data/borders/m15old/greenLand/stamp.png
rename to data/borders/m15/greenLand/stamp.png
diff --git a/data/borders/m15/imgArtMask.png b/data/borders/m15/imgArtMask.png
index 04987b35..39b863e1 100644
Binary files a/data/borders/m15/imgArtMask.png and b/data/borders/m15/imgArtMask.png differ
diff --git a/data/borders/m15/imgBorderMask.png b/data/borders/m15/imgBorderMask.png
index 255aa736..6b53fbbd 100644
Binary files a/data/borders/m15/imgBorderMask.png and b/data/borders/m15/imgBorderMask.png differ
diff --git a/data/borders/m15/imgFrameMask.png b/data/borders/m15/imgFrameMask.png
index cb8d8ee1..4de53f90 100644
Binary files a/data/borders/m15/imgFrameMask.png and b/data/borders/m15/imgFrameMask.png differ
diff --git a/data/borders/m15/imgPinlineMask.png b/data/borders/m15/imgPinlineMask.png
index bbb38713..d66c59f3 100644
Binary files a/data/borders/m15/imgPinlineMask.png and b/data/borders/m15/imgPinlineMask.png differ
diff --git a/data/borders/m15/imgRulesMask.png b/data/borders/m15/imgRulesMask.png
index f526d6fe..44f1d49e 100644
Binary files a/data/borders/m15/imgRulesMask.png and b/data/borders/m15/imgRulesMask.png differ
diff --git a/data/borders/m15/imgTitleMask.png b/data/borders/m15/imgTitleMask.png
index 5d0c1ea1..7fcf1da7 100644
Binary files a/data/borders/m15/imgTitleMask.png and b/data/borders/m15/imgTitleMask.png differ
diff --git a/data/borders/m15/imgTypeMask.png b/data/borders/m15/imgTypeMask.png
index 13c575ec..26c8af68 100644
Binary files a/data/borders/m15/imgTypeMask.png and b/data/borders/m15/imgTypeMask.png differ
diff --git a/data/borders/m15/red/frame.png b/data/borders/m15/red/frame.png
index 950471bb..8e6a1956 100644
Binary files a/data/borders/m15/red/frame.png and b/data/borders/m15/red/frame.png differ
diff --git a/data/borders/m15old/red/legendary.png b/data/borders/m15/red/legendary.png
similarity index 100%
rename from data/borders/m15old/red/legendary.png
rename to data/borders/m15/red/legendary.png
diff --git a/data/borders/m15old/red/miracle.png b/data/borders/m15/red/miracle.png
similarity index 100%
rename from data/borders/m15old/red/miracle.png
rename to data/borders/m15/red/miracle.png
diff --git a/data/borders/m15old/red/nyx.png b/data/borders/m15/red/nyx.png
similarity index 100%
rename from data/borders/m15old/red/nyx.png
rename to data/borders/m15/red/nyx.png
diff --git a/data/borders/m15old/red/pt.png b/data/borders/m15/red/pt.png
similarity index 100%
rename from data/borders/m15old/red/pt.png
rename to data/borders/m15/red/pt.png
diff --git a/data/borders/m15old/red/stamp.png b/data/borders/m15/red/stamp.png
similarity index 100%
rename from data/borders/m15old/red/stamp.png
rename to data/borders/m15/red/stamp.png
diff --git a/data/borders/m15old/redLand/frame.png b/data/borders/m15/redLand/frame.png
similarity index 100%
rename from data/borders/m15old/redLand/frame.png
rename to data/borders/m15/redLand/frame.png
diff --git a/data/borders/m15/redLand/legendary.png b/data/borders/m15/redLand/legendary.png
new file mode 100644
index 00000000..9d32d2b0
Binary files /dev/null and b/data/borders/m15/redLand/legendary.png differ
diff --git a/data/borders/m15old/redLand/miracle.png b/data/borders/m15/redLand/miracle.png
similarity index 100%
rename from data/borders/m15old/redLand/miracle.png
rename to data/borders/m15/redLand/miracle.png
diff --git a/data/borders/m15old/redLand/nyx.png b/data/borders/m15/redLand/nyx.png
similarity index 100%
rename from data/borders/m15old/redLand/nyx.png
rename to data/borders/m15/redLand/nyx.png
diff --git a/data/borders/m15old/redLand/pt.png b/data/borders/m15/redLand/pt.png
similarity index 100%
rename from data/borders/m15old/redLand/pt.png
rename to data/borders/m15/redLand/pt.png
diff --git a/data/borders/m15old/redLand/stamp.png b/data/borders/m15/redLand/stamp.png
similarity index 100%
rename from data/borders/m15old/redLand/stamp.png
rename to data/borders/m15/redLand/stamp.png
diff --git a/data/borders/m15old/vehicle/frame.png b/data/borders/m15/vehicle/frame.png
similarity index 100%
rename from data/borders/m15old/vehicle/frame.png
rename to data/borders/m15/vehicle/frame.png
diff --git a/data/borders/m15/vehicle/legendary.png b/data/borders/m15/vehicle/legendary.png
new file mode 100644
index 00000000..988f7c73
Binary files /dev/null and b/data/borders/m15/vehicle/legendary.png differ
diff --git a/data/borders/m15old/vehicle/miracle.png b/data/borders/m15/vehicle/miracle.png
similarity index 100%
rename from data/borders/m15old/vehicle/miracle.png
rename to data/borders/m15/vehicle/miracle.png
diff --git a/data/borders/m15old/vehicle/nyx.png b/data/borders/m15/vehicle/nyx.png
similarity index 100%
rename from data/borders/m15old/vehicle/nyx.png
rename to data/borders/m15/vehicle/nyx.png
diff --git a/data/borders/m15old/vehicle/pt.png b/data/borders/m15/vehicle/pt.png
similarity index 100%
rename from data/borders/m15old/vehicle/pt.png
rename to data/borders/m15/vehicle/pt.png
diff --git a/data/borders/m15old/vehicle/stamp.png b/data/borders/m15/vehicle/stamp.png
similarity index 100%
rename from data/borders/m15old/vehicle/stamp.png
rename to data/borders/m15/vehicle/stamp.png
diff --git a/data/borders/m15/white/frame.png b/data/borders/m15/white/frame.png
index 857bdcd6..55129369 100644
Binary files a/data/borders/m15/white/frame.png and b/data/borders/m15/white/frame.png differ
diff --git a/data/borders/m15old/white/legendary.png b/data/borders/m15/white/legendary.png
similarity index 100%
rename from data/borders/m15old/white/legendary.png
rename to data/borders/m15/white/legendary.png
diff --git a/data/borders/m15old/white/miracle.png b/data/borders/m15/white/miracle.png
similarity index 100%
rename from data/borders/m15old/white/miracle.png
rename to data/borders/m15/white/miracle.png
diff --git a/data/borders/m15old/white/nyx.png b/data/borders/m15/white/nyx.png
similarity index 100%
rename from data/borders/m15old/white/nyx.png
rename to data/borders/m15/white/nyx.png
diff --git a/data/borders/m15old/white/pt.png b/data/borders/m15/white/pt.png
similarity index 100%
rename from data/borders/m15old/white/pt.png
rename to data/borders/m15/white/pt.png
diff --git a/data/borders/m15old/white/stamp.png b/data/borders/m15/white/stamp.png
similarity index 100%
rename from data/borders/m15old/white/stamp.png
rename to data/borders/m15/white/stamp.png
diff --git a/data/borders/m15old/whiteLand/frame.png b/data/borders/m15/whiteLand/frame.png
similarity index 100%
rename from data/borders/m15old/whiteLand/frame.png
rename to data/borders/m15/whiteLand/frame.png
diff --git a/data/borders/m15/whiteLand/legendary.png b/data/borders/m15/whiteLand/legendary.png
new file mode 100644
index 00000000..c38f942f
Binary files /dev/null and b/data/borders/m15/whiteLand/legendary.png differ
diff --git a/data/borders/m15old/whiteLand/miracle.png b/data/borders/m15/whiteLand/miracle.png
similarity index 100%
rename from data/borders/m15old/whiteLand/miracle.png
rename to data/borders/m15/whiteLand/miracle.png
diff --git a/data/borders/m15old/whiteLand/nyx.png b/data/borders/m15/whiteLand/nyx.png
similarity index 100%
rename from data/borders/m15old/whiteLand/nyx.png
rename to data/borders/m15/whiteLand/nyx.png
diff --git a/data/borders/m15old/whiteLand/pt.png b/data/borders/m15/whiteLand/pt.png
similarity index 100%
rename from data/borders/m15old/whiteLand/pt.png
rename to data/borders/m15/whiteLand/pt.png
diff --git a/data/borders/m15old/whiteLand/stamp.png b/data/borders/m15/whiteLand/stamp.png
similarity index 100%
rename from data/borders/m15old/whiteLand/stamp.png
rename to data/borders/m15/whiteLand/stamp.png
diff --git a/data/borders/8th/artMask.png b/data/borders/old/8th/artMask.png
similarity index 100%
rename from data/borders/8th/artMask.png
rename to data/borders/old/8th/artMask.png
diff --git a/data/borders/8th/artifact/frame.png b/data/borders/old/8th/artifact/frame.png
similarity index 100%
rename from data/borders/8th/artifact/frame.png
rename to data/borders/old/8th/artifact/frame.png
diff --git a/data/borders/8th/artifact/pt.png b/data/borders/old/8th/artifact/pt.png
similarity index 100%
rename from data/borders/8th/artifact/pt.png
rename to data/borders/old/8th/artifact/pt.png
diff --git a/data/borders/8th/black/frame.png b/data/borders/old/8th/black/frame.png
similarity index 100%
rename from data/borders/8th/black/frame.png
rename to data/borders/old/8th/black/frame.png
diff --git a/data/borders/8th/black/pt.png b/data/borders/old/8th/black/pt.png
similarity index 100%
rename from data/borders/8th/black/pt.png
rename to data/borders/old/8th/black/pt.png
diff --git a/data/borders/8th/blackLand/frame.png b/data/borders/old/8th/blackLand/frame.png
similarity index 100%
rename from data/borders/8th/blackLand/frame.png
rename to data/borders/old/8th/blackLand/frame.png
diff --git a/data/borders/8th/blackLand/pt.png b/data/borders/old/8th/blackLand/pt.png
similarity index 100%
rename from data/borders/8th/blackLand/pt.png
rename to data/borders/old/8th/blackLand/pt.png
diff --git a/data/borders/8th/blue/frame.png b/data/borders/old/8th/blue/frame.png
similarity index 100%
rename from data/borders/8th/blue/frame.png
rename to data/borders/old/8th/blue/frame.png
diff --git a/data/borders/8th/blue/pt.png b/data/borders/old/8th/blue/pt.png
similarity index 100%
rename from data/borders/8th/blue/pt.png
rename to data/borders/old/8th/blue/pt.png
diff --git a/data/borders/8th/blueLand/frame.png b/data/borders/old/8th/blueLand/frame.png
similarity index 100%
rename from data/borders/8th/blueLand/frame.png
rename to data/borders/old/8th/blueLand/frame.png
diff --git a/data/borders/8th/blueLand/pt.png b/data/borders/old/8th/blueLand/pt.png
similarity index 100%
rename from data/borders/8th/blueLand/pt.png
rename to data/borders/old/8th/blueLand/pt.png
diff --git a/data/borders/8th/border.js b/data/borders/old/8th/border.js
similarity index 100%
rename from data/borders/8th/border.js
rename to data/borders/old/8th/border.js
diff --git a/data/borders/8th/colorless/frame.png b/data/borders/old/8th/colorless/frame.png
similarity index 100%
rename from data/borders/8th/colorless/frame.png
rename to data/borders/old/8th/colorless/frame.png
diff --git a/data/borders/8th/colorless/pt.png b/data/borders/old/8th/colorless/pt.png
similarity index 100%
rename from data/borders/8th/colorless/pt.png
rename to data/borders/old/8th/colorless/pt.png
diff --git a/data/borders/8th/colorlessLand/frame.png b/data/borders/old/8th/colorlessLand/frame.png
similarity index 100%
rename from data/borders/8th/colorlessLand/frame.png
rename to data/borders/old/8th/colorlessLand/frame.png
diff --git a/data/borders/8th/colorlessLand/pt.png b/data/borders/old/8th/colorlessLand/pt.png
similarity index 100%
rename from data/borders/8th/colorlessLand/pt.png
rename to data/borders/old/8th/colorlessLand/pt.png
diff --git a/data/borders/8th/frameMask.png b/data/borders/old/8th/frameMask.png
similarity index 100%
rename from data/borders/8th/frameMask.png
rename to data/borders/old/8th/frameMask.png
diff --git a/data/borders/8th/gold/frame.png b/data/borders/old/8th/gold/frame.png
similarity index 100%
rename from data/borders/8th/gold/frame.png
rename to data/borders/old/8th/gold/frame.png
diff --git a/data/borders/8th/gold/pt.png b/data/borders/old/8th/gold/pt.png
similarity index 100%
rename from data/borders/8th/gold/pt.png
rename to data/borders/old/8th/gold/pt.png
diff --git a/data/borders/8th/goldLand/frame.png b/data/borders/old/8th/goldLand/frame.png
similarity index 100%
rename from data/borders/8th/goldLand/frame.png
rename to data/borders/old/8th/goldLand/frame.png
diff --git a/data/borders/8th/goldLand/pt.png b/data/borders/old/8th/goldLand/pt.png
similarity index 100%
rename from data/borders/8th/goldLand/pt.png
rename to data/borders/old/8th/goldLand/pt.png
diff --git a/data/borders/8th/green/frame.png b/data/borders/old/8th/green/frame.png
similarity index 100%
rename from data/borders/8th/green/frame.png
rename to data/borders/old/8th/green/frame.png
diff --git a/data/borders/8th/green/pt.png b/data/borders/old/8th/green/pt.png
similarity index 100%
rename from data/borders/8th/green/pt.png
rename to data/borders/old/8th/green/pt.png
diff --git a/data/borders/8th/greenLand/frame.png b/data/borders/old/8th/greenLand/frame.png
similarity index 100%
rename from data/borders/8th/greenLand/frame.png
rename to data/borders/old/8th/greenLand/frame.png
diff --git a/data/borders/8th/greenLand/pt.png b/data/borders/old/8th/greenLand/pt.png
similarity index 100%
rename from data/borders/8th/greenLand/pt.png
rename to data/borders/old/8th/greenLand/pt.png
diff --git a/data/borders/8th/multiMask.png b/data/borders/old/8th/multiMask.png
similarity index 100%
rename from data/borders/8th/multiMask.png
rename to data/borders/old/8th/multiMask.png
diff --git a/data/borders/8th/oldArtifact/frame.png b/data/borders/old/8th/oldArtifact/frame.png
similarity index 100%
rename from data/borders/8th/oldArtifact/frame.png
rename to data/borders/old/8th/oldArtifact/frame.png
diff --git a/data/borders/8th/oldArtifact/pt.png b/data/borders/old/8th/oldArtifact/pt.png
similarity index 100%
rename from data/borders/8th/oldArtifact/pt.png
rename to data/borders/old/8th/oldArtifact/pt.png
diff --git a/data/borders/8th/oldGold/frame.png b/data/borders/old/8th/oldGold/frame.png
similarity index 100%
rename from data/borders/8th/oldGold/frame.png
rename to data/borders/old/8th/oldGold/frame.png
diff --git a/data/borders/8th/oldGold/pt.png b/data/borders/old/8th/oldGold/pt.png
similarity index 100%
rename from data/borders/8th/oldGold/pt.png
rename to data/borders/old/8th/oldGold/pt.png
diff --git a/data/borders/8th/oldGoldLand/frame.png b/data/borders/old/8th/oldGoldLand/frame.png
similarity index 100%
rename from data/borders/8th/oldGoldLand/frame.png
rename to data/borders/old/8th/oldGoldLand/frame.png
diff --git a/data/borders/8th/oldGoldLand/pt.png b/data/borders/old/8th/oldGoldLand/pt.png
similarity index 100%
rename from data/borders/8th/oldGoldLand/pt.png
rename to data/borders/old/8th/oldGoldLand/pt.png
diff --git a/data/borders/8th/red/frame.png b/data/borders/old/8th/red/frame.png
similarity index 100%
rename from data/borders/8th/red/frame.png
rename to data/borders/old/8th/red/frame.png
diff --git a/data/borders/8th/red/pt.png b/data/borders/old/8th/red/pt.png
similarity index 100%
rename from data/borders/8th/red/pt.png
rename to data/borders/old/8th/red/pt.png
diff --git a/data/borders/8th/redLand/frame.png b/data/borders/old/8th/redLand/frame.png
similarity index 100%
rename from data/borders/8th/redLand/frame.png
rename to data/borders/old/8th/redLand/frame.png
diff --git a/data/borders/8th/redLand/pt.png b/data/borders/old/8th/redLand/pt.png
similarity index 100%
rename from data/borders/8th/redLand/pt.png
rename to data/borders/old/8th/redLand/pt.png
diff --git a/data/borders/8th/white/frame.png b/data/borders/old/8th/white/frame.png
similarity index 100%
rename from data/borders/8th/white/frame.png
rename to data/borders/old/8th/white/frame.png
diff --git a/data/borders/8th/white/pt.png b/data/borders/old/8th/white/pt.png
similarity index 100%
rename from data/borders/8th/white/pt.png
rename to data/borders/old/8th/white/pt.png
diff --git a/data/borders/8th/whiteLand/frame.png b/data/borders/old/8th/whiteLand/frame.png
similarity index 100%
rename from data/borders/8th/whiteLand/frame.png
rename to data/borders/old/8th/whiteLand/frame.png
diff --git a/data/borders/8th/whiteLand/pt.png b/data/borders/old/8th/whiteLand/pt.png
similarity index 100%
rename from data/borders/8th/whiteLand/pt.png
rename to data/borders/old/8th/whiteLand/pt.png
diff --git a/data/borders/contraption/artMask.png b/data/borders/old/contraption/artMask.png
similarity index 100%
rename from data/borders/contraption/artMask.png
rename to data/borders/old/contraption/artMask.png
diff --git a/data/borders/contraption/border.js b/data/borders/old/contraption/border.js
similarity index 100%
rename from data/borders/contraption/border.js
rename to data/borders/old/contraption/border.js
diff --git a/data/borders/contraption/frameMask.png b/data/borders/old/contraption/frameMask.png
similarity index 100%
rename from data/borders/contraption/frameMask.png
rename to data/borders/old/contraption/frameMask.png
diff --git a/data/borders/contraption/white/frame.png b/data/borders/old/contraption/white/frame.png
similarity index 100%
rename from data/borders/contraption/white/frame.png
rename to data/borders/old/contraption/white/frame.png
diff --git a/data/borders/defaultBorder.js b/data/borders/old/defaultBorder.js
similarity index 100%
rename from data/borders/defaultBorder.js
rename to data/borders/old/defaultBorder.js
diff --git a/data/borders/fullArtLandM15/artMask.png b/data/borders/old/fullArtLandM15/artMask.png
similarity index 100%
rename from data/borders/fullArtLandM15/artMask.png
rename to data/borders/old/fullArtLandM15/artMask.png
diff --git a/data/borders/fullArtLandM15/black/frame.png b/data/borders/old/fullArtLandM15/black/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/black/frame.png
rename to data/borders/old/fullArtLandM15/black/frame.png
diff --git a/data/borders/fullArtLandM15/blue/frame.png b/data/borders/old/fullArtLandM15/blue/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/blue/frame.png
rename to data/borders/old/fullArtLandM15/blue/frame.png
diff --git a/data/borders/fullArtLandM15/border.js b/data/borders/old/fullArtLandM15/border.js
similarity index 100%
rename from data/borders/fullArtLandM15/border.js
rename to data/borders/old/fullArtLandM15/border.js
diff --git a/data/borders/fullArtLandM15/borderMask.png b/data/borders/old/fullArtLandM15/borderMask.png
similarity index 100%
rename from data/borders/fullArtLandM15/borderMask.png
rename to data/borders/old/fullArtLandM15/borderMask.png
diff --git a/data/borders/fullArtLandM15/colorless/frame.png b/data/borders/old/fullArtLandM15/colorless/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/colorless/frame.png
rename to data/borders/old/fullArtLandM15/colorless/frame.png
diff --git a/data/borders/fullArtLandM15/frameMask.png b/data/borders/old/fullArtLandM15/frameMask.png
similarity index 100%
rename from data/borders/fullArtLandM15/frameMask.png
rename to data/borders/old/fullArtLandM15/frameMask.png
diff --git a/data/borders/fullArtLandM15/gold/frame.png b/data/borders/old/fullArtLandM15/gold/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/gold/frame.png
rename to data/borders/old/fullArtLandM15/gold/frame.png
diff --git a/data/borders/fullArtLandM15/green/frame.png b/data/borders/old/fullArtLandM15/green/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/green/frame.png
rename to data/borders/old/fullArtLandM15/green/frame.png
diff --git a/data/borders/fullArtLandM15/red/frame.png b/data/borders/old/fullArtLandM15/red/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/red/frame.png
rename to data/borders/old/fullArtLandM15/red/frame.png
diff --git a/data/borders/fullArtLandM15/white/frame.png b/data/borders/old/fullArtLandM15/white/frame.png
similarity index 100%
rename from data/borders/fullArtLandM15/white/frame.png
rename to data/borders/old/fullArtLandM15/white/frame.png
diff --git a/data/borders/fullArtLandUnstable/artMask.png b/data/borders/old/fullArtLandUnstable/artMask.png
similarity index 100%
rename from data/borders/fullArtLandUnstable/artMask.png
rename to data/borders/old/fullArtLandUnstable/artMask.png
diff --git a/data/borders/old/fullArtLandUnstable/black/frame.png b/data/borders/old/fullArtLandUnstable/black/frame.png
new file mode 100644
index 00000000..3f6f3682
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/black/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/black/stamp.png b/data/borders/old/fullArtLandUnstable/black/stamp.png
new file mode 100644
index 00000000..0a7486b7
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/black/stamp.png differ
diff --git a/data/borders/old/fullArtLandUnstable/blue/frame.png b/data/borders/old/fullArtLandUnstable/blue/frame.png
new file mode 100644
index 00000000..1369273b
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/blue/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/blue/stamp.png b/data/borders/old/fullArtLandUnstable/blue/stamp.png
new file mode 100644
index 00000000..07abb2a0
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/blue/stamp.png differ
diff --git a/data/borders/old/fullArtLandUnstable/border.js b/data/borders/old/fullArtLandUnstable/border.js
new file mode 100644
index 00000000..013378cc
--- /dev/null
+++ b/data/borders/old/fullArtLandUnstable/border.js
@@ -0,0 +1,54 @@
+//Unstable Full Art Basic Land Border
+//Anything to do with...
+//Loading Images
+imgFrameMask.src = borderPath + "frameMask.png"
+imgBorderMask.src = borderPath + "borderMask.png"
+//Card Title
+document.getElementById("inputTitleColor").value = "#ffffff"
+var titleFont = "40px belerenb"
+var titleFontSpacing = "0.1px"
+var titleX = cardWidth / 2
+var titleY = 17
+var titleAlign = "center"
+//Mana Cost
+var manaCostRadius = 17.5
+var manaCostX = 657
+var manaCostY = 17
+//Card Type
+var typeFont = "33.5px belerenb"
+var typeFontSpacing = "0.05px"
+var typeX = cardWidth / 2
+var typeY = 1000
+var typeAlign = "center"
+//Rules/Flavor Text
+var textFont = "px mplantin"
+var textFontSpacing = 0.7
+var textX = 89
+var textY = 123
+var textWidth = 660
+//Bottom Info
+var infoY = 999
+//Set Symbol
+var setSymbolY = 82
+var setSymbolRight = cardWidth / 2
+var setSymbolWidth = 66
+var setSymbolHeight = 44
+var centerSetSymbol = 2
+//Watermark
+var watermarkWidth = 520
+var watermarkHeight = 250
+var watermarkY = 805
+//Color Options
+loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,colorless-Colorless")
+document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
+//Other
+var thirdBorder = false
+var creatureBorder = false
+var stampBorder = true
+var transparentBorder = true
+var artX = 0
+var artY = 0
+//With all the new values in place, the program will update it's border images
+finishTemplate()
+//Any special functions go at the bottom
+var uniqueFunctionName = "bottomInfoM15"
\ No newline at end of file
diff --git a/data/borders/fullArtLandUnstable/borderMask.png b/data/borders/old/fullArtLandUnstable/borderMask.png
similarity index 100%
rename from data/borders/fullArtLandUnstable/borderMask.png
rename to data/borders/old/fullArtLandUnstable/borderMask.png
diff --git a/data/borders/old/fullArtLandUnstable/colorless/frame.png b/data/borders/old/fullArtLandUnstable/colorless/frame.png
new file mode 100644
index 00000000..d8f2d8df
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/colorless/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/colorless/stamp.png b/data/borders/old/fullArtLandUnstable/colorless/stamp.png
new file mode 100644
index 00000000..8ca208dd
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/colorless/stamp.png differ
diff --git a/data/borders/fullArtLandUnstable/frameMask.png b/data/borders/old/fullArtLandUnstable/frameMask.png
similarity index 100%
rename from data/borders/fullArtLandUnstable/frameMask.png
rename to data/borders/old/fullArtLandUnstable/frameMask.png
diff --git a/data/borders/old/fullArtLandUnstable/gold/frame.png b/data/borders/old/fullArtLandUnstable/gold/frame.png
new file mode 100644
index 00000000..8e658eca
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/gold/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/gold/stamp.png b/data/borders/old/fullArtLandUnstable/gold/stamp.png
new file mode 100644
index 00000000..48c7754f
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/gold/stamp.png differ
diff --git a/data/borders/old/fullArtLandUnstable/green/frame.png b/data/borders/old/fullArtLandUnstable/green/frame.png
new file mode 100644
index 00000000..27fa9d4b
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/green/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/green/stamp.png b/data/borders/old/fullArtLandUnstable/green/stamp.png
new file mode 100644
index 00000000..3e8266eb
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/green/stamp.png differ
diff --git a/data/borders/old/fullArtLandUnstable/red/frame.png b/data/borders/old/fullArtLandUnstable/red/frame.png
new file mode 100644
index 00000000..b3b04492
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/red/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/red/stamp.png b/data/borders/old/fullArtLandUnstable/red/stamp.png
new file mode 100644
index 00000000..60acc79e
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/red/stamp.png differ
diff --git a/data/borders/old/fullArtLandUnstable/white/frame.png b/data/borders/old/fullArtLandUnstable/white/frame.png
new file mode 100644
index 00000000..bf0b6391
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/white/frame.png differ
diff --git a/data/borders/old/fullArtLandUnstable/white/stamp.png b/data/borders/old/fullArtLandUnstable/white/stamp.png
new file mode 100644
index 00000000..96e37de9
Binary files /dev/null and b/data/borders/old/fullArtLandUnstable/white/stamp.png differ
diff --git a/data/borders/m15old/artMask.png b/data/borders/old/m15/artMask.png
similarity index 100%
rename from data/borders/m15old/artMask.png
rename to data/borders/old/m15/artMask.png
diff --git a/data/borders/m15old/artifact/darkmiracle.png b/data/borders/old/m15/artifact/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/artifact/darkmiracle.png
rename to data/borders/old/m15/artifact/darkmiracle.png
diff --git a/data/borders/m15old/artifact/darkpt.png b/data/borders/old/m15/artifact/darkpt.png
similarity index 100%
rename from data/borders/m15old/artifact/darkpt.png
rename to data/borders/old/m15/artifact/darkpt.png
diff --git a/data/borders/m15old/artifact/flipCircle.png b/data/borders/old/m15/artifact/flipCircle.png
similarity index 100%
rename from data/borders/m15old/artifact/flipCircle.png
rename to data/borders/old/m15/artifact/flipCircle.png
diff --git a/data/borders/m15old/artifact/flipTip.png b/data/borders/old/m15/artifact/flipTip.png
similarity index 100%
rename from data/borders/m15old/artifact/flipTip.png
rename to data/borders/old/m15/artifact/flipTip.png
diff --git a/data/borders/m15old/artifact/flippedDark.png b/data/borders/old/m15/artifact/flippedDark.png
similarity index 100%
rename from data/borders/m15old/artifact/flippedDark.png
rename to data/borders/old/m15/artifact/flippedDark.png
diff --git a/data/borders/old/m15/artifact/frame.png b/data/borders/old/m15/artifact/frame.png
new file mode 100644
index 00000000..8fa95d51
Binary files /dev/null and b/data/borders/old/m15/artifact/frame.png differ
diff --git a/data/borders/old/m15/artifact/legendary.png b/data/borders/old/m15/artifact/legendary.png
new file mode 100644
index 00000000..988f7c73
Binary files /dev/null and b/data/borders/old/m15/artifact/legendary.png differ
diff --git a/data/borders/old/m15/artifact/miracle.png b/data/borders/old/m15/artifact/miracle.png
new file mode 100644
index 00000000..730d5013
Binary files /dev/null and b/data/borders/old/m15/artifact/miracle.png differ
diff --git a/data/borders/old/m15/artifact/nyx.png b/data/borders/old/m15/artifact/nyx.png
new file mode 100644
index 00000000..22a2b300
Binary files /dev/null and b/data/borders/old/m15/artifact/nyx.png differ
diff --git a/data/borders/tokenTall/artifact/pt.png b/data/borders/old/m15/artifact/pt.png
similarity index 100%
rename from data/borders/tokenTall/artifact/pt.png
rename to data/borders/old/m15/artifact/pt.png
diff --git a/data/borders/old/m15/artifact/stamp.png b/data/borders/old/m15/artifact/stamp.png
new file mode 100644
index 00000000..99a1fb1d
Binary files /dev/null and b/data/borders/old/m15/artifact/stamp.png differ
diff --git a/data/borders/m15old/black/darkmiracle.png b/data/borders/old/m15/black/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/black/darkmiracle.png
rename to data/borders/old/m15/black/darkmiracle.png
diff --git a/data/borders/m15old/black/darkpt.png b/data/borders/old/m15/black/darkpt.png
similarity index 100%
rename from data/borders/m15old/black/darkpt.png
rename to data/borders/old/m15/black/darkpt.png
diff --git a/data/borders/m15old/black/flipCircle.png b/data/borders/old/m15/black/flipCircle.png
similarity index 100%
rename from data/borders/m15old/black/flipCircle.png
rename to data/borders/old/m15/black/flipCircle.png
diff --git a/data/borders/m15old/black/flipTip.png b/data/borders/old/m15/black/flipTip.png
similarity index 100%
rename from data/borders/m15old/black/flipTip.png
rename to data/borders/old/m15/black/flipTip.png
diff --git a/data/borders/m15old/black/flippedDark.png b/data/borders/old/m15/black/flippedDark.png
similarity index 100%
rename from data/borders/m15old/black/flippedDark.png
rename to data/borders/old/m15/black/flippedDark.png
diff --git a/data/borders/m15old/black/frame.png b/data/borders/old/m15/black/frame.png
similarity index 100%
rename from data/borders/m15old/black/frame.png
rename to data/borders/old/m15/black/frame.png
diff --git a/data/borders/old/m15/black/legendary.png b/data/borders/old/m15/black/legendary.png
new file mode 100644
index 00000000..282b3ba0
Binary files /dev/null and b/data/borders/old/m15/black/legendary.png differ
diff --git a/data/borders/m15old/black/miracle.png b/data/borders/old/m15/black/miracle.png
similarity index 100%
rename from data/borders/m15old/black/miracle.png
rename to data/borders/old/m15/black/miracle.png
diff --git a/data/borders/m15old/black/nyx.png b/data/borders/old/m15/black/nyx.png
similarity index 100%
rename from data/borders/m15old/black/nyx.png
rename to data/borders/old/m15/black/nyx.png
diff --git a/data/borders/tokenTall/black/pt.png b/data/borders/old/m15/black/pt.png
similarity index 100%
rename from data/borders/tokenTall/black/pt.png
rename to data/borders/old/m15/black/pt.png
diff --git a/data/borders/m15old/black/stamp.png b/data/borders/old/m15/black/stamp.png
similarity index 100%
rename from data/borders/m15old/black/stamp.png
rename to data/borders/old/m15/black/stamp.png
diff --git a/data/borders/m15old/blackLand/darkmiracle.png b/data/borders/old/m15/blackLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/blackLand/darkmiracle.png
rename to data/borders/old/m15/blackLand/darkmiracle.png
diff --git a/data/borders/m15old/blackLand/darkpt.png b/data/borders/old/m15/blackLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/blackLand/darkpt.png
rename to data/borders/old/m15/blackLand/darkpt.png
diff --git a/data/borders/m15old/blackLand/flipCircle.png b/data/borders/old/m15/blackLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/blackLand/flipCircle.png
rename to data/borders/old/m15/blackLand/flipCircle.png
diff --git a/data/borders/m15old/blackLand/flipTip.png b/data/borders/old/m15/blackLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/blackLand/flipTip.png
rename to data/borders/old/m15/blackLand/flipTip.png
diff --git a/data/borders/m15old/blackLand/flippedDark.png b/data/borders/old/m15/blackLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/blackLand/flippedDark.png
rename to data/borders/old/m15/blackLand/flippedDark.png
diff --git a/data/borders/old/m15/blackLand/frame.png b/data/borders/old/m15/blackLand/frame.png
new file mode 100644
index 00000000..7740dbf3
Binary files /dev/null and b/data/borders/old/m15/blackLand/frame.png differ
diff --git a/data/borders/old/m15/blackLand/legendary.png b/data/borders/old/m15/blackLand/legendary.png
new file mode 100644
index 00000000..93738efb
Binary files /dev/null and b/data/borders/old/m15/blackLand/legendary.png differ
diff --git a/data/borders/old/m15/blackLand/miracle.png b/data/borders/old/m15/blackLand/miracle.png
new file mode 100644
index 00000000..5855c9aa
Binary files /dev/null and b/data/borders/old/m15/blackLand/miracle.png differ
diff --git a/data/borders/old/m15/blackLand/nyx.png b/data/borders/old/m15/blackLand/nyx.png
new file mode 100644
index 00000000..5cf62019
Binary files /dev/null and b/data/borders/old/m15/blackLand/nyx.png differ
diff --git a/data/borders/tokenText/black/pt.png b/data/borders/old/m15/blackLand/pt.png
similarity index 100%
rename from data/borders/tokenText/black/pt.png
rename to data/borders/old/m15/blackLand/pt.png
diff --git a/data/borders/old/m15/blackLand/stamp.png b/data/borders/old/m15/blackLand/stamp.png
new file mode 100644
index 00000000..eb8a2458
Binary files /dev/null and b/data/borders/old/m15/blackLand/stamp.png differ
diff --git a/data/borders/m15old/blue/darkmiracle.png b/data/borders/old/m15/blue/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/blue/darkmiracle.png
rename to data/borders/old/m15/blue/darkmiracle.png
diff --git a/data/borders/m15old/blue/darkpt.png b/data/borders/old/m15/blue/darkpt.png
similarity index 100%
rename from data/borders/m15old/blue/darkpt.png
rename to data/borders/old/m15/blue/darkpt.png
diff --git a/data/borders/m15old/blue/flipCircle.png b/data/borders/old/m15/blue/flipCircle.png
similarity index 100%
rename from data/borders/m15old/blue/flipCircle.png
rename to data/borders/old/m15/blue/flipCircle.png
diff --git a/data/borders/m15old/blue/flipTip.png b/data/borders/old/m15/blue/flipTip.png
similarity index 100%
rename from data/borders/m15old/blue/flipTip.png
rename to data/borders/old/m15/blue/flipTip.png
diff --git a/data/borders/m15old/blue/flippedDark.png b/data/borders/old/m15/blue/flippedDark.png
similarity index 100%
rename from data/borders/m15old/blue/flippedDark.png
rename to data/borders/old/m15/blue/flippedDark.png
diff --git a/data/borders/m15old/blue/frame.png b/data/borders/old/m15/blue/frame.png
similarity index 100%
rename from data/borders/m15old/blue/frame.png
rename to data/borders/old/m15/blue/frame.png
diff --git a/data/borders/old/m15/blue/legendary.png b/data/borders/old/m15/blue/legendary.png
new file mode 100644
index 00000000..c4014aba
Binary files /dev/null and b/data/borders/old/m15/blue/legendary.png differ
diff --git a/data/borders/old/m15/blue/miracle.png b/data/borders/old/m15/blue/miracle.png
new file mode 100644
index 00000000..a6e8603d
Binary files /dev/null and b/data/borders/old/m15/blue/miracle.png differ
diff --git a/data/borders/old/m15/blue/nyx.png b/data/borders/old/m15/blue/nyx.png
new file mode 100644
index 00000000..06f224d0
Binary files /dev/null and b/data/borders/old/m15/blue/nyx.png differ
diff --git a/data/borders/tokenTall/blue/pt.png b/data/borders/old/m15/blue/pt.png
similarity index 100%
rename from data/borders/tokenTall/blue/pt.png
rename to data/borders/old/m15/blue/pt.png
diff --git a/data/borders/old/m15/blue/stamp.png b/data/borders/old/m15/blue/stamp.png
new file mode 100644
index 00000000..f7ea61ae
Binary files /dev/null and b/data/borders/old/m15/blue/stamp.png differ
diff --git a/data/borders/m15old/blueLand/darkmiracle.png b/data/borders/old/m15/blueLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/blueLand/darkmiracle.png
rename to data/borders/old/m15/blueLand/darkmiracle.png
diff --git a/data/borders/m15old/blueLand/darkpt.png b/data/borders/old/m15/blueLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/blueLand/darkpt.png
rename to data/borders/old/m15/blueLand/darkpt.png
diff --git a/data/borders/m15old/blueLand/flipCircle.png b/data/borders/old/m15/blueLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/blueLand/flipCircle.png
rename to data/borders/old/m15/blueLand/flipCircle.png
diff --git a/data/borders/m15old/blueLand/flipTip.png b/data/borders/old/m15/blueLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/blueLand/flipTip.png
rename to data/borders/old/m15/blueLand/flipTip.png
diff --git a/data/borders/m15old/blueLand/flippedDark.png b/data/borders/old/m15/blueLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/blueLand/flippedDark.png
rename to data/borders/old/m15/blueLand/flippedDark.png
diff --git a/data/borders/old/m15/blueLand/frame.png b/data/borders/old/m15/blueLand/frame.png
new file mode 100644
index 00000000..3d8b5bbe
Binary files /dev/null and b/data/borders/old/m15/blueLand/frame.png differ
diff --git a/data/borders/old/m15/blueLand/legendary.png b/data/borders/old/m15/blueLand/legendary.png
new file mode 100644
index 00000000..f51705ae
Binary files /dev/null and b/data/borders/old/m15/blueLand/legendary.png differ
diff --git a/data/borders/old/m15/blueLand/miracle.png b/data/borders/old/m15/blueLand/miracle.png
new file mode 100644
index 00000000..f88ff474
Binary files /dev/null and b/data/borders/old/m15/blueLand/miracle.png differ
diff --git a/data/borders/old/m15/blueLand/nyx.png b/data/borders/old/m15/blueLand/nyx.png
new file mode 100644
index 00000000..dc16994b
Binary files /dev/null and b/data/borders/old/m15/blueLand/nyx.png differ
diff --git a/data/borders/tokenText/blue/pt.png b/data/borders/old/m15/blueLand/pt.png
similarity index 100%
rename from data/borders/tokenText/blue/pt.png
rename to data/borders/old/m15/blueLand/pt.png
diff --git a/data/borders/old/m15/blueLand/stamp.png b/data/borders/old/m15/blueLand/stamp.png
new file mode 100644
index 00000000..f7ea61ae
Binary files /dev/null and b/data/borders/old/m15/blueLand/stamp.png differ
diff --git a/data/borders/m15old/border.js b/data/borders/old/m15/border.js
similarity index 100%
rename from data/borders/m15old/border.js
rename to data/borders/old/m15/border.js
diff --git a/data/borders/m15old/borderMask.png b/data/borders/old/m15/borderMask.png
similarity index 100%
rename from data/borders/m15old/borderMask.png
rename to data/borders/old/m15/borderMask.png
diff --git a/data/borders/m15old/clear/darkmiracle.png b/data/borders/old/m15/clear/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/clear/darkmiracle.png
rename to data/borders/old/m15/clear/darkmiracle.png
diff --git a/data/borders/m15old/clear/darkpt.png b/data/borders/old/m15/clear/darkpt.png
similarity index 100%
rename from data/borders/m15old/clear/darkpt.png
rename to data/borders/old/m15/clear/darkpt.png
diff --git a/data/borders/m15old/clear/flipCircle.png b/data/borders/old/m15/clear/flipCircle.png
similarity index 100%
rename from data/borders/m15old/clear/flipCircle.png
rename to data/borders/old/m15/clear/flipCircle.png
diff --git a/data/borders/m15old/clear/flipTip.png b/data/borders/old/m15/clear/flipTip.png
similarity index 100%
rename from data/borders/m15old/clear/flipTip.png
rename to data/borders/old/m15/clear/flipTip.png
diff --git a/data/borders/m15old/clear/flippedDark.png b/data/borders/old/m15/clear/flippedDark.png
similarity index 100%
rename from data/borders/m15old/clear/flippedDark.png
rename to data/borders/old/m15/clear/flippedDark.png
diff --git a/data/borders/old/m15/clear/frame.png b/data/borders/old/m15/clear/frame.png
new file mode 100644
index 00000000..e902aa90
Binary files /dev/null and b/data/borders/old/m15/clear/frame.png differ
diff --git a/data/borders/old/m15/clear/legendary.png b/data/borders/old/m15/clear/legendary.png
new file mode 100644
index 00000000..988f7c73
Binary files /dev/null and b/data/borders/old/m15/clear/legendary.png differ
diff --git a/data/borders/old/m15/clear/miracle.png b/data/borders/old/m15/clear/miracle.png
new file mode 100644
index 00000000..730d5013
Binary files /dev/null and b/data/borders/old/m15/clear/miracle.png differ
diff --git a/data/borders/old/m15/clear/nyx.png b/data/borders/old/m15/clear/nyx.png
new file mode 100644
index 00000000..22a2b300
Binary files /dev/null and b/data/borders/old/m15/clear/nyx.png differ
diff --git a/data/borders/old/m15/clear/pt.png b/data/borders/old/m15/clear/pt.png
new file mode 100644
index 00000000..4fa6c833
Binary files /dev/null and b/data/borders/old/m15/clear/pt.png differ
diff --git a/data/borders/old/m15/clear/stamp.png b/data/borders/old/m15/clear/stamp.png
new file mode 100644
index 00000000..99a1fb1d
Binary files /dev/null and b/data/borders/old/m15/clear/stamp.png differ
diff --git a/data/borders/m15old/colorless/darkmiracle.png b/data/borders/old/m15/colorless/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/colorless/darkmiracle.png
rename to data/borders/old/m15/colorless/darkmiracle.png
diff --git a/data/borders/m15old/colorless/darkpt.png b/data/borders/old/m15/colorless/darkpt.png
similarity index 100%
rename from data/borders/m15old/colorless/darkpt.png
rename to data/borders/old/m15/colorless/darkpt.png
diff --git a/data/borders/m15old/colorless/flipCircle.png b/data/borders/old/m15/colorless/flipCircle.png
similarity index 100%
rename from data/borders/m15old/colorless/flipCircle.png
rename to data/borders/old/m15/colorless/flipCircle.png
diff --git a/data/borders/m15old/colorless/flipTip.png b/data/borders/old/m15/colorless/flipTip.png
similarity index 100%
rename from data/borders/m15old/colorless/flipTip.png
rename to data/borders/old/m15/colorless/flipTip.png
diff --git a/data/borders/m15old/colorless/flippedDark.png b/data/borders/old/m15/colorless/flippedDark.png
similarity index 100%
rename from data/borders/m15old/colorless/flippedDark.png
rename to data/borders/old/m15/colorless/flippedDark.png
diff --git a/data/borders/old/m15/colorless/frame.png b/data/borders/old/m15/colorless/frame.png
new file mode 100644
index 00000000..e37fce1e
Binary files /dev/null and b/data/borders/old/m15/colorless/frame.png differ
diff --git a/data/borders/old/m15/colorless/legendary.png b/data/borders/old/m15/colorless/legendary.png
new file mode 100644
index 00000000..ebddc01c
Binary files /dev/null and b/data/borders/old/m15/colorless/legendary.png differ
diff --git a/data/borders/old/m15/colorless/miracle.png b/data/borders/old/m15/colorless/miracle.png
new file mode 100644
index 00000000..56a495e3
Binary files /dev/null and b/data/borders/old/m15/colorless/miracle.png differ
diff --git a/data/borders/old/m15/colorless/nyx.png b/data/borders/old/m15/colorless/nyx.png
new file mode 100644
index 00000000..7b257a8d
Binary files /dev/null and b/data/borders/old/m15/colorless/nyx.png differ
diff --git a/data/borders/old/m15/colorless/pt.png b/data/borders/old/m15/colorless/pt.png
new file mode 100644
index 00000000..4fa6c833
Binary files /dev/null and b/data/borders/old/m15/colorless/pt.png differ
diff --git a/data/borders/old/m15/colorless/stamp.png b/data/borders/old/m15/colorless/stamp.png
new file mode 100644
index 00000000..ca5bfbfd
Binary files /dev/null and b/data/borders/old/m15/colorless/stamp.png differ
diff --git a/data/borders/m15old/colorlessLand/darkmiracle.png b/data/borders/old/m15/colorlessLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/darkmiracle.png
rename to data/borders/old/m15/colorlessLand/darkmiracle.png
diff --git a/data/borders/m15old/colorlessLand/darkpt.png b/data/borders/old/m15/colorlessLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/darkpt.png
rename to data/borders/old/m15/colorlessLand/darkpt.png
diff --git a/data/borders/m15old/colorlessLand/flipCircle.png b/data/borders/old/m15/colorlessLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/flipCircle.png
rename to data/borders/old/m15/colorlessLand/flipCircle.png
diff --git a/data/borders/m15old/colorlessLand/flipTip.png b/data/borders/old/m15/colorlessLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/flipTip.png
rename to data/borders/old/m15/colorlessLand/flipTip.png
diff --git a/data/borders/m15old/colorlessLand/flippedDark.png b/data/borders/old/m15/colorlessLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/colorlessLand/flippedDark.png
rename to data/borders/old/m15/colorlessLand/flippedDark.png
diff --git a/data/borders/old/m15/colorlessLand/frame.png b/data/borders/old/m15/colorlessLand/frame.png
new file mode 100644
index 00000000..081d9513
Binary files /dev/null and b/data/borders/old/m15/colorlessLand/frame.png differ
diff --git a/data/borders/old/m15/colorlessLand/legendary.png b/data/borders/old/m15/colorlessLand/legendary.png
new file mode 100644
index 00000000..18b7f5ee
Binary files /dev/null and b/data/borders/old/m15/colorlessLand/legendary.png differ
diff --git a/data/borders/old/m15/colorlessLand/miracle.png b/data/borders/old/m15/colorlessLand/miracle.png
new file mode 100644
index 00000000..c87be3c7
Binary files /dev/null and b/data/borders/old/m15/colorlessLand/miracle.png differ
diff --git a/data/borders/old/m15/colorlessLand/nyx.png b/data/borders/old/m15/colorlessLand/nyx.png
new file mode 100644
index 00000000..4b66cc1f
Binary files /dev/null and b/data/borders/old/m15/colorlessLand/nyx.png differ
diff --git a/data/borders/old/m15/colorlessLand/pt.png b/data/borders/old/m15/colorlessLand/pt.png
new file mode 100644
index 00000000..4fa6c833
Binary files /dev/null and b/data/borders/old/m15/colorlessLand/pt.png differ
diff --git a/data/borders/old/m15/colorlessLand/stamp.png b/data/borders/old/m15/colorlessLand/stamp.png
new file mode 100644
index 00000000..ca5bfbfd
Binary files /dev/null and b/data/borders/old/m15/colorlessLand/stamp.png differ
diff --git a/data/borders/m15old/frameMask.png b/data/borders/old/m15/frameMask.png
similarity index 100%
rename from data/borders/m15old/frameMask.png
rename to data/borders/old/m15/frameMask.png
diff --git a/data/borders/m15old/gold/darkmiracle.png b/data/borders/old/m15/gold/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/gold/darkmiracle.png
rename to data/borders/old/m15/gold/darkmiracle.png
diff --git a/data/borders/m15old/gold/darkpt.png b/data/borders/old/m15/gold/darkpt.png
similarity index 100%
rename from data/borders/m15old/gold/darkpt.png
rename to data/borders/old/m15/gold/darkpt.png
diff --git a/data/borders/m15old/gold/flipCircle.png b/data/borders/old/m15/gold/flipCircle.png
similarity index 100%
rename from data/borders/m15old/gold/flipCircle.png
rename to data/borders/old/m15/gold/flipCircle.png
diff --git a/data/borders/m15old/gold/flipTip.png b/data/borders/old/m15/gold/flipTip.png
similarity index 100%
rename from data/borders/m15old/gold/flipTip.png
rename to data/borders/old/m15/gold/flipTip.png
diff --git a/data/borders/m15old/gold/flippedDark.png b/data/borders/old/m15/gold/flippedDark.png
similarity index 100%
rename from data/borders/m15old/gold/flippedDark.png
rename to data/borders/old/m15/gold/flippedDark.png
diff --git a/data/borders/old/m15/gold/frame.png b/data/borders/old/m15/gold/frame.png
new file mode 100644
index 00000000..28c4ff65
Binary files /dev/null and b/data/borders/old/m15/gold/frame.png differ
diff --git a/data/borders/old/m15/gold/legendary.png b/data/borders/old/m15/gold/legendary.png
new file mode 100644
index 00000000..c6328cdf
Binary files /dev/null and b/data/borders/old/m15/gold/legendary.png differ
diff --git a/data/borders/old/m15/gold/miracle.png b/data/borders/old/m15/gold/miracle.png
new file mode 100644
index 00000000..9de82474
Binary files /dev/null and b/data/borders/old/m15/gold/miracle.png differ
diff --git a/data/borders/old/m15/gold/nyx.png b/data/borders/old/m15/gold/nyx.png
new file mode 100644
index 00000000..24000574
Binary files /dev/null and b/data/borders/old/m15/gold/nyx.png differ
diff --git a/data/borders/tokenTall/gold/pt.png b/data/borders/old/m15/gold/pt.png
similarity index 100%
rename from data/borders/tokenTall/gold/pt.png
rename to data/borders/old/m15/gold/pt.png
diff --git a/data/borders/old/m15/gold/stamp.png b/data/borders/old/m15/gold/stamp.png
new file mode 100644
index 00000000..63313a57
Binary files /dev/null and b/data/borders/old/m15/gold/stamp.png differ
diff --git a/data/borders/m15old/goldLand/darkmiracle.png b/data/borders/old/m15/goldLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/goldLand/darkmiracle.png
rename to data/borders/old/m15/goldLand/darkmiracle.png
diff --git a/data/borders/m15old/goldLand/darkpt.png b/data/borders/old/m15/goldLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/goldLand/darkpt.png
rename to data/borders/old/m15/goldLand/darkpt.png
diff --git a/data/borders/m15old/goldLand/flipCircle.png b/data/borders/old/m15/goldLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/goldLand/flipCircle.png
rename to data/borders/old/m15/goldLand/flipCircle.png
diff --git a/data/borders/m15old/goldLand/flipTip.png b/data/borders/old/m15/goldLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/goldLand/flipTip.png
rename to data/borders/old/m15/goldLand/flipTip.png
diff --git a/data/borders/m15old/goldLand/flippedDark.png b/data/borders/old/m15/goldLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/goldLand/flippedDark.png
rename to data/borders/old/m15/goldLand/flippedDark.png
diff --git a/data/borders/old/m15/goldLand/frame.png b/data/borders/old/m15/goldLand/frame.png
new file mode 100644
index 00000000..4cf8044c
Binary files /dev/null and b/data/borders/old/m15/goldLand/frame.png differ
diff --git a/data/borders/m15old/goldLand/legendary.png b/data/borders/old/m15/goldLand/legendary.png
similarity index 100%
rename from data/borders/m15old/goldLand/legendary.png
rename to data/borders/old/m15/goldLand/legendary.png
diff --git a/data/borders/old/m15/goldLand/miracle.png b/data/borders/old/m15/goldLand/miracle.png
new file mode 100644
index 00000000..d37b0136
Binary files /dev/null and b/data/borders/old/m15/goldLand/miracle.png differ
diff --git a/data/borders/old/m15/goldLand/nyx.png b/data/borders/old/m15/goldLand/nyx.png
new file mode 100644
index 00000000..3f9cca87
Binary files /dev/null and b/data/borders/old/m15/goldLand/nyx.png differ
diff --git a/data/borders/tokenText/gold/pt.png b/data/borders/old/m15/goldLand/pt.png
similarity index 100%
rename from data/borders/tokenText/gold/pt.png
rename to data/borders/old/m15/goldLand/pt.png
diff --git a/data/borders/old/m15/goldLand/stamp.png b/data/borders/old/m15/goldLand/stamp.png
new file mode 100644
index 00000000..63313a57
Binary files /dev/null and b/data/borders/old/m15/goldLand/stamp.png differ
diff --git a/data/borders/m15old/green/darkmiracle.png b/data/borders/old/m15/green/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/green/darkmiracle.png
rename to data/borders/old/m15/green/darkmiracle.png
diff --git a/data/borders/m15old/green/darkpt.png b/data/borders/old/m15/green/darkpt.png
similarity index 100%
rename from data/borders/m15old/green/darkpt.png
rename to data/borders/old/m15/green/darkpt.png
diff --git a/data/borders/m15old/green/flipCircle.png b/data/borders/old/m15/green/flipCircle.png
similarity index 100%
rename from data/borders/m15old/green/flipCircle.png
rename to data/borders/old/m15/green/flipCircle.png
diff --git a/data/borders/m15old/green/flipTip.png b/data/borders/old/m15/green/flipTip.png
similarity index 100%
rename from data/borders/m15old/green/flipTip.png
rename to data/borders/old/m15/green/flipTip.png
diff --git a/data/borders/m15old/green/flippedDark.png b/data/borders/old/m15/green/flippedDark.png
similarity index 100%
rename from data/borders/m15old/green/flippedDark.png
rename to data/borders/old/m15/green/flippedDark.png
diff --git a/data/borders/m15old/green/frame.png b/data/borders/old/m15/green/frame.png
similarity index 100%
rename from data/borders/m15old/green/frame.png
rename to data/borders/old/m15/green/frame.png
diff --git a/data/borders/old/m15/green/legendary.png b/data/borders/old/m15/green/legendary.png
new file mode 100644
index 00000000..a37d48fd
Binary files /dev/null and b/data/borders/old/m15/green/legendary.png differ
diff --git a/data/borders/old/m15/green/miracle.png b/data/borders/old/m15/green/miracle.png
new file mode 100644
index 00000000..e35be73c
Binary files /dev/null and b/data/borders/old/m15/green/miracle.png differ
diff --git a/data/borders/old/m15/green/nyx.png b/data/borders/old/m15/green/nyx.png
new file mode 100644
index 00000000..cf49bf89
Binary files /dev/null and b/data/borders/old/m15/green/nyx.png differ
diff --git a/data/borders/old/m15/green/pt.png b/data/borders/old/m15/green/pt.png
new file mode 100644
index 00000000..f553b708
Binary files /dev/null and b/data/borders/old/m15/green/pt.png differ
diff --git a/data/borders/old/m15/green/stamp.png b/data/borders/old/m15/green/stamp.png
new file mode 100644
index 00000000..3e4cd6cd
Binary files /dev/null and b/data/borders/old/m15/green/stamp.png differ
diff --git a/data/borders/m15old/greenLand/darkmiracle.png b/data/borders/old/m15/greenLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/greenLand/darkmiracle.png
rename to data/borders/old/m15/greenLand/darkmiracle.png
diff --git a/data/borders/m15old/greenLand/darkpt.png b/data/borders/old/m15/greenLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/greenLand/darkpt.png
rename to data/borders/old/m15/greenLand/darkpt.png
diff --git a/data/borders/m15old/greenLand/flipCircle.png b/data/borders/old/m15/greenLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/greenLand/flipCircle.png
rename to data/borders/old/m15/greenLand/flipCircle.png
diff --git a/data/borders/m15old/greenLand/flipTip.png b/data/borders/old/m15/greenLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/greenLand/flipTip.png
rename to data/borders/old/m15/greenLand/flipTip.png
diff --git a/data/borders/m15old/greenLand/flippedDark.png b/data/borders/old/m15/greenLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/greenLand/flippedDark.png
rename to data/borders/old/m15/greenLand/flippedDark.png
diff --git a/data/borders/old/m15/greenLand/frame.png b/data/borders/old/m15/greenLand/frame.png
new file mode 100644
index 00000000..33d0343d
Binary files /dev/null and b/data/borders/old/m15/greenLand/frame.png differ
diff --git a/data/borders/m15old/greenLand/legendary.png b/data/borders/old/m15/greenLand/legendary.png
similarity index 100%
rename from data/borders/m15old/greenLand/legendary.png
rename to data/borders/old/m15/greenLand/legendary.png
diff --git a/data/borders/old/m15/greenLand/miracle.png b/data/borders/old/m15/greenLand/miracle.png
new file mode 100644
index 00000000..2284b44c
Binary files /dev/null and b/data/borders/old/m15/greenLand/miracle.png differ
diff --git a/data/borders/old/m15/greenLand/nyx.png b/data/borders/old/m15/greenLand/nyx.png
new file mode 100644
index 00000000..5ebabdb5
Binary files /dev/null and b/data/borders/old/m15/greenLand/nyx.png differ
diff --git a/data/borders/old/m15/greenLand/pt.png b/data/borders/old/m15/greenLand/pt.png
new file mode 100644
index 00000000..f553b708
Binary files /dev/null and b/data/borders/old/m15/greenLand/pt.png differ
diff --git a/data/borders/old/m15/greenLand/stamp.png b/data/borders/old/m15/greenLand/stamp.png
new file mode 100644
index 00000000..3e4cd6cd
Binary files /dev/null and b/data/borders/old/m15/greenLand/stamp.png differ
diff --git a/data/borders/m15old/legendFrameMask.png b/data/borders/old/m15/legendFrameMask.png
similarity index 100%
rename from data/borders/m15old/legendFrameMask.png
rename to data/borders/old/m15/legendFrameMask.png
diff --git a/data/borders/m15old/multiMask.png b/data/borders/old/m15/multiMask.png
similarity index 100%
rename from data/borders/m15old/multiMask.png
rename to data/borders/old/m15/multiMask.png
diff --git a/data/borders/m15old/pinlineMask.png b/data/borders/old/m15/pinlineMask.png
similarity index 100%
rename from data/borders/m15old/pinlineMask.png
rename to data/borders/old/m15/pinlineMask.png
diff --git a/data/borders/m15old/rareStampMask.png b/data/borders/old/m15/rareStampMask.png
similarity index 100%
rename from data/borders/m15old/rareStampMask.png
rename to data/borders/old/m15/rareStampMask.png
diff --git a/data/borders/m15old/red/darkmiracle.png b/data/borders/old/m15/red/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/red/darkmiracle.png
rename to data/borders/old/m15/red/darkmiracle.png
diff --git a/data/borders/m15old/red/darkpt.png b/data/borders/old/m15/red/darkpt.png
similarity index 100%
rename from data/borders/m15old/red/darkpt.png
rename to data/borders/old/m15/red/darkpt.png
diff --git a/data/borders/m15old/red/flipCircle.png b/data/borders/old/m15/red/flipCircle.png
similarity index 100%
rename from data/borders/m15old/red/flipCircle.png
rename to data/borders/old/m15/red/flipCircle.png
diff --git a/data/borders/m15old/red/flipTip.png b/data/borders/old/m15/red/flipTip.png
similarity index 100%
rename from data/borders/m15old/red/flipTip.png
rename to data/borders/old/m15/red/flipTip.png
diff --git a/data/borders/m15old/red/flippedDark.png b/data/borders/old/m15/red/flippedDark.png
similarity index 100%
rename from data/borders/m15old/red/flippedDark.png
rename to data/borders/old/m15/red/flippedDark.png
diff --git a/data/borders/m15old/red/frame.png b/data/borders/old/m15/red/frame.png
similarity index 100%
rename from data/borders/m15old/red/frame.png
rename to data/borders/old/m15/red/frame.png
diff --git a/data/borders/old/m15/red/legendary.png b/data/borders/old/m15/red/legendary.png
new file mode 100644
index 00000000..9d32d2b0
Binary files /dev/null and b/data/borders/old/m15/red/legendary.png differ
diff --git a/data/borders/old/m15/red/miracle.png b/data/borders/old/m15/red/miracle.png
new file mode 100644
index 00000000..0201c4d4
Binary files /dev/null and b/data/borders/old/m15/red/miracle.png differ
diff --git a/data/borders/old/m15/red/nyx.png b/data/borders/old/m15/red/nyx.png
new file mode 100644
index 00000000..03917c2c
Binary files /dev/null and b/data/borders/old/m15/red/nyx.png differ
diff --git a/data/borders/tokenTall/red/pt.png b/data/borders/old/m15/red/pt.png
similarity index 100%
rename from data/borders/tokenTall/red/pt.png
rename to data/borders/old/m15/red/pt.png
diff --git a/data/borders/old/m15/red/stamp.png b/data/borders/old/m15/red/stamp.png
new file mode 100644
index 00000000..3430bf60
Binary files /dev/null and b/data/borders/old/m15/red/stamp.png differ
diff --git a/data/borders/m15old/redLand/darkmiracle.png b/data/borders/old/m15/redLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/redLand/darkmiracle.png
rename to data/borders/old/m15/redLand/darkmiracle.png
diff --git a/data/borders/m15old/redLand/darkpt.png b/data/borders/old/m15/redLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/redLand/darkpt.png
rename to data/borders/old/m15/redLand/darkpt.png
diff --git a/data/borders/m15old/redLand/flipCircle.png b/data/borders/old/m15/redLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/redLand/flipCircle.png
rename to data/borders/old/m15/redLand/flipCircle.png
diff --git a/data/borders/m15old/redLand/flipTip.png b/data/borders/old/m15/redLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/redLand/flipTip.png
rename to data/borders/old/m15/redLand/flipTip.png
diff --git a/data/borders/m15old/redLand/flippedDark.png b/data/borders/old/m15/redLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/redLand/flippedDark.png
rename to data/borders/old/m15/redLand/flippedDark.png
diff --git a/data/borders/old/m15/redLand/frame.png b/data/borders/old/m15/redLand/frame.png
new file mode 100644
index 00000000..feb21e20
Binary files /dev/null and b/data/borders/old/m15/redLand/frame.png differ
diff --git a/data/borders/m15old/redLand/legendary.png b/data/borders/old/m15/redLand/legendary.png
similarity index 100%
rename from data/borders/m15old/redLand/legendary.png
rename to data/borders/old/m15/redLand/legendary.png
diff --git a/data/borders/old/m15/redLand/miracle.png b/data/borders/old/m15/redLand/miracle.png
new file mode 100644
index 00000000..e9ad7caa
Binary files /dev/null and b/data/borders/old/m15/redLand/miracle.png differ
diff --git a/data/borders/old/m15/redLand/nyx.png b/data/borders/old/m15/redLand/nyx.png
new file mode 100644
index 00000000..e4cc2d45
Binary files /dev/null and b/data/borders/old/m15/redLand/nyx.png differ
diff --git a/data/borders/tokenText/red/pt.png b/data/borders/old/m15/redLand/pt.png
similarity index 100%
rename from data/borders/tokenText/red/pt.png
rename to data/borders/old/m15/redLand/pt.png
diff --git a/data/borders/old/m15/redLand/stamp.png b/data/borders/old/m15/redLand/stamp.png
new file mode 100644
index 00000000..3430bf60
Binary files /dev/null and b/data/borders/old/m15/redLand/stamp.png differ
diff --git a/data/borders/m15old/rulesMask.png b/data/borders/old/m15/rulesMask.png
similarity index 100%
rename from data/borders/m15old/rulesMask.png
rename to data/borders/old/m15/rulesMask.png
diff --git a/data/borders/m15old/titleMask.png b/data/borders/old/m15/titleMask.png
similarity index 100%
rename from data/borders/m15old/titleMask.png
rename to data/borders/old/m15/titleMask.png
diff --git a/data/borders/m15old/titleTypeBoxesMask.png b/data/borders/old/m15/titleTypeBoxesMask.png
similarity index 100%
rename from data/borders/m15old/titleTypeBoxesMask.png
rename to data/borders/old/m15/titleTypeBoxesMask.png
diff --git a/data/borders/m15old/typeMask.png b/data/borders/old/m15/typeMask.png
similarity index 100%
rename from data/borders/m15old/typeMask.png
rename to data/borders/old/m15/typeMask.png
diff --git a/data/borders/m15old/vehicle/darkmiracle.png b/data/borders/old/m15/vehicle/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/vehicle/darkmiracle.png
rename to data/borders/old/m15/vehicle/darkmiracle.png
diff --git a/data/borders/m15old/vehicle/darkpt.png b/data/borders/old/m15/vehicle/darkpt.png
similarity index 100%
rename from data/borders/m15old/vehicle/darkpt.png
rename to data/borders/old/m15/vehicle/darkpt.png
diff --git a/data/borders/m15old/vehicle/flipCircle.png b/data/borders/old/m15/vehicle/flipCircle.png
similarity index 100%
rename from data/borders/m15old/vehicle/flipCircle.png
rename to data/borders/old/m15/vehicle/flipCircle.png
diff --git a/data/borders/m15old/vehicle/flipTip.png b/data/borders/old/m15/vehicle/flipTip.png
similarity index 100%
rename from data/borders/m15old/vehicle/flipTip.png
rename to data/borders/old/m15/vehicle/flipTip.png
diff --git a/data/borders/m15old/vehicle/flippedDark.png b/data/borders/old/m15/vehicle/flippedDark.png
similarity index 100%
rename from data/borders/m15old/vehicle/flippedDark.png
rename to data/borders/old/m15/vehicle/flippedDark.png
diff --git a/data/borders/old/m15/vehicle/frame.png b/data/borders/old/m15/vehicle/frame.png
new file mode 100644
index 00000000..61b7da99
Binary files /dev/null and b/data/borders/old/m15/vehicle/frame.png differ
diff --git a/data/borders/m15old/vehicle/legendary.png b/data/borders/old/m15/vehicle/legendary.png
similarity index 100%
rename from data/borders/m15old/vehicle/legendary.png
rename to data/borders/old/m15/vehicle/legendary.png
diff --git a/data/borders/old/m15/vehicle/miracle.png b/data/borders/old/m15/vehicle/miracle.png
new file mode 100644
index 00000000..9b55b95d
Binary files /dev/null and b/data/borders/old/m15/vehicle/miracle.png differ
diff --git a/data/borders/old/m15/vehicle/nyx.png b/data/borders/old/m15/vehicle/nyx.png
new file mode 100644
index 00000000..3662cb6d
Binary files /dev/null and b/data/borders/old/m15/vehicle/nyx.png differ
diff --git a/data/borders/old/m15/vehicle/pt.png b/data/borders/old/m15/vehicle/pt.png
new file mode 100644
index 00000000..218ae720
Binary files /dev/null and b/data/borders/old/m15/vehicle/pt.png differ
diff --git a/data/borders/old/m15/vehicle/stamp.png b/data/borders/old/m15/vehicle/stamp.png
new file mode 100644
index 00000000..99a1fb1d
Binary files /dev/null and b/data/borders/old/m15/vehicle/stamp.png differ
diff --git a/data/borders/m15old/white/darkmiracle.png b/data/borders/old/m15/white/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/white/darkmiracle.png
rename to data/borders/old/m15/white/darkmiracle.png
diff --git a/data/borders/m15old/white/darkpt.png b/data/borders/old/m15/white/darkpt.png
similarity index 100%
rename from data/borders/m15old/white/darkpt.png
rename to data/borders/old/m15/white/darkpt.png
diff --git a/data/borders/m15old/white/flipCircle.png b/data/borders/old/m15/white/flipCircle.png
similarity index 100%
rename from data/borders/m15old/white/flipCircle.png
rename to data/borders/old/m15/white/flipCircle.png
diff --git a/data/borders/m15old/white/flipTip.png b/data/borders/old/m15/white/flipTip.png
similarity index 100%
rename from data/borders/m15old/white/flipTip.png
rename to data/borders/old/m15/white/flipTip.png
diff --git a/data/borders/m15old/white/flippedDark.png b/data/borders/old/m15/white/flippedDark.png
similarity index 100%
rename from data/borders/m15old/white/flippedDark.png
rename to data/borders/old/m15/white/flippedDark.png
diff --git a/data/borders/m15old/white/frame.png b/data/borders/old/m15/white/frame.png
similarity index 100%
rename from data/borders/m15old/white/frame.png
rename to data/borders/old/m15/white/frame.png
diff --git a/data/borders/old/m15/white/legendary.png b/data/borders/old/m15/white/legendary.png
new file mode 100644
index 00000000..c38f942f
Binary files /dev/null and b/data/borders/old/m15/white/legendary.png differ
diff --git a/data/borders/old/m15/white/miracle.png b/data/borders/old/m15/white/miracle.png
new file mode 100644
index 00000000..3ab228b0
Binary files /dev/null and b/data/borders/old/m15/white/miracle.png differ
diff --git a/data/borders/old/m15/white/nyx.png b/data/borders/old/m15/white/nyx.png
new file mode 100644
index 00000000..420291cb
Binary files /dev/null and b/data/borders/old/m15/white/nyx.png differ
diff --git a/data/borders/tokenTall/white/pt.png b/data/borders/old/m15/white/pt.png
similarity index 100%
rename from data/borders/tokenTall/white/pt.png
rename to data/borders/old/m15/white/pt.png
diff --git a/data/borders/old/m15/white/stamp.png b/data/borders/old/m15/white/stamp.png
new file mode 100644
index 00000000..bd677a7d
Binary files /dev/null and b/data/borders/old/m15/white/stamp.png differ
diff --git a/data/borders/m15old/whiteLand/darkmiracle.png b/data/borders/old/m15/whiteLand/darkmiracle.png
similarity index 100%
rename from data/borders/m15old/whiteLand/darkmiracle.png
rename to data/borders/old/m15/whiteLand/darkmiracle.png
diff --git a/data/borders/m15old/whiteLand/darkpt.png b/data/borders/old/m15/whiteLand/darkpt.png
similarity index 100%
rename from data/borders/m15old/whiteLand/darkpt.png
rename to data/borders/old/m15/whiteLand/darkpt.png
diff --git a/data/borders/m15old/whiteLand/flipCircle.png b/data/borders/old/m15/whiteLand/flipCircle.png
similarity index 100%
rename from data/borders/m15old/whiteLand/flipCircle.png
rename to data/borders/old/m15/whiteLand/flipCircle.png
diff --git a/data/borders/m15old/whiteLand/flipTip.png b/data/borders/old/m15/whiteLand/flipTip.png
similarity index 100%
rename from data/borders/m15old/whiteLand/flipTip.png
rename to data/borders/old/m15/whiteLand/flipTip.png
diff --git a/data/borders/m15old/whiteLand/flippedDark.png b/data/borders/old/m15/whiteLand/flippedDark.png
similarity index 100%
rename from data/borders/m15old/whiteLand/flippedDark.png
rename to data/borders/old/m15/whiteLand/flippedDark.png
diff --git a/data/borders/old/m15/whiteLand/frame.png b/data/borders/old/m15/whiteLand/frame.png
new file mode 100644
index 00000000..3e1014e9
Binary files /dev/null and b/data/borders/old/m15/whiteLand/frame.png differ
diff --git a/data/borders/m15old/whiteLand/legendary.png b/data/borders/old/m15/whiteLand/legendary.png
similarity index 100%
rename from data/borders/m15old/whiteLand/legendary.png
rename to data/borders/old/m15/whiteLand/legendary.png
diff --git a/data/borders/old/m15/whiteLand/miracle.png b/data/borders/old/m15/whiteLand/miracle.png
new file mode 100644
index 00000000..9260154a
Binary files /dev/null and b/data/borders/old/m15/whiteLand/miracle.png differ
diff --git a/data/borders/old/m15/whiteLand/nyx.png b/data/borders/old/m15/whiteLand/nyx.png
new file mode 100644
index 00000000..a98474b0
Binary files /dev/null and b/data/borders/old/m15/whiteLand/nyx.png differ
diff --git a/data/borders/tokenText/white/pt.png b/data/borders/old/m15/whiteLand/pt.png
similarity index 100%
rename from data/borders/tokenText/white/pt.png
rename to data/borders/old/m15/whiteLand/pt.png
diff --git a/data/borders/old/m15/whiteLand/stamp.png b/data/borders/old/m15/whiteLand/stamp.png
new file mode 100644
index 00000000..bd677a7d
Binary files /dev/null and b/data/borders/old/m15/whiteLand/stamp.png differ
diff --git a/data/borders/map/artMask.png b/data/borders/old/map/artMask.png
similarity index 100%
rename from data/borders/map/artMask.png
rename to data/borders/old/map/artMask.png
diff --git a/data/borders/map/artifact/frame.png b/data/borders/old/map/artifact/frame.png
similarity index 100%
rename from data/borders/map/artifact/frame.png
rename to data/borders/old/map/artifact/frame.png
diff --git a/data/borders/map/artifact/pt.png b/data/borders/old/map/artifact/pt.png
similarity index 100%
rename from data/borders/map/artifact/pt.png
rename to data/borders/old/map/artifact/pt.png
diff --git a/data/borders/map/artifactLand/frame.png b/data/borders/old/map/artifactLand/frame.png
similarity index 100%
rename from data/borders/map/artifactLand/frame.png
rename to data/borders/old/map/artifactLand/frame.png
diff --git a/data/borders/map/artifactLand/pt.png b/data/borders/old/map/artifactLand/pt.png
similarity index 100%
rename from data/borders/map/artifactLand/pt.png
rename to data/borders/old/map/artifactLand/pt.png
diff --git a/data/borders/map/black/frame.png b/data/borders/old/map/black/frame.png
similarity index 100%
rename from data/borders/map/black/frame.png
rename to data/borders/old/map/black/frame.png
diff --git a/data/borders/map/black/pt.png b/data/borders/old/map/black/pt.png
similarity index 100%
rename from data/borders/map/black/pt.png
rename to data/borders/old/map/black/pt.png
diff --git a/data/borders/map/blackLand/frame.png b/data/borders/old/map/blackLand/frame.png
similarity index 100%
rename from data/borders/map/blackLand/frame.png
rename to data/borders/old/map/blackLand/frame.png
diff --git a/data/borders/map/blackLand/pt.png b/data/borders/old/map/blackLand/pt.png
similarity index 100%
rename from data/borders/map/blackLand/pt.png
rename to data/borders/old/map/blackLand/pt.png
diff --git a/data/borders/map/blue/frame.png b/data/borders/old/map/blue/frame.png
similarity index 100%
rename from data/borders/map/blue/frame.png
rename to data/borders/old/map/blue/frame.png
diff --git a/data/borders/map/blue/pt.png b/data/borders/old/map/blue/pt.png
similarity index 100%
rename from data/borders/map/blue/pt.png
rename to data/borders/old/map/blue/pt.png
diff --git a/data/borders/map/blueLand/frame.png b/data/borders/old/map/blueLand/frame.png
similarity index 100%
rename from data/borders/map/blueLand/frame.png
rename to data/borders/old/map/blueLand/frame.png
diff --git a/data/borders/map/blueLand/pt.png b/data/borders/old/map/blueLand/pt.png
similarity index 100%
rename from data/borders/map/blueLand/pt.png
rename to data/borders/old/map/blueLand/pt.png
diff --git a/data/borders/map/border.js b/data/borders/old/map/border.js
similarity index 100%
rename from data/borders/map/border.js
rename to data/borders/old/map/border.js
diff --git a/data/borders/map/borderMask.png b/data/borders/old/map/borderMask.png
similarity index 100%
rename from data/borders/map/borderMask.png
rename to data/borders/old/map/borderMask.png
diff --git a/data/borders/map/colorless/frame.png b/data/borders/old/map/colorless/frame.png
similarity index 100%
rename from data/borders/map/colorless/frame.png
rename to data/borders/old/map/colorless/frame.png
diff --git a/data/borders/map/colorless/pt.png b/data/borders/old/map/colorless/pt.png
similarity index 100%
rename from data/borders/map/colorless/pt.png
rename to data/borders/old/map/colorless/pt.png
diff --git a/data/borders/map/colorlessLand/frame.png b/data/borders/old/map/colorlessLand/frame.png
similarity index 100%
rename from data/borders/map/colorlessLand/frame.png
rename to data/borders/old/map/colorlessLand/frame.png
diff --git a/data/borders/map/colorlessLand/pt.png b/data/borders/old/map/colorlessLand/pt.png
similarity index 100%
rename from data/borders/map/colorlessLand/pt.png
rename to data/borders/old/map/colorlessLand/pt.png
diff --git a/data/borders/map/frameMask.png b/data/borders/old/map/frameMask.png
similarity index 100%
rename from data/borders/map/frameMask.png
rename to data/borders/old/map/frameMask.png
diff --git a/data/borders/map/gold/frame.png b/data/borders/old/map/gold/frame.png
similarity index 100%
rename from data/borders/map/gold/frame.png
rename to data/borders/old/map/gold/frame.png
diff --git a/data/borders/map/gold/pt.png b/data/borders/old/map/gold/pt.png
similarity index 100%
rename from data/borders/map/gold/pt.png
rename to data/borders/old/map/gold/pt.png
diff --git a/data/borders/map/goldLand/frame.png b/data/borders/old/map/goldLand/frame.png
similarity index 100%
rename from data/borders/map/goldLand/frame.png
rename to data/borders/old/map/goldLand/frame.png
diff --git a/data/borders/map/goldLand/pt.png b/data/borders/old/map/goldLand/pt.png
similarity index 100%
rename from data/borders/map/goldLand/pt.png
rename to data/borders/old/map/goldLand/pt.png
diff --git a/data/borders/map/green/frame.png b/data/borders/old/map/green/frame.png
similarity index 100%
rename from data/borders/map/green/frame.png
rename to data/borders/old/map/green/frame.png
diff --git a/data/borders/map/green/pt.png b/data/borders/old/map/green/pt.png
similarity index 100%
rename from data/borders/map/green/pt.png
rename to data/borders/old/map/green/pt.png
diff --git a/data/borders/map/greenLand/frame.png b/data/borders/old/map/greenLand/frame.png
similarity index 100%
rename from data/borders/map/greenLand/frame.png
rename to data/borders/old/map/greenLand/frame.png
diff --git a/data/borders/map/greenLand/pt.png b/data/borders/old/map/greenLand/pt.png
similarity index 100%
rename from data/borders/map/greenLand/pt.png
rename to data/borders/old/map/greenLand/pt.png
diff --git a/data/borders/map/red/frame.png b/data/borders/old/map/red/frame.png
similarity index 100%
rename from data/borders/map/red/frame.png
rename to data/borders/old/map/red/frame.png
diff --git a/data/borders/map/red/pt.png b/data/borders/old/map/red/pt.png
similarity index 100%
rename from data/borders/map/red/pt.png
rename to data/borders/old/map/red/pt.png
diff --git a/data/borders/map/redLand/frame.png b/data/borders/old/map/redLand/frame.png
similarity index 100%
rename from data/borders/map/redLand/frame.png
rename to data/borders/old/map/redLand/frame.png
diff --git a/data/borders/map/redLand/pt.png b/data/borders/old/map/redLand/pt.png
similarity index 100%
rename from data/borders/map/redLand/pt.png
rename to data/borders/old/map/redLand/pt.png
diff --git a/data/borders/map/white/frame.png b/data/borders/old/map/white/frame.png
similarity index 100%
rename from data/borders/map/white/frame.png
rename to data/borders/old/map/white/frame.png
diff --git a/data/borders/map/white/pt.png b/data/borders/old/map/white/pt.png
similarity index 100%
rename from data/borders/map/white/pt.png
rename to data/borders/old/map/white/pt.png
diff --git a/data/borders/map/whiteLand/frame.png b/data/borders/old/map/whiteLand/frame.png
similarity index 100%
rename from data/borders/map/whiteLand/frame.png
rename to data/borders/old/map/whiteLand/frame.png
diff --git a/data/borders/map/whiteLand/pt.png b/data/borders/old/map/whiteLand/pt.png
similarity index 100%
rename from data/borders/map/whiteLand/pt.png
rename to data/borders/old/map/whiteLand/pt.png
diff --git a/data/borders/miniPlane/artMask.png b/data/borders/old/miniPlane/artMask.png
similarity index 100%
rename from data/borders/miniPlane/artMask.png
rename to data/borders/old/miniPlane/artMask.png
diff --git a/data/borders/miniPlane/border.js b/data/borders/old/miniPlane/border.js
similarity index 100%
rename from data/borders/miniPlane/border.js
rename to data/borders/old/miniPlane/border.js
diff --git a/data/borders/miniPlane/borderMask.png b/data/borders/old/miniPlane/borderMask.png
similarity index 100%
rename from data/borders/miniPlane/borderMask.png
rename to data/borders/old/miniPlane/borderMask.png
diff --git a/data/borders/miniPlane/frameMask.png b/data/borders/old/miniPlane/frameMask.png
similarity index 100%
rename from data/borders/miniPlane/frameMask.png
rename to data/borders/old/miniPlane/frameMask.png
diff --git a/data/borders/miniPlane/white/frame.png b/data/borders/old/miniPlane/white/frame.png
similarity index 100%
rename from data/borders/miniPlane/white/frame.png
rename to data/borders/old/miniPlane/white/frame.png
diff --git a/data/borders/old/oldScryfallBasedMasks/imgArtMask.png b/data/borders/old/oldScryfallBasedMasks/imgArtMask.png
new file mode 100644
index 00000000..04987b35
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgArtMask.png differ
diff --git a/data/borders/old/oldScryfallBasedMasks/imgBorderMask.png b/data/borders/old/oldScryfallBasedMasks/imgBorderMask.png
new file mode 100644
index 00000000..255aa736
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgBorderMask.png differ
diff --git a/data/borders/old/oldScryfallBasedMasks/imgFrameMask.png b/data/borders/old/oldScryfallBasedMasks/imgFrameMask.png
new file mode 100644
index 00000000..cb8d8ee1
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgFrameMask.png differ
diff --git a/data/borders/old/oldScryfallBasedMasks/imgPinlineMask.png b/data/borders/old/oldScryfallBasedMasks/imgPinlineMask.png
new file mode 100644
index 00000000..bbb38713
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgPinlineMask.png differ
diff --git a/data/borders/old/oldScryfallBasedMasks/imgRulesMask.png b/data/borders/old/oldScryfallBasedMasks/imgRulesMask.png
new file mode 100644
index 00000000..f526d6fe
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgRulesMask.png differ
diff --git a/data/borders/old/oldScryfallBasedMasks/imgTitleMask.png b/data/borders/old/oldScryfallBasedMasks/imgTitleMask.png
new file mode 100644
index 00000000..5d0c1ea1
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgTitleMask.png differ
diff --git a/data/borders/old/oldScryfallBasedMasks/imgTypeMask.png b/data/borders/old/oldScryfallBasedMasks/imgTypeMask.png
new file mode 100644
index 00000000..13c575ec
Binary files /dev/null and b/data/borders/old/oldScryfallBasedMasks/imgTypeMask.png differ
diff --git a/data/borders/plane/artMask.png b/data/borders/old/plane/artMask.png
similarity index 100%
rename from data/borders/plane/artMask.png
rename to data/borders/old/plane/artMask.png
diff --git a/data/borders/plane/border.js b/data/borders/old/plane/border.js
similarity index 100%
rename from data/borders/plane/border.js
rename to data/borders/old/plane/border.js
diff --git a/data/borders/plane/borderMask.png b/data/borders/old/plane/borderMask.png
similarity index 100%
rename from data/borders/plane/borderMask.png
rename to data/borders/old/plane/borderMask.png
diff --git a/data/borders/plane/frameMask.png b/data/borders/old/plane/frameMask.png
similarity index 100%
rename from data/borders/plane/frameMask.png
rename to data/borders/old/plane/frameMask.png
diff --git a/data/borders/plane/high/frame.png b/data/borders/old/plane/high/frame.png
similarity index 100%
rename from data/borders/plane/high/frame.png
rename to data/borders/old/plane/high/frame.png
diff --git a/data/borders/plane/low/frame.png b/data/borders/old/plane/low/frame.png
similarity index 100%
rename from data/borders/plane/low/frame.png
rename to data/borders/old/plane/low/frame.png
diff --git a/data/borders/plane/mid/frame.png b/data/borders/old/plane/mid/frame.png
similarity index 100%
rename from data/borders/plane/mid/frame.png
rename to data/borders/old/plane/mid/frame.png
diff --git a/data/borders/plane/none/frame.png b/data/borders/old/plane/none/frame.png
similarity index 100%
rename from data/borders/plane/none/frame.png
rename to data/borders/old/plane/none/frame.png
diff --git a/data/borders/plane/white/frame.png b/data/borders/old/plane/white/frame.png
similarity index 100%
rename from data/borders/plane/white/frame.png
rename to data/borders/old/plane/white/frame.png
diff --git a/data/borders/planeswalker/abilityLineEven.png b/data/borders/old/planeswalker/abilityLineEven.png
similarity index 100%
rename from data/borders/planeswalker/abilityLineEven.png
rename to data/borders/old/planeswalker/abilityLineEven.png
diff --git a/data/borders/planeswalker/abilityLineOdd.png b/data/borders/old/planeswalker/abilityLineOdd.png
similarity index 100%
rename from data/borders/planeswalker/abilityLineOdd.png
rename to data/borders/old/planeswalker/abilityLineOdd.png
diff --git a/data/borders/planeswalker/artMask.png b/data/borders/old/planeswalker/artMask.png
similarity index 100%
rename from data/borders/planeswalker/artMask.png
rename to data/borders/old/planeswalker/artMask.png
diff --git a/data/borders/planeswalker/artifact/altFrame.png b/data/borders/old/planeswalker/artifact/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/artifact/altFrame.png
rename to data/borders/old/planeswalker/artifact/altFrame.png
diff --git a/data/borders/planeswalker/artifact/frame.png b/data/borders/old/planeswalker/artifact/frame.png
similarity index 100%
rename from data/borders/planeswalker/artifact/frame.png
rename to data/borders/old/planeswalker/artifact/frame.png
diff --git a/data/borders/planeswalker/artifact/pt.png b/data/borders/old/planeswalker/artifact/pt.png
similarity index 100%
rename from data/borders/planeswalker/artifact/pt.png
rename to data/borders/old/planeswalker/artifact/pt.png
diff --git a/data/borders/planeswalker/artifact/stamp.png b/data/borders/old/planeswalker/artifact/stamp.png
similarity index 100%
rename from data/borders/planeswalker/artifact/stamp.png
rename to data/borders/old/planeswalker/artifact/stamp.png
diff --git a/data/borders/planeswalker/black/altFrame.png b/data/borders/old/planeswalker/black/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/black/altFrame.png
rename to data/borders/old/planeswalker/black/altFrame.png
diff --git a/data/borders/planeswalker/black/frame.png b/data/borders/old/planeswalker/black/frame.png
similarity index 100%
rename from data/borders/planeswalker/black/frame.png
rename to data/borders/old/planeswalker/black/frame.png
diff --git a/data/borders/planeswalker/black/pt.png b/data/borders/old/planeswalker/black/pt.png
similarity index 100%
rename from data/borders/planeswalker/black/pt.png
rename to data/borders/old/planeswalker/black/pt.png
diff --git a/data/borders/planeswalker/black/stamp.png b/data/borders/old/planeswalker/black/stamp.png
similarity index 100%
rename from data/borders/planeswalker/black/stamp.png
rename to data/borders/old/planeswalker/black/stamp.png
diff --git a/data/borders/planeswalker/blue/altFrame.png b/data/borders/old/planeswalker/blue/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/blue/altFrame.png
rename to data/borders/old/planeswalker/blue/altFrame.png
diff --git a/data/borders/planeswalker/blue/frame.png b/data/borders/old/planeswalker/blue/frame.png
similarity index 100%
rename from data/borders/planeswalker/blue/frame.png
rename to data/borders/old/planeswalker/blue/frame.png
diff --git a/data/borders/planeswalker/blue/pt.png b/data/borders/old/planeswalker/blue/pt.png
similarity index 100%
rename from data/borders/planeswalker/blue/pt.png
rename to data/borders/old/planeswalker/blue/pt.png
diff --git a/data/borders/planeswalker/blue/stamp.png b/data/borders/old/planeswalker/blue/stamp.png
similarity index 100%
rename from data/borders/planeswalker/blue/stamp.png
rename to data/borders/old/planeswalker/blue/stamp.png
diff --git a/data/borders/planeswalker/border.js b/data/borders/old/planeswalker/border.js
similarity index 100%
rename from data/borders/planeswalker/border.js
rename to data/borders/old/planeswalker/border.js
diff --git a/data/borders/planeswalker/borderMask.png b/data/borders/old/planeswalker/borderMask.png
similarity index 100%
rename from data/borders/planeswalker/borderMask.png
rename to data/borders/old/planeswalker/borderMask.png
diff --git a/data/borders/planeswalker/colorless/altFrame.png b/data/borders/old/planeswalker/colorless/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/colorless/altFrame.png
rename to data/borders/old/planeswalker/colorless/altFrame.png
diff --git a/data/borders/planeswalker/colorless/frame.png b/data/borders/old/planeswalker/colorless/frame.png
similarity index 100%
rename from data/borders/planeswalker/colorless/frame.png
rename to data/borders/old/planeswalker/colorless/frame.png
diff --git a/data/borders/planeswalker/colorless/pt.png b/data/borders/old/planeswalker/colorless/pt.png
similarity index 100%
rename from data/borders/planeswalker/colorless/pt.png
rename to data/borders/old/planeswalker/colorless/pt.png
diff --git a/data/borders/planeswalker/colorless/stamp.png b/data/borders/old/planeswalker/colorless/stamp.png
similarity index 100%
rename from data/borders/planeswalker/colorless/stamp.png
rename to data/borders/old/planeswalker/colorless/stamp.png
diff --git a/data/borders/planeswalker/frameMask.png b/data/borders/old/planeswalker/frameMask.png
similarity index 100%
rename from data/borders/planeswalker/frameMask.png
rename to data/borders/old/planeswalker/frameMask.png
diff --git a/data/borders/planeswalker/gold/altFrame.png b/data/borders/old/planeswalker/gold/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/gold/altFrame.png
rename to data/borders/old/planeswalker/gold/altFrame.png
diff --git a/data/borders/planeswalker/gold/frame.png b/data/borders/old/planeswalker/gold/frame.png
similarity index 100%
rename from data/borders/planeswalker/gold/frame.png
rename to data/borders/old/planeswalker/gold/frame.png
diff --git a/data/borders/planeswalker/gold/pt.png b/data/borders/old/planeswalker/gold/pt.png
similarity index 100%
rename from data/borders/planeswalker/gold/pt.png
rename to data/borders/old/planeswalker/gold/pt.png
diff --git a/data/borders/planeswalker/gold/stamp.png b/data/borders/old/planeswalker/gold/stamp.png
similarity index 100%
rename from data/borders/planeswalker/gold/stamp.png
rename to data/borders/old/planeswalker/gold/stamp.png
diff --git a/data/borders/planeswalker/green/altFrame.png b/data/borders/old/planeswalker/green/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/green/altFrame.png
rename to data/borders/old/planeswalker/green/altFrame.png
diff --git a/data/borders/planeswalker/green/frame.png b/data/borders/old/planeswalker/green/frame.png
similarity index 100%
rename from data/borders/planeswalker/green/frame.png
rename to data/borders/old/planeswalker/green/frame.png
diff --git a/data/borders/planeswalker/green/pt.png b/data/borders/old/planeswalker/green/pt.png
similarity index 100%
rename from data/borders/planeswalker/green/pt.png
rename to data/borders/old/planeswalker/green/pt.png
diff --git a/data/borders/planeswalker/green/stamp.png b/data/borders/old/planeswalker/green/stamp.png
similarity index 100%
rename from data/borders/planeswalker/green/stamp.png
rename to data/borders/old/planeswalker/green/stamp.png
diff --git a/data/borders/planeswalker/multiGradient.png b/data/borders/old/planeswalker/multiGradient.png
similarity index 100%
rename from data/borders/planeswalker/multiGradient.png
rename to data/borders/old/planeswalker/multiGradient.png
diff --git a/data/borders/planeswalker/multiMask.png b/data/borders/old/planeswalker/multiMask.png
similarity index 100%
rename from data/borders/planeswalker/multiMask.png
rename to data/borders/old/planeswalker/multiMask.png
diff --git a/data/borders/planeswalker/rareStampMask.png b/data/borders/old/planeswalker/rareStampMask.png
similarity index 100%
rename from data/borders/planeswalker/rareStampMask.png
rename to data/borders/old/planeswalker/rareStampMask.png
diff --git a/data/borders/planeswalker/red/altFrame.png b/data/borders/old/planeswalker/red/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/red/altFrame.png
rename to data/borders/old/planeswalker/red/altFrame.png
diff --git a/data/borders/planeswalker/red/frame.png b/data/borders/old/planeswalker/red/frame.png
similarity index 100%
rename from data/borders/planeswalker/red/frame.png
rename to data/borders/old/planeswalker/red/frame.png
diff --git a/data/borders/planeswalker/red/pt.png b/data/borders/old/planeswalker/red/pt.png
similarity index 100%
rename from data/borders/planeswalker/red/pt.png
rename to data/borders/old/planeswalker/red/pt.png
diff --git a/data/borders/planeswalker/red/stamp.png b/data/borders/old/planeswalker/red/stamp.png
similarity index 100%
rename from data/borders/planeswalker/red/stamp.png
rename to data/borders/old/planeswalker/red/stamp.png
diff --git a/data/borders/planeswalker/white/altFrame.png b/data/borders/old/planeswalker/white/altFrame.png
similarity index 100%
rename from data/borders/planeswalker/white/altFrame.png
rename to data/borders/old/planeswalker/white/altFrame.png
diff --git a/data/borders/planeswalker/white/frame.png b/data/borders/old/planeswalker/white/frame.png
similarity index 100%
rename from data/borders/planeswalker/white/frame.png
rename to data/borders/old/planeswalker/white/frame.png
diff --git a/data/borders/planeswalker/white/pt.png b/data/borders/old/planeswalker/white/pt.png
similarity index 100%
rename from data/borders/planeswalker/white/pt.png
rename to data/borders/old/planeswalker/white/pt.png
diff --git a/data/borders/planeswalker/white/stamp.png b/data/borders/old/planeswalker/white/stamp.png
similarity index 100%
rename from data/borders/planeswalker/white/stamp.png
rename to data/borders/old/planeswalker/white/stamp.png
diff --git a/data/borders/planeswalkerTall/abilityLineEven.png b/data/borders/old/planeswalkerTall/abilityLineEven.png
similarity index 100%
rename from data/borders/planeswalkerTall/abilityLineEven.png
rename to data/borders/old/planeswalkerTall/abilityLineEven.png
diff --git a/data/borders/planeswalkerTall/abilityLineOdd.png b/data/borders/old/planeswalkerTall/abilityLineOdd.png
similarity index 100%
rename from data/borders/planeswalkerTall/abilityLineOdd.png
rename to data/borders/old/planeswalkerTall/abilityLineOdd.png
diff --git a/data/borders/planeswalkerTall/artMask.png b/data/borders/old/planeswalkerTall/artMask.png
similarity index 100%
rename from data/borders/planeswalkerTall/artMask.png
rename to data/borders/old/planeswalkerTall/artMask.png
diff --git a/data/borders/planeswalkerTall/artifact/frame.png b/data/borders/old/planeswalkerTall/artifact/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/artifact/frame.png
rename to data/borders/old/planeswalkerTall/artifact/frame.png
diff --git a/data/borders/planeswalkerTall/artifact/pt.png b/data/borders/old/planeswalkerTall/artifact/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/artifact/pt.png
rename to data/borders/old/planeswalkerTall/artifact/pt.png
diff --git a/data/borders/planeswalkerTall/artifact/stamp.png b/data/borders/old/planeswalkerTall/artifact/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/artifact/stamp.png
rename to data/borders/old/planeswalkerTall/artifact/stamp.png
diff --git a/data/borders/planeswalkerTall/black/frame.png b/data/borders/old/planeswalkerTall/black/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/black/frame.png
rename to data/borders/old/planeswalkerTall/black/frame.png
diff --git a/data/borders/planeswalkerTall/black/pt.png b/data/borders/old/planeswalkerTall/black/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/black/pt.png
rename to data/borders/old/planeswalkerTall/black/pt.png
diff --git a/data/borders/planeswalkerTall/black/stamp.png b/data/borders/old/planeswalkerTall/black/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/black/stamp.png
rename to data/borders/old/planeswalkerTall/black/stamp.png
diff --git a/data/borders/planeswalkerTall/blue/frame.png b/data/borders/old/planeswalkerTall/blue/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/blue/frame.png
rename to data/borders/old/planeswalkerTall/blue/frame.png
diff --git a/data/borders/planeswalkerTall/blue/pt.png b/data/borders/old/planeswalkerTall/blue/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/blue/pt.png
rename to data/borders/old/planeswalkerTall/blue/pt.png
diff --git a/data/borders/planeswalkerTall/blue/stamp.png b/data/borders/old/planeswalkerTall/blue/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/blue/stamp.png
rename to data/borders/old/planeswalkerTall/blue/stamp.png
diff --git a/data/borders/planeswalkerTall/border.js b/data/borders/old/planeswalkerTall/border.js
similarity index 100%
rename from data/borders/planeswalkerTall/border.js
rename to data/borders/old/planeswalkerTall/border.js
diff --git a/data/borders/planeswalkerTall/borderMask.png b/data/borders/old/planeswalkerTall/borderMask.png
similarity index 100%
rename from data/borders/planeswalkerTall/borderMask.png
rename to data/borders/old/planeswalkerTall/borderMask.png
diff --git a/data/borders/planeswalkerTall/colorless/frame.png b/data/borders/old/planeswalkerTall/colorless/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/colorless/frame.png
rename to data/borders/old/planeswalkerTall/colorless/frame.png
diff --git a/data/borders/planeswalkerTall/colorless/pt.png b/data/borders/old/planeswalkerTall/colorless/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/colorless/pt.png
rename to data/borders/old/planeswalkerTall/colorless/pt.png
diff --git a/data/borders/planeswalkerTall/colorless/stamp.png b/data/borders/old/planeswalkerTall/colorless/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/colorless/stamp.png
rename to data/borders/old/planeswalkerTall/colorless/stamp.png
diff --git a/data/borders/planeswalkerTall/frameMask.png b/data/borders/old/planeswalkerTall/frameMask.png
similarity index 100%
rename from data/borders/planeswalkerTall/frameMask.png
rename to data/borders/old/planeswalkerTall/frameMask.png
diff --git a/data/borders/planeswalkerTall/gold/frame.png b/data/borders/old/planeswalkerTall/gold/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/gold/frame.png
rename to data/borders/old/planeswalkerTall/gold/frame.png
diff --git a/data/borders/planeswalkerTall/gold/pt.png b/data/borders/old/planeswalkerTall/gold/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/gold/pt.png
rename to data/borders/old/planeswalkerTall/gold/pt.png
diff --git a/data/borders/planeswalkerTall/gold/stamp.png b/data/borders/old/planeswalkerTall/gold/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/gold/stamp.png
rename to data/borders/old/planeswalkerTall/gold/stamp.png
diff --git a/data/borders/planeswalkerTall/green/frame.png b/data/borders/old/planeswalkerTall/green/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/green/frame.png
rename to data/borders/old/planeswalkerTall/green/frame.png
diff --git a/data/borders/planeswalkerTall/green/pt.png b/data/borders/old/planeswalkerTall/green/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/green/pt.png
rename to data/borders/old/planeswalkerTall/green/pt.png
diff --git a/data/borders/planeswalkerTall/green/stamp.png b/data/borders/old/planeswalkerTall/green/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/green/stamp.png
rename to data/borders/old/planeswalkerTall/green/stamp.png
diff --git a/data/borders/planeswalkerTall/multiGradient.png b/data/borders/old/planeswalkerTall/multiGradient.png
similarity index 100%
rename from data/borders/planeswalkerTall/multiGradient.png
rename to data/borders/old/planeswalkerTall/multiGradient.png
diff --git a/data/borders/planeswalkerTall/multiMask.png b/data/borders/old/planeswalkerTall/multiMask.png
similarity index 100%
rename from data/borders/planeswalkerTall/multiMask.png
rename to data/borders/old/planeswalkerTall/multiMask.png
diff --git a/data/borders/planeswalkerTall/rareStampMask.png b/data/borders/old/planeswalkerTall/rareStampMask.png
similarity index 100%
rename from data/borders/planeswalkerTall/rareStampMask.png
rename to data/borders/old/planeswalkerTall/rareStampMask.png
diff --git a/data/borders/planeswalkerTall/red/frame.png b/data/borders/old/planeswalkerTall/red/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/red/frame.png
rename to data/borders/old/planeswalkerTall/red/frame.png
diff --git a/data/borders/planeswalkerTall/red/pt.png b/data/borders/old/planeswalkerTall/red/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/red/pt.png
rename to data/borders/old/planeswalkerTall/red/pt.png
diff --git a/data/borders/planeswalkerTall/red/stamp.png b/data/borders/old/planeswalkerTall/red/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/red/stamp.png
rename to data/borders/old/planeswalkerTall/red/stamp.png
diff --git a/data/borders/planeswalkerTall/white/frame.png b/data/borders/old/planeswalkerTall/white/frame.png
similarity index 100%
rename from data/borders/planeswalkerTall/white/frame.png
rename to data/borders/old/planeswalkerTall/white/frame.png
diff --git a/data/borders/planeswalkerTall/white/pt.png b/data/borders/old/planeswalkerTall/white/pt.png
similarity index 100%
rename from data/borders/planeswalkerTall/white/pt.png
rename to data/borders/old/planeswalkerTall/white/pt.png
diff --git a/data/borders/planeswalkerTall/white/stamp.png b/data/borders/old/planeswalkerTall/white/stamp.png
similarity index 100%
rename from data/borders/planeswalkerTall/white/stamp.png
rename to data/borders/old/planeswalkerTall/white/stamp.png
diff --git a/data/borders/tokenTall/artMask.png b/data/borders/old/tokenTall/artMask.png
similarity index 100%
rename from data/borders/tokenTall/artMask.png
rename to data/borders/old/tokenTall/artMask.png
diff --git a/data/borders/tokenTall/artifact/frame.png b/data/borders/old/tokenTall/artifact/frame.png
similarity index 100%
rename from data/borders/tokenTall/artifact/frame.png
rename to data/borders/old/tokenTall/artifact/frame.png
diff --git a/data/borders/tokenTall/artifact/legendary.png b/data/borders/old/tokenTall/artifact/legendary.png
similarity index 100%
rename from data/borders/tokenTall/artifact/legendary.png
rename to data/borders/old/tokenTall/artifact/legendary.png
diff --git a/data/borders/tokenText/artifact/pt.png b/data/borders/old/tokenTall/artifact/pt.png
similarity index 100%
rename from data/borders/tokenText/artifact/pt.png
rename to data/borders/old/tokenTall/artifact/pt.png
diff --git a/data/borders/tokenTall/black/frame.png b/data/borders/old/tokenTall/black/frame.png
similarity index 100%
rename from data/borders/tokenTall/black/frame.png
rename to data/borders/old/tokenTall/black/frame.png
diff --git a/data/borders/tokenTall/black/legendary.png b/data/borders/old/tokenTall/black/legendary.png
similarity index 100%
rename from data/borders/tokenTall/black/legendary.png
rename to data/borders/old/tokenTall/black/legendary.png
diff --git a/data/borders/tokenTextless/black/pt.png b/data/borders/old/tokenTall/black/pt.png
similarity index 100%
rename from data/borders/tokenTextless/black/pt.png
rename to data/borders/old/tokenTall/black/pt.png
diff --git a/data/borders/tokenTall/blue/frame.png b/data/borders/old/tokenTall/blue/frame.png
similarity index 100%
rename from data/borders/tokenTall/blue/frame.png
rename to data/borders/old/tokenTall/blue/frame.png
diff --git a/data/borders/tokenTall/blue/legendary.png b/data/borders/old/tokenTall/blue/legendary.png
similarity index 100%
rename from data/borders/tokenTall/blue/legendary.png
rename to data/borders/old/tokenTall/blue/legendary.png
diff --git a/data/borders/tokenTextless/blue/pt.png b/data/borders/old/tokenTall/blue/pt.png
similarity index 100%
rename from data/borders/tokenTextless/blue/pt.png
rename to data/borders/old/tokenTall/blue/pt.png
diff --git a/data/borders/tokenTall/border.js b/data/borders/old/tokenTall/border.js
similarity index 100%
rename from data/borders/tokenTall/border.js
rename to data/borders/old/tokenTall/border.js
diff --git a/data/borders/tokenTall/borderMask.png b/data/borders/old/tokenTall/borderMask.png
similarity index 100%
rename from data/borders/tokenTall/borderMask.png
rename to data/borders/old/tokenTall/borderMask.png
diff --git a/data/borders/tokenTall/colorless/frame.png b/data/borders/old/tokenTall/colorless/frame.png
similarity index 100%
rename from data/borders/tokenTall/colorless/frame.png
rename to data/borders/old/tokenTall/colorless/frame.png
diff --git a/data/borders/tokenTall/colorless/legendary.png b/data/borders/old/tokenTall/colorless/legendary.png
similarity index 100%
rename from data/borders/tokenTall/colorless/legendary.png
rename to data/borders/old/tokenTall/colorless/legendary.png
diff --git a/data/borders/tokenTall/colorless/pt.png b/data/borders/old/tokenTall/colorless/pt.png
similarity index 100%
rename from data/borders/tokenTall/colorless/pt.png
rename to data/borders/old/tokenTall/colorless/pt.png
diff --git a/data/borders/tokenTall/frameMask.png b/data/borders/old/tokenTall/frameMask.png
similarity index 100%
rename from data/borders/tokenTall/frameMask.png
rename to data/borders/old/tokenTall/frameMask.png
diff --git a/data/borders/tokenTall/gold/frame.png b/data/borders/old/tokenTall/gold/frame.png
similarity index 100%
rename from data/borders/tokenTall/gold/frame.png
rename to data/borders/old/tokenTall/gold/frame.png
diff --git a/data/borders/tokenTall/gold/legendary.png b/data/borders/old/tokenTall/gold/legendary.png
similarity index 100%
rename from data/borders/tokenTall/gold/legendary.png
rename to data/borders/old/tokenTall/gold/legendary.png
diff --git a/data/borders/tokenTextless/gold/pt.png b/data/borders/old/tokenTall/gold/pt.png
similarity index 100%
rename from data/borders/tokenTextless/gold/pt.png
rename to data/borders/old/tokenTall/gold/pt.png
diff --git a/data/borders/tokenTall/green/frame.png b/data/borders/old/tokenTall/green/frame.png
similarity index 100%
rename from data/borders/tokenTall/green/frame.png
rename to data/borders/old/tokenTall/green/frame.png
diff --git a/data/borders/tokenTall/green/legendary.png b/data/borders/old/tokenTall/green/legendary.png
similarity index 100%
rename from data/borders/tokenTall/green/legendary.png
rename to data/borders/old/tokenTall/green/legendary.png
diff --git a/data/borders/tokenTall/green/pt.png b/data/borders/old/tokenTall/green/pt.png
similarity index 100%
rename from data/borders/tokenTall/green/pt.png
rename to data/borders/old/tokenTall/green/pt.png
diff --git a/data/borders/tokenTall/legendFrameMask.png b/data/borders/old/tokenTall/legendFrameMask.png
similarity index 100%
rename from data/borders/tokenTall/legendFrameMask.png
rename to data/borders/old/tokenTall/legendFrameMask.png
diff --git a/data/borders/tokenTall/multiMask.png b/data/borders/old/tokenTall/multiMask.png
similarity index 100%
rename from data/borders/tokenTall/multiMask.png
rename to data/borders/old/tokenTall/multiMask.png
diff --git a/data/borders/tokenTall/red/frame.png b/data/borders/old/tokenTall/red/frame.png
similarity index 100%
rename from data/borders/tokenTall/red/frame.png
rename to data/borders/old/tokenTall/red/frame.png
diff --git a/data/borders/tokenTall/red/legendary.png b/data/borders/old/tokenTall/red/legendary.png
similarity index 100%
rename from data/borders/tokenTall/red/legendary.png
rename to data/borders/old/tokenTall/red/legendary.png
diff --git a/data/borders/tokenTextless/red/pt.png b/data/borders/old/tokenTall/red/pt.png
similarity index 100%
rename from data/borders/tokenTextless/red/pt.png
rename to data/borders/old/tokenTall/red/pt.png
diff --git a/data/borders/tokenTall/white/frame.png b/data/borders/old/tokenTall/white/frame.png
similarity index 100%
rename from data/borders/tokenTall/white/frame.png
rename to data/borders/old/tokenTall/white/frame.png
diff --git a/data/borders/tokenTall/white/legendary.png b/data/borders/old/tokenTall/white/legendary.png
similarity index 100%
rename from data/borders/tokenTall/white/legendary.png
rename to data/borders/old/tokenTall/white/legendary.png
diff --git a/data/borders/tokenTextless/white/pt.png b/data/borders/old/tokenTall/white/pt.png
similarity index 100%
rename from data/borders/tokenTextless/white/pt.png
rename to data/borders/old/tokenTall/white/pt.png
diff --git a/data/borders/tokenText/artMask.png b/data/borders/old/tokenText/artMask.png
similarity index 100%
rename from data/borders/tokenText/artMask.png
rename to data/borders/old/tokenText/artMask.png
diff --git a/data/borders/tokenText/artifact/frame.png b/data/borders/old/tokenText/artifact/frame.png
similarity index 100%
rename from data/borders/tokenText/artifact/frame.png
rename to data/borders/old/tokenText/artifact/frame.png
diff --git a/data/borders/tokenText/artifact/legendary.png b/data/borders/old/tokenText/artifact/legendary.png
similarity index 100%
rename from data/borders/tokenText/artifact/legendary.png
rename to data/borders/old/tokenText/artifact/legendary.png
diff --git a/data/borders/tokenText/artifact/nyx.png b/data/borders/old/tokenText/artifact/nyx.png
similarity index 100%
rename from data/borders/tokenText/artifact/nyx.png
rename to data/borders/old/tokenText/artifact/nyx.png
diff --git a/data/borders/tokenTextless/artifact/pt.png b/data/borders/old/tokenText/artifact/pt.png
similarity index 100%
rename from data/borders/tokenTextless/artifact/pt.png
rename to data/borders/old/tokenText/artifact/pt.png
diff --git a/data/borders/tokenText/black/frame.png b/data/borders/old/tokenText/black/frame.png
similarity index 100%
rename from data/borders/tokenText/black/frame.png
rename to data/borders/old/tokenText/black/frame.png
diff --git a/data/borders/tokenText/black/legendary.png b/data/borders/old/tokenText/black/legendary.png
similarity index 100%
rename from data/borders/tokenText/black/legendary.png
rename to data/borders/old/tokenText/black/legendary.png
diff --git a/data/borders/tokenText/black/nyx.png b/data/borders/old/tokenText/black/nyx.png
similarity index 100%
rename from data/borders/tokenText/black/nyx.png
rename to data/borders/old/tokenText/black/nyx.png
diff --git a/data/borders/old/tokenText/black/pt.png b/data/borders/old/tokenText/black/pt.png
new file mode 100644
index 00000000..f4cbdac8
Binary files /dev/null and b/data/borders/old/tokenText/black/pt.png differ
diff --git a/data/borders/tokenText/blue/frame.png b/data/borders/old/tokenText/blue/frame.png
similarity index 100%
rename from data/borders/tokenText/blue/frame.png
rename to data/borders/old/tokenText/blue/frame.png
diff --git a/data/borders/tokenText/blue/legendary.png b/data/borders/old/tokenText/blue/legendary.png
similarity index 100%
rename from data/borders/tokenText/blue/legendary.png
rename to data/borders/old/tokenText/blue/legendary.png
diff --git a/data/borders/tokenText/blue/nyx.png b/data/borders/old/tokenText/blue/nyx.png
similarity index 100%
rename from data/borders/tokenText/blue/nyx.png
rename to data/borders/old/tokenText/blue/nyx.png
diff --git a/data/borders/old/tokenText/blue/pt.png b/data/borders/old/tokenText/blue/pt.png
new file mode 100644
index 00000000..e9f38eea
Binary files /dev/null and b/data/borders/old/tokenText/blue/pt.png differ
diff --git a/data/borders/tokenText/border.js b/data/borders/old/tokenText/border.js
similarity index 100%
rename from data/borders/tokenText/border.js
rename to data/borders/old/tokenText/border.js
diff --git a/data/borders/tokenText/borderMask.png b/data/borders/old/tokenText/borderMask.png
similarity index 100%
rename from data/borders/tokenText/borderMask.png
rename to data/borders/old/tokenText/borderMask.png
diff --git a/data/borders/tokenText/colorless/frame.png b/data/borders/old/tokenText/colorless/frame.png
similarity index 100%
rename from data/borders/tokenText/colorless/frame.png
rename to data/borders/old/tokenText/colorless/frame.png
diff --git a/data/borders/tokenText/colorless/legendary.png b/data/borders/old/tokenText/colorless/legendary.png
similarity index 100%
rename from data/borders/tokenText/colorless/legendary.png
rename to data/borders/old/tokenText/colorless/legendary.png
diff --git a/data/borders/tokenText/colorless/nyx.png b/data/borders/old/tokenText/colorless/nyx.png
similarity index 100%
rename from data/borders/tokenText/colorless/nyx.png
rename to data/borders/old/tokenText/colorless/nyx.png
diff --git a/data/borders/tokenText/colorless/pt.png b/data/borders/old/tokenText/colorless/pt.png
similarity index 100%
rename from data/borders/tokenText/colorless/pt.png
rename to data/borders/old/tokenText/colorless/pt.png
diff --git a/data/borders/tokenText/frameMask.png b/data/borders/old/tokenText/frameMask.png
similarity index 100%
rename from data/borders/tokenText/frameMask.png
rename to data/borders/old/tokenText/frameMask.png
diff --git a/data/borders/tokenText/gold/frame.png b/data/borders/old/tokenText/gold/frame.png
similarity index 100%
rename from data/borders/tokenText/gold/frame.png
rename to data/borders/old/tokenText/gold/frame.png
diff --git a/data/borders/tokenText/gold/legendary.png b/data/borders/old/tokenText/gold/legendary.png
similarity index 100%
rename from data/borders/tokenText/gold/legendary.png
rename to data/borders/old/tokenText/gold/legendary.png
diff --git a/data/borders/tokenText/gold/nyx.png b/data/borders/old/tokenText/gold/nyx.png
similarity index 100%
rename from data/borders/tokenText/gold/nyx.png
rename to data/borders/old/tokenText/gold/nyx.png
diff --git a/data/borders/old/tokenText/gold/pt.png b/data/borders/old/tokenText/gold/pt.png
new file mode 100644
index 00000000..163d7330
Binary files /dev/null and b/data/borders/old/tokenText/gold/pt.png differ
diff --git a/data/borders/tokenText/green/frame.png b/data/borders/old/tokenText/green/frame.png
similarity index 100%
rename from data/borders/tokenText/green/frame.png
rename to data/borders/old/tokenText/green/frame.png
diff --git a/data/borders/tokenText/green/legendary.png b/data/borders/old/tokenText/green/legendary.png
similarity index 100%
rename from data/borders/tokenText/green/legendary.png
rename to data/borders/old/tokenText/green/legendary.png
diff --git a/data/borders/tokenText/green/nyx.png b/data/borders/old/tokenText/green/nyx.png
similarity index 100%
rename from data/borders/tokenText/green/nyx.png
rename to data/borders/old/tokenText/green/nyx.png
diff --git a/data/borders/tokenText/green/pt.png b/data/borders/old/tokenText/green/pt.png
similarity index 100%
rename from data/borders/tokenText/green/pt.png
rename to data/borders/old/tokenText/green/pt.png
diff --git a/data/borders/tokenText/legendFrameMask.png b/data/borders/old/tokenText/legendFrameMask.png
similarity index 100%
rename from data/borders/tokenText/legendFrameMask.png
rename to data/borders/old/tokenText/legendFrameMask.png
diff --git a/data/borders/tokenText/multiMask.png b/data/borders/old/tokenText/multiMask.png
similarity index 100%
rename from data/borders/tokenText/multiMask.png
rename to data/borders/old/tokenText/multiMask.png
diff --git a/data/borders/tokenText/red/frame.png b/data/borders/old/tokenText/red/frame.png
similarity index 100%
rename from data/borders/tokenText/red/frame.png
rename to data/borders/old/tokenText/red/frame.png
diff --git a/data/borders/tokenText/red/legendary.png b/data/borders/old/tokenText/red/legendary.png
similarity index 100%
rename from data/borders/tokenText/red/legendary.png
rename to data/borders/old/tokenText/red/legendary.png
diff --git a/data/borders/tokenText/red/nyx.png b/data/borders/old/tokenText/red/nyx.png
similarity index 100%
rename from data/borders/tokenText/red/nyx.png
rename to data/borders/old/tokenText/red/nyx.png
diff --git a/data/borders/old/tokenText/red/pt.png b/data/borders/old/tokenText/red/pt.png
new file mode 100644
index 00000000..255cf8b8
Binary files /dev/null and b/data/borders/old/tokenText/red/pt.png differ
diff --git a/data/borders/tokenText/rulesMask.png b/data/borders/old/tokenText/rulesMask.png
similarity index 100%
rename from data/borders/tokenText/rulesMask.png
rename to data/borders/old/tokenText/rulesMask.png
diff --git a/data/borders/tokenText/titleMask.png b/data/borders/old/tokenText/titleMask.png
similarity index 100%
rename from data/borders/tokenText/titleMask.png
rename to data/borders/old/tokenText/titleMask.png
diff --git a/data/borders/tokenText/typeMask.png b/data/borders/old/tokenText/typeMask.png
similarity index 100%
rename from data/borders/tokenText/typeMask.png
rename to data/borders/old/tokenText/typeMask.png
diff --git a/data/borders/tokenText/white/frame.png b/data/borders/old/tokenText/white/frame.png
similarity index 100%
rename from data/borders/tokenText/white/frame.png
rename to data/borders/old/tokenText/white/frame.png
diff --git a/data/borders/tokenText/white/legendary.png b/data/borders/old/tokenText/white/legendary.png
similarity index 100%
rename from data/borders/tokenText/white/legendary.png
rename to data/borders/old/tokenText/white/legendary.png
diff --git a/data/borders/tokenText/white/nyx.png b/data/borders/old/tokenText/white/nyx.png
similarity index 100%
rename from data/borders/tokenText/white/nyx.png
rename to data/borders/old/tokenText/white/nyx.png
diff --git a/data/borders/old/tokenText/white/pt.png b/data/borders/old/tokenText/white/pt.png
new file mode 100644
index 00000000..6480a390
Binary files /dev/null and b/data/borders/old/tokenText/white/pt.png differ
diff --git a/data/borders/tokenTextless/artMask.png b/data/borders/old/tokenTextless/artMask.png
similarity index 100%
rename from data/borders/tokenTextless/artMask.png
rename to data/borders/old/tokenTextless/artMask.png
diff --git a/data/borders/tokenTextless/artifact/frame.png b/data/borders/old/tokenTextless/artifact/frame.png
similarity index 100%
rename from data/borders/tokenTextless/artifact/frame.png
rename to data/borders/old/tokenTextless/artifact/frame.png
diff --git a/data/borders/tokenTextless/artifact/legendary.png b/data/borders/old/tokenTextless/artifact/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/artifact/legendary.png
rename to data/borders/old/tokenTextless/artifact/legendary.png
diff --git a/data/borders/tokenTextless/artifact/nyx.png b/data/borders/old/tokenTextless/artifact/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/artifact/nyx.png
rename to data/borders/old/tokenTextless/artifact/nyx.png
diff --git a/data/borders/old/tokenTextless/artifact/pt.png b/data/borders/old/tokenTextless/artifact/pt.png
new file mode 100644
index 00000000..15d680e6
Binary files /dev/null and b/data/borders/old/tokenTextless/artifact/pt.png differ
diff --git a/data/borders/tokenTextless/black/frame.png b/data/borders/old/tokenTextless/black/frame.png
similarity index 100%
rename from data/borders/tokenTextless/black/frame.png
rename to data/borders/old/tokenTextless/black/frame.png
diff --git a/data/borders/tokenTextless/black/legendary.png b/data/borders/old/tokenTextless/black/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/black/legendary.png
rename to data/borders/old/tokenTextless/black/legendary.png
diff --git a/data/borders/tokenTextless/black/nyx.png b/data/borders/old/tokenTextless/black/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/black/nyx.png
rename to data/borders/old/tokenTextless/black/nyx.png
diff --git a/data/borders/old/tokenTextless/black/pt.png b/data/borders/old/tokenTextless/black/pt.png
new file mode 100644
index 00000000..f4cbdac8
Binary files /dev/null and b/data/borders/old/tokenTextless/black/pt.png differ
diff --git a/data/borders/tokenTextless/blue/frame.png b/data/borders/old/tokenTextless/blue/frame.png
similarity index 100%
rename from data/borders/tokenTextless/blue/frame.png
rename to data/borders/old/tokenTextless/blue/frame.png
diff --git a/data/borders/tokenTextless/blue/legendary.png b/data/borders/old/tokenTextless/blue/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/blue/legendary.png
rename to data/borders/old/tokenTextless/blue/legendary.png
diff --git a/data/borders/tokenTextless/blue/nyx.png b/data/borders/old/tokenTextless/blue/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/blue/nyx.png
rename to data/borders/old/tokenTextless/blue/nyx.png
diff --git a/data/borders/old/tokenTextless/blue/pt.png b/data/borders/old/tokenTextless/blue/pt.png
new file mode 100644
index 00000000..e9f38eea
Binary files /dev/null and b/data/borders/old/tokenTextless/blue/pt.png differ
diff --git a/data/borders/tokenTextless/border.js b/data/borders/old/tokenTextless/border.js
similarity index 100%
rename from data/borders/tokenTextless/border.js
rename to data/borders/old/tokenTextless/border.js
diff --git a/data/borders/tokenTextless/borderMask.png b/data/borders/old/tokenTextless/borderMask.png
similarity index 100%
rename from data/borders/tokenTextless/borderMask.png
rename to data/borders/old/tokenTextless/borderMask.png
diff --git a/data/borders/tokenTextless/colorless/frame.png b/data/borders/old/tokenTextless/colorless/frame.png
similarity index 100%
rename from data/borders/tokenTextless/colorless/frame.png
rename to data/borders/old/tokenTextless/colorless/frame.png
diff --git a/data/borders/tokenTextless/colorless/legendary.png b/data/borders/old/tokenTextless/colorless/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/colorless/legendary.png
rename to data/borders/old/tokenTextless/colorless/legendary.png
diff --git a/data/borders/tokenTextless/colorless/nyx.png b/data/borders/old/tokenTextless/colorless/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/colorless/nyx.png
rename to data/borders/old/tokenTextless/colorless/nyx.png
diff --git a/data/borders/tokenTextless/colorless/pt.png b/data/borders/old/tokenTextless/colorless/pt.png
similarity index 100%
rename from data/borders/tokenTextless/colorless/pt.png
rename to data/borders/old/tokenTextless/colorless/pt.png
diff --git a/data/borders/tokenTextless/frameMask.png b/data/borders/old/tokenTextless/frameMask.png
similarity index 100%
rename from data/borders/tokenTextless/frameMask.png
rename to data/borders/old/tokenTextless/frameMask.png
diff --git a/data/borders/tokenTextless/gold/frame.png b/data/borders/old/tokenTextless/gold/frame.png
similarity index 100%
rename from data/borders/tokenTextless/gold/frame.png
rename to data/borders/old/tokenTextless/gold/frame.png
diff --git a/data/borders/tokenTextless/gold/legendary.png b/data/borders/old/tokenTextless/gold/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/gold/legendary.png
rename to data/borders/old/tokenTextless/gold/legendary.png
diff --git a/data/borders/tokenTextless/gold/nyx.png b/data/borders/old/tokenTextless/gold/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/gold/nyx.png
rename to data/borders/old/tokenTextless/gold/nyx.png
diff --git a/data/borders/old/tokenTextless/gold/pt.png b/data/borders/old/tokenTextless/gold/pt.png
new file mode 100644
index 00000000..163d7330
Binary files /dev/null and b/data/borders/old/tokenTextless/gold/pt.png differ
diff --git a/data/borders/tokenTextless/green/frame.png b/data/borders/old/tokenTextless/green/frame.png
similarity index 100%
rename from data/borders/tokenTextless/green/frame.png
rename to data/borders/old/tokenTextless/green/frame.png
diff --git a/data/borders/tokenTextless/green/legendary.png b/data/borders/old/tokenTextless/green/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/green/legendary.png
rename to data/borders/old/tokenTextless/green/legendary.png
diff --git a/data/borders/tokenTextless/green/nyx.png b/data/borders/old/tokenTextless/green/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/green/nyx.png
rename to data/borders/old/tokenTextless/green/nyx.png
diff --git a/data/borders/tokenTextless/green/pt.png b/data/borders/old/tokenTextless/green/pt.png
similarity index 100%
rename from data/borders/tokenTextless/green/pt.png
rename to data/borders/old/tokenTextless/green/pt.png
diff --git a/data/borders/tokenTextless/legendFrameMask.png b/data/borders/old/tokenTextless/legendFrameMask.png
similarity index 100%
rename from data/borders/tokenTextless/legendFrameMask.png
rename to data/borders/old/tokenTextless/legendFrameMask.png
diff --git a/data/borders/tokenTextless/multiMask.png b/data/borders/old/tokenTextless/multiMask.png
similarity index 100%
rename from data/borders/tokenTextless/multiMask.png
rename to data/borders/old/tokenTextless/multiMask.png
diff --git a/data/borders/tokenTextless/red/frame.png b/data/borders/old/tokenTextless/red/frame.png
similarity index 100%
rename from data/borders/tokenTextless/red/frame.png
rename to data/borders/old/tokenTextless/red/frame.png
diff --git a/data/borders/tokenTextless/red/legendary.png b/data/borders/old/tokenTextless/red/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/red/legendary.png
rename to data/borders/old/tokenTextless/red/legendary.png
diff --git a/data/borders/tokenTextless/red/nyx.png b/data/borders/old/tokenTextless/red/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/red/nyx.png
rename to data/borders/old/tokenTextless/red/nyx.png
diff --git a/data/borders/old/tokenTextless/red/pt.png b/data/borders/old/tokenTextless/red/pt.png
new file mode 100644
index 00000000..255cf8b8
Binary files /dev/null and b/data/borders/old/tokenTextless/red/pt.png differ
diff --git a/data/borders/tokenTextless/white/frame.png b/data/borders/old/tokenTextless/white/frame.png
similarity index 100%
rename from data/borders/tokenTextless/white/frame.png
rename to data/borders/old/tokenTextless/white/frame.png
diff --git a/data/borders/tokenTextless/white/legendary.png b/data/borders/old/tokenTextless/white/legendary.png
similarity index 100%
rename from data/borders/tokenTextless/white/legendary.png
rename to data/borders/old/tokenTextless/white/legendary.png
diff --git a/data/borders/tokenTextless/white/nyx.png b/data/borders/old/tokenTextless/white/nyx.png
similarity index 100%
rename from data/borders/tokenTextless/white/nyx.png
rename to data/borders/old/tokenTextless/white/nyx.png
diff --git a/data/borders/old/tokenTextless/white/pt.png b/data/borders/old/tokenTextless/white/pt.png
new file mode 100644
index 00000000..6480a390
Binary files /dev/null and b/data/borders/old/tokenTextless/white/pt.png differ
diff --git a/data/borders/vanguard/artMask.png b/data/borders/old/vanguard/artMask.png
similarity index 100%
rename from data/borders/vanguard/artMask.png
rename to data/borders/old/vanguard/artMask.png
diff --git a/data/borders/vanguard/black/frame.png b/data/borders/old/vanguard/black/frame.png
similarity index 100%
rename from data/borders/vanguard/black/frame.png
rename to data/borders/old/vanguard/black/frame.png
diff --git a/data/borders/vanguard/blue/frame.png b/data/borders/old/vanguard/blue/frame.png
similarity index 100%
rename from data/borders/vanguard/blue/frame.png
rename to data/borders/old/vanguard/blue/frame.png
diff --git a/data/borders/vanguard/border.js b/data/borders/old/vanguard/border.js
similarity index 100%
rename from data/borders/vanguard/border.js
rename to data/borders/old/vanguard/border.js
diff --git a/data/borders/vanguard/borderMask.png b/data/borders/old/vanguard/borderMask.png
similarity index 100%
rename from data/borders/vanguard/borderMask.png
rename to data/borders/old/vanguard/borderMask.png
diff --git a/data/borders/vanguard/colorless/frame.png b/data/borders/old/vanguard/colorless/frame.png
similarity index 100%
rename from data/borders/vanguard/colorless/frame.png
rename to data/borders/old/vanguard/colorless/frame.png
diff --git a/data/borders/vanguard/frameMask.png b/data/borders/old/vanguard/frameMask.png
similarity index 100%
rename from data/borders/vanguard/frameMask.png
rename to data/borders/old/vanguard/frameMask.png
diff --git a/data/borders/vanguard/gold/frame.png b/data/borders/old/vanguard/gold/frame.png
similarity index 100%
rename from data/borders/vanguard/gold/frame.png
rename to data/borders/old/vanguard/gold/frame.png
diff --git a/data/borders/vanguard/green/frame.png b/data/borders/old/vanguard/green/frame.png
similarity index 100%
rename from data/borders/vanguard/green/frame.png
rename to data/borders/old/vanguard/green/frame.png
diff --git a/data/borders/vanguard/red/frame.png b/data/borders/old/vanguard/red/frame.png
similarity index 100%
rename from data/borders/vanguard/red/frame.png
rename to data/borders/old/vanguard/red/frame.png
diff --git a/data/borders/vanguard/rulesMask.png b/data/borders/old/vanguard/rulesMask.png
similarity index 100%
rename from data/borders/vanguard/rulesMask.png
rename to data/borders/old/vanguard/rulesMask.png
diff --git a/data/borders/vanguard/white/frame.png b/data/borders/old/vanguard/white/frame.png
similarity index 100%
rename from data/borders/vanguard/white/frame.png
rename to data/borders/old/vanguard/white/frame.png
diff --git a/data/fonts/gotham-medium.ttf b/data/fonts/gotham-medium.ttf
new file mode 100644
index 00000000..fd822114
Binary files /dev/null and b/data/fonts/gotham-medium.ttf differ
diff --git a/data/main.js b/data/main.js
index 09e38cf6..d47a43ed 100644
--- a/data/main.js
+++ b/data/main.js
@@ -1,9 +1,46 @@
+//============================================//
+//       Card Conjurer, by Kyle Burton        //
+//============================================//
+//Hi there :D
+
+//============================================//
+//     Anything I Like to Change Often :)     //
+//============================================//
+randomizeSampleCards(4)
+
+//============================================//
+//         Setup Variables/Canvases           //
+//============================================//
 //Define important variables
-var sectionFrame = 0;
-var sectionSamples = 0;
-var sectionSymbols = 0;
-var cardWidth = 750
-var cardHeight = 1050
+var sectionFrame = 0, sectionText = 0, sectionOther = 0
+var cardWidth = 750, cardHeight = 1050
+var savedArtList = [], cardArtUrlList = [], cardArtArtistList = []
+//Create the object that stores data for convencience :) It's what keeps track of values necessary to change between card frames
+var defaultCardData = {
+	version:"m15",
+	manaSymbolX:659, manaSymbolY:60, manaSymbolRadius:17.5, manaSymbolDirection:"left",
+	titleX:63, titleY:94, titleRight:687, titleFont:"belerenb", titleFontSize:40,
+	typeX:63, typeY:630, typeRight:687, typeFont:"belerenb", typeFontSize:34,
+	textX:63, textY:690, textRight:690, textFont:"mplantin",
+	ptFont:"39px belerenb", ptX:645, ptY:975,
+	ptBoxX:571, ptBoxY:929, ptBoxWidth:135, ptBoxHeight:76,
+	setSymbolWidth:77, setSymbolHeight:42, setSymbolX:693, setSymbolY:620,
+	watermarkWidth:520, watermarkHeight:250, watermarkY:815,
+	cardArtX:58, cardArtY:118
+}
+var cardData = defaultCardData
+//Function that restores image values for various things :)
+function defaultImageValues() {
+	imgLegendary.load("none", 20, 20, 714, 186)
+	imgLegendaryRight.load("none", 20, 20, 714, 186)
+	imgRareStamp.load("none", 329, 949, 90, 50)
+	imgRareStampRight.load("none", 329, 949, 90, 50)
+	imgStamp.load("none", 340, 965, 70, 37)
+	imgNyx.load("none", 30, 30, 690, 586)
+	imgNyxRight.load("none", 30, 30, 690, 586)
+	imgMiracle.load("none", 30, 30, 689, 511)
+	imgMiracleRight.load("none", 30, 30, 689, 511)
+}
 
 //Set up canvases
 var cardCanvas = document.getElementById("cardCanvas")
@@ -17,27 +54,16 @@ function newCanvas(name) {
 newCanvas("mask")
 newCanvas("frame")
 newCanvas("text")
+newCanvas("other")
+newCanvas("transparent")
+newCanvas("crop")
 
-//Toggles the visibility of predetermined sections of the input boxes
-function toggleView(targetId, targetClass) {
-	for (var i = 0; i < document.getElementsByClassName(targetClass).length; i++) {
-		document.getElementsByClassName(targetClass)[i].classList.remove("shown")
-	}
-	document.getElementById(targetClass + "-" + targetId).classList.add("shown")
-}
-
-//Downloads the image!
-function downloadCardImage(linkElement) {
-	var cardImageData = cardCanvas.toDataURL()
-	if (cardImageData == undefined) {
-		alert("Sorry, it seems that you cannot download your card. Please try using a different browser/device.")
-	}
-	linkElement.href = cardImageData
-}
-
+//============================================//
+//          Custom Canvas Functions           //
+//============================================//
 //Create custom canvas functions
 //Image masks
-CanvasRenderingContext2D.prototype.mask = function(image, masks, color) {
+CanvasRenderingContext2D.prototype.mask = function(image, masks, color, opacity = 1) {
 	//Clear the mask canvas
     maskContext.clearRect(0, 0, cardWidth, cardHeight)
     maskContext.globalCompositeOperation = "source-over"
@@ -57,20 +83,30 @@ CanvasRenderingContext2D.prototype.mask = function(image, masks, color) {
 	    //Now all the masks are applied. Draw the image, if provided.
    		maskContext.globalCompositeOperation = "source-in"
     }
+    maskContext.globalAlpha = opacity
     if (image != "none") {
     	maskContext.drawImage(image, image.xVal, image.yVal, image.wVal, image.hVal)
     }
     //If a color is provided, fill that in too.
     if (color != undefined && color != "none") {
+    	maskContext.globalCompositeOperation = "source-in"
     	maskContext.fillStyle = color
         maskContext.fillRect(0, 0, cardWidth, cardHeight)
     }
+    maskContext.globalAlpha = 1
     this.drawImage(maskCanvas, 0, 0, cardWidth, cardHeight)
 }
-//Text processor
-CanvasRenderingContext2D.prototype.writeText = function(text, x, y, rightLimit, textFont, textFontSize, textColor, skipLines) {
+
+//Text processor... kind of...
+CanvasRenderingContext2D.prototype.writeText = function(text, inputX, inputY, inputRightLimit, textFont, textFontSize, textColor, skipLines, outline, outlineColor) {
 	this.font = textFontSize + "px " + textFont
 	this.fillStyle = textColor
+	this.strokeStyle = outlineColor
+	this.lineWidth = 2
+	this.textAlign = "left"
+	var x = inputX
+	var y = inputY
+	var rightLimit = inputRightLimit
 	var splitText = text.split(" ")
 	if (skipLines == false) {
 		//The text is condensed into one line
@@ -78,6 +114,9 @@ CanvasRenderingContext2D.prototype.writeText = function(text, x, y, rightLimit,
 			textFontSize -= 0.5
 			this.font = textFontSize + "px " + textFont
 		}
+		if (outline) {
+			this.strokeText(text, x, y)
+		}
 		this.fillText(text, x, y)
 	} else {
 		//Multiple lines and codes? Processing time!
@@ -87,15 +126,16 @@ CanvasRenderingContext2D.prototype.writeText = function(text, x, y, rightLimit,
 		for (var i = 0; i < splitText.length; i ++) {
 			if (splitText[i].includes("{") && splitText[i].includes("}")) {
 				//Codes or not, something will happen. First write what we already have.
+				if (outline) {
+					this.strokeText(currentString, currentX, currentY)
+				}
 				this.fillText(currentString, currentX, currentY)
 				currentX += this.measureText(currentString).width
 				currentString = ""
-				var deleteMe = 0
 				while(splitText[i] != "") {
-					deleteMe += 1
 					//There may be codes within! split up the string further incase there are multiple codes/words
 					var wordToWrite = ""
-					if (splitText[i].charAt(0) == "{") {
+					if (splitText[i].charAt(0) == "{" && splitText[i].includes("}")) {
 						//It might be a code
 						var possibleCode = splitText[i].slice(0, splitText[i].indexOf("}") + 1)
 						var possibleCodeLower = possibleCode.toLowerCase()
@@ -107,9 +147,42 @@ CanvasRenderingContext2D.prototype.writeText = function(text, x, y, rightLimit,
 						} else if (possibleCodeLower == "{line}") {
 							currentX = x
 							currentY += textFontSize + parseInt(document.getElementById("inputTextShift").value)
+						} else if (possibleCodeLower == "{bar}") {
+							this.drawImage(imgBar, cardWidth / 2 - imgBar.width / 2, currentY + parseInt(document.getElementById("inputTextShift").value) + 6)
+							currentX = x
+							currentY += textFontSize + 2 * parseInt(document.getElementById("inputTextShift").value)
 						} else if (possibleCodeLower == "{linenospace}") {
 							currentX = x
 							currentY += textFontSize
+						} else if (possibleCodeLower == "{left}") {
+							rightLimit = inputRightLimit
+							this.textAlign = "left"
+							x = inputX
+							currentX = x
+						} else if (possibleCodeLower == "{center}") {
+							rightLimit = 1.5 * inputRightLimit
+							this.textAlign = "center"
+							x = cardWidth / 2
+							currentX = x
+						} else if (possibleCodeLower == "{right}") {
+							rightLimit = 2 * inputRightLimit - inputX
+							this.textAlign = "right"
+							x = cardWidth - inputX
+							currentX = x
+						} else if (possibleCodeLower.slice(0, 3) == "{up" && possibleCodeLower.charAt(possibleCodeLower.length - 1) == "}") {
+							currentY -= parseInt(possibleCodeLower.slice(3, possibleCodeLower.length - 1))
+						} else if (possibleCodeLower.slice(0, 5) == "{down" && possibleCodeLower.charAt(possibleCodeLower.length - 1) == "}") {
+							currentY += parseInt(possibleCodeLower.slice(5, possibleCodeLower.length - 1))
+						} else if (possibleCodeLower.slice(0, 5) == "{left" && possibleCodeLower.charAt(possibleCodeLower.length - 1) == "}") {
+							currentX -= parseInt(possibleCodeLower.slice(5, possibleCodeLower.length - 1))
+							x -= parseInt(possibleCodeLower.slice(5, possibleCodeLower.length - 1))
+						} else if (possibleCodeLower.slice(0, 6) == "{right" && possibleCodeLower.charAt(possibleCodeLower.length - 1) == "}") {
+							currentX += parseInt(possibleCodeLower.slice(6, possibleCodeLower.length - 1))
+							x += parseInt(possibleCodeLower.slice(6, possibleCodeLower.length - 1))
+						} else if (manaSymbolCodeList.includes((possibleCodeLower.replace("{", "").replace("}", "")))) {
+							//It's a mana symbol! Draw it.
+							this.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf(possibleCodeLower.replace("{", "").replace("}", ""))], currentX + textFontSize * 0.054, currentY - textFontSize * 0.7, textFontSize * 0.77, textFontSize * 0.77)
+							currentX += textFontSize * 0.84
 						} else {
 							//It's not a code. treat it like a regular word.
 							wordToWrite = possibleCode
@@ -132,20 +205,25 @@ CanvasRenderingContext2D.prototype.writeText = function(text, x, y, rightLimit,
 						if (this.measureText(wordToWrite).width + currentX > rightLimit) {
 							//The word doesn't fit. Write the word on the next line.
 							currentY += textFontSize
+							if (outline) {
+								this.strokeText(wordToWrite, x, currentY)
+							}
 							this.fillText(wordToWrite, x, currentY)
 							currentX = x + this.measureText(wordToWrite).width
 						} else {
+							if (outline) {
+								this.strokeText(wordToWrite, currentX, currentY)
+							}
 							this.fillText(wordToWrite, currentX, currentY)
 							currentX += this.measureText(wordToWrite).width
 						}
 					}
-					// console.log(splitText[i])
-					if (deleteMe >= 3) {
-						splitText[i] = ""
-					}
 				}
 			} else if (this.measureText(currentString + " " + splitText[i]).width + currentX > rightLimit) {
 				//There aren't any codes, but the text doesn't fit. Finish writing the current line and move to the next one.
+				if (outline) {
+					this.strokeText(currentString, currentX, currentY)
+				}
 				this.fillText(currentString, currentX, currentY)
 				currentString = splitText[i] + " "
 				currentY += textFontSize
@@ -155,11 +233,16 @@ CanvasRenderingContext2D.prototype.writeText = function(text, x, y, rightLimit,
 				currentString += splitText[i] + " "
 			}
 			if (i == splitText.length - 1) {
+				if (outline) {
+					this.strokeText(currentString, currentX, currentY)
+				}
 				this.fillText(currentString, currentX, currentY)
 			}
 		}
 	}
+	this.textAlign = "left"
 }
+
 //Mana cost!
 CanvasRenderingContext2D.prototype.manaCost = function(input, x, y, size, path) {
 	this.fillStyle = "black"
@@ -182,6 +265,90 @@ CanvasRenderingContext2D.prototype.manaCost = function(input, x, y, size, path)
 	return manaSymbolWidth
 }
 
+//Function that autocrops the image
+function autocrop(targetImage) {
+    //Create image, size canvas, draw image
+    var imgTempTarget = new Image()
+    imgTempTarget.crossOrigin = "anonymous"
+    imgTempTarget.src = targetImage.src
+    imgTempTarget.onload = function() {
+        if (imgTempTarget.width > 0 && imgTempTarget.height > 0) {
+            cropCanvas.width = imgTempTarget.width
+            cropCanvas.height = imgTempTarget.height
+            cropContext.drawImage(imgTempTarget, 0, 0)
+            //declare variables
+            var width = cropCanvas.width
+            var height = cropCanvas.height
+            var pix = {x:[], y:[]}
+            var imageData = cropContext.getImageData(0, 0, cropCanvas.width, cropCanvas.height)
+            var x, y, index
+            if (imageData.data.length > 4) {
+            	//Go through every pixel and
+	            for (y = 0; y < height; y++) {
+	                for (x = 0; x < width; x++) {
+	                    //(y * width + x) * 4 + 3 calculates the index at which the alpha value of the pixel at x, y is given
+	                    index = (y * width + x) * 4 + 3
+	                    if (imageData.data[index] > 0) {
+	                        //pix is the image object that stores two arrays of x and y coordinates. These stored coordinates are all the visible pixels
+	                        pix.x.push(x)
+	                        pix.y.push(y)
+	                    }
+	                }
+	            }
+	            //sorts the arrays numerically
+	            pix.x.sort(function(a,b){return a-b})
+	            pix.y.sort(function(a,b){return a-b})
+	            var n = pix.x.length - 1
+	            //Finds the difference between the leftmost and rightmost visible pixels, and the topmost and bottommost pixels, cuts out a section of the canvas
+	            width = pix.x[n] - pix.x[0]
+	            height = pix.y[n] - pix.y[0]
+	            var cropped = cropContext.getImageData(pix.x[0], pix.y[0], width + 1, height + 1)
+	            //Resizes the canvas and draws cropped image
+	            cropCanvas.width = width + 1
+	            cropCanvas.height = height + 1
+	            cropContext.putImageData(cropped, 0, 0)
+	            //Saves the newly cropped image to the given image
+	            targetImage.src = cropCanvas.toDataURL()
+            }
+        }
+    }
+}
+
+//Function that auto... makes the image's white pixels transparent
+function whiteToTransparent(targetImage) {
+    //Create image, size canvas, draw image
+    var imgTempTarget = new Image()
+    imgTempTarget.crossOrigin = "anonymous"
+    imgTempTarget.src = targetImage.src
+    imgTempTarget.onload = function() {
+    	if (imgTempTarget.width > 0 && imgTempTarget.height > 0) {
+    		transparentCanvas.width = imgTempTarget.width
+    		transparentCanvas.height = imgTempTarget.height
+    		transparentContext.drawImage(imgTempTarget, 0, 0)
+            //declare variables
+            var width = transparentCanvas.width
+            var height = transparentCanvas.height
+            var imageData = transparentContext.getImageData(0, 0, transparentCanvas.width, transparentCanvas.height)
+            var x, y, index
+            //Go through every pixel and
+            for (y = 0; y < height; y++) {
+            	for (x = 0; x < width; x++) {
+                    index = (y * width + x) * 4
+                    if (imageData.data[index] >= 250 && imageData.data[index + 1] >= 250 && imageData.data[index + 2] >= 250) {
+                        imageData.data[index + 3] = 0
+                    }
+                }
+            }
+            transparentContext.clearRect(0, 0, width, height)
+            transparentContext.putImageData(imageData, 0, 0)
+            targetImage.src = transparentCanvas.toDataURL()
+        }
+    }
+}
+
+//============================================//
+//             Custom Image Stuff             //
+//============================================//
 //Whenever a new image is created it will be given an onload function.
 function createImage(name, section) {
 	//Create the image and give it default values
@@ -211,34 +378,37 @@ function createImage(name, section) {
 
 //This is a custom function meant to load new image sources
 Image.prototype.load = function(source, x, y, w, h) {
-	if (this.loadingStatus != true && this.cardSection != "none") {
-		window[this.cardSection] += 1
-	}
 	if (source != "none") {
+		if (this.loadingStatus != true && this.cardSection != "none") {
+			window[this.cardSection] += 1
+		}
 		this.loadingStatus = true
 		this.src = source
 	}
-	if (x != undefined) {this.xVal = x} else {this.xVal = 0}
-	if (y != undefined) {this.yVal = y} else {this.yVal = 0}
-	if (w != undefined) {this.wVal = w} else {this.wVal = cardWidth}
-	if (h != undefined) {this.hVal = h} else {this.hVal = cardHeight}
+	if (x != undefined) {this.xVal = x} else if (this.xVal == undefined) {this.xVal = 0}
+	if (y != undefined) {this.yVal = y} else if (this.yVal == undefined) {this.yVal = 0}
+	if (w != undefined) {this.wVal = w} else if (this.wVal == undefined) {this.wVal = cardWidth}
+	if (h != undefined) {this.hVal = h} else if (this.hVal == undefined) {this.hVal = cardHeight}
 }
 
-//Gives all the select boxes the same color options to choose from
-function populateSelectBoxes(options) {
-	for (var i = 0; i < document.getElementsByClassName("selectColor").length; i++) {
-		document.getElementsByClassName("selectColor")[i].innerHTML = options
-	}
+//Loads images via URL
+function imageURL(input, targetImage, processes) {
+	targetImage.cropStatus = processes
+	targetImage.load("https://cors-anywhere.herokuapp.com/" + input)
 }
-//changeme
-populateSelectBoxes('<option value="data/borders/m15/white/">White</option><option value="data/borders/m15/blue/">Blue</option><option value="data/borders/m15/black/">Black</option><option value="data/borders/m15/red/">Red</option><option value="data/borders/m15/green/">Green</option>')
 
+//============================================//
+//           Loads all the images             //
+//============================================//
 //Images that are drawn on the frame
-var frameImageList = ["imgSectionFrame", "imgFrame", "imgFrameRight", "imgTitleTypeBoxes", "imgTitleTypeBoxesRight", "imgRulesBox", "imgRulesBoxRight", "imgPinline", "imgPinlineRight"]
+var frameImageList = ["imgSectionFrame", "imgFrame", "imgFrameRight", "imgTitleTypeBoxes", "imgTitleTypeBoxesRight", "imgRulesBox", "imgRulesBoxRight", "imgPinline", "imgPinlineRight", "imgLegendary", "imgLegendaryRight", "imgNyx", "imgNyxRight", "imgMiracle", "imgMiracleRight", "imgRareStamp", "imgRareStampRight"]
 for (var i = 0; i < frameImageList.length; i++) {
 	createImage(frameImageList[i], "sectionFrame")
 	window[frameImageList[i]].load("data/borders/m15/white/frame.png")
 }
+//changeme
+createImage("imgPowerToughness", "sectionText")
+imgPowerToughness.load("data/borders/m15/white/pt.png")
 //masks for the card frame
 var frameMaskList = ["imgTypeMask", "imgTitleMask", "imgPinlineMask", "imgRulesMask", "imgFrameMask", "imgArtMask"]
 for (var i = 0; i < frameMaskList.length; i++) {
@@ -246,19 +416,34 @@ for (var i = 0; i < frameMaskList.length; i++) {
 	window[frameMaskList[i]].load("data/borders/m15/" + frameMaskList[i] + ".png")
 }
 //any images that stay the same
-var staticImageList = ["imgMultiGradient", "imgArtistBrush", "imgFoil", "imgStamp", "imgCornerMask"]
+var staticImageList = ["imgMultiGradient", "imgArtistBrush", "imgFoil", "imgStamp", "imgCornerMask", "imgBar", "imgBlank", "imgWhite"]
 for (var i = 0; i < staticImageList.length; i++) {
 	createImage(staticImageList[i], "none")
 	window[staticImageList[i]].load("data/borders/" + staticImageList[i] + ".png")
 }
 //Any images uploaded by the user
-var userInputImageList = ["imgCardArt"]
+var userInputImageList = ["imgCardArt", "imgSetSymbol", "imgWatermark"]
 for (var i = 0; i < userInputImageList.length; i++) {
-	createImage(userInputImageList[i], "none")
+	createImage(userInputImageList[i], "sectionOther")
 	window[userInputImageList[i]].load("data/borders/imgBlank.png")
 	window[userInputImageList[i]].crossOrigin = "anonymous"
-	window[userInputImageList[i]].onload = function() {
-		drawCard()
+		window[userInputImageList[i]].onload = function() {
+		if (this.cropStatus == "needsBoth") {
+			this.cropStatus = "needsCrop"
+			whiteToTransparent(this)
+		} else if (this.cropStatus == "needsWhite") {
+			this.cropStatus = "none"
+			whiteToTransparent(this)
+		} else if (this.cropStatus == "needsCrop") {
+			this.cropStatus = "none"
+			autocrop(this)
+		} else {
+			this.loadingStatus = false
+			sectionOther -= 1
+			if (sectionOther <= 0) {
+				sectionOtherFunction()
+			}
+		}
 	}
 }
 //Mana symbol Array setup
@@ -272,19 +457,12 @@ for (var i = 0; i < manaSymbolCodeList.length; i++) {
 		document.getElementById(this.name).src = this.src
 	}
 }
-//It's easier to generate the mana symbol list via js, so do it here
-var symbolList = ""
-	for (var i = 0; i < manaSymbolCodeList.length; i++) {
-		symbolList += "<div class='manaSymbol' alt='...'>" + manaSymbolCodeList[i] + "<br/>" + "<img id='" + i + "'></img></div>"
-	}
-document.getElementById("symbolList").innerHTML += symbolList
-
-//Loads images via URL
-function imageURL(input, targetImage) {
-	targetImage.src = "https://cors-anywhere.herokuapp.com/" + input.value
-}
-
+//changeme
+imageURL("http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + document.getElementById("inputSetSymbolCode").value.toUpperCase() + "&size=large&rarity=" + document.getElementById("inputSetSymbolRarity").value.toUpperCase(), imgSetSymbol, "needsBoth")
 
+//============================================//
+//             Draw The Sections!             //
+//============================================//
 function sectionFrameFunction() {
 	//Whenever images for the card from finish loading this function will run
 	//Draw the primary frame stuff!
@@ -293,16 +471,22 @@ function sectionFrameFunction() {
 	if (document.getElementById("inputCheckboxFrameRight").checked) {
 		frameContext.mask(imgFrameRight, "imgMultiGradient,source-over")
 	}
+	if (document.getElementById("inputCheckboxRulesBox").checked) {
+		frameContext.mask(imgRulesBox, "imgRulesMask,source-over")
+		if (document.getElementById("inputCheckboxRulesBoxRight").checked) {
+			frameContext.mask(imgRulesBoxRight, "imgRulesMask,source-over;imgMultiGradient,source-in")
+		}
+	}
 	if (document.getElementById("inputCheckboxTitleTypeBoxes").checked) {
 		frameContext.mask(imgTitleTypeBoxes, "imgTitleMask,source-over;imgTypeMask,source-over")
 		if (document.getElementById("inputCheckboxTitleTypeBoxesRight").checked) {
 			frameContext.mask(imgTitleTypeBoxesRight, "imgTitleMask,source-over;imgTypeMask,source-over;imgMultiGradient,source-in")
 		}
 	}
-	if (document.getElementById("inputCheckboxRulesBox").checked) {
-		frameContext.mask(imgRulesBox, "imgRulesMask,source-over")
-		if (document.getElementById("inputCheckboxRulesBoxRight").checked) {
-			frameContext.mask(imgRulesBoxRight, "imgRulesMask,source-over;imgMultiGradient,source-in")
+	if (document.getElementById("inputCheckboxNyx").checked) {
+		frameContext.mask(imgNyx)
+		if (document.getElementById("inputCheckboxFrameRight").checked) {
+			frameContext.mask(imgNyxRight, "imgMultiGradient,source-over")
 		}
 	}
 	if (document.getElementById("inputCheckboxPinline").checked) {
@@ -311,51 +495,338 @@ function sectionFrameFunction() {
 			frameContext.mask(imgPinlineRight, "imgPinlineMask,source-over;imgMultiGradient,source-in")
 		}
 	}
-	//Erase anything if needed
+	if (document.getElementById("inputCheckboxMiracle").checked) {
+		if ((document.getElementById("inputCheckboxTitleTypeBoxes").checked && document.getElementById("inputCheckboxTitleTypeBoxesRight").checked) || (document.getElementById("inputCheckboxFrameRight").checked && document.getElementById("inputCheckboxTitleTypeBoxes").checked == false)) {
+			frameContext.mask(imgMiracle) //changeme
+			frameContext.mask(imgMiracleRight, "imgMultiGradient,source-over")
+		} else {
+			frameContext.mask(imgMiracle)
+		}
+	}
+	if (document.getElementById("inputCheckboxLegendary").checked) {
+		frameContext.fillStyle = "black"
+		frameContext.fillRect(0, 0, cardWidth, 50)
+		frameContext.mask(imgLegendary, "imgTitleMask,source-over;imgWhite,source-out")
+		if ((document.getElementById("inputCheckboxPinline").checked && document.getElementById("inputCheckboxPinlineRight").checked) || (document.getElementById("inputCheckboxFrameRight").checked && document.getElementById("inputCheckboxPinline").checked == false)) {
+			frameContext.mask(imgLegendaryRight, "imgTitleMask,source-over;imgMultiGradient,source-out")
+		}
+	}
+	
+	if (document.getElementById("inputCheckboxRareStamp").checked) {
+		frameContext.mask(imgRareStamp)
+		if ((document.getElementById("inputCheckboxPinline").checked && document.getElementById("inputCheckboxPinlineRight").checked) || (document.getElementById("inputCheckboxFrameRight").checked && document.getElementById("inputCheckboxPinline").checked == false)) {
+			frameContext.mask(imgRareStampRight, "imgMultiGradient,source-over")
+		}
+		frameContext.mask(imgStamp)
+	}
+	//Erase anything if needed (includes opacity fun)
 	frameContext.globalCompositeOperation = "destination-out"
 	frameContext.mask(imgArtMask)
 	frameContext.mask(imgCornerMask)
+	frameContext.mask(imgWhite, "imgTitleMask,source-over;imgTypeMask,source-over", "none", 1 - (parseInt(document.getElementById("inputTitleTypeOpacity").value) / 100))
+	frameContext.mask(imgWhite, "imgRulesMask,source-over", "none", 1 - (parseInt(document.getElementById("inputRulesBoxOpacity").value) / 100))
+	frameContext.mask(imgWhite, "imgPinlineMask,source-over", "none", 1 - (parseInt(document.getElementById("inputPinlineOpacity").value) / 100))
+	frameContext.mask(imgWhite, "imgFrameMask,source-over", "none", 1 - (parseInt(document.getElementById("inputFrameOpacity").value) / 100))
 	frameContext.globalCompositeOperation = "source-over"
 	//Update the card
 	drawCard()
 }
 
-function textFunction() {
+function sectionTextFunction() {
 	//Clears the text canvas
 	textContext.clearRect(0, 0, cardWidth, cardHeight)
 	//mana cost, name, type, text
-	var manaSymbolWidth = textContext.manaCost(document.getElementById("inputCost").value, 658, 59, 18, "left")
-	textContext.writeText(document.getElementById("inputName").value, 63, 94, 687 - manaSymbolWidth, "belerenb", 40, "black", false)
-	textContext.writeText(document.getElementById("inputType").value, 62, 630, 687, "belerenb", 34, "black", false)
-	textContext.writeText(document.getElementById("inputText").value, 63, 690 + parseInt(document.getElementById("inputTextDown").value), 690, "mplantin", parseInt(document.getElementById("inputTextSize").value), "black", true)
+	var manaSymbolWidth = textContext.manaCost(document.getElementById("inputCost").value, cardData.manaSymbolX, cardData.manaSymbolY, cardData.manaSymbolRadius, cardData.manaSymbolDirection)
+	textContext.writeText(document.getElementById("inputName").value, cardData.titleX, cardData.titleY, cardData.titleRight - manaSymbolWidth, cardData.titleFont, cardData.titleFontSize, document.getElementById("inputTitleColor").value, false, document.getElementById("inputCheckboxTitleOutline").checked, document.getElementById("inputTitleOutlineColor").value)
+	textContext.writeText(document.getElementById("inputType").value, cardData.typeX, cardData.typeY, cardData.typeRight, cardData.typeFont, cardData.typeFontSize, document.getElementById("inputTypeColor").value, false, document.getElementById("inputCheckboxTypeOutline").checked, document.getElementById("inputTypeOutlineColor").value)
+	textContext.writeText(document.getElementById("inputText").value, cardData.textX, cardData.textY + parseInt(document.getElementById("inputTextDown").value), cardData.textRight, cardData.textFont, parseInt(document.getElementById("inputTextSize").value), document.getElementById("inputRulesColor").value, true, document.getElementById("inputCheckboxRulesOutline").checked, document.getElementById("inputRulesOutlineColor").value)
+	//Power Toughness
+	if (document.getElementById("inputCheckboxPowerToughness").checked) {
+		imgPowerToughness.xVal = cardData.ptBoxX
+		imgPowerToughness.yVal = cardData.ptBoxY
+		imgPowerToughness.wVal = cardData.ptBoxWidth
+		imgPowerToughness.hVal = cardData.ptBoxHeight
+		textContext.mask(imgPowerToughness)
+		textContext.textAlign = "center"
+		textContext.font = cardData.ptFont
+		textContext.fillStyle = document.getElementById("inputCreatureColor").value
+		textContext.fillText(document.getElementById("inputPowerToughness").value, cardData.ptX, cardData.ptY)
+		textContext.textAlign = "left"
+	}
 	//and all the rest (bottom info stuff)
-
+	var infoNumber = document.getElementById("inputInfoNumber").value
+	var infoRarity = document.getElementById("inputInfoRarity").value
+	var infoSet = document.getElementById("inputInfoSet").value
+	var infoLanguage = document.getElementById("inputInfoLanguage").value
+	var infoArtist = document.getElementById("inputInfoArtist").value
+	var infoCopyright = "CC \u2014 " + document.getElementById("inputInfoCopyright").value
+	var infoSetLanguage = infoSet + " \u00b7 " + infoLanguage
+	textContext.font = "18px gothammedium"
+	textContext.fillStyle = "white"
+	textContext.fillText(infoNumber, 47, 997)
+	textContext.fillText(infoSetLanguage, 47, 1016)
+	//Takes the longer of the two strings and records its width
+	var rarityArtistShift = textContext.measureText(infoSetLanguage).width
+	if (rarityArtistShift < textContext.measureText(infoNumber).width) {
+		rarityArtistShift = textContext.measureText(infoNumber).width
+	}
+	rarityArtistShift += 7 + 47
+	textContext.fillText(infoRarity, rarityArtistShift, 997)
+	imgArtistBrush.load("none", rarityArtistShift, 1003, 21, 13)
+	textContext.mask(imgArtistBrush, "none", textContext.fillStyle)
+	textContext.font = "18px belerenbsc"
+	textContext.fillText(infoArtist, rarityArtistShift + 25, 1016)
+	//"\u2122 & \u00a9 " + year + " Wizards of the Coast"
+	textContext.font = "18px mplantin"
+	textContext.textAlign = "right"
+	if (infoCopyright == "CC \u2014 secretcode") {
+		var date = new Date()
+		var year = date.getFullYear()
+		infoCopyright = "\u2122 & \u00a9 " + year + " Wizards of the Coast"
+	} else if (infoCopyright == "CC \u2014 ") {
+		infoCopyright = ""
+	}
+	var copyrightY = 997
+	if (document.getElementById("inputCheckboxPowerToughness").checked) {
+		copyrightY = 1016
+	}
+	textContext.fillText(infoCopyright, 700, copyrightY)
+	textContext.textAlign = "left"
+	drawCard()
+}
+//changeme
+setTimeout(function(){sectionTextFunction()}, 500)
+setTimeout(function(){sectionTextFunction()}, 1000)
+
+function sectionOtherFunction() {
+	//clears the 'other' canvas
+	otherContext.clearRect(0, 0, cardWidth, cardHeight)
+	if (document.getElementById("inputCheckboxSetSymbol").checked) {
+		//Set Symbol
+		var setSymbolWidth = cardData.setSymbolWidth
+		var setSymbolHeight = imgSetSymbol.height / imgSetSymbol.width * setSymbolWidth
+		if (setSymbolHeight > cardData.setSymbolHeight) {
+			setSymbolHeight = cardData.setSymbolHeight
+			setSymbolWidth = imgSetSymbol.width / imgSetSymbol.height * setSymbolHeight
+		}
+		setSymbolWidth *= parseInt(document.getElementById("inputSetSymbolScale").value) / 100
+		setSymbolHeight *= parseInt(document.getElementById("inputSetSymbolScale").value) / 100
+		otherContext.drawImage(imgSetSymbol, cardData.setSymbolX - setSymbolWidth, cardData.setSymbolY - setSymbolHeight / 2, setSymbolWidth, setSymbolHeight)
+	}
+	if (document.getElementById("inputCheckboxWatermark").checked) {
+		//Watermark
+		var watermarkWidth = cardData.watermarkWidth
+		var watermarkHeight = imgWatermark.height / imgWatermark.width * watermarkWidth
+		if (watermarkHeight > cardData.watermarkHeight) {
+			watermarkHeight = cardData.watermarkHeight
+			watermarkWidth = imgWatermark.width / imgWatermark.height * watermarkHeight
+		}
+		imgWatermark.xVal = cardWidth / 2 - watermarkWidth / 2
+		imgWatermark.yVal = cardData.watermarkY - watermarkHeight / 2
+		imgWatermark.wVal = watermarkWidth
+		imgWatermark.hVal = watermarkHeight
+		otherContext.globalAlpha = 0.4
+		if (document.getElementById("inputCheckboxSecondWatermark").checked) {
+			otherContext.mask(imgWatermark, "imgMultiGradient,source-over;imgWhite,source-out", document.getElementById("inputWatermarkColor").value)
+			otherContext.mask(imgWatermark, "imgMultiGradient,source-over", document.getElementById("inputSecondWatermarkColor").value)
+		} else {
+			otherContext.mask(imgWatermark, "none", document.getElementById("inputWatermarkColor").value)
+		}
+		otherContext.globalAlpha = 1
+	}
 	drawCard()
 }
-setTimeout(function(){textFunction()}, 500)
-setTimeout(function(){textFunction()}, 1000)
 
 function drawCard() {
 	//Clears the card
 	card.clearRect(0, 0, cardWidth, cardHeight)
 	//Draws the card art
-	card.drawImage(imgCardArt, document.getElementById("inputCardArtX").value, document.getElementById("inputCardArtY").value, imgCardArt.width * document.getElementById("inputCardArtZoom").value / 100, imgCardArt.height * document.getElementById("inputCardArtZoom").value / 100)
+	card.drawImage(imgCardArt, parseInt(document.getElementById("inputCardArtX").value) + cardData.cardArtX, parseInt(document.getElementById("inputCardArtY").value) + cardData.cardArtY, imgCardArt.width * document.getElementById("inputCardArtZoom").value / 100, imgCardArt.height * document.getElementById("inputCardArtZoom").value / 100)
 	//Draws the card frame
 	card.drawImage(frameCanvas, 0, 0, cardWidth, cardHeight)
 	//Draws the card text
 	card.drawImage(textCanvas, 0, 0, cardWidth, cardHeight)
+	//Draws the other stuff
+	card.drawImage(otherCanvas, 0, 0, cardWidth, cardHeight)
 	//Erase anything if needed
 	card.globalCompositeOperation = "destination-out"
 	card.mask(imgCornerMask)
 	card.globalCompositeOperation = "source-over"
 }
 
-// setInterval(function(){console.log(sectionFrame)}, 1)
+//============================================//
+//                HTML Stuff                  //
+//============================================//
+//Toggles the visibility of predetermined sections of the input boxes
+function toggleView(targetId, targetClass) {
+	for (var i = 0; i < document.getElementsByClassName(targetClass).length; i++) {
+		document.getElementsByClassName(targetClass)[i].classList.remove("shown")
+	}
+	document.getElementById(targetClass + "-" + targetId).classList.add("shown")
+}
 
-//RIP Old Card Conjurer :)
-// //This is the primary javascript file for Card Conjurer, a program by Kyle Burton that draws custom Magic: The Gathering cards!
+//Downloads the image!
+function downloadCardImage(linkElement) {
+	var cardImageData = cardCanvas.toDataURL()
+	if (cardImageData == undefined) {
+		alert("Sorry, it seems that you cannot download your card. Please try using a different browser/device.")
+	}
+	linkElement.href = cardImageData
+}
 
+//Gives all the select boxes the same color options to choose from
+//loadColors("white-White,blue-Blue,colorlessLand-Colorless Land,gold-Gold"), this is an example of how to use the function
+function loadColors(colors) {
+	var endResult = ""
+	var colorList = colors.split(",")
+	for (var i = 0; i < colorList.length; i++) {
+		endResult += "<option value='data/borders/" + cardData.version + "/" + colorList[i].split("-")[0] + "/'>" + colorList[i].split("-")[1] + "</option>"
+	}
+	for (var i = 0; i < document.getElementsByClassName("selectColor").length; i++) {
+		document.getElementsByClassName("selectColor")[i].innerHTML = endResult
+	}
+}
+//changeme?
+loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless,vehicle-Vehicle,clear-Clear,whiteLand-White Land,blueLand-Blue Land,blackLand-Black Land,redLand-Red Land,greenLand-Green Land,goldLand-Gold Land,colorlessLand-Colorless Land")
 
+//It's easier to generate the mana symbol list via js, so do it here
+var symbolList = ""
+for (var i = 0; i < manaSymbolCodeList.length; i++) {
+	symbolList += "<div class='manaSymbol' alt='...'>" + manaSymbolCodeList[i] + "<br/>" + "<img id='" + i + "'></img></div>"
+}
+document.getElementById("symbolList").innerHTML += symbolList
+
+//Randomizes the sample cards at the bottom of the page.
+function randomizeSampleCards(count) {
+	var cardNumbers = []
+	while (cardNumbers.length < 3) {
+		var randomNumber = Math.floor(Math.random() * count) + 1
+		if (cardNumbers.indexOf(randomNumber) > -1) {
+			continue
+		}
+		cardNumbers[cardNumbers.length] = randomNumber
+		var imgName = "sampleCard" + cardNumbers.length
+		window[imgName] = new Image()
+		window[imgName].src = "images/sampleCards/sample" + randomNumber + ".png"
+	}
+	sampleCard1.onload = function() {
+		document.getElementById("sampleCardA").src = sampleCard1.src
+	}
+	sampleCard2.onload = function() {
+		document.getElementById("sampleCardB").src = sampleCard2.src
+	}
+	sampleCard3.onload = function() {
+		document.getElementById("sampleCardC").src = sampleCard3.src
+	}
+}
+
+//Loads images from a file upload
+function loadImage(event, destination) {
+	var input = event.target
+	var reader = new FileReader()
+	reader.onload = function() {
+		var dataURL = reader.result
+		destination.src = dataURL
+		destination.cropped = false
+		if (destination == imgWatermark) {
+			imgWatermark.whiteToTransparent = false
+		}
+	}
+	reader.readAsDataURL(input.files[0])
+}
+
+//============================================//
+//                Misc Stuff                  //
+//============================================//
+//Allows javascript files to be loaded through javascript code
+function loadScript(scriptName){
+	var script = document.createElement("script")
+	script.setAttribute("type","text/javascript")
+	script.setAttribute("src", scriptName)
+	if (typeof script != "undefined") {
+		document.getElementsByTagName("head")[0].appendChild(script)
+	}
+}
+
+//Loads card art from Scryfall's API via card name!
+function inputCardArtName(cardArtNameInput) {
+	var xhttp = new XMLHttpRequest()
+	xhttp.onreadystatechange = function() {
+		if (this.readyState == 4 && this.status == 200) {
+			savedArtList = this.responseText.split('"art_crop":"')
+			savedArtList.splice(0, 1)
+			document.getElementById("inputCardArtNameNumber").max = savedArtList.length
+			document.getElementById("inputCardArtNameNumber").value = 1
+			for (i = 0; i < savedArtList.length; i ++) {
+				cardArtUrlList[i] = savedArtList[i].split('","border_crop":')[0]
+			}
+			for (i = 0; i < savedArtList.length; i ++) {
+				cardArtArtistList[i] = savedArtList[i].slice(savedArtList[i].indexOf('"artist":"') + 10, savedArtList[i].indexOf('","border_color":'))
+			}
+			inputCardArtNameNumber(1)
+		} else if (this.readyState == 4 && this.status == 404) {
+			alert("Sorry, but we can't seem to find any art for '" + cardArtNameInput + "'")
+		}
+	}
+	xhttp.open("GET", "https://api.scryfall.com/cards/search?order=released&unique=art&q=name%3D" + cardArtNameInput.replace(/ /g, "_"), true)
+	xhttp.send()
+}
+function inputCardArtNameNumber(cardArtNameNumberInput) {
+	imgCardArt.load("https://cors-anywhere.herokuapp.com/" + cardArtUrlList[cardArtNameNumberInput - 1])
+	document.getElementById("inputInfoArtist").value = cardArtArtistList[cardArtNameNumberInput - 1]
+	sectionTextFunction()
+}
+
+//============================================//
+//           Special Image Loading            //
+//============================================//
+function loadLegendaryImages() {
+	if (document.getElementById("inputCheckboxPinline").checked) {
+		imgLegendary.load(imgPinline.src.replace("frame.png", "legendary.png"))
+		imgLegendaryRight.load(imgPinlineRight.src.replace("frame.png", "legendary.png"))
+	} else {
+		imgLegendary.load(imgFrame.src.replace("frame.png", "legendary.png"))
+		imgLegendaryRight.load(imgFrameRight.src.replace("frame.png", "legendary.png"))
+	}
+}
+function loadRareStampImages() {
+	if (document.getElementById("inputCheckboxPinline").checked) {
+		imgRareStamp.load(imgPinline.src.replace("frame.png", "stamp.png"))
+		imgRareStampRight.load(imgPinlineRight.src.replace("frame.png", "stamp.png"))
+	} else {
+		imgRareStamp.load(imgFrame.src.replace("frame.png", "stamp.png"))
+		imgRareStampRight.load(imgFrameRight.src.replace("frame.png", "stamp.png"))
+	}
+}
+function loadMiracleImages() {
+	if (document.getElementById("inputCheckboxTitleTypeBoxes").checked) {
+		imgMiracle.load(imgTitleTypeBoxes.src.replace("frame.png", "miracle.png"))
+		imgMiracleRight.load(imgTitleTypeBoxesRight.src.replace("frame.png", "miracle.png"))
+	} else {
+		imgMiracle.load(imgFrame.src.replace("frame.png", "miracle.png"))
+		imgMiracleRight.load(imgFrameRight.src.replace("frame.png", "miracle.png"))
+	}
+}
+function loadNyxImages() {
+	imgNyx.load(imgFrame.src.replace("frame.png", "nyx.png"))
+	imgNyxRight.load(imgFrameRight.src.replace("frame.png", "nyx.png"))
+}
+for (var i = 0; i < document.getElementsByClassName("changesFrame").length; i++) {
+	document.getElementsByClassName("changesFrame")[i].addEventListener("change", function() {loadLegendaryImages(); loadRareStampImages(); loadNyxImages(); loadMiracleImages()}, false)
+}
+for (var i = 0; i < document.getElementsByClassName("changesTitleType").length; i++) {
+	document.getElementsByClassName("changesTitleType")[i].addEventListener("change", function() {loadMiracleImages()}, false)
+}
+for (var i = 0; i < document.getElementsByClassName("changesPinline").length; i++) {
+	document.getElementsByClassName("changesPinline")[i].addEventListener("change", function() {loadLegendaryImages(); loadRareStampImages()}, false)
+}
+
+//Runs stuff at the very end (once everything is set up)
+defaultImageValues()
+
+//============================================//
+//            RIP OLD CARD CONJURER           //
+//============================================//
 // //============================================//
 // //              Initialization                //
 // //============================================//
@@ -529,7 +1000,6 @@ function drawCard() {
 // 		card.moveTo(0, titleX)
 // 		card.lineTo(cardWidth, titleX)
 // 		card.stroke()
-// 		console.log("debugging")
 // 	}
 // }
 
@@ -1261,16 +1731,16 @@ function drawCard() {
 // 	xhttp.send()
 // }
 // function inputCardArtNameNumber(cardArtNameNumberInput) {
-// 	var tempArtUrlList = []
+// 	var cardArtUrlList = []
 // 	for (i = 0; i < savedArtList.length; i ++) {
-// 		tempArtUrlList[i] = savedArtList[i].split('","border_crop":')[0]
+// 		cardArtUrlList[i] = savedArtList[i].split('","border_crop":')[0]
 // 	}
-// 	imgArt.src = "https://cors-anywhere.herokuapp.com/" + tempArtUrlList[cardArtNameNumberInput - 1]
-// 	var tempArtArtistList = []
+// 	imgArt.src = "https://cors-anywhere.herokuapp.com/" + cardArtUrlList[cardArtNameNumberInput - 1]
+// 	var cardArtArtistList = []
 // 	for (i = 0; i < savedArtList.length; i ++) {
-// 		tempArtArtistList[i] = savedArtList[i].slice(savedArtList[i].indexOf('"artist":"') + 10, savedArtList[i].indexOf('","border_color":'))
+// 		cardArtArtistList[i] = savedArtList[i].slice(savedArtList[i].indexOf('"artist":"') + 10, savedArtList[i].indexOf('","border_color":'))
 // 	}
-// 	document.getElementById("inputArtist").value = tempArtArtistList[cardArtNameNumberInput - 1]
+// 	document.getElementById("inputArtist").value = cardArtArtistList[cardArtNameNumberInput - 1]
 // }
 
 
@@ -1440,12 +1910,6 @@ function drawCard() {
 // }
 
 
-// //============================================//
-// //                  Log it!                   //
-// //============================================//
-// console.log("The main.js file has finished loading.")
-
-
 // //============================================//
 // //                  Cookies!                  //
 // //============================================//
diff --git a/images/sampleCards/sample-card-1.png b/images/sampleCards/old/sample-card-1.png
similarity index 100%
rename from images/sampleCards/sample-card-1.png
rename to images/sampleCards/old/sample-card-1.png
diff --git a/images/sampleCards/sample-card-10.png b/images/sampleCards/old/sample-card-10.png
similarity index 100%
rename from images/sampleCards/sample-card-10.png
rename to images/sampleCards/old/sample-card-10.png
diff --git a/images/sampleCards/sample-card-11.png b/images/sampleCards/old/sample-card-11.png
similarity index 100%
rename from images/sampleCards/sample-card-11.png
rename to images/sampleCards/old/sample-card-11.png
diff --git a/images/sampleCards/sample-card-12.png b/images/sampleCards/old/sample-card-12.png
similarity index 100%
rename from images/sampleCards/sample-card-12.png
rename to images/sampleCards/old/sample-card-12.png
diff --git a/images/sampleCards/sample-card-13.png b/images/sampleCards/old/sample-card-13.png
similarity index 100%
rename from images/sampleCards/sample-card-13.png
rename to images/sampleCards/old/sample-card-13.png
diff --git a/images/sampleCards/sample-card-14.png b/images/sampleCards/old/sample-card-14.png
similarity index 100%
rename from images/sampleCards/sample-card-14.png
rename to images/sampleCards/old/sample-card-14.png
diff --git a/images/sampleCards/sample-card-15.png b/images/sampleCards/old/sample-card-15.png
similarity index 100%
rename from images/sampleCards/sample-card-15.png
rename to images/sampleCards/old/sample-card-15.png
diff --git a/images/sampleCards/sample-card-2.png b/images/sampleCards/old/sample-card-2.png
similarity index 100%
rename from images/sampleCards/sample-card-2.png
rename to images/sampleCards/old/sample-card-2.png
diff --git a/images/sampleCards/sample-card-3.png b/images/sampleCards/old/sample-card-3.png
similarity index 100%
rename from images/sampleCards/sample-card-3.png
rename to images/sampleCards/old/sample-card-3.png
diff --git a/images/sampleCards/sample-card-4.png b/images/sampleCards/old/sample-card-4.png
similarity index 100%
rename from images/sampleCards/sample-card-4.png
rename to images/sampleCards/old/sample-card-4.png
diff --git a/images/sampleCards/sample-card-5.png b/images/sampleCards/old/sample-card-5.png
similarity index 100%
rename from images/sampleCards/sample-card-5.png
rename to images/sampleCards/old/sample-card-5.png
diff --git a/images/sampleCards/sample-card-6.png b/images/sampleCards/old/sample-card-6.png
similarity index 100%
rename from images/sampleCards/sample-card-6.png
rename to images/sampleCards/old/sample-card-6.png
diff --git a/images/sampleCards/sample-card-7.png b/images/sampleCards/old/sample-card-7.png
similarity index 100%
rename from images/sampleCards/sample-card-7.png
rename to images/sampleCards/old/sample-card-7.png
diff --git a/images/sampleCards/sample-card-8.png b/images/sampleCards/old/sample-card-8.png
similarity index 100%
rename from images/sampleCards/sample-card-8.png
rename to images/sampleCards/old/sample-card-8.png
diff --git a/images/sampleCards/sample-card-9.png b/images/sampleCards/old/sample-card-9.png
similarity index 100%
rename from images/sampleCards/sample-card-9.png
rename to images/sampleCards/old/sample-card-9.png
diff --git a/images/sampleCards/sample1.png b/images/sampleCards/sample1.png
new file mode 100644
index 00000000..52d78237
Binary files /dev/null and b/images/sampleCards/sample1.png differ
diff --git a/images/sampleCards/sample2.png b/images/sampleCards/sample2.png
new file mode 100644
index 00000000..3fc43821
Binary files /dev/null and b/images/sampleCards/sample2.png differ
diff --git a/images/sampleCards/sample3.png b/images/sampleCards/sample3.png
new file mode 100644
index 00000000..0ddd6022
Binary files /dev/null and b/images/sampleCards/sample3.png differ
diff --git a/images/sampleCards/sample4.png b/images/sampleCards/sample4.png
new file mode 100644
index 00000000..d6812a54
Binary files /dev/null and b/images/sampleCards/sample4.png differ
diff --git a/index.html b/index.html
index fb1f4815..b22e7827 100644
--- a/index.html
+++ b/index.html
@@ -71,6 +71,7 @@
 				<div onclick="toggleView('art', 'cmm')">Art</div>
 				<div onclick="toggleView('set', 'cmm')">Set Symbol</div>
 				<div onclick="toggleView('watermark', 'cmm')">Watermark</div>
+				<div onclick="toggleView('advanced', 'cmm')">Advanced</div>
 				<div onclick="toggleView('download', 'cmm')">Download</div>
 				<!-- <div onclick="toggleView('color', 'cmm')">Color</div>
 				<div onclick="toggleView('general', 'cmm')">General</div>
@@ -86,109 +87,196 @@
 			</div>
 			<div class="cardManipulationMenu">
 				<div class="cmm shown" id="cmm-frame">
+					Border
+					<span class="dropdown">
+						<select onchange="loadScript('data/borders/' + this.value + '/border.js')">
+							<option value="m15">M15</option>
+							<option value="fullArtLandUnstable">Full Art Land (Unstable)</option>
+						</select>
+					</span>
+					<br><br>
 					Frame
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgFrame.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesFrame" onchange="imgFrame.load(this.value + 'frame.png')"></select>
 					</span>
 					<br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxFrameRight" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxFrameRight" onchange="sectionFrameFunction()" class="changesFrame">
 						<label for="inputCheckboxFrameRight"/>
 						<div>Frame (right)</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgFrameRight.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesFrame" onchange="imgFrameRight.load(this.value + 'frame.png')"></select>
 					</span>
 					<br><br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxTitleTypeBoxes" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxTitleTypeBoxes" onchange="sectionFrameFunction()" class="changesTitleType">
 						<label for="inputCheckboxTitleTypeBoxes"/>
 						<div>Title and Type Boxes</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgTitleTypeBoxes.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesTitleType" onchange="imgTitleTypeBoxes.load(this.value + 'frame.png')"></select>
 					</span>
 					<br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxTitleTypeBoxesRight" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxTitleTypeBoxesRight" onchange="sectionFrameFunction()" class="changesTitleType">
 						<label for="inputCheckboxTitleTypeBoxesRight"/>
 						<div>Title and Type Boxes (right)</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgTitleTypeBoxesRight.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesTitleType" onchange="imgTitleTypeBoxesRight.load(this.value + 'frame.png')"></select>
 					</span>
 					<br><br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxRulesBox" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxRulesBox" onchange="sectionFrameFunction()" class="changesRulesBox">
 						<label for="inputCheckboxRulesBox"/>
 						<div>Rules Box</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgRulesBox.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesRulesBox" onchange="imgRulesBox.load(this.value + 'frame.png')"></select>
 					</span>
 					<br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxRulesBoxRight" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxRulesBoxRight" onchange="sectionFrameFunction()" class="changesRulesBox">
 						<label for="inputCheckboxRulesBoxRight"/>
 						<div>Rules Box (right)</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgRulesBoxRight.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesRulesBox" onchange="imgRulesBoxRight.load(this.value + 'frame.png')"></select>
 					</span>
 					<br><br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxPinline" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxPinline" onchange="sectionFrameFunction()" class="changesPinline">
 						<label for="inputCheckboxPinline"/>
 						<div>Pinline</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgPinline.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesPinline" onchange="imgPinline.load(this.value + 'frame.png')"></select>
 					</span>
 					<br>
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxPinlineRight" onchange="sectionFrameFunction()">
+						<input type="checkbox" id="inputCheckboxPinlineRight" onchange="sectionFrameFunction()" class="changesPinline">
 						<label for="inputCheckboxPinlineRight"/>
 						<div>Pinline (right)</div>
 					</div>
 					<span class="dropdown">
-						<select class="selectColor" onchange="imgPinlineRight.load(this.value + 'frame.png')"></select>
+						<select class="selectColor changesPinline" onchange="imgPinlineRight.load(this.value + 'frame.png')"></select>
 					</span>
 				</div>
+				<div class="cmm" id="cmm-advanced">
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxLegendary" onchange="loadLegendaryImages()" />
+						<label for="inputCheckboxLegendary" />
+						<div>Legendary</div>
+					</div>
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxRareStamp" onchange="loadRareStampImages()" />
+						<label for="inputCheckboxRareStamp" />
+						<div>Rare Stamp</div>
+					</div>
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxNyx" onchange="loadNyxImages()" />
+						<label for="inputCheckboxNyx" />
+						<div>Nyx</div>
+					</div>
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxMiracle" onchange="loadMiracleImages()" />
+						<label for="inputCheckboxMiracle" />
+						<div>Miracle</div>
+					</div>
+					<br>
+					Frame Opacity
+					<input id="inputFrameOpacity" type="number" class="input" min="0" max="100" value="100" step="1" oninput="sectionFrameFunction()">
+					<br>
+					Title/Type Opacity
+					<input id="inputTitleTypeOpacity" type="number" class="input" min="0" max="100" value="100" step="1" oninput="sectionFrameFunction()">
+					<br>
+					Rules Box Opacity
+					<input id="inputRulesBoxOpacity" type="number" class="input" min="0" max="100" value="100" step="1" oninput="sectionFrameFunction()">
+					<br>
+					Pinline Opacity
+					<input id="inputPinlineOpacity" type="number" class="input" min="0" max="100" value="100" step="1" oninput="sectionFrameFunction()">
+					<br><br>
+					Title Color <input type="color" id="inputTitleColor" value="#000000" onchange="sectionTextFunction()"> Outline <input type="color" id="inputTitleOutlineColor" value="#ffffff" onchange="sectionTextFunction()">
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxTitleOutline" onchange="sectionTextFunction()">
+						<label for="inputCheckboxTitleOutline" />
+						<div>Title Outline</div>
+					</div>
+					Type Color <input type="color" id="inputTypeColor" value="#000000" onchange="sectionTextFunction()"> Outline <input type="color" id="inputTypeOutlineColor" value="#ffffff" onchange="sectionTextFunction()">
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxTypeOutline" onchange="sectionTextFunction()">
+						<label for="inputCheckboxTypeOutline" />
+						<div>Type Outline</div>
+					</div>
+					Rules Color <input type="color" id="inputRulesColor" value="#000000" onchange="sectionTextFunction()"> Outline <input type="color" id="inputRulesOutlineColor" value="#ffffff" onchange="sectionTextFunction()">
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxRulesOutline" onchange="sectionTextFunction()">
+						<label for="inputCheckboxRulesOutline" />
+						<div>Rules Outline</div>
+					</div>
+					<input type="color" id="inputCreatureColor" value="#000000" onchange="sectionTextFunction()"> Power/Toughness Color<br>
+				</div>
 				<div class="cmm" id="cmm-text">
 					Name
-					<input id="inputName" type="text" class="input" value="Battle Mastery" oninput="textFunction()">
+					<input id="inputName" type="text" class="input" value="" oninput="sectionTextFunction()">
 					<br>
 					Mana Cost
-					<input id="inputCost" type="text" class="input" value="2 w" oninput="textFunction()">
+					<input id="inputCost" type="text" class="input" value="" oninput="sectionTextFunction()">
 					<br>
 					Type
-					<input id="inputType" type="text" class="input" value="Enchantment — Aura" oninput="textFunction()">
+					<input id="inputType" type="text" class="input" value="" oninput="sectionTextFunction()">
 					<div class="checkbox">
-						<input type="checkbox" id="inputCheckboxCreature" onchange="sectionFrameFunction()" />
-						<label for="inputCheckboxCreature" />
+						<input type="checkbox" id="inputCheckboxPowerToughness" onchange="sectionTextFunction()" />
+						<label for="inputCheckboxPowerToughness" />
 						<div>Power/Toughness</div>
 					</div>
-					<input id="inputPowerToughness" class="input" type="text" oninput="textFunction()">
+					<span class="dropdown">
+						<select class="selectColor" onchange="imgPowerToughness.load(this.value + 'pt.png')"></select>
+					</span>
+					<input id="inputPowerToughness" class="input" type="text" oninput="sectionTextFunction()">
 					<br><br>
 					Rules Text
 					<br>
-					<textarea id="inputText" class="input" rows="5" cols="40" style="width: 100%; resize: none; height: 200px" placeholder="Remember to include curly brackets ('{' and '}') around each code. To skip to the next line use {line}. See 'Mana Symbols' and 'Other Codes' (below) for more information." oninput="textFunction()">Enchant creature {line}Enchanted creature has double strike. {i}(It deals both first-strike and regular combat damage.) {line}“Boom! Boom! Boots the size of oxcarts, then an axe like a falling sun. Elves scattered. Trees scattered. Even the hills ran for the hills!” {/i}{lineNoSpace}—Clachan Tales</textarea>
+					<textarea id="inputText" class="input" rows="5" cols="40" style="width: 100%; resize: none; height: 200px" placeholder="Remember to include curly brackets ('{' and '}') around each code. To skip to the next line use {line}. See 'Mana Symbols' and 'Other Codes' (below) for more information." oninput="sectionTextFunction()"></textarea>
 					<br>
 					Rules Text Font Size
-					<input id="inputTextSize" type="number" class="input" min="0" value="37" step="0.5" oninput="textFunction()">
+					<input id="inputTextSize" type="number" class="input" min="0" value="37" step="0.5" oninput="sectionTextFunction()">
 					<br>
 					Pixels Between Paragraphs
-					<input id="inputTextShift" type="number" class="input" min="0" value="13" oninput="textFunction()">
+					<input id="inputTextShift" type="number" class="input" min="0" value="13" oninput="sectionTextFunction()">
 					<br>
 					Shift All Text Down
-					<input id="inputTextDown" type="number" class="input" value="0" oninput="textFunction()">
+					<input id="inputTextDown" type="number" class="input" value="0" oninput="sectionTextFunction()">
 				</div>
 				<div class="cmm" id="cmm-info">
-
+					Collector's Number
+					<input id="inputInfoNumber" type="text" class="input" value="001/001" oninput="sectionTextFunction()">
+					<br>
+					Rarity
+					<input id="inputInfoRarity" type="text" class="input" value="S" oninput="sectionTextFunction()">
+					<br>
+					Set Abbreviation
+					<input id="inputInfoSet" type="text" class="input" value="MTG" oninput="sectionTextFunction()">
+					<br>
+					Language
+					<input id="inputInfoLanguage" type="text" class="input" value="EN" oninput="sectionTextFunction()">
+					<br>
+					Artist Credit
+					<input id="inputInfoArtist" type="text" class="input" value="" oninput="sectionTextFunction()">
+					<br>
+					Other Information
+					<input id="inputInfoCopyright" type="text" class="input" value="Not a Real Card" oninput="sectionTextFunction()">
 				</div>
 				<div class="cmm" id="cmm-art">
 					Upload an Image
-					<input type="text" class="input" placeholder="Via URL" onchange="imageURL(this, imgCardArt)">
+					<input type="text" class="input" placeholder="Via URL" onchange="imageURL(this.value, imgCardArt, 'none')">
+					<input id="inputCardArtName" onchange="inputCardArtName(this.value)" class="input" type="text" placeholder="Via Card Name"></input>
+					<input type="file" name="inputCardArt" class="input" accept="image/*" onchange="loadImage(event, imgCardArt)" id="inputPicture" placeholder="Via File Upload">
+					<br>
+					Card Name Result:
+					<input id="inputCardArtNameNumber" onchange="inputCardArtNameNumber(this.value)" class="input" type="number" value="1" min="1" max="3">
+					<br>
 					Image Zoom
 					<input id="inputCardArtZoom" type="number" class="input" value="100" step="0.1" oninput="drawCard()">
 					<br>
@@ -202,10 +290,64 @@
 					<input id="inputCardArtRotation" type="number" class="input" value="0" step="1" min="0" max="360" oninput="drawCard()"> -->
 				</div>
 				<div class="cmm" id="cmm-set">
-
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxSetSymbol" checked="true" onchange="sectionOtherFunction()" />
+						<label for="inputCheckboxSetSymbol" />
+						<div>Set Symbol</div>
+					</div>
+					Set Code
+					<input id="inputSetSymbolCode" type="text" class="input" onchange='imageURL("http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + document.getElementById("inputSetSymbolCode").value.toUpperCase() + "&size=large&rarity=" + document.getElementById("inputSetSymbolRarity").value.toUpperCase(), imgSetSymbol, "needsCrop")' value="LRW">
+					Rarity
+					<input id="inputSetSymbolRarity" type="text" class="input" onchange='imageURL("http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + document.getElementById("inputSetSymbolCode").value.toUpperCase() + "&size=large&rarity=" + document.getElementById("inputSetSymbolRarity").value.toUpperCase(), imgSetSymbol, "needsCrop")' value="U">
+					Or Upload an Image
+					<input type="text" class="input" placeholder="Via URL" onchange="imageURL(this.value, imgSetSymbol, 'needsCrop')">
+					<input type="file" name="inputCardArt" class="input" accept="image/*" onchange="loadImage(event, imgSetSymbol)" id="inputPicture" placeholder="Via File Upload">
+					<br>
+					Scale Set Symbol
+					<input id="inputSetSymbolScale" type="number" class="input" min="0" value="100" step="0.1" oninput="sectionOtherFunction()">
 				</div>
 				<div class="cmm" id="cmm-watermark">
-
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxWatermark" checked="true" onchange="sectionOtherFunction()" />
+						<label for="inputCheckboxWatermark" />
+						<div>Watermark</div>
+					</div>
+					Set Code
+					<input id="inputWatermarkCode" type="text" class="input" onchange='imageURL("http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + this.value.toUpperCase() + "&size=large&rarity=C", imgWatermark, "needsBoth")'>
+					Or Upload an Image
+					<input type="text" class="input" placeholder="Via URL" onchange="imageURL(this.value, imgWatermark, 'needsBoth')">
+					<input type="file" name="inputCardArt" class="input" accept="image/*" onchange="loadImage(event, imgWatermark)" id="inputPicture" placeholder="Via File Upload">
+					<br>
+					Watermark Color
+					<span class="dropdown">
+						<select onchange="sectionOtherFunction()" id="inputWatermarkColor">
+							<option value="none">default</option>
+							<option value="#afa360">White</option>
+							<option value="#04527c">Blue</option>
+							<option value="#494949">Black</option>
+							<option value="#a3280d">Red</option>
+							<option value="#0f4f14">Green</option>
+							<option value="#7f5f00">Gold</option>
+							<option value="#616b72">Artifact/Colorless</option>
+						</select>
+					</span>
+					<div class="checkbox">
+						<input type="checkbox" id="inputCheckboxSecondWatermark" onchange="sectionOtherFunction()" />
+						<label for="inputCheckboxSecondWatermark" />
+						<div>Second WatermarkColor</div>
+					</div>
+					<span class="dropdown">
+						<select onchange="sectionOtherFunction()" id="inputSecondWatermarkColor">
+							<option value="none">default</option>
+							<option value="#afa360">White</option>
+							<option value="#04527c">Blue</option>
+							<option value="#494949">Black</option>
+							<option value="#a3280d">Red</option>
+							<option value="#0f4f14">Green</option>
+							<option value="#7f5f00">Gold</option>
+							<option value="#616b72">Artifact/Colorless</option>
+						</select>
+					</span>
 				</div>
 				<div class="cmm" id="cmm-download">
 					<a onclick="downloadCardImage(this)" id="downloadCardImage" href="" target="_blank" download="card.png">Download</a><br>
@@ -547,7 +689,6 @@
 				<div onclick="toggleView('symbolList', 'extras')">Mana Symbols</div>
 				<div onclick="toggleView('codes', 'extras')">Other Codes</div>
 				<div onclick="toggleView('set', 'extras')">Set Codes</div>
-				<div onclick="toggleView('border', 'extras')">Card Colors</div>
 			</div>
 			<div class="extrasMenu">
 				<div class="extras shown" id="extras-about">
@@ -581,13 +722,13 @@
 					</div>
 				</div>
 				<div class="extras" id="extras-symbolList">
-					Each of the following codes must include '{' before each code and '}' after. These codes aren't caps sensitive.
+					Each of the following codes must include '{' before each code and '}' after.
 					<div class="symbolGrid grid" id="symbolList">
 						
 					</div>
 				</div>
 				<div class="extras" id="extras-codes">
-					Like the mana symbols, each of the following codes must include '{' before each code and '}' after. These codes are caps sensitive.<br>
+					Like the mana symbols, each of the following codes must include '{' before each code and '}' after. If a code doesn't work, try putting a space before and/or after the code.<br>
 					&#8226 line &#8594 Skips to the next line<br>
 					&#8226 bar &#8594 Just like line, except adds the bar that usually seperates flavor text<br>
 					&#8226 lineNoSpace &#8594 Just like line, except stays closer to the previous line<br>
@@ -600,20 +741,13 @@
 					&#8226 downX &#8594 Shifts the following text X pixels down<br>
 					&#8226 leftX &#8594 Shifts the following text X pixels left<br>
 					&#8226 rightX &#8594 Shifts the following text X pixels right<br>
-					&#8226 plane &#8594 Creates a large <img src="data/manaSymbols/56.png" style="height: 1em; background-color: white;"></img> and shifts the following text to the right. This is designed for planar cards.
 				</div>
 				<div class="extras" id="extras-set">
-					Every set in Magic: The Gathering has an associated 2-3 letter code. For example, Homelands is HM and Innistrad is ISD. This program uses the codes from <a href="http://gatherer.wizards.com" target="_blank">The Gatherer</a>, the official Magic card database. A handy list of all sets and their codes can be found on <a href="https://en.wikipedia.org/wiki/List_of_Magic:_The_Gathering_sets" target="_blank">Wikipedia</a>. These codes aren't caps sensitive.
-				</div>
-				<div class="extras" id="extras-border">
-					Under the 'Card Border' tab use the following guidelines:<br>
-					&#8226 Border &#8594 Selects the border style, such as planar card, m15 card, etc...<br>
-					&#8226 Color &#8594 Primary color<br>
-					&#8226 Second Color &#8594 Secondary color. Only affects the right half of the card, as seen on hybrid cards.<br>
-					&#8226 Third Color &#8594 Tertiary color. Affects the entire card, including power and toughness, as seen on two-colored gold cards.<br><br>
-					Under the 'Border (Advanced)' tab the checkboxes are fairly straightforward. Try each feature out to see what it does.
+					Every set in Magic: The Gathering has an associated 2-3 letter code. For example, Homelands is HM and Innistrad is ISD. This program uses the codes from <a href="http://gatherer.wizards.com" target="_blank">The Gatherer</a>, the official Magic card database. A handy list of all sets and their codes can be found on <a href="https://en.wikipedia.org/wiki/List_of_Magic:_The_Gathering_sets" target="_blank">Wikipedia</a>.
 				</div>
 				<div class="extras" id="extras-tutorial">
+					Card Conjurer has gone under some major changes since the making of this video, but it can still help to give a general idea of how to use the program:
+					<br><br>
 					<iframe src="https://www.youtube.com/embed/Uh9Qr35u49I" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen style="width: calc(100vw - 94px); height: calc((100vw - 94px) * 9/16)"></iframe>
 				</div>
 			</div>
@@ -637,6 +771,10 @@
 	font-family: relaymedium;
 	src: url("data/fonts/relay-medium.ttf");
 }
+@font-face {
+	font-family: gothammedium;
+	src: url("data/fonts/gotham-medium.ttf");
+}
 @font-face {
 	font-family: belerenb;
 	src: url("data/fonts/beleren-b.ttf");
@@ -645,10 +783,6 @@
 	font-family: belerenbsc;
 	src: url("data/fonts/beleren-bsc.ttf");
 }
-@font-face {
-	font-family: matrixbsc;
-	src: url("data/fonts/matrix-bsc.ttf");
-}
 @font-face {
 	font-family: matrix;
 	src: url("data/fonts/matrix.ttf");
@@ -657,6 +791,10 @@
 	font-family: matrixb;
 	src: url("data/fonts/matrix-b.ttf");
 }
+@font-face {
+	font-family: matrixbsc;
+	src: url("data/fonts/matrix-bsc.ttf");
+}
 @font-face {
 	font-family: mplantin;
 	src: url("data/fonts/mplantin.ttf");
@@ -682,6 +820,8 @@
 	font-size: 6vw;
 	user-select: none;
 	color: #eee;
+	-webkit-transition: 0.5s;
+  	transition: 0.5s;
 }
 html {
 	background: url("images/background.png") no-repeat center center fixed;