diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style
index d24f6c56..6390da1e 100644
--- a/data/magic-new-token.mse-style/style
+++ b/data/magic-new-token.mse-style/style
@@ -238,6 +238,7 @@ card style:
 		padding bottom: 2
 		line height hard: 1.2
 		line height line: 1.5
+		line height soft: 0.9
 
 	############################# PT
 	pt:
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 498e543d..dc1a8cf6 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -256,16 +256,20 @@ init script:
 	add := "" # default is nothing
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" then (
-			if not contains(input.param, match:",") 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>"
 			else
 				"{add}<param-cost>{input.param}</param-cost>"
 		) else
-			"{add}<param-mana>{input.param}</param-mana>"
+			"{add}<param-cost>{input.param}</param-cost>"
 	}
 	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:",", 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)