diff --git a/data/magic-new-token.mse-style/1acard.jpg b/data/magic-new-token.mse-style/1acard.jpg
new file mode 100644
index 00000000..fb515cda
Binary files /dev/null and b/data/magic-new-token.mse-style/1acard.jpg differ
diff --git a/data/magic-new-token.mse-style/1apt.jpg b/data/magic-new-token.mse-style/1apt.jpg
new file mode 100644
index 00000000..54d33cf4
Binary files /dev/null and b/data/magic-new-token.mse-style/1apt.jpg differ
diff --git a/data/magic-new-token.mse-style/1bcard.jpg b/data/magic-new-token.mse-style/1bcard.jpg
new file mode 100644
index 00000000..46a1cc8c
Binary files /dev/null and b/data/magic-new-token.mse-style/1bcard.jpg differ
diff --git a/data/magic-new-token.mse-style/1bpt.jpg b/data/magic-new-token.mse-style/1bpt.jpg
new file mode 100644
index 00000000..5e6b1186
Binary files /dev/null and b/data/magic-new-token.mse-style/1bpt.jpg differ
diff --git a/data/magic-new-token.mse-style/1ccard.jpg b/data/magic-new-token.mse-style/1ccard.jpg
new file mode 100644
index 00000000..1a56e86b
Binary files /dev/null and b/data/magic-new-token.mse-style/1ccard.jpg differ
diff --git a/data/magic-new-token.mse-style/1cpt.jpg b/data/magic-new-token.mse-style/1cpt.jpg
new file mode 100644
index 00000000..b9b73529
Binary files /dev/null and b/data/magic-new-token.mse-style/1cpt.jpg differ
diff --git a/data/magic-new-token.mse-style/1gcard.jpg b/data/magic-new-token.mse-style/1gcard.jpg
new file mode 100644
index 00000000..cede6191
Binary files /dev/null and b/data/magic-new-token.mse-style/1gcard.jpg differ
diff --git a/data/magic-new-token.mse-style/1gpt.jpg b/data/magic-new-token.mse-style/1gpt.jpg
new file mode 100644
index 00000000..aeaf77ab
Binary files /dev/null and b/data/magic-new-token.mse-style/1gpt.jpg differ
diff --git a/data/magic-new-token.mse-style/1hybrid_blend_nt.png b/data/magic-new-token.mse-style/1hybrid_blend_nt.png
new file mode 100644
index 00000000..81c88a8e
Binary files /dev/null and b/data/magic-new-token.mse-style/1hybrid_blend_nt.png differ
diff --git a/data/magic-new-token.mse-style/1imagemask.png b/data/magic-new-token.mse-style/1imagemask.png
new file mode 100644
index 00000000..3898b2e2
Binary files /dev/null and b/data/magic-new-token.mse-style/1imagemask.png differ
diff --git a/data/magic-new-token.mse-style/1mcard.jpg b/data/magic-new-token.mse-style/1mcard.jpg
new file mode 100644
index 00000000..ccbcb914
Binary files /dev/null and b/data/magic-new-token.mse-style/1mcard.jpg differ
diff --git a/data/magic-new-token.mse-style/1mpt.jpg b/data/magic-new-token.mse-style/1mpt.jpg
new file mode 100644
index 00000000..fe6096e6
Binary files /dev/null and b/data/magic-new-token.mse-style/1mpt.jpg differ
diff --git a/data/magic-new-token.mse-style/1multicolor_dual_blend.png b/data/magic-new-token.mse-style/1multicolor_dual_blend.png
new file mode 100644
index 00000000..acc826c2
Binary files /dev/null and b/data/magic-new-token.mse-style/1multicolor_dual_blend.png differ
diff --git a/data/magic-new-token.mse-style/1rcard.jpg b/data/magic-new-token.mse-style/1rcard.jpg
new file mode 100644
index 00000000..5260a8d8
Binary files /dev/null and b/data/magic-new-token.mse-style/1rcard.jpg differ
diff --git a/data/magic-new-token.mse-style/1rpt.jpg b/data/magic-new-token.mse-style/1rpt.jpg
new file mode 100644
index 00000000..267922f7
Binary files /dev/null and b/data/magic-new-token.mse-style/1rpt.jpg differ
diff --git a/data/magic-new-token.mse-style/1ucard.jpg b/data/magic-new-token.mse-style/1ucard.jpg
new file mode 100644
index 00000000..959d002f
Binary files /dev/null and b/data/magic-new-token.mse-style/1ucard.jpg differ
diff --git a/data/magic-new-token.mse-style/1upt.jpg b/data/magic-new-token.mse-style/1upt.jpg
new file mode 100644
index 00000000..dc733241
Binary files /dev/null and b/data/magic-new-token.mse-style/1upt.jpg differ
diff --git a/data/magic-new-token.mse-style/1wcard.jpg b/data/magic-new-token.mse-style/1wcard.jpg
new file mode 100644
index 00000000..d83ff8fa
Binary files /dev/null and b/data/magic-new-token.mse-style/1wcard.jpg differ
diff --git a/data/magic-new-token.mse-style/1wpt.jpg b/data/magic-new-token.mse-style/1wpt.jpg
new file mode 100644
index 00000000..cf23e47a
Binary files /dev/null and b/data/magic-new-token.mse-style/1wpt.jpg differ
diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style
index a60cd034..e82efe5c 100644
--- a/data/magic-new-token.mse-style/style
+++ b/data/magic-new-token.mse-style/style
@@ -13,6 +13,10 @@ card width: 375
 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
