diff --git a/data/images/manaSymbols/m21/0.png b/data/images/manaSymbols/m21/0.png
deleted file mode 100644
index 8faed042..00000000
Binary files a/data/images/manaSymbols/m21/0.png and /dev/null differ
diff --git a/data/images/manaSymbols/m21/m210.png b/data/images/manaSymbols/m21/m210.png
new file mode 100644
index 00000000..7a3c4d69
Binary files /dev/null and b/data/images/manaSymbols/m21/m210.png differ
diff --git a/data/images/manaSymbols/m21/m211.png b/data/images/manaSymbols/m21/m211.png
new file mode 100644
index 00000000..54c23b88
Binary files /dev/null and b/data/images/manaSymbols/m21/m211.png differ
diff --git a/data/images/manaSymbols/m21/m212.png b/data/images/manaSymbols/m21/m212.png
new file mode 100644
index 00000000..e00c1ac4
Binary files /dev/null and b/data/images/manaSymbols/m21/m212.png differ
diff --git a/data/images/manaSymbols/m21/m213.png b/data/images/manaSymbols/m21/m213.png
new file mode 100644
index 00000000..11fe7831
Binary files /dev/null and b/data/images/manaSymbols/m21/m213.png differ
diff --git a/data/images/manaSymbols/m21/m214.png b/data/images/manaSymbols/m21/m214.png
new file mode 100644
index 00000000..03b5e1bf
Binary files /dev/null and b/data/images/manaSymbols/m21/m214.png differ
diff --git a/data/images/manaSymbols/m21/m215.png b/data/images/manaSymbols/m21/m215.png
new file mode 100644
index 00000000..053bf21b
Binary files /dev/null and b/data/images/manaSymbols/m21/m215.png differ
diff --git a/data/images/manaSymbols/m21/m216.png b/data/images/manaSymbols/m21/m216.png
new file mode 100644
index 00000000..207006a0
Binary files /dev/null and b/data/images/manaSymbols/m21/m216.png differ
diff --git a/data/images/manaSymbols/m21/m217.png b/data/images/manaSymbols/m21/m217.png
new file mode 100644
index 00000000..a1f227a1
Binary files /dev/null and b/data/images/manaSymbols/m21/m217.png differ
diff --git a/data/images/manaSymbols/m21/m218.png b/data/images/manaSymbols/m21/m218.png
new file mode 100644
index 00000000..f798756a
Binary files /dev/null and b/data/images/manaSymbols/m21/m218.png differ
diff --git a/data/images/manaSymbols/m21/m219.png b/data/images/manaSymbols/m21/m219.png
new file mode 100644
index 00000000..b2c5787a
Binary files /dev/null and b/data/images/manaSymbols/m21/m219.png differ
diff --git a/data/images/manaSymbols/m21/m21b.png b/data/images/manaSymbols/m21/m21b.png
new file mode 100644
index 00000000..fc448ded
Binary files /dev/null and b/data/images/manaSymbols/m21/m21b.png differ
diff --git a/data/images/manaSymbols/m21/m21g.png b/data/images/manaSymbols/m21/m21g.png
new file mode 100644
index 00000000..2b353ca6
Binary files /dev/null and b/data/images/manaSymbols/m21/m21g.png differ
diff --git a/data/images/manaSymbols/m21/m21r.png b/data/images/manaSymbols/m21/m21r.png
new file mode 100644
index 00000000..ee9f4009
Binary files /dev/null and b/data/images/manaSymbols/m21/m21r.png differ
diff --git a/data/images/manaSymbols/m21/m21u.png b/data/images/manaSymbols/m21/m21u.png
new file mode 100644
index 00000000..e9e932cc
Binary files /dev/null and b/data/images/manaSymbols/m21/m21u.png differ
diff --git a/data/images/manaSymbols/m21/m21w.png b/data/images/manaSymbols/m21/m21w.png
new file mode 100644
index 00000000..8122f9b0
Binary files /dev/null and b/data/images/manaSymbols/m21/m21w.png differ
diff --git a/data/images/manaSymbols/m21/m21x.png b/data/images/manaSymbols/m21/m21x.png
new file mode 100644
index 00000000..f8d133e7
Binary files /dev/null and b/data/images/manaSymbols/m21/m21x.png differ
diff --git a/data/scripts/main.js b/data/scripts/main.js
index 507568b0..ceb9d53b 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -534,7 +534,7 @@ function writeText(textObjectList, targetContext) {
 					} else if (manaSymbolCodeList.includes(possibleCodeLower.split('/').join(''))) {
 						//THIS HAS TO BE THE LAST ONE
 						var manaSymbolDiameter = textSize * 0.77
-						if (manaCost) {
+						if (manaCost && manaCostShadowOffset != 'none') {
 							var shadowOffset = eval(manaCostShadowOffset)
 							textLineContext.beginPath()
 							textLineContext.arc(textX + manaSymbolDiameter / 2 + shadowOffset[0], textCanvasBuffer + textSize - manaSymbolDiameter * 0.45 + shadowOffset[1], manaSymbolDiameter / 2, 0, 2 * Math.PI)
@@ -690,10 +690,12 @@ function manaCostUpdated() {
 			var x = eval(manaCostXPath)
 			var y = eval(manaCostYPath)
 			var diameter = eval(manaCostDiameter)
-			var shadowOffset = eval(manaCostShadowOffset)
-			manaCostContext.beginPath()
-			manaCostContext.arc(x + diameter / 2 + shadowOffset[0], y + diameter / 2 + shadowOffset[1], diameter / 2, 0, 2 * Math.PI)
-			manaCostContext.fill()
+			if (manaCostShadowOffset != 'none') {
+				var shadowOffset = eval(manaCostShadowOffset)
+				manaCostContext.beginPath()
+				manaCostContext.arc(x + diameter / 2 + shadowOffset[0], y + diameter / 2 + shadowOffset[1], diameter / 2, 0, 2 * Math.PI)
+				manaCostContext.fill()
+			}
 			manaCostContext.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf(manaCostList[i])], x, y, diameter, diameter)
 		}
 	}
