diff --git a/data/magic-new-token.mse-style/acard0.jpg b/data/magic-new-token.mse-style/acard0.jpg
index 29dd0395..98b4d396 100644
Binary files a/data/magic-new-token.mse-style/acard0.jpg and b/data/magic-new-token.mse-style/acard0.jpg differ
diff --git a/data/magic-new-token.mse-style/acard1.jpg b/data/magic-new-token.mse-style/acard1.jpg
index fb515cda..007321d8 100644
Binary files a/data/magic-new-token.mse-style/acard1.jpg and b/data/magic-new-token.mse-style/acard1.jpg differ
diff --git a/data/magic-new-token.mse-style/acard2.jpg b/data/magic-new-token.mse-style/acard2.jpg
index b11c29d3..4124cf48 100644
Binary files a/data/magic-new-token.mse-style/acard2.jpg and b/data/magic-new-token.mse-style/acard2.jpg differ
diff --git a/data/magic-new-token.mse-style/apt0.jpg b/data/magic-new-token.mse-style/apt0.jpg
index eced0642..694890e9 100644
Binary files a/data/magic-new-token.mse-style/apt0.jpg and b/data/magic-new-token.mse-style/apt0.jpg differ
diff --git a/data/magic-new-token.mse-style/apt1.jpg b/data/magic-new-token.mse-style/apt1.jpg
index 54d33cf4..7b06ee7e 100644
Binary files a/data/magic-new-token.mse-style/apt1.jpg and b/data/magic-new-token.mse-style/apt1.jpg differ
diff --git a/data/magic-new-token.mse-style/apt2.jpg b/data/magic-new-token.mse-style/apt2.jpg
index 0ca3fe72..7aba1859 100644
Binary files a/data/magic-new-token.mse-style/apt2.jpg and b/data/magic-new-token.mse-style/apt2.jpg differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_card0.png b/data/magic-new-token.mse-style/hybrid_blend_card0.png
deleted file mode 100644
index a2590634..00000000
Binary files a/data/magic-new-token.mse-style/hybrid_blend_card0.png and /dev/null differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_card1.png b/data/magic-new-token.mse-style/hybrid_blend_card1.png
deleted file mode 100644
index 81c88a8e..00000000
Binary files a/data/magic-new-token.mse-style/hybrid_blend_card1.png and /dev/null differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_card2.png b/data/magic-new-token.mse-style/hybrid_blend_card2.png
deleted file mode 100644
index 35690cd3..00000000
Binary files a/data/magic-new-token.mse-style/hybrid_blend_card2.png and /dev/null differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_pt.png b/data/magic-new-token.mse-style/hybrid_blend_pt.png
deleted file mode 100644
index 489c036c..00000000
Binary files a/data/magic-new-token.mse-style/hybrid_blend_pt.png and /dev/null differ
diff --git a/data/magic-new-token.mse-style/mask_pt.PNG b/data/magic-new-token.mse-style/mask_pt.PNG
deleted file mode 100644
index 24a1ead7..00000000
Binary files a/data/magic-new-token.mse-style/mask_pt.PNG and /dev/null differ
diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt.png b/data/magic-new-token.mse-style/multicolor_blend_pt.png
deleted file mode 100644
index 0558fb3d..00000000
Binary files a/data/magic-new-token.mse-style/multicolor_blend_pt.png and /dev/null differ
diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt0.png b/data/magic-new-token.mse-style/multicolor_blend_pt0.png
new file mode 100644
index 00000000..168e206f
Binary files /dev/null and b/data/magic-new-token.mse-style/multicolor_blend_pt0.png differ
diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt1.png b/data/magic-new-token.mse-style/multicolor_blend_pt1.png
new file mode 100644
index 00000000..dafe8f2c
Binary files /dev/null and b/data/magic-new-token.mse-style/multicolor_blend_pt1.png differ
diff --git a/data/magic-new-token.mse-style/multicolor_blend_pt2.png b/data/magic-new-token.mse-style/multicolor_blend_pt2.png
new file mode 100644
index 00000000..168e206f
Binary files /dev/null and b/data/magic-new-token.mse-style/multicolor_blend_pt2.png differ
diff --git a/data/magic-new-token.mse-style/name-left.png b/data/magic-new-token.mse-style/name-left.png
index cee3e18c..96411ed4 100644
Binary files a/data/magic-new-token.mse-style/name-left.png and b/data/magic-new-token.mse-style/name-left.png differ
diff --git a/data/magic-new-token.mse-style/name-mid.png b/data/magic-new-token.mse-style/name-mid.png
index 8a925132..00ae119b 100644
Binary files a/data/magic-new-token.mse-style/name-mid.png and b/data/magic-new-token.mse-style/name-mid.png differ
diff --git a/data/magic-new-token.mse-style/name-right.png b/data/magic-new-token.mse-style/name-right.png
index 69537624..41c982ff 100644
Binary files a/data/magic-new-token.mse-style/name-right.png and b/data/magic-new-token.mse-style/name-right.png differ
diff --git a/data/magic-new-token.mse-style/oacard0.jpg b/data/magic-new-token.mse-style/oacard0.jpg
new file mode 100644
index 00000000..29dd0395
Binary files /dev/null and b/data/magic-new-token.mse-style/oacard0.jpg differ
diff --git a/data/magic-new-token.mse-style/oacard1.jpg b/data/magic-new-token.mse-style/oacard1.jpg
new file mode 100644
index 00000000..fb515cda
Binary files /dev/null and b/data/magic-new-token.mse-style/oacard1.jpg differ
diff --git a/data/magic-new-token.mse-style/oacard2.jpg b/data/magic-new-token.mse-style/oacard2.jpg
new file mode 100644
index 00000000..b11c29d3
Binary files /dev/null and b/data/magic-new-token.mse-style/oacard2.jpg differ
diff --git a/data/magic-new-token.mse-style/oapt0.jpg b/data/magic-new-token.mse-style/oapt0.jpg
new file mode 100644
index 00000000..eced0642
Binary files /dev/null and b/data/magic-new-token.mse-style/oapt0.jpg differ
diff --git a/data/magic-new-token.mse-style/oapt1.jpg b/data/magic-new-token.mse-style/oapt1.jpg
new file mode 100644
index 00000000..54d33cf4
Binary files /dev/null and b/data/magic-new-token.mse-style/oapt1.jpg differ
diff --git a/data/magic-new-token.mse-style/oapt2.jpg b/data/magic-new-token.mse-style/oapt2.jpg
new file mode 100644
index 00000000..0ca3fe72
Binary files /dev/null and b/data/magic-new-token.mse-style/oapt2.jpg differ
diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style
index 0b25dc65..811b8646 100644
--- a/data/magic-new-token.mse-style/style
+++ b/data/magic-new-token.mse-style/style
@@ -14,11 +14,7 @@ card height: 523
 card dpi: 150
 
 #error list:
