diff --git a/CardConjurer/CardConjurer.html b/CardConjurer.html
similarity index 97%
rename from CardConjurer/CardConjurer.html
rename to CardConjurer.html
index 5bd69c2a..d35d028a 100644
--- a/CardConjurer/CardConjurer.html
+++ b/CardConjurer.html
@@ -1,782 +1,782 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-	<title>Card Conjurer - Custom Magic Card Maker</title>
-	<script src="data/scripts/loadScript.js"></script>
-	<script src="data/scripts/loadImage.js"></script>
-	<script src="data/scripts/loadColors.js"></script>
-	<script src="data/scripts/mask.js"></script>
-    <!--<script src="data/scripts/autocrop.js"></script> This is no longer required, but possibly could be in the future -->
-	<div class="title">Card Conjurer</div>
-</head>
-<!-- <img src="data/background.png"></img> -->
-<body>
-	<div class="row">
-		<div class="column"><canvas id="canvas" width="749" height="1044"></canvas></div>
-		<!--OPTIONS-->
-		<div class="column">
-			<br/>
-			<div style="width: 375px">
-				<div class="toggle" onclick="toggleVisibility('cardBorder', this, 'toggleShown', 'hidden', 'shown')">Card Border</div>
-				<div class="cardBorder hidden">
-					Border
-					<select id="borderSelection" onchange="updateBorder()">
-						<option value="m15/">M15</option>
-						<option value="8th/">8th</option>
-					</select>
-					<br/>
-					Color
-					<select id="colorSelection" onchange="updateColor()">
-						<option value="white">White</option>
-					</select>
-					<br/>
-					<input type="checkbox" id="checkboxSecondColor" onchange="updateColor()">Second Color <select id="secondColorSelection" onchange="updateColor()"></select></input>
-					<br/>
-					<input type="checkbox" id="checkboxThirdColor" onchange="updateColor()">Third Color <select id="thirdColorSelection" onchange="updateColor()"></select></input>
-					<br/>
-					<input type="checkbox" id="creatureCheckbox" onchange="updateColor()">Power/Toughness
-					<input id="inputPowerToughness" value="" type="text"></input>
-					<br/>
-					<input type="checkbox" id="legendaryCheckbox" onchange="updateColor()">Legendary</input>
-					<br/>
-					<input type="checkbox" id="rareStampCheckbox" onchange="updateColor()">Rare Stamp</input>
-					<br/>
-					<input type="checkbox" id="silverBorderCheckbox">Silver Border</input>
-					<br/>
-					<input type="checkbox" id="foilCheckbox">Foil</input>
-					<br/>
-				</div>
-				<div class="toggle" onclick="toggleVisibility('nameCostType', this, 'toggleShown', 'hidden', 'shown')">Name, Mana Cost, Type</div>
-				<div class="nameCostType hidden">
-					Name
-					<input id="inputName" type="text"></input>
-					<br/>
-					Mana Cost
-					<input id="inputCost" type="text"></input>
-					<br/>
-					Type
-					<input id="inputType" type="text"></input>
-					<br/>
-				</div>
-				<div class="toggle" onclick="toggleVisibility('rulesText', this, 'toggleShown', 'hidden', 'shown')">Rules Text</div>
-				<div class="rulesText hidden">
-					Rules Text
-					<br/>
-					<textarea id="inputText" rows="5" cols="40" style="width: 99%; resize: vertical; height: 100px"></textarea>
-					<br/>
-					Rules Text Font Size
-					<input id="textSize" type="number" min="0" max="100" value="37" step="0.5"></input>
-					<br/>
-					Pixels Between Paragraphs
-					<input id="textShift" type="number" min="0" max="300" value="0"></input>
-					<br/>
-					Shift All Text Down
-					<input id="textDown" type="number" min="0" max="300" value="0"></input>
-					<br/>
-				</div>
-				<div class="toggle" onclick="toggleVisibility('cardArt', this, 'toggleShown', 'hidden', 'shown')">Card Art</div>
-				<div class="cardArt hidden">
-					Image
-					<input type="file" accept="image/*" onchange="loadImage(event, imgArt, true)" id="inputPicture"></input>
-					<br/>
-					Image Zoom
-					<input id="imageSize" type="number" value="100" step="0.1"></input>
-					<br/>
-					Image Left
-					<input id="imageLeft" type="number" value="0" step="1"></input>
-					<br/>
-					Image Up
-					<input id="imageUp" type="number" value="0" step="1"></input>
-					<br/>
-				</div>
-				<div class="toggle" onclick="toggleVisibility('otherInfo', this, 'toggleShown', 'hidden', 'shown')">Other Information</div>
-				<div class="otherInfo hidden">
-					Other Info
-					<input id="inputInfo" value="Not A Real Card" type="text"></input>
-					<br/>
-					Card Number
-					<input id="inputNumber" value="001/001" type="text"></input>
-					<br/>
-					Rarity
-					<input id="inputRarity" value="C" type="text"></input>
-					<br/>
-					Set Abbreviation
-					<input id="inputSet" value="MTG" type="text"></input>
-					<br/>
-					Language
-					<input id="inputLanguage" value="EN" type="text"></input>
-					<br/>
-					Artist Credit
-					<input id="inputArtist" value="" type="text"></input>
-					<br/>
-					<input id="artistColor" type="checkbox">Make Artist Credit font black</input>
-					<br/>
-				</div>
-				<div class="toggle" onclick="toggleVisibility('setSymbolWatermark', this, 'toggleShown', 'hidden', 'shown')">Set Symbol and Watermark</div>
-				<div class="setSymbolWatermark hidden">
-					<input type="checkbox" id="setSymbolCheckbox" checked="true">Set Symbol</input>
-                    <br>
-                    Set Code
-                    <input type="text" onchange="loadSetSymbol()" value="HM" id="setSymbolCode"></input>
-                    <br>
-                    Set Symbol Rarity
-                    <input type="text" onchange="loadSetSymbol()" value="C" id="setSymbolRarity"></input>
-                    <br>
-					Custom Set Symbol
-					<input type="file" accept="image/*" onchange="loadImage(event, imgSetSymbol, true)" id="inputSetSymbol"></input>
-					<br/>
-					Scale Set Symbol
-					<input id="setSymbolSize" type="number" value="100" step="0.5"></input>
-					<br/><br/>
-					<input type="checkbox" id="watermarkCheckbox" checked="true"></input>
-					Watermark
-					<input type="file" accept="image/*" onchange="loadImage(event, imgWatermark, true)" id="inputWatermark"></input>
-					<br/>
-					Watermark Color
-					<select id="watermarkColorSelection">
-						<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>
-					<br/>
-					<input type="checkbox" id="checkboxSecondWatermarkColor"> Second Watermark Color <select id="secondWatermarkColorSelection"></select></input>
-					<br/>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="row text">
-		Use the following codes to get the respective symbol in the card's mana cost and rules text. In the mana cost, make sure to include spaces in between the codes, and in the rules text include '<' before each code and '>' after.<br/>
-		<div class="column" style="width: 100px">
-			w - <img id="w"><br/>
-			u - <img id="u"><br/>
-			b - <img id="b"><br/>
-			r - <img id="r"><br/>
-			g - <img id="g"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			pw - <img id="pw"><br/>
-			pu - <img id="pu"><br/>
-			pb - <img id="pb"><br/>
-			pr - <img id="pr"><br/>
-			pg - <img id="pg"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			2w - <img id="2w"><br/>
-			2u - <img id="2u"><br/>
-			2b - <img id="2b"><br/>
-			2r - <img id="2r"><br/>
-			2g - <img id="2g"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			w - <img id="wu"><br/>
-			u - <img id="wb"><br/>
-			b - <img id="ub"><br/>
-			r - <img id="ur"><br/>
-			g - <img id="br"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			w - <img id="bg"><br/>
-			u - <img id="rg"><br/>
-			b - <img id="rw"><br/>
-			r - <img id="gw"><br/>
-			g - <img id="gu"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			0 - <img id="0"><br/>
-			1 - <img id="1"><br/>
-			2 - <img id="2"><br/>
-			3 - <img id="3"><br/>
-			4 - <img id="4"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			5 - <img id="5"><br/>
-			6 - <img id="6"><br/>
-			7 - <img id="7"><br/>
-			8 - <img id="8"><br/>
-			9 - <img id="9"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			10 - <img id="10"><br/>
-			11 - <img id="11"><br/>
-			12 - <img id="12"><br/>
-			13 - <img id="13"><br/>
-			14 - <img id="14"><br/>
-		</div>
-		<div class="column" style="width: 100px">
-			15 - <img id="15"><br/>
-			16 - <img id="16"><br/>
-			17 - <img id="17"><br/>
-			18 - <img id="18"><br/>
-			19 - <img id="19"><br/>
-		</div>
-		<div class="column" style="width: 120px">
-			20 - <img id="20"><br/>
-			c - <img id="c"><br/>
-			x - <img id="x"><br/>
-			t - <img id="t"><br/>
-			untap - <img id="untap"><br/>
-		</div>
-		<div class="column" style="width: 120px">
-			snow - <img id="snow"><br/>
-			e - <img id="e"><br/>
-			<br/>
-			<br/>
-			<br/>
-		</div>
-		<br/><br/><br/><br/><br/><br/><br/> <!-- Not quite sure why I needed so many linebreaks here! -->
-		When selecting the card's color, use 'Second Color' for hybrid cards, and 'Third Color' for non-hybrid two-colored cards.
-	</div>
-	<div class="info">For Terms of Use and Disclaimer, see <a href="https://github.com/ImKyle4815/CardConjurer" target="_blank">the Github page</a>.</div>
-</body>
-
-
-
-<!--CSS-->
-<style>
-@font-face {
-	font-family: relaymedium;
-	src: url("data/fonts/relay-medium.ttf");
-}
-@font-face {
-	font-family: belerenb;
-	src: url("data/fonts/beleren-b.ttf");
-}
-@font-face {
-	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");
-}
-@font-face {
-	font-family: matrixb;
-	src: url("data/fonts/matrix-b.ttf");
-}
-@font-face {
-	font-family: mplantin;
-	src: url("data/fonts/mplantin.ttf");
-}
-@font-face {
-	font-family: mplantini;
-	src: url("data/fonts/mplantin-i.ttf");
-}
-.title {
-	text-align: center;
-	color: rgb(128,255,128);
-	font-family: belerenbsc;
-	font-size: 60px;
-}
-.info {
-	text-align: center;
-	color: rgb(96,96,96);
-	font-family: belerenbsc;
-	font-size: 16px;
-}
-.toggle {
-	text-align: center;
-	color: rgb(255, 255, 255);
-	font-family: belerenbsc;
-	font-size: 20px;
-	width: 100%;
-	padding: 5px;
-	border: 1px solid rgb(128, 255, 128);
-}
-.toggle:hover {
-	color: rgb(128, 255, 128);
-}
-.toggleShown {
-	color: rgb(128, 255, 128);
-	border-color: rgb(128, 255, 128);
-	border-style: solid solid hidden solid;
-}
-.hidden {
-	display: none;
-	font-size: 100px;
-}
-.shown {
-	width: 100%;
-	padding: 5px;
-	border-width: 1px;
-	border-color: rgb(128, 255, 128);
-	border-style: dashed solid solid solid;
-	font-size: 20px;
-	color: rgb(255,255,255);
-	font-family: belerenbsc;
-}
-.shown * {
-	font-family: mplantin;
-	font-size: 20px;
-}
-input[type="text"] {
-	width: 99%;
-}
-input[type="number"] {
-	width: 99%;
-}
-select {
-	width: 100%;
-}
-.column {
-	float: left;
-}
-.row:after{
-	content: "";
-	display: table;
-	clear: both;
-}
-.text {
-	padding: 10px;
-	text-align: left;
-	color: rgb(128, 128, 128);
-	font-family: beleren;
-	font-size: 25px;
-}
-.text img {
-	position: relative;
-	top: 8px;
-	width: 30px;
-	padding: 0px 0px 0px 0px !important;
-	margin: 0px;
-}
-body {
-	color: rgb(255,255,255);
-	font-family: mplantin;
-	font-size: 18px;
-}
-html {
-	background:url(data/background.png) no-repeat center center fixed;
-	-webkit-background-size: cover;
-	-moz-background-size: cover;
- 	-o-background-size: cover;
-	background-size: cover;
-}
-canvas {
-	float: left;
-	padding: 10px;
-}
-a:link {
-	color: rgb(128,128,128); 
-}
-
-a:visited {
-	color: rgb(128,128,128);
-}
-
-a:hover {
-	color: rgb(128,255,128);
-}
-
-a:active {
-	color: rgb(128,255,128);
-}
-</style>
-
-
-
-<script>
-//set up initial variables
-loadScript("data/borders/m15/border.js")
-var borderPath
-var m15Info = true
-//set up canvas
-var canvas = document.getElementById("canvas")
-var card = canvas.getContext("2d")
-//Load dynamic images
-var dynamicImageList = ["borderColor", "secondBorderColor", "thirdBorderColor", "borderCreature", "secondBorderCreature", "thirdBorderCreature", "borderLegendary", "secondBorderLegendary", "thirdBorderLegendary", "borderRareStamp", "secondBorderRareStamp", "art", "artMask", "setSymbol", "watermark", "multiMask", "LegendMultiMask", "legendSilver"]
-for (i = 0; i < dynamicImageList.length; i ++) {
-	var imgName = "img" + dynamicImageList[i].charAt(0).toUpperCase() + dynamicImageList[i].slice(1)
-	window[imgName] = new Image()
-}
-//Load static images
-var staticImageList = ["artistBrush", "foil", "stampGradient", "multiGradient", "rareStamp", "cardMask", "silverBorder", "borderEdge"]
-for (i = 0; i < staticImageList.length; i ++) {
-	var imgName = "img" + staticImageList[i].charAt(0).toUpperCase() + staticImageList[i].slice(1)
-	window[imgName] = new Image()
-	window[imgName].src = "data/borders/" + staticImageList[i] + ".png"
-}
-//Mana symbol Array setup
-var manaSymbolCode = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "w", "u", "b", "r", "g", "2w", "2u", "2b", "2r", "2g", "pw", "pu", "pb", "pr", "pg", "wu", "wb", "ub", "ur", "br", "bg", "rg", "rw", "gw", "gu", "x", "snow", "c", "t","untap", "e"]
-var manaSymbolImages = new Array()
-for (var i = 0; i < manaSymbolCode.length; i++) {
-	manaSymbolImages[i] = new Image()
-	manaSymbolImages[i].src = "data/manaSymbols/" + i + ".png"
-	//alert(document.getElementById(manaSymbolImages[i]))
-	if (document.getElementById(manaSymbolCode[i]) != null) {
-		document.getElementById(manaSymbolCode[i]).src = "data/manaSymbols/" + i + ".png"
-	}
-}
-//load first set symbol
-loadSetSymbol()
-//fill second watermark dropdown menu
-document.getElementById("secondWatermarkColorSelection").innerHTML = document.getElementById("watermarkColorSelection").innerHTML
-
-
-//Runs ten times every second (main loop)
-updateBorder()
-setInterval(function() {
-		//Insures that the corners of the final image are transparent
-		card.globalCompositeOperation = "source-over"
-		card.drawImage(imgCardMask, 0, 0, 749, 1044)
-		card.globalCompositeOperation = "source-atop"
-		//These functions draw everything
-		drawPicture()
-		drawBorder()
-		drawSetSymbol()
-		drawManaCost()
-		drawWatermark()
-		writeText()
-		//m15 and 8th edition have different info at the bottom of the cards and require completely different functions
-		if (m15Info == true) {
-			bottomInfoM15()
-		}
-		if (eighthInfo == true) {
-			bottomInfo8th()
-		}
-		//A shiny foil overlay!
-		if(document.getElementById("foilCheckbox").checked == true) {
-			card.drawImage(imgFoil, 0, 0, canvas.width, canvas.height)
-		}
-		//These are for pinpointing coordinates while adjusting values for new border types
-		//Vertical Line
-		//card.beginPath()
-		//card.moveTo(setSymbolRight, 0)
-		//card.lineTo(setSymbolRight, 1044)
-		//card.stroke()
-		//Horizontal Line
-		//card.beginPath()
-		//card.moveTo(0, setSymbolY)
-		//card.lineTo(749, setSymbolY)
-		//card.stroke()
-	}, 100)
-
-
-
-//Loads different types of borders
-function updateBorder() {
-	//the loadScript function is located in data/scripts/loadScript.js. It sets values to variables such as set symbol coordinates or title font
-	loadScript("data/borders/" + document.getElementById("borderSelection").value + "border.js")
-	document.getElementById("colorSelection").value = "white"
-	imgArtMask.src = "data/borders/" + document.getElementById("borderSelection").value + "artMask.png"
-	imgMultiMask.src = "data/borders/" + document.getElementById("borderSelection").value + "multiMask.png"
-	imgLegendMultiMask.src = "data/borders/" + document.getElementById("borderSelection").value + "legendMultiMask.png"
-	imgLegendSilver.src = "data/borders/" + document.getElementById("borderSelection").value + "legendSilver.png"
-	updateColor()
-}
-//Loads the images for the card frame, power toughness box, and rare stamp
-function updateColor() {
-	borderPath = "data/borders/" + document.getElementById("borderSelection").value
-	imgBorderColor.src = borderPath + document.getElementById("colorSelection").value + "/frame.png"
-	imgSecondBorderColor.src = borderPath + document.getElementById("secondColorSelection").value + "/frame.png"
-	imgThirdBorderColor.src = borderPath + document.getElementById("thirdColorSelection").value + "/frame.png"
-	imgBorderCreature.src = borderPath + document.getElementById("colorSelection").value + "/pt.png"
-	imgSecondBorderCreature.src = borderPath + document.getElementById("secondColorSelection").value + "/pt.png"
-	imgThirdBorderCreature.src = borderPath + document.getElementById("thirdColorSelection").value + "/pt.png"
-	if (m15Info == true) {
-		imgBorderLegendary.src = borderPath + document.getElementById("colorSelection").value + "/legendary.png"
-		imgSecondBorderLegendary.src = borderPath + document.getElementById("secondColorSelection").value + "/legendary.png"
-		imgThirdBorderLegendary.src = borderPath + document.getElementById("thirdColorSelection").value + "/legendary.png"
-		imgBorderRareStamp.src = borderPath + document.getElementById("colorSelection").value + "/stamp.png"
-		imgSecondBorderRareStamp.src = borderPath + document.getElementById("secondColorSelection").value + "/stamp.png"
-	}
-}
-//Draw Picture
-function drawPicture() {
-	//scales the card art and draws it
-	var imageScale = document.getElementById("imageSize").value * 0.01
-	var imageLeftShift = parseInt(document.getElementById("imageLeft").value)
-	var imageUpShift = parseInt(document.getElementById("imageUp").value)
-	card.drawImage(imgArt, 58 - imageLeftShift, 119 - imageUpShift, imgArt.width * imageScale, imgArt.height * imageScale)
-}
-//Draw Border
-function drawBorder() {
-	//These if else statements check to see whether or not to draw different parts of the card, like the legendary border or rare stamp, and draws them in the appropriate order such that when multiple border colors are used the gradients overlap correctly
-	drawMask(imgBorderColor, 0, 0, canvas.width, canvas.height, imgArtMask, false, false)
-	if (document.getElementById("checkboxSecondColor").checked == true) {
-		drawMask(imgSecondBorderColor, 0, 0, canvas.width, canvas.height, imgArtMask, imgMultiGradient, "reverseSecond")
-	}
-	if (document.getElementById("checkboxThirdColor").checked == true) {
-		drawMask(imgThirdBorderColor, 0, 0, canvas.width, canvas.height, imgMultiMask, imgArtMask, false)
-	}
-	if (m15Info == true) {
-		if (document.getElementById("legendaryCheckbox").checked == true && imgBorderLegendary.width != 0) {
-			card.drawImage(imgBorderLegendary, 0, 0, canvas.width, canvas.height)
-			if (document.getElementById("checkboxSecondColor").checked == true && imgBorderLegendary.width != 0) {
-				drawMask(imgSecondBorderLegendary, 0, 0, canvas.width, canvas.height, imgArtMask, imgMultiGradient, "reverseSecond")
-			}
-			if (document.getElementById("checkboxThirdColor").checked == true) {
-				drawMask(imgThirdBorderColor, 0, 0, canvas.width, canvas.height, imgLegendMultiMask, imgArtMask, false)
-			}
-		}
-		if (document.getElementById("rareStampCheckbox").checked == true) {
-			if (imgBorderRareStamp.width != 0) {
-				card.drawImage(imgBorderRareStamp, 329, rareStampY - 15, 90, 50)
-				if (document.getElementById("checkboxSecondColor").checked == true) {
-					drawMask(imgSecondBorderRareStamp, 329, rareStampY - 15, 90, 50, imgSecondBorderRareStamp, imgStampGradient, "reverseSecond")
-				}
-			}
-			card.drawImage(imgRareStamp, 340, rareStampY, 70, 37)
-		}
-	}
-	if(document.getElementById("legendaryCheckbox").checked == true) {
-		card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height)
-		if (document.getElementById("silverBorderCheckbox").checked == true) {
-			drawMask(imgLegendSilver, 0, 0, canvas.width, canvas.height, imgCardMask, false, false)
-		}
-	} else {
-		card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height)
-		if (document.getElementById("silverBorderCheckbox").checked == true) {
-			card.drawImage(imgSilverBorder, 0, 0, canvas.width, canvas.height)
-		}
-	}
-}
-//Draw Set Symbol
-function drawSetSymbol() {
-	//scales the set symbol so that it fits in the correct area and centers it
-	if (imgSetSymbol.src != "" && document.getElementById("setSymbolCheckbox").checked == true) {
-		var height = setSymbolHeight
-		var width = imgSetSymbol.width * (height / imgSetSymbol.height)
-		if (width > setSymbolWidth) {
-			width = setSymbolWidth
-			height = imgSetSymbol.height * (width / imgSetSymbol.width)
-		}
-		height *= document.getElementById("setSymbolSize").value / 100
-		width *= document.getElementById("setSymbolSize").value / 100
-		var y = setSymbolY - height / 2
-		var x = setSymbolRight - width
-		card.drawImage(imgSetSymbol, x, y, width, height)
-	}
-}
-//Draw Watermark
-function drawWatermark() {
-	//The watermark is centered/scaled just like the set symbol
-	if (imgWatermark.src != "" && document.getElementById("watermarkCheckbox").checked == true) {
-		var height = watermarkHeight
-		var width = imgWatermark.width * (height / imgWatermark.height)
-		if (width > watermarkWidth) {
-			width = watermarkWidth
-			height = imgWatermark.height * (width / imgWatermark.width)
-		}
-		var x = canvas.width / 2 - width / 2
-		var y = watermarkY - height / 2
-		//globalAlpha insures that the watermark is drawn partially transparent. This value may not be perfect but the watermark colors are calibrated to it
-		card.globalAlpha = 0.4
-	    //if the following if statement is true, the watermark will be drawn in two halves of the chosen colors. Otherwise, a single watermark of the first chosen color is drawn.
-	    if (document.getElementById("checkboxSecondWatermarkColor").checked == true) {
-	    	drawMask(document.getElementById("watermarkColorSelection").value, x, y, width, height, imgWatermark, imgMultiGradient, false)
-	    	drawMask(document.getElementById("secondWatermarkColorSelection").value, x, y, width, height, imgWatermark, imgMultiGradient, "reverseSecond")
-	    } else {
-	    	drawMask(document.getElementById("watermarkColorSelection").value, x, y, width, height, imgWatermark, false, false)
-	    }
-	    card.globalAlpha = 1
-	}
-}
-//Mana cost
-function drawManaCost() {
-	//the symbols string splits the mana cost input into an array of strings which is then put into a for loop that draws the appropriate set symbol then adjusts the xShift so the set symbols are spaced properly
-	card.fillStyle = "Black"
-	var symbols = document.getElementById("inputCost").value.split(" ")
-	var xShift = 0
-	for (n = symbols.length; n > -1; n--) {
-		if (manaSymbolCode.indexOf(symbols[n]) != -1) {
-			card.beginPath()
-			card.arc(manaCostX + xShift + manaCostRadius - 1, manaCostY + manaCostRadius + 3.5, manaCostRadius, 0, 6.29, false)
-			card.fill()
-			card.drawImage(manaSymbolImages[manaSymbolCode.indexOf(symbols[n])], manaCostX + xShift, manaCostY, manaCostRadius * 2, manaCostRadius * 2)
-			xShift -= 39
-		}
-	}
-}
-//Write Text
-function writeText() {
-	//Draws the entered text onto the card, also draws the power/toughness box if necessary
-	//All use these:
-	card.textBaseline = "top"
-	card.fillStyle = "Black"
-	//Title
-	canvas.style.letterSpacing = titleFontSpacing
-	card.font = titleFont	
-	card.fillText(document.getElementById("inputName").value, titleX, titleY)
-	//Type
-	canvas.style.letterSpacing = typeFontSpacing
-	card.font = typeFont
-	card.fillText(document.getElementById("inputType").value, typeX, typeY)
-	//Rules Text
-	canvas.style.letterSpacing = textFontSpacing + "px"
-	card.font = document.getElementById("textSize").value + textFont
-	var text = document.getElementById("inputText").value
-	rulesText(text, textX, textY)
-	//Power/Toughness
-	if (document.getElementById("creatureCheckbox").checked == true) {
-		if (document.getElementById("checkboxThirdColor").checked == true) {
-			card.drawImage(imgThirdBorderCreature, ptX, ptY, ptWidth, ptHeight)
-		} else if (document.getElementById("checkboxSecondColor").checked == true) {
-			card.drawImage(imgSecondBorderCreature, ptX, ptY, ptWidth, ptHeight)
-		} else {
-			card.drawImage(imgBorderCreature, ptX, ptY, ptWidth, ptHeight)
-		}
-		canvas.style.letterSpacing = ptFontSpacing
-		card.font = ptFont
-		powerToughness = document.getElementById("inputPowerToughness").value
-		card.fillText(powerToughness, ptTextX - (card.measureText(powerToughness).width / 2), ptTextY)
-	}
-}
-//Bottom info on M15 cards
-function bottomInfoM15() {
-	var shiftInfo = 445
-	card.fillStyle = "white"
-	canvas.style.letterSpacing = "0.8px"
-	card.font = "19.5px relaymedium"
-	var bottomLine = document.getElementById("inputSet").value + " \u00b7 " + document.getElementById("inputLanguage").value
-	card.fillText(bottomLine, 48, m15InfoY)
-	var artistBrushShift = card.measureText(bottomLine).width + 58
-	card.drawImage(imgArtistBrush, artistBrushShift, m15InfoY + 5, 21, 13)
-	canvas.style.letterSpacing = "1.3px"
-	card.font = "19.5px relaymedium"
-	card.fillText(document.getElementById("inputNumber").value, 49, m15InfoY - 20)
-	card.fillText(document.getElementById("inputRarity").value, artistBrushShift - 1, m15InfoY - 20)
-	if (445 < artistBrushShift  + card.measureText(document.getElementById("inputRarity").value).width && document.getElementById("creatureCheckbox").checked == false) {
-		shiftInfo = artistBrushShift  + card.measureText(document.getElementById("inputRarity").value).width + 5
-	}
-	canvas.style.letterSpacing = "-0.1px"
-	card.font = "24px matrixbsc"
-	card.fillText(document.getElementById("inputArtist").value, artistBrushShift + 21, m15InfoY + 2)
-	if (445 < artistBrushShift + 21 + card.measureText(document.getElementById("inputArtist").value).width && document.getElementById("creatureCheckbox").checked == true) {
-		shiftInfo = artistBrushShift + card.measureText(document.getElementById("inputArtist").value).width + 26
-	}
-	//This is where "CC —" is hardcoded. The only reason is to prevent users from easily typing in the trademark and copyright that's usually on real cards. It's also there so I can see if a card was created with my program, it makes me feel good :)
-	if (document.getElementById("inputInfo").value != "") {
-		canvas.style.letterSpacing = "0px"
-		card.font = "17px mplantin"
-		if (document.getElementById("creatureCheckbox").checked == true) {
-			card.fillText("CC \u2014 " + document.getElementById("inputInfo").value, shiftInfo, m15InfoY + 3)
-		} else {
-			card.fillText("CC \u2014 " + document.getElementById("inputInfo").value, shiftInfo, m15InfoY - 17)
-		}
-	}
-}
-//Bottom info on 8th edition cards
-function bottomInfo8th() {
-	if (document.getElementById("artistColor").checked == true) {
-		card.fillStyle = "black"
-	} else {
-		card.fillStyle = "white"
-	}
-	canvas.style.letterSpacing = "1px"
-	card.font = "25px matrixb"
-	card.fillText(document.getElementById("inputArtist").value, 116, eighthInfoY)
-	canvas.style.letterSpacing = "0.5px"
-	card.font = "16px mplantin"
-	card.fillText("CC \u2014 " + document.getElementById("inputInfo").value + " " + document.getElementById("inputNumber").value, 62, eighthInfoY + 31)
-}
-
-//Write rules and flavor text
-function rulesText(text, x, y) {
-	//This uses a long series of if/else statements to process the entered text (after its split into an array). It writes the rules text line by line taking into accounts symbols, line breaks, and italicized text
-	var paragraphShift = parseInt(document.getElementById("textShift").value, 10)
-	var paragraphDown = parseInt(document.getElementById("textDown").value, 10)
-	var words = (text + " ").split(" ")
-	var testLine = ""
-	var line = ""
-	var xShift = 0
-	var textSize = parseInt(document.getElementById("textSize").value)
-	y += paragraphDown
-	for(var n = 0; n < words.length; n++) {
-		//Special characters/fonts
-		if (words[n] == "<i>") {
-			card.fillText(line, x + xShift, y)
-			xShift += card.measureText(line).width
-			line = ""
-			canvas.style.letterSpacing = textFontSpacing * 1/3 + "px"
-			card.font = textSize + textFont + "i"
-		} else if (words[n] == "</i>") {
-			card.fillText(line, x + xShift, y)
-			xShift += card.measureText(line).width
-			line = ""
-			canvas.style.letterSpacing = textFontSpacing + "px"
-			card.font = "normal " + textSize + textFont
-		} else if (words[n] == "<line>") {
-			card.fillText(line, x + xShift, y)
-			line = ""
-			y += textSize + 1 + paragraphShift
-			xShift = 0
-		} else if (words[n] == "<lineNoSpace>") {
-			card.fillText(line, x + xShift, y)
-			line = ""
-			y += textSize + 1
-			xShift = 0
-		} else if (words[n].includes("<") && words[n].includes(">")) {
-			var splitWord = words[n].split("<")
-			aMax = words[n].length
-			for (var a = 0; a < aMax; a++) {
-				var extraSpace
-				if (words[n].charAt(0) == "<") {
-					card.fillText(line, x + xShift, y)
-					xShift += card.measureText(line).width
-					line = ""
-					if (extraSpace == true) {
-						xShift += 2
-					}
-					card.drawImage(manaSymbolImages[manaSymbolCode.indexOf(words[n].substring(words[n].indexOf("<") + 1, words[n].indexOf(">")))], x + xShift + textSize * 0.054, y + textSize * 0.11, textSize * 0.77, textSize * 0.77)
-					xShift += textSize * 0.84
-					words[n] = words[n].slice(words[n].indexOf(">") + 1, words[n].length)
-					extraSpace = true
-				} else {
-					line += words[n].charAt(0)
-					words[n] = words[n].slice(1, words[n].length)
-					extraSpace = false
-				}
-				if (a == aMax -1) {
-					line += " "
-				}
-			}
-		} else {
-			//REAL WORD
-			testLine = line + words[n]
-			var lineSize = card.measureText(testLine).width
-			if (lineSize + xShift + x > textWidth && n > 0) {
-				//Word is too big
-				card.fillText(line, x + xShift, y)
-				line = words[n] + " "
-				y += textSize + 1
-				xShift = 0
-			} else {
-				//Word fits
-				line = testLine + " "
-				if (n + 1 == words.length) {
-					card.fillText(line, x + xShift, y)
-				}
-			}
-		}
-	}
-}
-
-//Toggles the visibility of predetermined sections of the input boxes
-function toggleVisibility(targetClass, self, selfClass, hiddenClass, shownClass) {
-	var alreadyShown = document.getElementsByClassName(selfClass)
-	if (alreadyShown.length >= 1 && alreadyShown[0] != self) {
-		alreadyShown[0].click()
-	}
-	self.classList.toggle(selfClass)
-	var elementList = document.getElementsByClassName(targetClass)
-	for (i = 0; i < elementList.length; i ++) {
-		elementList[i].classList.toggle(hiddenClass)
-		elementList[i].classList.toggle(shownClass)
-	}
-}
-
-//runs the autocrop function for the chosen set symbol
-function loadSetSymbol() {
-    imgSetSymbol.src = "https://raw.githubusercontent.com/ImKyle4815/MTG-Set-Symbols/master/setSymbols/" + document.getElementById("setSymbolCode").value.toUpperCase() + "_" + document.getElementById("setSymbolRarity").value.toUpperCase() + ".png"
-}
-</script>
-<html>
+<!DOCTYPE HTML>
+<html>
+<head>
+	<title>Card Conjurer - Custom Magic Card Maker</title>
+	<script src="data/scripts/loadScript.js"></script>
+	<script src="data/scripts/loadImage.js"></script>
+	<script src="data/scripts/loadColors.js"></script>
+	<script src="data/scripts/mask.js"></script>
+    <!--<script src="data/scripts/autocrop.js"></script> This is no longer required, but possibly could be in the future -->
+	<div class="title">Card Conjurer</div>
+</head>
+<!-- <img src="data/background.png"></img> -->
+<body>
+	<div class="row">
+		<div class="column"><canvas id="canvas" width="749" height="1044"></canvas></div>
+		<!--OPTIONS-->
+		<div class="column">
+			<br/>
+			<div style="width: 375px">
+				<div class="toggle" onclick="toggleVisibility('cardBorder', this, 'toggleShown', 'hidden', 'shown')">Card Border</div>
+				<div class="cardBorder hidden">
+					Border
+					<select id="borderSelection" onchange="updateBorder()">
+						<option value="m15/">M15</option>
+						<option value="8th/">8th</option>
+					</select>
+					<br/>
+					Color
+					<select id="colorSelection" onchange="updateColor()">
+						<option value="white">White</option>
+					</select>
+					<br/>
+					<input type="checkbox" id="checkboxSecondColor" onchange="updateColor()">Second Color <select id="secondColorSelection" onchange="updateColor()"></select></input>
+					<br/>
+					<input type="checkbox" id="checkboxThirdColor" onchange="updateColor()">Third Color <select id="thirdColorSelection" onchange="updateColor()"></select></input>
+					<br/>
+					<input type="checkbox" id="creatureCheckbox" onchange="updateColor()">Power/Toughness
+					<input id="inputPowerToughness" value="" type="text"></input>
+					<br/>
+					<input type="checkbox" id="legendaryCheckbox" onchange="updateColor()">Legendary</input>
+					<br/>
+					<input type="checkbox" id="rareStampCheckbox" onchange="updateColor()">Rare Stamp</input>
+					<br/>
+					<input type="checkbox" id="silverBorderCheckbox">Silver Border</input>
+					<br/>
+					<input type="checkbox" id="foilCheckbox">Foil</input>
+					<br/>
+				</div>
+				<div class="toggle" onclick="toggleVisibility('nameCostType', this, 'toggleShown', 'hidden', 'shown')">Name, Mana Cost, Type</div>
+				<div class="nameCostType hidden">
+					Name
+					<input id="inputName" type="text"></input>
+					<br/>
+					Mana Cost
+					<input id="inputCost" type="text"></input>
+					<br/>
+					Type
+					<input id="inputType" type="text"></input>
+					<br/>
+				</div>
+				<div class="toggle" onclick="toggleVisibility('rulesText', this, 'toggleShown', 'hidden', 'shown')">Rules Text</div>
+				<div class="rulesText hidden">
+					Rules Text
+					<br/>
+					<textarea id="inputText" rows="5" cols="40" style="width: 99%; resize: vertical; height: 100px"></textarea>
+					<br/>
+					Rules Text Font Size
+					<input id="textSize" type="number" min="0" max="100" value="37" step="0.5"></input>
+					<br/>
+					Pixels Between Paragraphs
+					<input id="textShift" type="number" min="0" max="300" value="0"></input>
+					<br/>
+					Shift All Text Down
+					<input id="textDown" type="number" min="0" max="300" value="0"></input>
+					<br/>
+				</div>
+				<div class="toggle" onclick="toggleVisibility('cardArt', this, 'toggleShown', 'hidden', 'shown')">Card Art</div>
+				<div class="cardArt hidden">
+					Image
+					<input type="file" accept="image/*" onchange="loadImage(event, imgArt, true)" id="inputPicture"></input>
+					<br/>
+					Image Zoom
+					<input id="imageSize" type="number" value="100" step="0.1"></input>
+					<br/>
+					Image Left
+					<input id="imageLeft" type="number" value="0" step="1"></input>
+					<br/>
+					Image Up
+					<input id="imageUp" type="number" value="0" step="1"></input>
+					<br/>
+				</div>
+				<div class="toggle" onclick="toggleVisibility('otherInfo', this, 'toggleShown', 'hidden', 'shown')">Other Information</div>
+				<div class="otherInfo hidden">
+					Other Info
+					<input id="inputInfo" value="Not A Real Card" type="text"></input>
+					<br/>
+					Card Number
+					<input id="inputNumber" value="001/001" type="text"></input>
+					<br/>
+					Rarity
+					<input id="inputRarity" value="C" type="text"></input>
+					<br/>
+					Set Abbreviation
+					<input id="inputSet" value="MTG" type="text"></input>
+					<br/>
+					Language
+					<input id="inputLanguage" value="EN" type="text"></input>
+					<br/>
+					Artist Credit
+					<input id="inputArtist" value="" type="text"></input>
+					<br/>
+					<input id="artistColor" type="checkbox">Make Artist Credit font black</input>
+					<br/>
+				</div>
+				<div class="toggle" onclick="toggleVisibility('setSymbolWatermark', this, 'toggleShown', 'hidden', 'shown')">Set Symbol and Watermark</div>
+				<div class="setSymbolWatermark hidden">
+					<input type="checkbox" id="setSymbolCheckbox" checked="true">Set Symbol</input>
+                    <br>
+                    Set Code
+                    <input type="text" onchange="loadSetSymbol()" value="HM" id="setSymbolCode"></input>
+                    <br>
+                    Set Symbol Rarity
+                    <input type="text" onchange="loadSetSymbol()" value="C" id="setSymbolRarity"></input>
+                    <br>
+					Custom Set Symbol
+					<input type="file" accept="image/*" onchange="loadImage(event, imgSetSymbol, true)" id="inputSetSymbol"></input>
+					<br/>
+					Scale Set Symbol
+					<input id="setSymbolSize" type="number" value="100" step="0.5"></input>
+					<br/><br/>
+					<input type="checkbox" id="watermarkCheckbox" checked="true"></input>
+					Watermark
+					<input type="file" accept="image/*" onchange="loadImage(event, imgWatermark, true)" id="inputWatermark"></input>
+					<br/>
+					Watermark Color
+					<select id="watermarkColorSelection">
+						<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>
+					<br/>
+					<input type="checkbox" id="checkboxSecondWatermarkColor"> Second Watermark Color <select id="secondWatermarkColorSelection"></select></input>
+					<br/>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row text">
+		Use the following codes to get the respective symbol in the card's mana cost and rules text. In the mana cost, make sure to include spaces in between the codes, and in the rules text include '<' before each code and '>' after.<br/>
+		<div class="column" style="width: 100px">
+			w - <img id="w"><br/>
+			u - <img id="u"><br/>
+			b - <img id="b"><br/>
+			r - <img id="r"><br/>
+			g - <img id="g"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			pw - <img id="pw"><br/>
+			pu - <img id="pu"><br/>
+			pb - <img id="pb"><br/>
+			pr - <img id="pr"><br/>
+			pg - <img id="pg"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			2w - <img id="2w"><br/>
+			2u - <img id="2u"><br/>
+			2b - <img id="2b"><br/>
+			2r - <img id="2r"><br/>
+			2g - <img id="2g"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			w - <img id="wu"><br/>
+			u - <img id="wb"><br/>
+			b - <img id="ub"><br/>
+			r - <img id="ur"><br/>
+			g - <img id="br"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			w - <img id="bg"><br/>
+			u - <img id="rg"><br/>
+			b - <img id="rw"><br/>
+			r - <img id="gw"><br/>
+			g - <img id="gu"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			0 - <img id="0"><br/>
+			1 - <img id="1"><br/>
+			2 - <img id="2"><br/>
+			3 - <img id="3"><br/>
+			4 - <img id="4"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			5 - <img id="5"><br/>
+			6 - <img id="6"><br/>
+			7 - <img id="7"><br/>
+			8 - <img id="8"><br/>
+			9 - <img id="9"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			10 - <img id="10"><br/>
+			11 - <img id="11"><br/>
+			12 - <img id="12"><br/>
+			13 - <img id="13"><br/>
+			14 - <img id="14"><br/>
+		</div>
+		<div class="column" style="width: 100px">
+			15 - <img id="15"><br/>
+			16 - <img id="16"><br/>
+			17 - <img id="17"><br/>
+			18 - <img id="18"><br/>
+			19 - <img id="19"><br/>
+		</div>
+		<div class="column" style="width: 120px">
+			20 - <img id="20"><br/>
+			c - <img id="c"><br/>
+			x - <img id="x"><br/>
+			t - <img id="t"><br/>
+			untap - <img id="untap"><br/>
+		</div>
+		<div class="column" style="width: 120px">
+			snow - <img id="snow"><br/>
+			e - <img id="e"><br/>
+			<br/>
+			<br/>
+			<br/>
+		</div>
+		<br/><br/><br/><br/><br/><br/><br/> <!-- Not quite sure why I needed so many linebreaks here! -->
+		When selecting the card's color, use 'Second Color' for hybrid cards, and 'Third Color' for non-hybrid two-colored cards.
+	</div>
+	<div class="info">For Terms of Use and Disclaimer, see <a href="https://github.com/ImKyle4815/CardConjurer" target="_blank">the Github page</a>.</div>
+</body>
+
+
+
+<!--CSS-->
+<style>
+@font-face {
+	font-family: relaymedium;
+	src: url("data/fonts/relay-medium.ttf");
+}
+@font-face {
+	font-family: belerenb;
+	src: url("data/fonts/beleren-b.ttf");
+}
+@font-face {
+	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");
+}
+@font-face {
+	font-family: matrixb;
+	src: url("data/fonts/matrix-b.ttf");
+}
+@font-face {
+	font-family: mplantin;
+	src: url("data/fonts/mplantin.ttf");
+}
+@font-face {
+	font-family: mplantini;
+	src: url("data/fonts/mplantin-i.ttf");
+}
+.title {
+	text-align: center;
+	color: rgb(128,255,128);
+	font-family: belerenbsc;
+	font-size: 60px;
+}
+.info {
+	text-align: center;
+	color: rgb(96,96,96);
+	font-family: belerenbsc;
+	font-size: 16px;
+}
+.toggle {
+	text-align: center;
+	color: rgb(255, 255, 255);
+	font-family: belerenbsc;
+	font-size: 20px;
+	width: 100%;
+	padding: 5px;
+	border: 1px solid rgb(128, 255, 128);
+}
+.toggle:hover {
+	color: rgb(128, 255, 128);
+}
+.toggleShown {
+	color: rgb(128, 255, 128);
+	border-color: rgb(128, 255, 128);
+	border-style: solid solid hidden solid;
+}
+.hidden {
+	display: none;
+	font-size: 100px;
+}
+.shown {
+	width: 100%;
+	padding: 5px;
+	border-width: 1px;
+	border-color: rgb(128, 255, 128);
+	border-style: dashed solid solid solid;
+	font-size: 20px;
+	color: rgb(255,255,255);
+	font-family: belerenbsc;
+}
+.shown * {
+	font-family: mplantin;
+	font-size: 20px;
+}
+input[type="text"] {
+	width: 99%;
+}
+input[type="number"] {
+	width: 99%;
+}
+select {
+	width: 100%;
+}
+.column {
+	float: left;
+}
+.row:after{
+	content: "";
+	display: table;
+	clear: both;
+}
+.text {
+	padding: 10px;
+	text-align: left;
+	color: rgb(128, 128, 128);
+	font-family: beleren;
+	font-size: 25px;
+}
+.text img {
+	position: relative;
+	top: 8px;
+	width: 30px;
+	padding: 0px 0px 0px 0px !important;
+	margin: 0px;
+}
+body {
+	color: rgb(255,255,255);
+	font-family: mplantin;
+	font-size: 18px;
+}
+html {
+	background:url(data/background.png) no-repeat center center fixed;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+ 	-o-background-size: cover;
+	background-size: cover;
+}
+canvas {
+	float: left;
+	padding: 10px;
+}
+a:link {
+	color: rgb(128,128,128); 
+}
+
+a:visited {
+	color: rgb(128,128,128);
+}
+
+a:hover {
+	color: rgb(128,255,128);
+}
+
+a:active {
+	color: rgb(128,255,128);
+}
+</style>
+
+
+
+<script>
+//set up initial variables
+loadScript("data/borders/m15/border.js")
+var borderPath
+var m15Info = true
+//set up canvas
+var canvas = document.getElementById("canvas")
+var card = canvas.getContext("2d")
+//Load dynamic images
+var dynamicImageList = ["borderColor", "secondBorderColor", "thirdBorderColor", "borderCreature", "secondBorderCreature", "thirdBorderCreature", "borderLegendary", "secondBorderLegendary", "thirdBorderLegendary", "borderRareStamp", "secondBorderRareStamp", "art", "artMask", "setSymbol", "watermark", "multiMask", "LegendMultiMask", "legendSilver"]
+for (i = 0; i < dynamicImageList.length; i ++) {
+	var imgName = "img" + dynamicImageList[i].charAt(0).toUpperCase() + dynamicImageList[i].slice(1)
+	window[imgName] = new Image()
+}
+//Load static images
+var staticImageList = ["artistBrush", "foil", "stampGradient", "multiGradient", "rareStamp", "cardMask", "silverBorder", "borderEdge"]
+for (i = 0; i < staticImageList.length; i ++) {
+	var imgName = "img" + staticImageList[i].charAt(0).toUpperCase() + staticImageList[i].slice(1)
+	window[imgName] = new Image()
+	window[imgName].src = "data/borders/" + staticImageList[i] + ".png"
+}
+//Mana symbol Array setup
+var manaSymbolCode = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "w", "u", "b", "r", "g", "2w", "2u", "2b", "2r", "2g", "pw", "pu", "pb", "pr", "pg", "wu", "wb", "ub", "ur", "br", "bg", "rg", "rw", "gw", "gu", "x", "snow", "c", "t","untap", "e"]
+var manaSymbolImages = new Array()
+for (var i = 0; i < manaSymbolCode.length; i++) {
+	manaSymbolImages[i] = new Image()
+	manaSymbolImages[i].src = "data/manaSymbols/" + i + ".png"
+	//alert(document.getElementById(manaSymbolImages[i]))
+	if (document.getElementById(manaSymbolCode[i]) != null) {
+		document.getElementById(manaSymbolCode[i]).src = "data/manaSymbols/" + i + ".png"
+	}
+}
+//load first set symbol
+loadSetSymbol()
+//fill second watermark dropdown menu
+document.getElementById("secondWatermarkColorSelection").innerHTML = document.getElementById("watermarkColorSelection").innerHTML
+
+
+//Runs ten times every second (main loop)
+updateBorder()
+setInterval(function() {
+		//Insures that the corners of the final image are transparent
+		card.globalCompositeOperation = "source-over"
+		card.drawImage(imgCardMask, 0, 0, 749, 1044)
+		card.globalCompositeOperation = "source-atop"
+		//These functions draw everything
+		drawPicture()
+		drawBorder()
+		drawSetSymbol()
+		drawManaCost()
+		drawWatermark()
+		writeText()
+		//m15 and 8th edition have different info at the bottom of the cards and require completely different functions
+		if (m15Info == true) {
+			bottomInfoM15()
+		}
+		if (eighthInfo == true) {
+			bottomInfo8th()
+		}
+		//A shiny foil overlay!
+		if(document.getElementById("foilCheckbox").checked == true) {
+			card.drawImage(imgFoil, 0, 0, canvas.width, canvas.height)
+		}
+		//These are for pinpointing coordinates while adjusting values for new border types
+		//Vertical Line
+		//card.beginPath()
+		//card.moveTo(setSymbolRight, 0)
+		//card.lineTo(setSymbolRight, 1044)
+		//card.stroke()
+		//Horizontal Line
+		//card.beginPath()
+		//card.moveTo(0, setSymbolY)
+		//card.lineTo(749, setSymbolY)
+		//card.stroke()
+	}, 100)
+
+
+
+//Loads different types of borders
+function updateBorder() {
+	//the loadScript function is located in data/scripts/loadScript.js. It sets values to variables such as set symbol coordinates or title font
+	loadScript("data/borders/" + document.getElementById("borderSelection").value + "border.js")
+	document.getElementById("colorSelection").value = "white"
+	imgArtMask.src = "data/borders/" + document.getElementById("borderSelection").value + "artMask.png"
+	imgMultiMask.src = "data/borders/" + document.getElementById("borderSelection").value + "multiMask.png"
+	imgLegendMultiMask.src = "data/borders/" + document.getElementById("borderSelection").value + "legendMultiMask.png"
+	imgLegendSilver.src = "data/borders/" + document.getElementById("borderSelection").value + "legendSilver.png"
+	updateColor()
+}
+//Loads the images for the card frame, power toughness box, and rare stamp
+function updateColor() {
+	borderPath = "data/borders/" + document.getElementById("borderSelection").value
+	imgBorderColor.src = borderPath + document.getElementById("colorSelection").value + "/frame.png"
+	imgSecondBorderColor.src = borderPath + document.getElementById("secondColorSelection").value + "/frame.png"
+	imgThirdBorderColor.src = borderPath + document.getElementById("thirdColorSelection").value + "/frame.png"
+	imgBorderCreature.src = borderPath + document.getElementById("colorSelection").value + "/pt.png"
+	imgSecondBorderCreature.src = borderPath + document.getElementById("secondColorSelection").value + "/pt.png"
+	imgThirdBorderCreature.src = borderPath + document.getElementById("thirdColorSelection").value + "/pt.png"
+	if (m15Info == true) {
+		imgBorderLegendary.src = borderPath + document.getElementById("colorSelection").value + "/legendary.png"
+		imgSecondBorderLegendary.src = borderPath + document.getElementById("secondColorSelection").value + "/legendary.png"
+		imgThirdBorderLegendary.src = borderPath + document.getElementById("thirdColorSelection").value + "/legendary.png"
+		imgBorderRareStamp.src = borderPath + document.getElementById("colorSelection").value + "/stamp.png"
+		imgSecondBorderRareStamp.src = borderPath + document.getElementById("secondColorSelection").value + "/stamp.png"
+	}
+}
+//Draw Picture
+function drawPicture() {
+	//scales the card art and draws it
+	var imageScale = document.getElementById("imageSize").value * 0.01
+	var imageLeftShift = parseInt(document.getElementById("imageLeft").value)
+	var imageUpShift = parseInt(document.getElementById("imageUp").value)
+	card.drawImage(imgArt, 58 - imageLeftShift, 119 - imageUpShift, imgArt.width * imageScale, imgArt.height * imageScale)
+}
+//Draw Border
+function drawBorder() {
+	//These if else statements check to see whether or not to draw different parts of the card, like the legendary border or rare stamp, and draws them in the appropriate order such that when multiple border colors are used the gradients overlap correctly
+	drawMask(imgBorderColor, 0, 0, canvas.width, canvas.height, imgArtMask, false, false)
+	if (document.getElementById("checkboxSecondColor").checked == true) {
+		drawMask(imgSecondBorderColor, 0, 0, canvas.width, canvas.height, imgArtMask, imgMultiGradient, "reverseSecond")
+	}
+	if (document.getElementById("checkboxThirdColor").checked == true) {
+		drawMask(imgThirdBorderColor, 0, 0, canvas.width, canvas.height, imgMultiMask, imgArtMask, false)
+	}
+	if (m15Info == true) {
+		if (document.getElementById("legendaryCheckbox").checked == true && imgBorderLegendary.width != 0) {
+			card.drawImage(imgBorderLegendary, 0, 0, canvas.width, canvas.height)
+			if (document.getElementById("checkboxSecondColor").checked == true && imgBorderLegendary.width != 0) {
+				drawMask(imgSecondBorderLegendary, 0, 0, canvas.width, canvas.height, imgArtMask, imgMultiGradient, "reverseSecond")
+			}
+			if (document.getElementById("checkboxThirdColor").checked == true) {
+				drawMask(imgThirdBorderColor, 0, 0, canvas.width, canvas.height, imgLegendMultiMask, imgArtMask, false)
+			}
+		}
+		if (document.getElementById("rareStampCheckbox").checked == true) {
+			if (imgBorderRareStamp.width != 0) {
+				card.drawImage(imgBorderRareStamp, 329, rareStampY - 15, 90, 50)
+				if (document.getElementById("checkboxSecondColor").checked == true) {
+					drawMask(imgSecondBorderRareStamp, 329, rareStampY - 15, 90, 50, imgSecondBorderRareStamp, imgStampGradient, "reverseSecond")
+				}
+			}
+			card.drawImage(imgRareStamp, 340, rareStampY, 70, 37)
+		}
+	}
+	if(document.getElementById("legendaryCheckbox").checked == true) {
+		card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height)
+		if (document.getElementById("silverBorderCheckbox").checked == true) {
+			drawMask(imgLegendSilver, 0, 0, canvas.width, canvas.height, imgCardMask, false, false)
+		}
+	} else {
+		card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height)
+		if (document.getElementById("silverBorderCheckbox").checked == true) {
+			card.drawImage(imgSilverBorder, 0, 0, canvas.width, canvas.height)
+		}
+	}
+}
+//Draw Set Symbol
+function drawSetSymbol() {
+	//scales the set symbol so that it fits in the correct area and centers it
+	if (imgSetSymbol.src != "" && document.getElementById("setSymbolCheckbox").checked == true) {
+		var height = setSymbolHeight
+		var width = imgSetSymbol.width * (height / imgSetSymbol.height)
+		if (width > setSymbolWidth) {
+			width = setSymbolWidth
+			height = imgSetSymbol.height * (width / imgSetSymbol.width)
+		}
+		height *= document.getElementById("setSymbolSize").value / 100
+		width *= document.getElementById("setSymbolSize").value / 100
+		var y = setSymbolY - height / 2
+		var x = setSymbolRight - width
+		card.drawImage(imgSetSymbol, x, y, width, height)
+	}
+}
+//Draw Watermark
+function drawWatermark() {
+	//The watermark is centered/scaled just like the set symbol
+	if (imgWatermark.src != "" && document.getElementById("watermarkCheckbox").checked == true) {
+		var height = watermarkHeight
+		var width = imgWatermark.width * (height / imgWatermark.height)
+		if (width > watermarkWidth) {
+			width = watermarkWidth
+			height = imgWatermark.height * (width / imgWatermark.width)
+		}
+		var x = canvas.width / 2 - width / 2
+		var y = watermarkY - height / 2
+		//globalAlpha insures that the watermark is drawn partially transparent. This value may not be perfect but the watermark colors are calibrated to it
+		card.globalAlpha = 0.4
+	    //if the following if statement is true, the watermark will be drawn in two halves of the chosen colors. Otherwise, a single watermark of the first chosen color is drawn.
+	    if (document.getElementById("checkboxSecondWatermarkColor").checked == true) {
+	    	drawMask(document.getElementById("watermarkColorSelection").value, x, y, width, height, imgWatermark, imgMultiGradient, false)
+	    	drawMask(document.getElementById("secondWatermarkColorSelection").value, x, y, width, height, imgWatermark, imgMultiGradient, "reverseSecond")
+	    } else {
+	    	drawMask(document.getElementById("watermarkColorSelection").value, x, y, width, height, imgWatermark, false, false)
+	    }
+	    card.globalAlpha = 1
+	}
+}
+//Mana cost
+function drawManaCost() {
+	//the symbols string splits the mana cost input into an array of strings which is then put into a for loop that draws the appropriate set symbol then adjusts the xShift so the set symbols are spaced properly
+	card.fillStyle = "Black"
+	var symbols = document.getElementById("inputCost").value.split(" ")
+	var xShift = 0
+	for (n = symbols.length; n > -1; n--) {
+		if (manaSymbolCode.indexOf(symbols[n]) != -1) {
+			card.beginPath()
+			card.arc(manaCostX + xShift + manaCostRadius - 1, manaCostY + manaCostRadius + 3.5, manaCostRadius, 0, 6.29, false)
+			card.fill()
+			card.drawImage(manaSymbolImages[manaSymbolCode.indexOf(symbols[n])], manaCostX + xShift, manaCostY, manaCostRadius * 2, manaCostRadius * 2)
+			xShift -= 39
+		}
+	}
+}
+//Write Text
+function writeText() {
+	//Draws the entered text onto the card, also draws the power/toughness box if necessary
+	//All use these:
+	card.textBaseline = "top"
+	card.fillStyle = "Black"
+	//Title
+	canvas.style.letterSpacing = titleFontSpacing
+	card.font = titleFont	
+	card.fillText(document.getElementById("inputName").value, titleX, titleY)
+	//Type
+	canvas.style.letterSpacing = typeFontSpacing
+	card.font = typeFont
+	card.fillText(document.getElementById("inputType").value, typeX, typeY)
+	//Rules Text
+	canvas.style.letterSpacing = textFontSpacing + "px"
+	card.font = document.getElementById("textSize").value + textFont
+	var text = document.getElementById("inputText").value
+	rulesText(text, textX, textY)
+	//Power/Toughness
+	if (document.getElementById("creatureCheckbox").checked == true) {
+		if (document.getElementById("checkboxThirdColor").checked == true) {
+			card.drawImage(imgThirdBorderCreature, ptX, ptY, ptWidth, ptHeight)
+		} else if (document.getElementById("checkboxSecondColor").checked == true) {
+			card.drawImage(imgSecondBorderCreature, ptX, ptY, ptWidth, ptHeight)
+		} else {
+			card.drawImage(imgBorderCreature, ptX, ptY, ptWidth, ptHeight)
+		}
+		canvas.style.letterSpacing = ptFontSpacing
+		card.font = ptFont
+		powerToughness = document.getElementById("inputPowerToughness").value
+		card.fillText(powerToughness, ptTextX - (card.measureText(powerToughness).width / 2), ptTextY)
+	}
+}
+//Bottom info on M15 cards
+function bottomInfoM15() {
+	var shiftInfo = 445
+	card.fillStyle = "white"
+	canvas.style.letterSpacing = "0.8px"
+	card.font = "19.5px relaymedium"
+	var bottomLine = document.getElementById("inputSet").value + " \u00b7 " + document.getElementById("inputLanguage").value
+	card.fillText(bottomLine, 48, m15InfoY)
+	var artistBrushShift = card.measureText(bottomLine).width + 58
+	card.drawImage(imgArtistBrush, artistBrushShift, m15InfoY + 5, 21, 13)
+	canvas.style.letterSpacing = "1.3px"
+	card.font = "19.5px relaymedium"
+	card.fillText(document.getElementById("inputNumber").value, 49, m15InfoY - 20)
+	card.fillText(document.getElementById("inputRarity").value, artistBrushShift - 1, m15InfoY - 20)
+	if (445 < artistBrushShift  + card.measureText(document.getElementById("inputRarity").value).width && document.getElementById("creatureCheckbox").checked == false) {
+		shiftInfo = artistBrushShift  + card.measureText(document.getElementById("inputRarity").value).width + 5
+	}
+	canvas.style.letterSpacing = "-0.1px"
+	card.font = "24px matrixbsc"
+	card.fillText(document.getElementById("inputArtist").value, artistBrushShift + 21, m15InfoY + 2)
+	if (445 < artistBrushShift + 21 + card.measureText(document.getElementById("inputArtist").value).width && document.getElementById("creatureCheckbox").checked == true) {
+		shiftInfo = artistBrushShift + card.measureText(document.getElementById("inputArtist").value).width + 26
+	}
+	//This is where "CC —" is hardcoded. The only reason is to prevent users from easily typing in the trademark and copyright that's usually on real cards. It's also there so I can see if a card was created with my program, it makes me feel good :)
+	if (document.getElementById("inputInfo").value != "") {
+		canvas.style.letterSpacing = "0px"
+		card.font = "17px mplantin"
+		if (document.getElementById("creatureCheckbox").checked == true) {
+			card.fillText("CC \u2014 " + document.getElementById("inputInfo").value, shiftInfo, m15InfoY + 3)
+		} else {
+			card.fillText("CC \u2014 " + document.getElementById("inputInfo").value, shiftInfo, m15InfoY - 17)
+		}
+	}
+}
+//Bottom info on 8th edition cards
+function bottomInfo8th() {
+	if (document.getElementById("artistColor").checked == true) {
+		card.fillStyle = "black"
+	} else {
+		card.fillStyle = "white"
+	}
+	canvas.style.letterSpacing = "1px"
+	card.font = "25px matrixb"
+	card.fillText(document.getElementById("inputArtist").value, 116, eighthInfoY)
+	canvas.style.letterSpacing = "0.5px"
+	card.font = "16px mplantin"
+	card.fillText("CC \u2014 " + document.getElementById("inputInfo").value + " " + document.getElementById("inputNumber").value, 62, eighthInfoY + 31)
+}
+
+//Write rules and flavor text
+function rulesText(text, x, y) {
+	//This uses a long series of if/else statements to process the entered text (after its split into an array). It writes the rules text line by line taking into accounts symbols, line breaks, and italicized text
+	var paragraphShift = parseInt(document.getElementById("textShift").value, 10)
+	var paragraphDown = parseInt(document.getElementById("textDown").value, 10)
+	var words = (text + " ").split(" ")
+	var testLine = ""
+	var line = ""
+	var xShift = 0
+	var textSize = parseInt(document.getElementById("textSize").value)
+	y += paragraphDown
+	for(var n = 0; n < words.length; n++) {
+		//Special characters/fonts
+		if (words[n] == "<i>") {
+			card.fillText(line, x + xShift, y)
+			xShift += card.measureText(line).width
+			line = ""
+			canvas.style.letterSpacing = textFontSpacing * 1/3 + "px"
+			card.font = textSize + textFont + "i"
+		} else if (words[n] == "</i>") {
+			card.fillText(line, x + xShift, y)
+			xShift += card.measureText(line).width
+			line = ""
+			canvas.style.letterSpacing = textFontSpacing + "px"
+			card.font = "normal " + textSize + textFont
+		} else if (words[n] == "<line>") {
+			card.fillText(line, x + xShift, y)
+			line = ""
+			y += textSize + 1 + paragraphShift
+			xShift = 0
+		} else if (words[n] == "<lineNoSpace>") {
+			card.fillText(line, x + xShift, y)
+			line = ""
+			y += textSize + 1
+			xShift = 0
+		} else if (words[n].includes("<") && words[n].includes(">")) {
+			var splitWord = words[n].split("<")
+			aMax = words[n].length
+			for (var a = 0; a < aMax; a++) {
+				var extraSpace
+				if (words[n].charAt(0) == "<") {
+					card.fillText(line, x + xShift, y)
+					xShift += card.measureText(line).width
+					line = ""
+					if (extraSpace == true) {
+						xShift += 2
+					}
+					card.drawImage(manaSymbolImages[manaSymbolCode.indexOf(words[n].substring(words[n].indexOf("<") + 1, words[n].indexOf(">")))], x + xShift + textSize * 0.054, y + textSize * 0.11, textSize * 0.77, textSize * 0.77)
+					xShift += textSize * 0.84
+					words[n] = words[n].slice(words[n].indexOf(">") + 1, words[n].length)
+					extraSpace = true
+				} else {
+					line += words[n].charAt(0)
+					words[n] = words[n].slice(1, words[n].length)
+					extraSpace = false
+				}
+				if (a == aMax -1) {
+					line += " "
+				}
+			}
+		} else {
+			//REAL WORD
+			testLine = line + words[n]
+			var lineSize = card.measureText(testLine).width
+			if (lineSize + xShift + x > textWidth && n > 0) {
+				//Word is too big
+				card.fillText(line, x + xShift, y)
+				line = words[n] + " "
+				y += textSize + 1
+				xShift = 0
+			} else {
+				//Word fits
+				line = testLine + " "
+				if (n + 1 == words.length) {
+					card.fillText(line, x + xShift, y)
+				}
+			}
+		}
+	}
+}
+
+//Toggles the visibility of predetermined sections of the input boxes
+function toggleVisibility(targetClass, self, selfClass, hiddenClass, shownClass) {
+	var alreadyShown = document.getElementsByClassName(selfClass)
+	if (alreadyShown.length >= 1 && alreadyShown[0] != self) {
+		alreadyShown[0].click()
+	}
+	self.classList.toggle(selfClass)
+	var elementList = document.getElementsByClassName(targetClass)
+	for (i = 0; i < elementList.length; i ++) {
+		elementList[i].classList.toggle(hiddenClass)
+		elementList[i].classList.toggle(shownClass)
+	}
+}
+
+//runs the autocrop function for the chosen set symbol
+function loadSetSymbol() {
+    imgSetSymbol.src = "https://raw.githubusercontent.com/ImKyle4815/MTG-Set-Symbols/master/setSymbols/" + document.getElementById("setSymbolCode").value.toUpperCase() + "_" + document.getElementById("setSymbolRarity").value.toUpperCase() + ".png"
+}
+</script>
+<html>
diff --git a/CardConjurer/data/background-original.png b/data/background-original.png
similarity index 100%
rename from CardConjurer/data/background-original.png
rename to data/background-original.png
diff --git a/CardConjurer/data/background.png b/data/background.png
similarity index 100%
rename from CardConjurer/data/background.png
rename to data/background.png
diff --git a/CardConjurer/data/borders/8th/artMask.png b/data/borders/8th/artMask.png
similarity index 100%
rename from CardConjurer/data/borders/8th/artMask.png
rename to data/borders/8th/artMask.png
diff --git a/CardConjurer/data/borders/8th/artifact/frame.png b/data/borders/8th/artifact/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/artifact/frame.png
rename to data/borders/8th/artifact/frame.png
diff --git a/CardConjurer/data/borders/8th/artifact/pt.png b/data/borders/8th/artifact/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/artifact/pt.png
rename to data/borders/8th/artifact/pt.png
diff --git a/CardConjurer/data/borders/8th/black/frame.png b/data/borders/8th/black/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/black/frame.png
rename to data/borders/8th/black/frame.png
diff --git a/CardConjurer/data/borders/8th/black/pt.png b/data/borders/8th/black/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/black/pt.png
rename to data/borders/8th/black/pt.png
diff --git a/CardConjurer/data/borders/8th/blackLand/frame.png b/data/borders/8th/blackLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/blackLand/frame.png
rename to data/borders/8th/blackLand/frame.png
diff --git a/CardConjurer/data/borders/8th/blackLand/pt.png b/data/borders/8th/blackLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/blackLand/pt.png
rename to data/borders/8th/blackLand/pt.png
diff --git a/CardConjurer/data/borders/8th/blue/frame.png b/data/borders/8th/blue/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/blue/frame.png
rename to data/borders/8th/blue/frame.png
diff --git a/CardConjurer/data/borders/8th/blue/pt.png b/data/borders/8th/blue/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/blue/pt.png
rename to data/borders/8th/blue/pt.png
diff --git a/CardConjurer/data/borders/8th/blueLand/frame.png b/data/borders/8th/blueLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/blueLand/frame.png
rename to data/borders/8th/blueLand/frame.png
diff --git a/CardConjurer/data/borders/8th/blueLand/pt.png b/data/borders/8th/blueLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/blueLand/pt.png
rename to data/borders/8th/blueLand/pt.png
diff --git a/CardConjurer/data/borders/8th/border.js b/data/borders/8th/border.js
similarity index 96%
rename from CardConjurer/data/borders/8th/border.js
rename to data/borders/8th/border.js
index a8d49279..a4f2aed1 100644
--- a/CardConjurer/data/borders/8th/border.js
+++ b/data/borders/8th/border.js
@@ -1,48 +1,48 @@
-var titleFont = "44px matrixb"
-var titleFontSpacing = "0.5px"
-var titleX = 66
-var titleY = 62
-
-var manaCostRadius = 16.5
-var manaCostX = 652
-var manaCostY = 68
-
-var typeFont = "37.5px matrixb"
-var typeFontSpacing = "0px"
-var typeX = 74
-var typeY = 598
-
-var textFont = "px mplantin"
-var textFontSpacing = 1.2
-var textX = 76
-var textY = 656
-var textWidth = 680
-
-var ptFont = "bold 48px matrix"
-var ptFontSpacing = "0.3px"
-var ptTextX = 626
-var ptTextY = 936
-var ptX = 541
-var ptY = 920.5
-var ptWidth = 162
-var ptHeight = 84
-
-var eighthInfo = true
-var eighthInfoY = 956
-var m15Info = false
-var m15InfoY = 992
-
-var setSymbolY = 615
-var setSymbolRight = 689
-var setSymbolWidth = 77
-var setSymbolHeight = 44
-
-var watermarkWidth = 520
-var watermarkHeight = 208
-var watermarkY = 796
-
-var rareStampY = 958
-
-loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black-Black,blackLand-Black Land,red-Red,redLand-Red Land,green-Green,greenLand-Green Land,gold-Gold,goldLand-Gold Land,colorless-Colorless,colorlessLand-Colorless Land,artifact-Artifact,oldArtifact-Old Artifact,oldGold-Old Gold,oldGoldLand-Old Gold Land")
-document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
+var titleFont = "44px matrixb"
+var titleFontSpacing = "0.5px"
+var titleX = 66
+var titleY = 62
+
+var manaCostRadius = 16.5
+var manaCostX = 652
+var manaCostY = 68
+
+var typeFont = "37.5px matrixb"
+var typeFontSpacing = "0px"
+var typeX = 74
+var typeY = 598
+
+var textFont = "px mplantin"
+var textFontSpacing = 1.2
+var textX = 76
+var textY = 656
+var textWidth = 680
+
+var ptFont = "bold 48px matrix"
+var ptFontSpacing = "0.3px"
+var ptTextX = 626
+var ptTextY = 936
+var ptX = 541
+var ptY = 920.5
+var ptWidth = 162
+var ptHeight = 84
+
+var eighthInfo = true
+var eighthInfoY = 956
+var m15Info = false
+var m15InfoY = 992
+
+var setSymbolY = 615
+var setSymbolRight = 689
+var setSymbolWidth = 77
+var setSymbolHeight = 44
+
+var watermarkWidth = 520
+var watermarkHeight = 208
+var watermarkY = 796
+
+var rareStampY = 958
+
+loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black-Black,blackLand-Black Land,red-Red,redLand-Red Land,green-Green,greenLand-Green Land,gold-Gold,goldLand-Gold Land,colorless-Colorless,colorlessLand-Colorless Land,artifact-Artifact,oldArtifact-Old Artifact,oldGold-Old Gold,oldGoldLand-Old Gold Land")
+document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
 document.getElementById("thirdColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
\ No newline at end of file
diff --git a/CardConjurer/data/borders/8th/colorless/frame.png b/data/borders/8th/colorless/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/colorless/frame.png
rename to data/borders/8th/colorless/frame.png
diff --git a/CardConjurer/data/borders/8th/colorless/pt.png b/data/borders/8th/colorless/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/colorless/pt.png
rename to data/borders/8th/colorless/pt.png
diff --git a/CardConjurer/data/borders/8th/colorlessLand/frame.png b/data/borders/8th/colorlessLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/colorlessLand/frame.png
rename to data/borders/8th/colorlessLand/frame.png
diff --git a/CardConjurer/data/borders/8th/colorlessLand/pt.png b/data/borders/8th/colorlessLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/colorlessLand/pt.png
rename to data/borders/8th/colorlessLand/pt.png
diff --git a/CardConjurer/data/borders/8th/gold/frame.png b/data/borders/8th/gold/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/gold/frame.png
rename to data/borders/8th/gold/frame.png
diff --git a/CardConjurer/data/borders/8th/gold/pt.png b/data/borders/8th/gold/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/gold/pt.png
rename to data/borders/8th/gold/pt.png
diff --git a/CardConjurer/data/borders/8th/goldLand/frame.png b/data/borders/8th/goldLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/goldLand/frame.png
rename to data/borders/8th/goldLand/frame.png
diff --git a/CardConjurer/data/borders/8th/goldLand/pt.png b/data/borders/8th/goldLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/goldLand/pt.png
rename to data/borders/8th/goldLand/pt.png
diff --git a/CardConjurer/data/borders/8th/green/frame.png b/data/borders/8th/green/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/green/frame.png
rename to data/borders/8th/green/frame.png
diff --git a/CardConjurer/data/borders/8th/green/pt.png b/data/borders/8th/green/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/green/pt.png
rename to data/borders/8th/green/pt.png
diff --git a/CardConjurer/data/borders/8th/greenLand/frame.png b/data/borders/8th/greenLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/greenLand/frame.png
rename to data/borders/8th/greenLand/frame.png
diff --git a/CardConjurer/data/borders/8th/greenLand/pt.png b/data/borders/8th/greenLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/greenLand/pt.png
rename to data/borders/8th/greenLand/pt.png
diff --git a/CardConjurer/data/borders/8th/multiMask.png b/data/borders/8th/multiMask.png
similarity index 100%
rename from CardConjurer/data/borders/8th/multiMask.png
rename to data/borders/8th/multiMask.png
diff --git a/CardConjurer/data/borders/8th/oldArtifact/frame.png b/data/borders/8th/oldArtifact/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/oldArtifact/frame.png
rename to data/borders/8th/oldArtifact/frame.png
diff --git a/CardConjurer/data/borders/8th/oldArtifact/pt.png b/data/borders/8th/oldArtifact/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/oldArtifact/pt.png
rename to data/borders/8th/oldArtifact/pt.png
diff --git a/CardConjurer/data/borders/8th/oldGold/frame.png b/data/borders/8th/oldGold/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/oldGold/frame.png
rename to data/borders/8th/oldGold/frame.png
diff --git a/CardConjurer/data/borders/8th/oldGold/pt.png b/data/borders/8th/oldGold/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/oldGold/pt.png
rename to data/borders/8th/oldGold/pt.png
diff --git a/CardConjurer/data/borders/8th/oldGoldLand/frame.png b/data/borders/8th/oldGoldLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/oldGoldLand/frame.png
rename to data/borders/8th/oldGoldLand/frame.png
diff --git a/CardConjurer/data/borders/8th/oldGoldLand/pt.png b/data/borders/8th/oldGoldLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/oldGoldLand/pt.png
rename to data/borders/8th/oldGoldLand/pt.png
diff --git a/CardConjurer/data/borders/8th/red/frame.png b/data/borders/8th/red/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/red/frame.png
rename to data/borders/8th/red/frame.png
diff --git a/CardConjurer/data/borders/8th/red/pt.png b/data/borders/8th/red/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/red/pt.png
rename to data/borders/8th/red/pt.png
diff --git a/CardConjurer/data/borders/8th/redLand/frame.png b/data/borders/8th/redLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/redLand/frame.png
rename to data/borders/8th/redLand/frame.png
diff --git a/CardConjurer/data/borders/8th/redLand/pt.png b/data/borders/8th/redLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/redLand/pt.png
rename to data/borders/8th/redLand/pt.png
diff --git a/CardConjurer/data/borders/8th/white/frame.png b/data/borders/8th/white/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/white/frame.png
rename to data/borders/8th/white/frame.png
diff --git a/CardConjurer/data/borders/8th/white/pt.png b/data/borders/8th/white/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/white/pt.png
rename to data/borders/8th/white/pt.png
diff --git a/CardConjurer/data/borders/8th/whiteLand/frame.png b/data/borders/8th/whiteLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/8th/whiteLand/frame.png
rename to data/borders/8th/whiteLand/frame.png
diff --git a/CardConjurer/data/borders/8th/whiteLand/pt.png b/data/borders/8th/whiteLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/8th/whiteLand/pt.png
rename to data/borders/8th/whiteLand/pt.png
diff --git a/CardConjurer/data/borders/artistBrush.png b/data/borders/artistBrush.png
similarity index 100%
rename from CardConjurer/data/borders/artistBrush.png
rename to data/borders/artistBrush.png
diff --git a/CardConjurer/data/borders/borderEdge.png b/data/borders/borderEdge.png
similarity index 100%
rename from CardConjurer/data/borders/borderEdge.png
rename to data/borders/borderEdge.png
diff --git a/CardConjurer/data/borders/cardMask.png b/data/borders/cardMask.png
similarity index 100%
rename from CardConjurer/data/borders/cardMask.png
rename to data/borders/cardMask.png
diff --git a/CardConjurer/data/borders/foil.png b/data/borders/foil.png
similarity index 100%
rename from CardConjurer/data/borders/foil.png
rename to data/borders/foil.png
diff --git a/CardConjurer/data/borders/m15/artMask.png b/data/borders/m15/artMask.png
similarity index 100%
rename from CardConjurer/data/borders/m15/artMask.png
rename to data/borders/m15/artMask.png
diff --git a/CardConjurer/data/borders/m15/artifact/frame.png b/data/borders/m15/artifact/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/artifact/frame.png
rename to data/borders/m15/artifact/frame.png
diff --git a/CardConjurer/data/borders/m15/artifact/pt.png b/data/borders/m15/artifact/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/artifact/pt.png
rename to data/borders/m15/artifact/pt.png
diff --git a/CardConjurer/data/borders/m15/artifact/stamp.png b/data/borders/m15/artifact/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/artifact/stamp.png
rename to data/borders/m15/artifact/stamp.png
diff --git a/CardConjurer/data/borders/m15/black/frame.png b/data/borders/m15/black/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/black/frame.png
rename to data/borders/m15/black/frame.png
diff --git a/CardConjurer/data/borders/m15/black/legendary.png b/data/borders/m15/black/legendary.png
similarity index 100%
rename from CardConjurer/data/borders/m15/black/legendary.png
rename to data/borders/m15/black/legendary.png
diff --git a/CardConjurer/data/borders/m15/black/pt.png b/data/borders/m15/black/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/black/pt.png
rename to data/borders/m15/black/pt.png
diff --git a/CardConjurer/data/borders/m15/black/stamp.png b/data/borders/m15/black/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/black/stamp.png
rename to data/borders/m15/black/stamp.png
diff --git a/CardConjurer/data/borders/m15/blackLand/frame.png b/data/borders/m15/blackLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blackLand/frame.png
rename to data/borders/m15/blackLand/frame.png
diff --git a/CardConjurer/data/borders/m15/blackLand/pt.png b/data/borders/m15/blackLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blackLand/pt.png
rename to data/borders/m15/blackLand/pt.png
diff --git a/CardConjurer/data/borders/m15/blackLand/stamp.png b/data/borders/m15/blackLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blackLand/stamp.png
rename to data/borders/m15/blackLand/stamp.png
diff --git a/CardConjurer/data/borders/m15/blue/frame.png b/data/borders/m15/blue/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blue/frame.png
rename to data/borders/m15/blue/frame.png
diff --git a/CardConjurer/data/borders/m15/blue/legendary.png b/data/borders/m15/blue/legendary.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blue/legendary.png
rename to data/borders/m15/blue/legendary.png
diff --git a/CardConjurer/data/borders/m15/blue/pt.png b/data/borders/m15/blue/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blue/pt.png
rename to data/borders/m15/blue/pt.png
diff --git a/CardConjurer/data/borders/m15/blue/stamp.png b/data/borders/m15/blue/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blue/stamp.png
rename to data/borders/m15/blue/stamp.png
diff --git a/CardConjurer/data/borders/m15/blueLand/frame.png b/data/borders/m15/blueLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blueLand/frame.png
rename to data/borders/m15/blueLand/frame.png
diff --git a/CardConjurer/data/borders/m15/blueLand/pt.png b/data/borders/m15/blueLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blueLand/pt.png
rename to data/borders/m15/blueLand/pt.png
diff --git a/CardConjurer/data/borders/m15/blueLand/stamp.png b/data/borders/m15/blueLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/blueLand/stamp.png
rename to data/borders/m15/blueLand/stamp.png
diff --git a/CardConjurer/data/borders/m15/border.js b/data/borders/m15/border.js
similarity index 96%
rename from CardConjurer/data/borders/m15/border.js
rename to data/borders/m15/border.js
index 688b89db..e09ccd32 100644
--- a/CardConjurer/data/borders/m15/border.js
+++ b/data/borders/m15/border.js
@@ -1,48 +1,48 @@
-var titleFont = "40px belerenb"
-var titleFontSpacing = "0.15px"
-var titleX = 62
-var titleY = 56
-
-var manaCostRadius = 17.5
-var manaCostX = 657
-var manaCostY = 59
-
-var typeFont = "33.5px belerenb"
-var typeFontSpacing = "0.05px"
-var typeX = 62
-var typeY = 595
-
-var textFont = "px mplantin"
-var textFontSpacing = 1.3
-var textX = 66
-var textY = 656
-var textWidth = 682
-
-var ptFont = "39px belerenb"
-var ptFontSpacing = "0.3px"
-var ptTextX = 645
-var ptTextY = 936
-var ptX = 571
-var ptY = 929
-var ptWidth = 137
-var ptHeight = 75
-
-var eighthInfo = false
-var eighthInfoY = 992
-var m15Info = true
-var m15InfoY = 993
-
-var setSymbolY = 616
-var setSymbolRight = 693
-var setSymbolWidth = 77
-var setSymbolHeight = 44
-
-var watermarkWidth = 520
-var watermarkHeight = 250
-var watermarkY = 805
-
-var rareStampY = 958
-
-loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black-Black,blackLand-Black Land,red-Red,redLand-Red Land,green-Green,greenLand-Green Land,gold-Gold,goldLand-Gold Land,colorless-Colorless,colorlessLand-Colorless Land,artifact-Artifact")
-document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
+var titleFont = "40px belerenb"
+var titleFontSpacing = "0.15px"
+var titleX = 62
+var titleY = 56
+
+var manaCostRadius = 17.5
+var manaCostX = 657
+var manaCostY = 59
+
+var typeFont = "33.5px belerenb"
+var typeFontSpacing = "0.05px"
+var typeX = 62
+var typeY = 595
+
+var textFont = "px mplantin"
+var textFontSpacing = 1.3
+var textX = 66
+var textY = 656
+var textWidth = 682
+
+var ptFont = "39px belerenb"
+var ptFontSpacing = "0.3px"
+var ptTextX = 645
+var ptTextY = 936
+var ptX = 571
+var ptY = 929
+var ptWidth = 137
+var ptHeight = 75
+
+var eighthInfo = false
+var eighthInfoY = 992
+var m15Info = true
+var m15InfoY = 993
+
+var setSymbolY = 616
+var setSymbolRight = 693
+var setSymbolWidth = 77
+var setSymbolHeight = 44
+
+var watermarkWidth = 520
+var watermarkHeight = 250
+var watermarkY = 805
+
+var rareStampY = 958
+
+loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black-Black,blackLand-Black Land,red-Red,redLand-Red Land,green-Green,greenLand-Green Land,gold-Gold,goldLand-Gold Land,colorless-Colorless,colorlessLand-Colorless Land,artifact-Artifact")
+document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
 document.getElementById("thirdColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
\ No newline at end of file
diff --git a/CardConjurer/data/borders/m15/borderMask.png b/data/borders/m15/borderMask.png
similarity index 100%
rename from CardConjurer/data/borders/m15/borderMask.png
rename to data/borders/m15/borderMask.png
diff --git a/CardConjurer/data/borders/m15/colorless/frame.png b/data/borders/m15/colorless/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/colorless/frame.png
rename to data/borders/m15/colorless/frame.png
diff --git a/CardConjurer/data/borders/m15/colorless/pt.png b/data/borders/m15/colorless/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/colorless/pt.png
rename to data/borders/m15/colorless/pt.png
diff --git a/CardConjurer/data/borders/m15/colorless/stamp.png b/data/borders/m15/colorless/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/colorless/stamp.png
rename to data/borders/m15/colorless/stamp.png
diff --git a/CardConjurer/data/borders/m15/colorlessLand/frame.png b/data/borders/m15/colorlessLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/colorlessLand/frame.png
rename to data/borders/m15/colorlessLand/frame.png
diff --git a/CardConjurer/data/borders/m15/colorlessLand/pt.png b/data/borders/m15/colorlessLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/colorlessLand/pt.png
rename to data/borders/m15/colorlessLand/pt.png
diff --git a/CardConjurer/data/borders/m15/colorlessLand/stamp.png b/data/borders/m15/colorlessLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/colorlessLand/stamp.png
rename to data/borders/m15/colorlessLand/stamp.png
diff --git a/CardConjurer/data/borders/m15/gold/frame.png b/data/borders/m15/gold/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/gold/frame.png
rename to data/borders/m15/gold/frame.png
diff --git a/CardConjurer/data/borders/m15/gold/legendary.png b/data/borders/m15/gold/legendary.png
similarity index 100%
rename from CardConjurer/data/borders/m15/gold/legendary.png
rename to data/borders/m15/gold/legendary.png
diff --git a/CardConjurer/data/borders/m15/gold/pt.png b/data/borders/m15/gold/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/gold/pt.png
rename to data/borders/m15/gold/pt.png
diff --git a/CardConjurer/data/borders/m15/gold/stamp.png b/data/borders/m15/gold/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/gold/stamp.png
rename to data/borders/m15/gold/stamp.png
diff --git a/CardConjurer/data/borders/m15/goldLand/frame.png b/data/borders/m15/goldLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/goldLand/frame.png
rename to data/borders/m15/goldLand/frame.png
diff --git a/CardConjurer/data/borders/m15/goldLand/pt.png b/data/borders/m15/goldLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/goldLand/pt.png
rename to data/borders/m15/goldLand/pt.png
diff --git a/CardConjurer/data/borders/m15/goldLand/stamp.png b/data/borders/m15/goldLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/goldLand/stamp.png
rename to data/borders/m15/goldLand/stamp.png
diff --git a/CardConjurer/data/borders/m15/green/frame.png b/data/borders/m15/green/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/green/frame.png
rename to data/borders/m15/green/frame.png
diff --git a/CardConjurer/data/borders/m15/green/legendary.png b/data/borders/m15/green/legendary.png
similarity index 100%
rename from CardConjurer/data/borders/m15/green/legendary.png
rename to data/borders/m15/green/legendary.png
diff --git a/CardConjurer/data/borders/m15/green/pt.png b/data/borders/m15/green/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/green/pt.png
rename to data/borders/m15/green/pt.png
diff --git a/CardConjurer/data/borders/m15/green/stamp.png b/data/borders/m15/green/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/green/stamp.png
rename to data/borders/m15/green/stamp.png
diff --git a/CardConjurer/data/borders/m15/greenLand/frame.png b/data/borders/m15/greenLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/greenLand/frame.png
rename to data/borders/m15/greenLand/frame.png
diff --git a/CardConjurer/data/borders/m15/greenLand/pt.png b/data/borders/m15/greenLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/greenLand/pt.png
rename to data/borders/m15/greenLand/pt.png
diff --git a/CardConjurer/data/borders/m15/greenLand/stamp.png b/data/borders/m15/greenLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/greenLand/stamp.png
rename to data/borders/m15/greenLand/stamp.png
diff --git a/CardConjurer/data/borders/m15/legendMultiMask.png b/data/borders/m15/legendMultiMask.png
similarity index 100%
rename from CardConjurer/data/borders/m15/legendMultiMask.png
rename to data/borders/m15/legendMultiMask.png
diff --git a/CardConjurer/data/borders/m15/legendSilver.png b/data/borders/m15/legendSilver.png
similarity index 100%
rename from CardConjurer/data/borders/m15/legendSilver.png
rename to data/borders/m15/legendSilver.png
diff --git a/CardConjurer/data/borders/m15/multiMask.png b/data/borders/m15/multiMask.png
similarity index 100%
rename from CardConjurer/data/borders/m15/multiMask.png
rename to data/borders/m15/multiMask.png
diff --git a/CardConjurer/data/borders/m15/red/frame.png b/data/borders/m15/red/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/red/frame.png
rename to data/borders/m15/red/frame.png
diff --git a/CardConjurer/data/borders/m15/red/legendary.png b/data/borders/m15/red/legendary.png
similarity index 100%
rename from CardConjurer/data/borders/m15/red/legendary.png
rename to data/borders/m15/red/legendary.png
diff --git a/CardConjurer/data/borders/m15/red/pt.png b/data/borders/m15/red/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/red/pt.png
rename to data/borders/m15/red/pt.png
diff --git a/CardConjurer/data/borders/m15/red/stamp.png b/data/borders/m15/red/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/red/stamp.png
rename to data/borders/m15/red/stamp.png
diff --git a/CardConjurer/data/borders/m15/redLand/frame.png b/data/borders/m15/redLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/redLand/frame.png
rename to data/borders/m15/redLand/frame.png
diff --git a/CardConjurer/data/borders/m15/redLand/pt.png b/data/borders/m15/redLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/redLand/pt.png
rename to data/borders/m15/redLand/pt.png
diff --git a/CardConjurer/data/borders/m15/redLand/stamp.png b/data/borders/m15/redLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/redLand/stamp.png
rename to data/borders/m15/redLand/stamp.png
diff --git a/CardConjurer/data/borders/m15/white/frame.png b/data/borders/m15/white/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/white/frame.png
rename to data/borders/m15/white/frame.png
diff --git a/CardConjurer/data/borders/m15/white/legendary.png b/data/borders/m15/white/legendary.png
similarity index 100%
rename from CardConjurer/data/borders/m15/white/legendary.png
rename to data/borders/m15/white/legendary.png
diff --git a/CardConjurer/data/borders/m15/white/pt.png b/data/borders/m15/white/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/white/pt.png
rename to data/borders/m15/white/pt.png
diff --git a/CardConjurer/data/borders/m15/white/stamp.png b/data/borders/m15/white/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/white/stamp.png
rename to data/borders/m15/white/stamp.png
diff --git a/CardConjurer/data/borders/m15/whiteLand/frame.png b/data/borders/m15/whiteLand/frame.png
similarity index 100%
rename from CardConjurer/data/borders/m15/whiteLand/frame.png
rename to data/borders/m15/whiteLand/frame.png
diff --git a/CardConjurer/data/borders/m15/whiteLand/pt.png b/data/borders/m15/whiteLand/pt.png
similarity index 100%
rename from CardConjurer/data/borders/m15/whiteLand/pt.png
rename to data/borders/m15/whiteLand/pt.png
diff --git a/CardConjurer/data/borders/m15/whiteLand/stamp.png b/data/borders/m15/whiteLand/stamp.png
similarity index 100%
rename from CardConjurer/data/borders/m15/whiteLand/stamp.png
rename to data/borders/m15/whiteLand/stamp.png
diff --git a/CardConjurer/data/borders/multiGradient.png b/data/borders/multiGradient.png
similarity index 100%
rename from CardConjurer/data/borders/multiGradient.png
rename to data/borders/multiGradient.png
diff --git a/CardConjurer/data/borders/rareStamp.png b/data/borders/rareStamp.png
similarity index 100%
rename from CardConjurer/data/borders/rareStamp.png
rename to data/borders/rareStamp.png
diff --git a/CardConjurer/data/borders/silverBorder.png b/data/borders/silverBorder.png
similarity index 100%
rename from CardConjurer/data/borders/silverBorder.png
rename to data/borders/silverBorder.png
diff --git a/CardConjurer/data/borders/stampGradient.png b/data/borders/stampGradient.png
similarity index 100%
rename from CardConjurer/data/borders/stampGradient.png
rename to data/borders/stampGradient.png
diff --git a/CardConjurer/data/fonts/beleren-b.ttf b/data/fonts/beleren-b.ttf
similarity index 100%
rename from CardConjurer/data/fonts/beleren-b.ttf
rename to data/fonts/beleren-b.ttf
diff --git a/CardConjurer/data/fonts/beleren-bsc.ttf b/data/fonts/beleren-bsc.ttf
similarity index 100%
rename from CardConjurer/data/fonts/beleren-bsc.ttf
rename to data/fonts/beleren-bsc.ttf
diff --git a/CardConjurer/data/fonts/matrix-b.ttf b/data/fonts/matrix-b.ttf
similarity index 100%
rename from CardConjurer/data/fonts/matrix-b.ttf
rename to data/fonts/matrix-b.ttf
diff --git a/CardConjurer/data/fonts/matrix-bsc.ttf b/data/fonts/matrix-bsc.ttf
similarity index 100%
rename from CardConjurer/data/fonts/matrix-bsc.ttf
rename to data/fonts/matrix-bsc.ttf
diff --git a/CardConjurer/data/fonts/matrix.ttf b/data/fonts/matrix.ttf
similarity index 100%
rename from CardConjurer/data/fonts/matrix.ttf
rename to data/fonts/matrix.ttf
diff --git a/CardConjurer/data/fonts/mplantin-i.ttf b/data/fonts/mplantin-i.ttf
similarity index 100%
rename from CardConjurer/data/fonts/mplantin-i.ttf
rename to data/fonts/mplantin-i.ttf
diff --git a/CardConjurer/data/fonts/mplantin.ttf b/data/fonts/mplantin.ttf
similarity index 100%
rename from CardConjurer/data/fonts/mplantin.ttf
rename to data/fonts/mplantin.ttf
diff --git a/CardConjurer/data/fonts/relay-medium.ttf b/data/fonts/relay-medium.ttf
similarity index 100%
rename from CardConjurer/data/fonts/relay-medium.ttf
rename to data/fonts/relay-medium.ttf
diff --git a/CardConjurer/data/manaSymbols/0.png b/data/manaSymbols/0.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/0.png
rename to data/manaSymbols/0.png
diff --git a/CardConjurer/data/manaSymbols/1.png b/data/manaSymbols/1.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/1.png
rename to data/manaSymbols/1.png
diff --git a/CardConjurer/data/manaSymbols/10.png b/data/manaSymbols/10.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/10.png
rename to data/manaSymbols/10.png
diff --git a/CardConjurer/data/manaSymbols/11.png b/data/manaSymbols/11.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/11.png
rename to data/manaSymbols/11.png
diff --git a/CardConjurer/data/manaSymbols/12.png b/data/manaSymbols/12.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/12.png
rename to data/manaSymbols/12.png
diff --git a/CardConjurer/data/manaSymbols/13.png b/data/manaSymbols/13.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/13.png
rename to data/manaSymbols/13.png
diff --git a/CardConjurer/data/manaSymbols/14.png b/data/manaSymbols/14.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/14.png
rename to data/manaSymbols/14.png
diff --git a/CardConjurer/data/manaSymbols/15.png b/data/manaSymbols/15.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/15.png
rename to data/manaSymbols/15.png
diff --git a/CardConjurer/data/manaSymbols/16.png b/data/manaSymbols/16.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/16.png
rename to data/manaSymbols/16.png
diff --git a/CardConjurer/data/manaSymbols/17.png b/data/manaSymbols/17.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/17.png
rename to data/manaSymbols/17.png
diff --git a/CardConjurer/data/manaSymbols/18.png b/data/manaSymbols/18.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/18.png
rename to data/manaSymbols/18.png
diff --git a/CardConjurer/data/manaSymbols/19.png b/data/manaSymbols/19.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/19.png
rename to data/manaSymbols/19.png
diff --git a/CardConjurer/data/manaSymbols/2.png b/data/manaSymbols/2.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/2.png
rename to data/manaSymbols/2.png
diff --git a/CardConjurer/data/manaSymbols/20.png b/data/manaSymbols/20.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/20.png
rename to data/manaSymbols/20.png
diff --git a/CardConjurer/data/manaSymbols/21.png b/data/manaSymbols/21.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/21.png
rename to data/manaSymbols/21.png
diff --git a/CardConjurer/data/manaSymbols/22.png b/data/manaSymbols/22.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/22.png
rename to data/manaSymbols/22.png
diff --git a/CardConjurer/data/manaSymbols/23.png b/data/manaSymbols/23.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/23.png
rename to data/manaSymbols/23.png
diff --git a/CardConjurer/data/manaSymbols/24.png b/data/manaSymbols/24.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/24.png
rename to data/manaSymbols/24.png
diff --git a/CardConjurer/data/manaSymbols/25.png b/data/manaSymbols/25.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/25.png
rename to data/manaSymbols/25.png
diff --git a/CardConjurer/data/manaSymbols/26.png b/data/manaSymbols/26.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/26.png
rename to data/manaSymbols/26.png
diff --git a/CardConjurer/data/manaSymbols/27.png b/data/manaSymbols/27.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/27.png
rename to data/manaSymbols/27.png
diff --git a/CardConjurer/data/manaSymbols/28.png b/data/manaSymbols/28.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/28.png
rename to data/manaSymbols/28.png
diff --git a/CardConjurer/data/manaSymbols/29.png b/data/manaSymbols/29.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/29.png
rename to data/manaSymbols/29.png
diff --git a/CardConjurer/data/manaSymbols/3.png b/data/manaSymbols/3.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/3.png
rename to data/manaSymbols/3.png
diff --git a/CardConjurer/data/manaSymbols/30.png b/data/manaSymbols/30.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/30.png
rename to data/manaSymbols/30.png
diff --git a/CardConjurer/data/manaSymbols/31.png b/data/manaSymbols/31.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/31.png
rename to data/manaSymbols/31.png
diff --git a/CardConjurer/data/manaSymbols/32.png b/data/manaSymbols/32.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/32.png
rename to data/manaSymbols/32.png
diff --git a/CardConjurer/data/manaSymbols/33.png b/data/manaSymbols/33.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/33.png
rename to data/manaSymbols/33.png
diff --git a/CardConjurer/data/manaSymbols/34.png b/data/manaSymbols/34.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/34.png
rename to data/manaSymbols/34.png
diff --git a/CardConjurer/data/manaSymbols/35.png b/data/manaSymbols/35.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/35.png
rename to data/manaSymbols/35.png
diff --git a/CardConjurer/data/manaSymbols/36.png b/data/manaSymbols/36.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/36.png
rename to data/manaSymbols/36.png
diff --git a/CardConjurer/data/manaSymbols/37.png b/data/manaSymbols/37.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/37.png
rename to data/manaSymbols/37.png
diff --git a/CardConjurer/data/manaSymbols/38.png b/data/manaSymbols/38.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/38.png
rename to data/manaSymbols/38.png
diff --git a/CardConjurer/data/manaSymbols/39.png b/data/manaSymbols/39.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/39.png
rename to data/manaSymbols/39.png
diff --git a/CardConjurer/data/manaSymbols/4.png b/data/manaSymbols/4.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/4.png
rename to data/manaSymbols/4.png
diff --git a/CardConjurer/data/manaSymbols/40.png b/data/manaSymbols/40.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/40.png
rename to data/manaSymbols/40.png
diff --git a/CardConjurer/data/manaSymbols/41.png b/data/manaSymbols/41.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/41.png
rename to data/manaSymbols/41.png
diff --git a/CardConjurer/data/manaSymbols/42.png b/data/manaSymbols/42.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/42.png
rename to data/manaSymbols/42.png
diff --git a/CardConjurer/data/manaSymbols/43.png b/data/manaSymbols/43.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/43.png
rename to data/manaSymbols/43.png
diff --git a/CardConjurer/data/manaSymbols/44.png b/data/manaSymbols/44.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/44.png
rename to data/manaSymbols/44.png
diff --git a/CardConjurer/data/manaSymbols/45.png b/data/manaSymbols/45.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/45.png
rename to data/manaSymbols/45.png
diff --git a/CardConjurer/data/manaSymbols/46.png b/data/manaSymbols/46.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/46.png
rename to data/manaSymbols/46.png
diff --git a/CardConjurer/data/manaSymbols/47.png b/data/manaSymbols/47.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/47.png
rename to data/manaSymbols/47.png
diff --git a/CardConjurer/data/manaSymbols/48.png b/data/manaSymbols/48.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/48.png
rename to data/manaSymbols/48.png
diff --git a/CardConjurer/data/manaSymbols/49.png b/data/manaSymbols/49.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/49.png
rename to data/manaSymbols/49.png
diff --git a/CardConjurer/data/manaSymbols/5.png b/data/manaSymbols/5.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/5.png
rename to data/manaSymbols/5.png
diff --git a/CardConjurer/data/manaSymbols/50.png b/data/manaSymbols/50.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/50.png
rename to data/manaSymbols/50.png
diff --git a/CardConjurer/data/manaSymbols/51.png b/data/manaSymbols/51.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/51.png
rename to data/manaSymbols/51.png
diff --git a/CardConjurer/data/manaSymbols/6.png b/data/manaSymbols/6.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/6.png
rename to data/manaSymbols/6.png
diff --git a/CardConjurer/data/manaSymbols/7.png b/data/manaSymbols/7.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/7.png
rename to data/manaSymbols/7.png
diff --git a/CardConjurer/data/manaSymbols/8.png b/data/manaSymbols/8.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/8.png
rename to data/manaSymbols/8.png
diff --git a/CardConjurer/data/manaSymbols/9.png b/data/manaSymbols/9.png
similarity index 100%
rename from CardConjurer/data/manaSymbols/9.png
rename to data/manaSymbols/9.png
diff --git a/CardConjurer/data/scripts/autocrop.js b/data/scripts/autocrop.js
similarity index 100%
rename from CardConjurer/data/scripts/autocrop.js
rename to data/scripts/autocrop.js
diff --git a/CardConjurer/data/scripts/loadColors.js b/data/scripts/loadColors.js
similarity index 97%
rename from CardConjurer/data/scripts/loadColors.js
rename to data/scripts/loadColors.js
index e240d3b8..ae1d1d23 100644
--- a/CardConjurer/data/scripts/loadColors.js
+++ b/data/scripts/loadColors.js
@@ -1,9 +1,9 @@
-//loadColors("white-White,blue-Blue,colorlessLand-Colorless Land,gold-Gold")
-function loadColors(colors) {
-	var endResult = ""
-	var colorList = colors.split(",")
-	for (i = 0; i < colorList.length; i++) {
-		endResult += "<option value='" + colorList[i].split("-")[0] + "'>" + colorList[i].split("-")[1] + "</option>"
-	}
-	document.getElementById("colorSelection").innerHTML = endResult
+//loadColors("white-White,blue-Blue,colorlessLand-Colorless Land,gold-Gold")
+function loadColors(colors) {
+	var endResult = ""
+	var colorList = colors.split(",")
+	for (i = 0; i < colorList.length; i++) {
+		endResult += "<option value='" + colorList[i].split("-")[0] + "'>" + colorList[i].split("-")[1] + "</option>"
+	}
+	document.getElementById("colorSelection").innerHTML = endResult
 }
\ No newline at end of file
diff --git a/CardConjurer/data/scripts/loadImage.js b/data/scripts/loadImage.js
similarity index 96%
rename from CardConjurer/data/scripts/loadImage.js
rename to data/scripts/loadImage.js
index 6d30b3f3..2548d224 100644
--- a/CardConjurer/data/scripts/loadImage.js
+++ b/data/scripts/loadImage.js
@@ -1,11 +1,11 @@
-function loadImage(event, destination, arg) {
-	if (arg != false) {
-		var input = event.target
-		var reader = new FileReader()
-		reader.onload = function() {
-			var dataURL = reader.result
-			destination.src = dataURL
-		}
-		reader.readAsDataURL(input.files[0])
-	}
+function loadImage(event, destination, arg) {
+	if (arg != false) {
+		var input = event.target
+		var reader = new FileReader()
+		reader.onload = function() {
+			var dataURL = reader.result
+			destination.src = dataURL
+		}
+		reader.readAsDataURL(input.files[0])
+	}
 }
\ No newline at end of file
diff --git a/CardConjurer/data/scripts/loadScript.js b/data/scripts/loadScript.js
similarity index 97%
rename from CardConjurer/data/scripts/loadScript.js
rename to data/scripts/loadScript.js
index 58b4e69a..050e5230 100644
--- a/CardConjurer/data/scripts/loadScript.js
+++ b/data/scripts/loadScript.js
@@ -1,8 +1,8 @@
-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)
-	}
+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)
+	}
 }
