diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style
index 6390da1e..148933fd 100644
--- a/data/magic-new-token.mse-style/style
+++ b/data/magic-new-token.mse-style/style
@@ -131,7 +131,7 @@ card style:
 		top: 25
 		width: 275
 		height: 28
-		alignment: bottom center shrink-overflow
+		alignment: bottom center justify-overflow
 		padding bottom: -2
 		padding top: 2
 		z index: 3
diff --git a/data/magic-old-token.mse-style/ccard.jpg b/data/magic-old-token.mse-style/ccard.jpg
index 4d5c1bb5..645c3601 100644
Binary files a/data/magic-old-token.mse-style/ccard.jpg and b/data/magic-old-token.mse-style/ccard.jpg differ
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 0d022151..6125c264 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -235,26 +235,24 @@ init script:
 	add := "" # default is nothing
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" then (
-			if not contains(input.param, match:"and") then
-				"<param-cost>{input.param}</param-cost>"
-			else if not contains(input.param, match:"<sym>") and not contains(input.param, match:"<sym-auto>") then
-				"<param-cost>{input.param}</param-cost>"
+			if contains(input.param, match:",") then
+				"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
 			else
-				"{add}<param-cost>{input.param}</param-cost>"
+				"<param-cost>{alternative_cost(input.param)}</param-cost>"
 		) else
-			"{add}<param-cost>{input.param}</param-cost>"
+			"{add}<param-mana>{input.param}</param-mana>"
 	}
 	alternative_cost := replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	combined_cost := replace_rule(match:", [A-Z]", replace: { to_lower() })+
 		replace_rule(match:",", replace:" and")+
 		replace_rule(match:"^[STXYZWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
 		replace_rule(match:"^[A-Z]", replace: { to_lower() })
-	format_alt_cost := {
-		if input.separator_before == "—" and not contains(input.param, match:",") then
-			alternative_cost(input.param)
-		else
-			combined_cost(input.param)
-	}
+	#format_alt_cost := {
+	#	if input.separator_before == "—" then
+	#		alternative_cost(input.param)
+	#	else
+	#		input.param
+	#}
 	long_dash := replace_rule(match:"-", replace:"—")
 	# Utilities for keywords
 	has_cc := { card.casting_cost != "" }
@@ -1406,12 +1404,12 @@ keyword parameter type:
 	refer script:
 		name: add "pay an additional " for mana costs
 		description: When using mana only costs, words the reminder text as "pay an additional <cost>"
-		script: \{for_mana_costs(add:"pay an additional ",{input})\}
+		script: \{for_mana_costs(add:"pay an additional ", {input})\}
 	refer script:
 		name: add "pay " for mana costs
 		description: When using mana only costs, words the reminder text as "pay <cost>"
-		script: \{for_mana_costs(add:"pay ",{input})\}
-	reminder script: format_alt_cost()
+		script: \{for_mana_costs(add:"pay ", {input})\}
+	#reminder script: format_alt_cost()
 	separator script: long_dash()
 keyword parameter type:
 	name: number
@@ -1572,7 +1570,7 @@ keyword:
 	keyword: Kicker
 	match: Kicker <atom-param>cost</atom-param>
 	mode: expert
-	reminder: You may {for_mana_costs(add:"pay an additional ",param1)} as you play this spell.
+	reminder: You may {for_mana_costs(add:"pay an additional ", param1)} as you play this spell.
 keyword:
 	keyword: Flashback
 	match: Flashback <atom-param>cost</atom-param>