diff --git a/data/magic-firepenguinmaster-flip.mse-style/style b/data/magic-firepenguinmaster-flip.mse-style/style
index c28bf094..6dbee036 100644
--- a/data/magic-firepenguinmaster-flip.mse-style/style
+++ b/data/magic-firepenguinmaster-flip.mse-style/style
@@ -204,7 +204,7 @@ card style:
 		top : 358
 		width: 256
 		height: 18
-		alignment: top shrink-overflow
+		alignment: middle shrink-overflow
 		z index: 1
 		padding top: 2
 		font:
diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style
index 1c4b503e..3f7d4bf2 100644
--- a/data/magic-firepenguinmaster.mse-style/style
+++ b/data/magic-firepenguinmaster.mse-style/style
@@ -195,7 +195,7 @@ card style:
 		top : 312
 		width: 220
 		height: 20
-		alignment: top shrink-overflow
+		alignment: middle shrink-overflow
 		z index: 2
 		padding top: 2
 		font:
diff --git a/data/magic-firepenguinmasterpromo.mse-style/style b/data/magic-firepenguinmasterpromo.mse-style/style
index 57d8ad19..81b74509 100644
--- a/data/magic-firepenguinmasterpromo.mse-style/style
+++ b/data/magic-firepenguinmasterpromo.mse-style/style
@@ -178,10 +178,10 @@ card style:
 
 	############################# Image
 	image:
-		left:	50
-		top:	67
-		width:	306
-		height:	437
+		left:	49
+		top:	65
+		width:	307
+		height:	439
 		mask:	imagemask.png
 		z index: 1
 
diff --git a/data/magic-firepenguinmastersplit.mse-style/style b/data/magic-firepenguinmastersplit.mse-style/style
index dd163697..4a16cc41 100644
--- a/data/magic-firepenguinmastersplit.mse-style/style
+++ b/data/magic-firepenguinmastersplit.mse-style/style
@@ -230,7 +230,7 @@ card style:
 
 	############################# Image
 	image:
-		left:	38.25
+		left:	39.25
 		top:	52
 		width:	214.02
 		height:	154.45
diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style
index b323e5f3..ad75e891 100644
--- a/data/magic-firepenguinmastertokens.mse-style/style
+++ b/data/magic-firepenguinmastertokens.mse-style/style
@@ -180,10 +180,10 @@ card style:
 
 	############################# Image
 	image:
-		left:	50
-		top:	67
-		width:	306
-		height:	437
+		left:	49
+		top:	65
+		width:	307
+		height:	439
 		mask:	imagemask.png
 		z index: 1
 
diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style
index d3681370..46de6e45 100644
--- a/data/magic-new-flip.mse-style/style
+++ b/data/magic-new-flip.mse-style/style
@@ -204,7 +204,7 @@ card style:
 	type:
 		left: 33
 		top : 134
-		width: 253
+		width: { if card.pt !="" then 253 else 310 }
 		height: 18
 		alignment: top shrink-overflow
 		z index: 1
@@ -215,9 +215,9 @@ card style:
 			separator color: rgb(128,128,128)
 
 	type 2:
-		left: 86
+		left: { if card.pt != "" then 86 else 34 }
 		top : 353
-		width: 256
+		width: { if card.pt != "" then 256 else 308 }
 		height: 18
 		alignment: top shrink-overflow
 		angle: 180
diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style
index dc221937..3925a9ce 100644
--- a/data/magic-new-promo.mse-style/style
+++ b/data/magic-new-promo.mse-style/style
@@ -167,7 +167,7 @@ card style:
 	type:
 		left: 33
 		top : 309
-		width: 286
+		width: 306
 		height: 18
 		alignment: top shrink-overflow
 		z index: 1
diff --git a/data/magic-old-token.mse-style/style b/data/magic-old-token.mse-style/style
index ad0ea8c2..89501d77 100644
--- a/data/magic-old-token.mse-style/style
+++ b/data/magic-old-token.mse-style/style
@@ -201,7 +201,7 @@ card style:
 	type:
 		left: 58
 		top : 348
-		width: { 271 - max(22,card_style.rarity.content_width) }
+		width: { 262 - max(22,card_style.rarity.content_width) }
 		height: 18
 		alignment: top left shrink-overflow
 		z index: 1
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index b9cdf052..2a694fe8 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -1591,7 +1591,7 @@ keyword parameter type:
 	example: Forest
 keyword parameter type:
 	name: a
-	match: an?
+	match: [ ]*|[ an?]*
 
 ############################# All Magic keywords
 # By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234
@@ -2026,7 +2026,7 @@ keyword:
 	reminder: You may play this spell for its evoke cost. If you do, it's sacrificed when it comes into play.
 keyword:
 	keyword: Champion
-	match: Champion <atom-param>a</atom-param> <atom-param>name</atom-param>
+	match: Champion<atom-param>a</atom-param><atom-param>name</atom-param>
 	mode: expert
 	reminder: When this comes into play, sacrifice it unless you remove another {param2} you control from the game. When this leaves play, that card returns to play.
 keyword:
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index 81471a1f..922b11af 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -492,7 +492,7 @@ keyword parameter type:
 	example: Forest
 keyword parameter type:
 	name: a
-	match: an?
+	match: [ ]*|[ an?]*
 
 ############################# All Magic keywords
 # By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234
@@ -920,7 +920,7 @@ keyword:
 	reminder: You may play it for its evoke cost. If you do, it's sacrificed when it comes into play.
 keyword:
 	keyword: Champion
-	match: champion <atom-param>a</atom-param> <atom-param>name</atom-param>
+	match: champion<atom-param>a</atom-param><atom-param>name</atom-param>
 	mode: expert
 	reminder: When it comes into play, sacrifice it unless you remove another {param2} you control from the game. When it leaves play, that card returns to play.
 keyword: