diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style
index eb47dd40c..6ceda9330 100644
--- a/data/magic-m15-altered.mse-style/style
+++ b/data/magic-m15-altered.mse-style/style
@@ -639,7 +639,7 @@ init script:
 		cw := if cw > 44 then (if set.print_fix != "" then set.print_fix else 22) else if cw < 22 then 22 else cw
 		if card_style.rarity.width == 0 then 0 else cw
 	}
-	special_text := {if is_leveler() then ((if card.level_0 != "" then "[" + level_label(0) + " " + card.level_0 + "] " else "") + card.level_1_text + (if card.pt != "" then " [" + card.pt + "]" else "") + "\n"
+	special_text := {if is_leveler() then ((if card.level_0 != "" then "[" + level_label(0) + " " + card.level_0 + "] " else "") + card.level_1_text + (if card.pt != "" and not lone_pt() then " [" + card.pt + "]" else "") + "\n"
 			+ (if card.level_1 != "" then "[" + level_label(1) + " " + card.level_1 + "] " else "") + card.level_2_text + (if card.pt_2 != "" then " [" + card.pt_2 + "]" else "") + "\n"
 			+ (if card.level_2 != "" then "[" + level_label(2) + " " + card.level_2 + "] " else "") + card.level_3_text + (if card.pt_3 != "" then " [" + card.pt_3 + "]" else "") + (if card.level_4_text != "" then "\n" else "")
 			+ (if card.level_3 != "" then "[" + level_label(3) + " " + card.level_3 + "] " else "") + card.level_4_text + (if card.pt_7 != "" then " [" + card.pt_7 + "]" else "")
diff --git a/data/magic-m15-mainframe-planeswalker.mse-style/style b/data/magic-m15-mainframe-planeswalker.mse-style/style
index c24758348..2826a05f1 100644
--- a/data/magic-m15-mainframe-planeswalker.mse-style/style
+++ b/data/magic-m15-mainframe-planeswalker.mse-style/style
@@ -266,6 +266,12 @@ init script:
 	is_snow := {chosen(styling.other_options, choice:"snow")}
 	is_vehicle := {chosen(styling.other_options, choice:"vehicle")}
 	is_pinned := {chosen(styling.other_options, choice:"pride pinlines")}
+	is_custom_border := {
+		chosen(styling.other_options, choice:"custom border")
+		and contains(styling.custom_border_source, match:".png")
+	}
+	custom_border_blend := { color_background(type:"custom_border",     base_hybrid:card_hybrid) }
+
 	paragraph_count := replace@(match:"\n", replace:"~")+
 		filter_text@(match:"~")
 	special_text := {
@@ -376,11 +382,16 @@ styling field:
 	choice: nyx
 	choice: snow
 	choice: vehicle
+	choice: custom border
 	choice: adventure
 	choice: reversed adventure
 	choice: pride pinlines
 	choice: popunder art
 	initial: un-indent nonloyalty abilities
+styling field:
+	type: text
+	name: custom border source
+	description: Use this file from magic-mainframe-extras as a custom vehicle-like frame. if colored, name images like "wborder.png" and put "-color-border.png" here.
 styling field:
 	type: text
 	name: custom mask
@@ -977,6 +988,12 @@ extra card field:
 	choice: car door
 	save value: false
 	editable: false
+extra card field:
+	type: choice
+	name: custom overlay
+	choice: car door
+	save value: false
+	editable: false
 extra card field:
 	type: choice
 	name: snow overlay
@@ -1413,7 +1430,7 @@ extra card style:
 		image: {module_nyx()}
 		z index: 330
 		visible: {is_nyx()}
-		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw" + (if is_vehicle() then "_v") + "_mask.png"}
+		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw" + (if is_vehicle() or is_custom_border() then "_v") + "_mask.png"}
 	snow overlay:
 		left: 0
 		top: 0
@@ -1423,7 +1440,7 @@ extra card style:
 		image: {module_snow()}
 		z index: 320
 		visible: {is_snow()}
-		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw" + (if is_vehicle() then "_v") + "_mask.png"}
+		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw" + (if is_vehicle() or is_custom_border()  then "_v") + "_mask.png"}
 	vehicle overlay:
 		left: 0
 		top: 0
@@ -1432,8 +1449,18 @@ extra card style:
 		render style: image
 		image: full_voverlay.png
 		z index: 310
-		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw_mask.png"}
+		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw" + (if is_custom_border()  then "_v") + "_mask.png"}
 		visible: {is_vehicle()}
+	custom overlay:
+		left: 0
+		top: 0
+		width: 375
+		height: 523
+		render style: image
+		image: { custom_border_blend() }
+		z index: 317
+		mask: {"trim_masks/" + (if has_four_abilities() then "4") + "pw_mask.png"}
+		visible: { is_custom_border() }
 	pride pin:
 		left: { if not is_pinned() then 0 else 19}
 		top: { if not is_pinned() then 0 else 51}
diff --git a/data/magic-m15-mainframe-tokens.mse-style/style b/data/magic-m15-mainframe-tokens.mse-style/style
index 732a7ba5c..59c60bfa3 100644
--- a/data/magic-m15-mainframe-tokens.mse-style/style
+++ b/data/magic-m15-mainframe-tokens.mse-style/style
@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/tokens
 position hint: 004
 
-version: 2024-09-03
+version: 2025-01-11
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -228,6 +228,11 @@ init script:
 			then module_stamp()
 		else "/magic-modules.mse-include/stamps/backs/" + (if sh == "triangle" then "triangle_stamp.png" else "stamp.png")
 	}
+	is_custom_border := {
+		chosen(styling.frames, choice:"custom border")
+		and contains(styling.custom_border_source, match:".png")
+	}
+	custom_border_blend := { color_background(type:"custom_border",     base_hybrid:card_hybrid) }
 	watermark_include := "/magic-modules.mse-include/watermarks"
 ############################################################## Set info fields
 set info style:
@@ -253,6 +258,11 @@ styling field:
 	choice: nyx
 	choice: snow
 	choice: vehicle
+	choice: custom border
+styling field:
+	type: text
+	name: custom border source
+	description: Use this file from magic-mainframe-extras as a custom vehicle-like frame. if colored, name images like "wborder.png" and put "-color-border.png" here.
 styling field:
 	type: multiple choice
 	name: auto frames
@@ -486,7 +496,7 @@ card style:
 		top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else "0"}
 		width: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).2 else "0"}
 		height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else "0"}
-		z index: 8
+		z index: 1010
 	############################# Card type
 	type:
 		left: 32
@@ -712,6 +722,12 @@ extra card field:
 	choice: plate
 	save value: false
 	editable: false
+extra card field:
+	type: choice
+	name: custom overlay
+	choice: plate
+	save value: false
+	editable: false
 extra card field:
 	type: text
 	name: vorthos box
@@ -856,6 +872,16 @@ extra card style:
 		image: voverlay.png
 		mask: {"v_" + (if is_nyx() or is_snow() then "nyx_" else "") + if is_tall() then "tall_mask.png" else if is_textless() then "short_mask.png" else "mid_mask.png"}
 		visible: { is_vehicle() }
+	vehicle overlay:
+		left: 15
+		top: 15
+		width: 345
+		height: 471
+		z index: 1
+		render style: image
+		image: {custom_border_blend()}
+		mask: {"v_" + (if is_nyx() or is_snow() then "nyx_" else "") + if is_tall() then "tall_mask.png" else if is_textless() then "short_mask.png" else "mid_mask.png"}
+		visible: { is_custom_border() }
 	vorthos box:
 		right: { if card.pt != "" then 275 else 350 }
 		top: 488