-#error about mask size not matching image size when dealing with p/t boxes
-#error about mask size not matching image size when dealing with name boxes
-#make sure name boxes are working correctly
-#templates do not change properly to one textline versions
-##############################P############################### Extra scripts
+############################################################## Extra scripts
 
 init script:
 	# Load scripts for default images
@@ -34,9 +30,13 @@ init script:
 		else "2" # large textbox
 	}
 	
-	suffix := ""
-	template      := { input + "{type}{suffix}.jpg" }
-	land_template := { "c{type}{suffix}.jpg" }
+	artifact_template := {
+		if input == "a" and styling.artifact_style == "light" then "oa"
+		else input
+	}
+	
+	template      := { artifact_template() + "{type}.jpg" }
+	land_template := { "c{type}.jpg" }
 	colored_lands := false
 		
 	# Use the normal tap symbol
@@ -48,12 +48,22 @@ init script:
 	
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
+	
+	# We have no land template
+	font_colors_white := { input == "b" }
 
 	
 ############################################################## Set info fields
 
-####################################I######################### Extra style
+############################################################## Extra style
 
+styling field:
+	type: choice
+	name: artifact style
+	description: Choose the style of artifacts: light = before Fifth Dawn, dark = used since Fifth Dawn
+	initial: dark
+	choice: light
+	choice: dark
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -77,7 +87,13 @@ styling field:
 	choice: modern
 	choice: old
 	choice: diagonal T
+
 styling style:
+	artifact style:
+		render style: both
+		choice images:
+			light: oacard0.jpg
+			dark:  acard0.jpg
 	popup mana symbols:
 		choice images:
 			yes: /magic-mana-large.mse-symbol-font/mana_w.png
@@ -153,7 +169,7 @@ card style:
 		top:
 			{ if      text_shape() == "0" then 432
 			  else if text_shape() == "1" then 414
-			  else                             350 }
+			  else                             353 }
 		width: 286
 		height: 20
 		alignment: top shrink-overflow
@@ -172,7 +188,7 @@ card style:
 		top:
 			{ if      text_shape() == "0" then 432
 			  else if text_shape() == "1" then 414
-			  else                             351 }
+			  else                             353 }
 		width: 22
 		height: 22
 		z index: 1
@@ -231,8 +247,12 @@ card style:
 	############################# PT
 	pt:
 		z index: 4
-		left:	284
-		top:	467
+		left:
+			{ if text_shape() == "2" then 288
+			  else                        284 }
+		top:
+			{ if text_shape() == "2" then 472
+			  else                        467 }
 		width:	60
 		height:	28
 		alignment: center middle shrink-overflow
@@ -250,7 +270,7 @@ card style:
 		top : 478
 		width: 246
 		height: 16
-		z index: 1
+		z index: 2
 		font:
 			name: Matrix
 			size: 11
@@ -265,7 +285,7 @@ card style:
 		top : 493
 		width: 247
 		height: 12
-		z index: 1
+		z index: 2
 		font:
 			name: MPlantin
 			size: 7.5
@@ -315,8 +335,7 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		#mask: mask_pt.png
-		image: { card_ptbox(suffix: text_shape()) }
+		image: { color_background(type:"pt" + text_shape(), base_hybrid:pt_hybrid) }
 
 	name box:
 		left: { card_style.name.content_width * -0.5 + 187.5 }