\ No newline at end of file
diff --git a/CardConjurer/data/scripts/mask.js b/data/scripts/mask.js
similarity index 97%
rename from CardConjurer/data/scripts/mask.js
rename to data/scripts/mask.js
index 1339d935..85c086ce 100644
--- a/CardConjurer/data/scripts/mask.js
+++ b/data/scripts/mask.js
@@ -1,26 +1,26 @@
-var mask = document.createElement("canvas")
-var maskContext = mask.getContext("2d")
-
-function drawMask(img, x, y, width, height, imgMask, secondMask, arg) {
-	mask.width = width
-	mask.height = height
-	maskContext.clearRect(0, 0, width, height)
-	maskContext.globalCompositeOperation = "source-over"
-	if (secondMask.src != undefined) {
-		maskContext.drawImage(secondMask, 0, 0, width, height)
-		if (arg == "reverseSecond") {
-			maskContext.globalCompositeOperation = "source-out"
-		} else {
-			maskContext.globalCompositeOperation = "source-in"
-		}
-	}
-	maskContext.drawImage(imgMask, 0, 0, width, height)
-	maskContext.globalCompositeOperation = "source-in"
-	if (img.src == undefined) {
-		maskContext.fillStyle = img
-		maskContext.fillRect(0, 0, width, height)
-	} else {
-		maskContext.drawImage(img, 0, 0, width, height)
-	}
-	card.drawImage(mask, x, y, width, height)
+var mask = document.createElement("canvas")
+var maskContext = mask.getContext("2d")
+
+function drawMask(img, x, y, width, height, imgMask, secondMask, arg) {
+	mask.width = width
+	mask.height = height
+	maskContext.clearRect(0, 0, width, height)
+	maskContext.globalCompositeOperation = "source-over"
+	if (secondMask.src != undefined) {
+		maskContext.drawImage(secondMask, 0, 0, width, height)
+		if (arg == "reverseSecond") {
+			maskContext.globalCompositeOperation = "source-out"
+		} else {
+			maskContext.globalCompositeOperation = "source-in"
+		}
+	}
+	maskContext.drawImage(imgMask, 0, 0, width, height)
+	maskContext.globalCompositeOperation = "source-in"
+	if (img.src == undefined) {
+		maskContext.fillStyle = img
+		maskContext.fillRect(0, 0, width, height)
+	} else {
+		maskContext.drawImage(img, 0, 0, width, height)
+	}
+	card.drawImage(mask, x, y, width, height)
 }
\ No newline at end of file
diff --git a/googlef9aa262dda68ac25.html b/googlef9aa262dda68ac25.html
deleted file mode 100644
index 44488294..00000000
--- a/googlef9aa262dda68ac25.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: googlef9aa262dda68ac25.html
\ No newline at end of file
diff --git a/watermarks/Abzan.png b/watermarks/Abzan.png
deleted file mode 100644
index e5143ce4..00000000
Binary files a/watermarks/Abzan.png and /dev/null differ
diff --git a/watermarks/Amonkhet.png b/watermarks/Amonkhet.png
deleted file mode 100644
index 3401b89e..00000000
Binary files a/watermarks/Amonkhet.png and /dev/null differ
diff --git a/watermarks/Azorius.png b/watermarks/Azorius.png
deleted file mode 100644
index 3273f0a8..00000000
Binary files a/watermarks/Azorius.png and /dev/null differ
diff --git a/watermarks/Boros.png b/watermarks/Boros.png
deleted file mode 100644
index b95509cb..00000000
Binary files a/watermarks/Boros.png and /dev/null differ
diff --git a/watermarks/DCI.png b/watermarks/DCI.png
deleted file mode 100644
index b90f460c..00000000
Binary files a/watermarks/DCI.png and /dev/null differ
diff --git a/watermarks/Dimir.png b/watermarks/Dimir.png
deleted file mode 100644
index 3a5bb319..00000000
Binary files a/watermarks/Dimir.png and /dev/null differ
diff --git a/watermarks/Golgari.png b/watermarks/Golgari.png
deleted file mode 100644
index 3d18b7b3..00000000
Binary files a/watermarks/Golgari.png and /dev/null differ
diff --git a/watermarks/Gruul.png b/watermarks/Gruul.png
deleted file mode 100644
index 91c06601..00000000
Binary files a/watermarks/Gruul.png and /dev/null differ
diff --git a/watermarks/Izzet.png b/watermarks/Izzet.png
deleted file mode 100644
index 9b6b776f..00000000
Binary files a/watermarks/Izzet.png and /dev/null differ
diff --git a/watermarks/Jeskai.png b/watermarks/Jeskai.png
deleted file mode 100644
index 494a5a28..00000000
Binary files a/watermarks/Jeskai.png and /dev/null differ
diff --git a/watermarks/MMQ.png b/watermarks/MMQ.png
deleted file mode 100644
index 76877ba4..00000000
Binary files a/watermarks/MMQ.png and /dev/null differ
diff --git a/watermarks/Mardu.png b/watermarks/Mardu.png
deleted file mode 100644
index c31d20f5..00000000
Binary files a/watermarks/Mardu.png and /dev/null differ
diff --git a/watermarks/Orzhov.png b/watermarks/Orzhov.png
deleted file mode 100644
index f351b0c5..00000000
Binary files a/watermarks/Orzhov.png and /dev/null differ
diff --git a/watermarks/Planeswalker.png b/watermarks/Planeswalker.png
deleted file mode 100644
index 0042e57b..00000000
Binary files a/watermarks/Planeswalker.png and /dev/null differ
diff --git a/watermarks/Rakdos.png b/watermarks/Rakdos.png
deleted file mode 100644
index 841bac96..00000000
Binary files a/watermarks/Rakdos.png and /dev/null differ
diff --git a/watermarks/Selesnya.png b/watermarks/Selesnya.png
deleted file mode 100644
index 4a46541f..00000000
Binary files a/watermarks/Selesnya.png and /dev/null differ
diff --git a/watermarks/Simic.png b/watermarks/Simic.png
deleted file mode 100644
index 9960424d..00000000
Binary files a/watermarks/Simic.png and /dev/null differ
diff --git a/watermarks/Sultai.png b/watermarks/Sultai.png
deleted file mode 100644
index 1aef38b1..00000000
Binary files a/watermarks/Sultai.png and /dev/null differ
diff --git a/watermarks/Temur.png b/watermarks/Temur.png
deleted file mode 100644
index b61b6dec..00000000
Binary files a/watermarks/Temur.png and /dev/null differ
diff --git a/watermarks/black.png b/watermarks/black.png
deleted file mode 100644
index 585ca2ab..00000000
Binary files a/watermarks/black.png and /dev/null differ
diff --git a/watermarks/blue.png b/watermarks/blue.png
deleted file mode 100644
index 6d5b1285..00000000
Binary files a/watermarks/blue.png and /dev/null differ
diff --git a/watermarks/green.png b/watermarks/green.png
deleted file mode 100644
index a51f6004..00000000
Binary files a/watermarks/green.png and /dev/null differ
diff --git a/watermarks/red.png b/watermarks/red.png
deleted file mode 100644
index 6d72b349..00000000
Binary files a/watermarks/red.png and /dev/null differ
diff --git a/watermarks/white.png b/watermarks/white.png
deleted file mode 100644
index 83900060..00000000
Binary files a/watermarks/white.png and /dev/null differ