+#templates do not change properly to one textline versions
 ##############################P############################### Extra scripts
 
 init script:
@@ -25,7 +29,11 @@ init script:
 	
 	# We have no land templates
 	# Which artifact template should be used?
-	text_sensor := { if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then "2"
+	text_sensor := {
+		if styling.one_textline_tokens
+		and card_style.rule_text.content_lines == 1
+		and card.flavor_text == "<i-flavor></i-flavor>" then "1"
+		else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then "2"
 		else "" }
 	
 	land_to_artifact := {
@@ -42,7 +50,10 @@ init script:
 		if mask_hybrid_with_land() then
 			masked_blend(
 				mask: (
-					if card.rule_text != "" then "2hybrid_blend_nt.png"
+					if styling.one_textline_tokens
+					and card_style.rule_text.content_lines == 1
+					and card.flavor_text == "<i-flavor></i-flavor>" then "1hybrid_blend_nt.png"
+					else if card.rule_text != "" then "2hybrid_blend_nt.png"
 					else "hybrid_blend_nt.png" ),
 				dark:  land_template(""),
 				light: input,
@@ -52,7 +63,10 @@ init script:
 	multi_hybrid := {
 		masked_blend(
 			mask: (
-				if card.rule_text != "" then "2multicolor_dual_blend.png"
+				if styling.one_textline_tokens
+				and card_style.rule_text.content_lines == 1
+				and card.flavor_text == "<i-flavor></i-flavor>" then "1multicolor_dual_blend.png"
+				else if card.rule_text != "" then "2multicolor_dual_blend.png"
 				else "multicolor_dual_blend.png" ),
 			dark: (
 				if card.rule_text != "" then "2mcard.jpg"
@@ -66,7 +80,11 @@ init script:
 	land_hybrid_pt := { text_sensor() + "cpt.jpg" }
 	
 	# Use the normal tap symbol
-	small_mana_t := "mana_t.png"
+	mana_t := {
+		if      styling.tap_symbol == "old"        then "old"
+		else if styling.tap_symbol == "diagonal T" then "older"
+		else                                            "new"
+	}
 	
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
@@ -92,6 +110,11 @@ styling field:
 	name: popup mana symbols
 	description: Use the symbols of the casting cost line inside the text box as well
 	initial: no
+styling field:
+	type: boolean
+	name: one textline tokens
+	description: Should token frames with a single line for text be enabled?
+	initial: no
 styling field:
 	type: choice
 	name: tap symbol
@@ -200,20 +223,24 @@ card style:
 		left:	30
 		top:
 			script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
-					58
-				else
-					59
+				58
+			else
+				59
 		width:	315
 		height:
-			script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
-					288
-				else
-					366
+			script: if styling.one_textline_tokens and card_style.rule_text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+				349
+			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+				288
+			else
+				366
 		mask:
-			script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
-					"2imagemask.png"
-				else
-					"imagemask.png"
+			script: if styling.one_textline_tokens and card_style.rule_text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+				"1imagemask.png"
+			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+				"2imagemask.png"
+			else
+				"imagemask.png"
 		z index: 1
 
 
@@ -222,7 +249,9 @@ card style:
 	type:
 		left: 35
 		top:
-			script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+			script: if styling.one_textline_tokens and card_style.rule_text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+				414
+			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
 				350
 			else
 				433
@@ -242,7 +271,9 @@ card style:
 	rarity:
 		left: 320
 		top:
-			script: if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
+			script: if styling.one_textline_tokens and card_style.rule_text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then
+				415
+			else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
 				351
 			else
 				432
@@ -262,12 +293,15 @@ card style:
 	text:
 		left: 31
 		top:
-			if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then
-				388
-			else
-				300
+			script:
+				if styling.one_textline_tokens and card_style.rule_text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then 444
+				else if card.rule_text != "" or number_of_items(in:"" + card.flavor_text) > 21 then 388
+				else 300
 		width: 311
-		height: 80
+		height: 
+			script:
+				if styling.one_textline_tokens and card_style.rule_text.content_lines == 1and card.flavor_text == "<i-flavor></i-flavor>" then 22
+				else 80
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
@@ -289,7 +323,7 @@ card style:
 				not contains(match: ":", card.rule_text) and
 				not contains (match: "!", card.rule_text) and
 				not contains (match: "?", card.rule_text) and
-				   card.flavor_text == "<i-flavor></i-flavor>"
+				card.flavor_text == "<i-flavor></i-flavor>"
 				then "middle center"
 				else "middle left"
 		z index: 2