diff --git a/data/scripts/versions/m15/m21.js b/data/scripts/versions/m15/m21.js
index 0efdb78c..cdd387d8 100644
--- a/data/scripts/versions/m15/m21.js
+++ b/data/scripts/versions/m15/m21.js
@@ -18,8 +18,8 @@ if (!loadedVersions.includes('m15M21Showcase')) {
 		['Green Power/Toughness', 'data/images/m15/m21/m15M21PTG.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']],
 		['Holo Stamp', 'data/images/m15/m21/m15M21Stamp.png', 709/1500, 1873/2100, 82/1500, 82/2100, ['Full']]
 	], 'frameClassM15M21Showcase')
-	// addToManaSymbolList('data/images/manaSymbols/future/', ["f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "fw", "fu", "fb", "fr", "fg", "fwu", "fwb", "fub", "fur", "fbr", "fbg", "frg", "frw", "fgw", "fgu", "fx"])
-	// notify('The Future Shifted frame uses special mana symbols for 1-20, WUBRG, all hybrid mana symbols, and X. If you would like to use these, just add an "f" at the beginning of each symbol. For example, "2 g g" would become "f2 fg fg".', '#aaffaae0')
+	addToManaSymbolList('data/images/manaSymbols/m21/', ["m210", "m211", "m212", "m213", "m214", "m215", "m216", "m217", "m218", "m219", "m21w", "m21u", "m21b", "m21r", "m21g", "m21x"])
+	notify('The M21 Showcase frame uses special mana symbols for 1-9, WUBRG, and X. If you would like to use these, just add an "m21" at the beginning of each symbol. For example, "2 g g" would become "m212 m21g m21g".', '#aaffaae0')
 }
 
 if (currentVersion != 'm15M21Showcase') {
@@ -31,6 +31,12 @@ if (currentVersion != 'm15M21Showcase') {
 	new cardText('Rules Text', '', 145/1500, 1370/2100, 1210/1500, 625/2100, 'mplantin', 74/2100, 'black'),
 	new cardText('Power/Toughness', '', 1191/1500, 1954/2100, 205/1500, 78/2100, 'belerenbsc', 78/2100, 'white', ['oneLine=true,textAlign="center"'])
 	])
+
+	manaCostXPath = '1316 - 78 * manaSymbolIndex'
+	manaCostYPath = '121'
+	manaCostDiameter = '74'
+	manaCostShadowOffset = 'none'
+	manaCostDirection = 'reverse'
 }
 
 hideFrameImages('frameClassM15M21Showcase')
\ No newline at end of file