diff --git a/data/magic-m15-adventure.mse-style/acard.jpg b/data/magic-m15-adventure.mse-style/acard.jpg
deleted file mode 100644
index 56249531c..000000000
Binary files a/data/magic-m15-adventure.mse-style/acard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/acard2.png b/data/magic-m15-adventure.mse-style/acard2.png
deleted file mode 100644
index 792ad8edb..000000000
Binary files a/data/magic-m15-adventure.mse-style/acard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/adv_mask.jpg b/data/magic-m15-adventure.mse-style/adv_mask.jpg
new file mode 100644
index 000000000..f7d855816
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/adv_mask.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/alcard2.png b/data/magic-m15-adventure.mse-style/alcard2.png
deleted file mode 100644
index 38c05d6d7..000000000
Binary files a/data/magic-m15-adventure.mse-style/alcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_card.png b/data/magic-m15-adventure.mse-style/artifact_blend_card.png
deleted file mode 100644
index c6f8fb9da..000000000
Binary files a/data/magic-m15-adventure.mse-style/artifact_blend_card.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_card2.png b/data/magic-m15-adventure.mse-style/artifact_blend_card2.png
deleted file mode 100644
index c19a267b2..000000000
Binary files a/data/magic-m15-adventure.mse-style/artifact_blend_card2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_card3.png b/data/magic-m15-adventure.mse-style/artifact_blend_card3.png
deleted file mode 100644
index c6f8fb9da..000000000
Binary files a/data/magic-m15-adventure.mse-style/artifact_blend_card3.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_card4.png b/data/magic-m15-adventure.mse-style/artifact_blend_card4.png
deleted file mode 100644
index a764cd57b..000000000
Binary files a/data/magic-m15-adventure.mse-style/artifact_blend_card4.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_page2.png b/data/magic-m15-adventure.mse-style/artifact_blend_page2.png
deleted file mode 100644
index 3bc0e9da0..000000000
Binary files a/data/magic-m15-adventure.mse-style/artifact_blend_page2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_spot2.png b/data/magic-m15-adventure.mse-style/artifact_blend_spot2.png
deleted file mode 100644
index cf274f3aa..000000000
Binary files a/data/magic-m15-adventure.mse-style/artifact_blend_spot2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/bcard.jpg b/data/magic-m15-adventure.mse-style/bcard.jpg
deleted file mode 100644
index 244b9da7f..000000000
Binary files a/data/magic-m15-adventure.mse-style/bcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/bcard2.png b/data/magic-m15-adventure.mse-style/bcard2.png
deleted file mode 100644
index 9b069fdca..000000000
Binary files a/data/magic-m15-adventure.mse-style/bcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/binding/ablock.jpg b/data/magic-m15-adventure.mse-style/binding/ablock.jpg
new file mode 100644
index 000000000..365b8cf93
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/ablock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/bblock.jpg b/data/magic-m15-adventure.mse-style/binding/bblock.jpg
new file mode 100644
index 000000000..aaae4088a
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/bblock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/cblock.jpg b/data/magic-m15-adventure.mse-style/binding/cblock.jpg
new file mode 100644
index 000000000..c9980f689
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/cblock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/gblock.jpg b/data/magic-m15-adventure.mse-style/binding/gblock.jpg
new file mode 100644
index 000000000..eb862ad79
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/gblock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/mblock.jpg b/data/magic-m15-adventure.mse-style/binding/mblock.jpg
new file mode 100644
index 000000000..97aa6ef1d
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/mblock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/rblock.jpg b/data/magic-m15-adventure.mse-style/binding/rblock.jpg
new file mode 100644
index 000000000..0df05330e
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/rblock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/ublock.jpg b/data/magic-m15-adventure.mse-style/binding/ublock.jpg
new file mode 100644
index 000000000..298003e17
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/ublock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/binding/wblock.jpg b/data/magic-m15-adventure.mse-style/binding/wblock.jpg
new file mode 100644
index 000000000..8480b4af4
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/binding/wblock.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/blcard.jpg b/data/magic-m15-adventure.mse-style/blcard.jpg
deleted file mode 100644
index b57e4cacc..000000000
Binary files a/data/magic-m15-adventure.mse-style/blcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/blcard2.png b/data/magic-m15-adventure.mse-style/blcard2.png
deleted file mode 100644
index d0dcbf4b5..000000000
Binary files a/data/magic-m15-adventure.mse-style/blcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_alias.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_alias.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_alias.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_alias.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_binding.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_binding.png
new file mode 100644
index 000000000..2a291488b
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_binding.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_card.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_card.png
new file mode 100644
index 000000000..d59420469
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_card.png differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_crown.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_crown.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_crown.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_crown.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_custom_border.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_custom_border.png
new file mode 100644
index 000000000..350da1644
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_custom_border.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_decoration.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_decoration.png
new file mode 100644
index 000000000..f5d95d0c2
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_decoration.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_double_flat.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_double_flat.png
new file mode 100644
index 000000000..eeb62fcc4
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_double_flat.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_double_page.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_double_page.png
new file mode 100644
index 000000000..0645822c9
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_double_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_identity.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_identity.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_identity.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_identity.png
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_identity2.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_identity2.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_identity2.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_identity2.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_null_page.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_null_page.png
new file mode 100644
index 000000000..b28f822b9
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_null_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_nyx.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_nyx.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_nyx.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_nyx.png
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_pt.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_pt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_pt.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_pt.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_single_flat.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_single_flat.png
new file mode 100644
index 000000000..eeb62fcc4
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_single_flat.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_single_page.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_single_page.png
new file mode 100644
index 000000000..fe141b4ca
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_single_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_snowtexture.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_snowtexture.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_snowtexture.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_snowtexture.png
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_spot.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_spot.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_spot.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_spot.png
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_page.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_spotpage.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_page.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_spotpage.png
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_spotpt.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_spotpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_spotpt.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_spotpt.png
diff --git a/data/magic-m15-adventure.mse-style/artifact_blend_stamp.png b/data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_stamp.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/artifact_blend_stamp.png
rename to data/magic-m15-adventure.mse-style/blend_masks/artifact_blend_stamp.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_alias.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_alias.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_alias.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_alias.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_binding.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_binding.png
new file mode 100644
index 000000000..e5d986373
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_binding.png differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_card.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_card.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_card.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_card.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_crown.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_crown.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_crown.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_crown.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_custom_border.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_custom_border.png
new file mode 100644
index 000000000..5d72dec02
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_custom_border.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_decoration.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_decoration.png
new file mode 100644
index 000000000..41d049161
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_decoration.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_double_flat.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_double_flat.png
new file mode 100644
index 000000000..041390c66
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_double_flat.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_double_page.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_double_page.png
new file mode 100644
index 000000000..953c45a84
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_double_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_identity.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_identity.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_identity.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_identity.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_identity2.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_identity2.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_identity2.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_identity2.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_null_page.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_null_page.png
new file mode 100644
index 000000000..c37278399
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_null_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_nyx.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_nyx.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_nyx.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_nyx.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_pt.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_pt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_pt.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_pt.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_single_flat.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_single_flat.png
new file mode 100644
index 000000000..041390c66
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_single_flat.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_single_page.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_single_page.png
new file mode 100644
index 000000000..5c2ea5590
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_single_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_snowtexture.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_snowtexture.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_snowtexture.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_snowtexture.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_spot.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_spot.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_spot.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_spot.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_page.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_spotpage.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_page.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_spotpage.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_spotpt.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_spotpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_spotpt.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_spotpt.png
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_stamp.png b/data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_stamp.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/hybrid_blend_stamp.png
rename to data/magic-m15-adventure.mse-style/blend_masks/hybrid_blend_stamp.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_alias.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_alias.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_alias.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_alias.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_binding.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_binding.png
new file mode 100644
index 000000000..50829edc2
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_binding.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_card.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_card.png
new file mode 100644
index 000000000..af6ec2fa8
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_card.png differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_crown.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_crown.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_crown.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_crown.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_custom_border.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_custom_border.png
new file mode 100644
index 000000000..350da1644
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_custom_border.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_decoration.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_decoration.png
new file mode 100644
index 000000000..44cc42cba
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_decoration.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_double_flat.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_double_flat.png
new file mode 100644
index 000000000..ccbe87270
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_double_flat.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_double_page.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_double_page.png
new file mode 100644
index 000000000..ba5168b68
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_double_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_identity.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_identity.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_identity.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_identity.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_identity2.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_identity2.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_identity2.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_identity2.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_null_page.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_null_page.png
new file mode 100644
index 000000000..3524e21e2
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_null_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_nyx.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_nyx.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_nyx.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_nyx.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_pt.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_pt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_pt.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_pt.png
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_single_flat.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_single_flat.png
new file mode 100644
index 000000000..ccbe87270
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_single_flat.png differ
diff --git a/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_single_page.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_single_page.png
new file mode 100644
index 000000000..684d2cfa1
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_single_page.png differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_snowtexture.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_snowtexture.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_snowtexture.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_snowtexture.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_spot.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_spot.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_spot.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_spot.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_page.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_spotpage.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_page.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_spotpage.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_spotpt.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_spotpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_spotpt.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_spotpt.png
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_stamp.png b/data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_stamp.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/multicolor_blend_stamp.png
rename to data/magic-m15-adventure.mse-style/blend_masks/multicolor_blend_stamp.png
diff --git a/data/magic-m15-adventure.mse-style/card-sample.png b/data/magic-m15-adventure.mse-style/card-sample.png
index 6a1637367..042ae686e 100644
Binary files a/data/magic-m15-adventure.mse-style/card-sample.png and b/data/magic-m15-adventure.mse-style/card-sample.png differ
diff --git a/data/magic-m15-adventure.mse-style/cards/acard.jpg b/data/magic-m15-adventure.mse-style/cards/acard.jpg
new file mode 100644
index 000000000..8ddddf802
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/acard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/bcard.jpg b/data/magic-m15-adventure.mse-style/cards/bcard.jpg
new file mode 100644
index 000000000..278a68ff4
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/bcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/blcard.jpg b/data/magic-m15-adventure.mse-style/cards/blcard.jpg
new file mode 100644
index 000000000..030fe1393
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/blcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/ccard.jpg b/data/magic-m15-adventure.mse-style/cards/ccard.jpg
new file mode 100644
index 000000000..d10f892d3
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/ccard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/clcard.jpg b/data/magic-m15-adventure.mse-style/cards/clcard.jpg
new file mode 100644
index 000000000..7947581ed
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/clcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/gcard.jpg b/data/magic-m15-adventure.mse-style/cards/gcard.jpg
new file mode 100644
index 000000000..f0b28345d
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/gcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/glcard.jpg b/data/magic-m15-adventure.mse-style/cards/glcard.jpg
new file mode 100644
index 000000000..fb579865b
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/glcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/mcard.jpg b/data/magic-m15-adventure.mse-style/cards/mcard.jpg
new file mode 100644
index 000000000..da78d604a
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/mcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/mlcard.jpg b/data/magic-m15-adventure.mse-style/cards/mlcard.jpg
new file mode 100644
index 000000000..edc98af95
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/mlcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/rcard.jpg b/data/magic-m15-adventure.mse-style/cards/rcard.jpg
new file mode 100644
index 000000000..c40e5c545
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/rcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/rlcard.jpg b/data/magic-m15-adventure.mse-style/cards/rlcard.jpg
new file mode 100644
index 000000000..458f0f276
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/rlcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/ucard.jpg b/data/magic-m15-adventure.mse-style/cards/ucard.jpg
new file mode 100644
index 000000000..97bfe4715
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/ucard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/ulcard.jpg b/data/magic-m15-adventure.mse-style/cards/ulcard.jpg
new file mode 100644
index 000000000..3c6c48fdf
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/ulcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/wcard.jpg b/data/magic-m15-adventure.mse-style/cards/wcard.jpg
new file mode 100644
index 000000000..5b198ef03
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/wcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/cards/wlcard.jpg b/data/magic-m15-adventure.mse-style/cards/wlcard.jpg
new file mode 100644
index 000000000..4d0dc2589
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/cards/wlcard.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/ccard.jpg b/data/magic-m15-adventure.mse-style/ccard.jpg
deleted file mode 100644
index dddd0955c..000000000
Binary files a/data/magic-m15-adventure.mse-style/ccard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/ccard2.png b/data/magic-m15-adventure.mse-style/ccard2.png
deleted file mode 100644
index e18f6ba40..000000000
Binary files a/data/magic-m15-adventure.mse-style/ccard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/clcard.jpg b/data/magic-m15-adventure.mse-style/clcard.jpg
deleted file mode 100644
index 1e7800930..000000000
Binary files a/data/magic-m15-adventure.mse-style/clcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/clcard2.png b/data/magic-m15-adventure.mse-style/clcard2.png
deleted file mode 100644
index f1cc76960..000000000
Binary files a/data/magic-m15-adventure.mse-style/clcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/apage.png b/data/magic-m15-adventure.mse-style/double_flat/apage.png
new file mode 100644
index 000000000..f00f186f5
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/apage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/bpage.png b/data/magic-m15-adventure.mse-style/double_flat/bpage.png
new file mode 100644
index 000000000..0398db5fe
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/bpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/cpage.png b/data/magic-m15-adventure.mse-style/double_flat/cpage.png
new file mode 100644
index 000000000..0047f4edf
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/cpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/gpage.png b/data/magic-m15-adventure.mse-style/double_flat/gpage.png
new file mode 100644
index 000000000..b62eb165d
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/gpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/mpage.png b/data/magic-m15-adventure.mse-style/double_flat/mpage.png
new file mode 100644
index 000000000..baf8fd7a7
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/mpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/rpage.png b/data/magic-m15-adventure.mse-style/double_flat/rpage.png
new file mode 100644
index 000000000..af0f67c94
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/rpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/upage.png b/data/magic-m15-adventure.mse-style/double_flat/upage.png
new file mode 100644
index 000000000..a64fe2784
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/upage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_flat/wpage.png b/data/magic-m15-adventure.mse-style/double_flat/wpage.png
new file mode 100644
index 000000000..04618d0a2
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_flat/wpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_frame_border_mask.png b/data/magic-m15-adventure.mse-style/double_frame_border_mask.png
new file mode 100644
index 000000000..403bc2e1d
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_frame_border_mask.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_mask.png b/data/magic-m15-adventure.mse-style/double_mask.png
new file mode 100644
index 000000000..5db7708f5
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_mask.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/apage.png b/data/magic-m15-adventure.mse-style/double_page/apage.png
new file mode 100644
index 000000000..40efeb9e3
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/apage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/bpage.png b/data/magic-m15-adventure.mse-style/double_page/bpage.png
new file mode 100644
index 000000000..9261eea85
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/bpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/cpage.png b/data/magic-m15-adventure.mse-style/double_page/cpage.png
new file mode 100644
index 000000000..bea9c7cf3
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/cpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/gpage.png b/data/magic-m15-adventure.mse-style/double_page/gpage.png
new file mode 100644
index 000000000..0ea2a6042
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/gpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/mpage.png b/data/magic-m15-adventure.mse-style/double_page/mpage.png
new file mode 100644
index 000000000..7428339d3
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/mpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/rpage.png b/data/magic-m15-adventure.mse-style/double_page/rpage.png
new file mode 100644
index 000000000..6a6265992
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/rpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/upage.png b/data/magic-m15-adventure.mse-style/double_page/upage.png
new file mode 100644
index 000000000..ef3b60d13
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/upage.png differ
diff --git a/data/magic-m15-adventure.mse-style/double_page/wpage.png b/data/magic-m15-adventure.mse-style/double_page/wpage.png
new file mode 100644
index 000000000..30f23f35c
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/double_page/wpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/flat_deco/uline.png b/data/magic-m15-adventure.mse-style/flat_deco/uline.png
new file mode 100644
index 000000000..5a3cb9e44
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/flat_deco/uline.png differ
diff --git a/data/magic-m15-adventure.mse-style/frame_border_mask.png b/data/magic-m15-adventure.mse-style/frame_border_mask.png
new file mode 100644
index 000000000..a20a6b645
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/frame_border_mask.png differ
diff --git a/data/magic-m15-adventure.mse-style/gcard.jpg b/data/magic-m15-adventure.mse-style/gcard.jpg
deleted file mode 100644
index dcd8246f2..000000000
Binary files a/data/magic-m15-adventure.mse-style/gcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/gcard2.png b/data/magic-m15-adventure.mse-style/gcard2.png
deleted file mode 100644
index 060dc66ab..000000000
Binary files a/data/magic-m15-adventure.mse-style/gcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/glcard.jpg b/data/magic-m15-adventure.mse-style/glcard.jpg
deleted file mode 100644
index 45eb0d99f..000000000
Binary files a/data/magic-m15-adventure.mse-style/glcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/glcard2.png b/data/magic-m15-adventure.mse-style/glcard2.png
deleted file mode 100644
index ae0a17673..000000000
Binary files a/data/magic-m15-adventure.mse-style/glcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_card2.png b/data/magic-m15-adventure.mse-style/hybrid_blend_card2.png
deleted file mode 100644
index 8e61af4f9..000000000
Binary files a/data/magic-m15-adventure.mse-style/hybrid_blend_card2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_card3.png b/data/magic-m15-adventure.mse-style/hybrid_blend_card3.png
deleted file mode 100644
index e8c6222ca..000000000
Binary files a/data/magic-m15-adventure.mse-style/hybrid_blend_card3.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_card4.png b/data/magic-m15-adventure.mse-style/hybrid_blend_card4.png
deleted file mode 100644
index 4db3b0a9d..000000000
Binary files a/data/magic-m15-adventure.mse-style/hybrid_blend_card4.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_page2.png b/data/magic-m15-adventure.mse-style/hybrid_blend_page2.png
deleted file mode 100644
index fcbd271e3..000000000
Binary files a/data/magic-m15-adventure.mse-style/hybrid_blend_page2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/hybrid_blend_spot2.png b/data/magic-m15-adventure.mse-style/hybrid_blend_spot2.png
deleted file mode 100644
index d48f3e650..000000000
Binary files a/data/magic-m15-adventure.mse-style/hybrid_blend_spot2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/mcard.jpg b/data/magic-m15-adventure.mse-style/mcard.jpg
deleted file mode 100644
index 25ac68956..000000000
Binary files a/data/magic-m15-adventure.mse-style/mcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/mcard2.png b/data/magic-m15-adventure.mse-style/mcard2.png
deleted file mode 100644
index 71b121935..000000000
Binary files a/data/magic-m15-adventure.mse-style/mcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/mlcard.jpg b/data/magic-m15-adventure.mse-style/mlcard.jpg
deleted file mode 100644
index f188409b5..000000000
Binary files a/data/magic-m15-adventure.mse-style/mlcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/mlcard2.png b/data/magic-m15-adventure.mse-style/mlcard2.png
deleted file mode 100644
index 95198a460..000000000
Binary files a/data/magic-m15-adventure.mse-style/mlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_card.png b/data/magic-m15-adventure.mse-style/multicolor_blend_card.png
deleted file mode 100644
index 996745628..000000000
Binary files a/data/magic-m15-adventure.mse-style/multicolor_blend_card.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_card2.png b/data/magic-m15-adventure.mse-style/multicolor_blend_card2.png
deleted file mode 100644
index 65e7689a9..000000000
Binary files a/data/magic-m15-adventure.mse-style/multicolor_blend_card2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_card3.png b/data/magic-m15-adventure.mse-style/multicolor_blend_card3.png
deleted file mode 100644
index 996745628..000000000
Binary files a/data/magic-m15-adventure.mse-style/multicolor_blend_card3.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_card4.png b/data/magic-m15-adventure.mse-style/multicolor_blend_card4.png
deleted file mode 100644
index 06e011b9e..000000000
Binary files a/data/magic-m15-adventure.mse-style/multicolor_blend_card4.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_page2.png b/data/magic-m15-adventure.mse-style/multicolor_blend_page2.png
deleted file mode 100644
index 604d4459d..000000000
Binary files a/data/magic-m15-adventure.mse-style/multicolor_blend_page2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/multicolor_blend_spot2.png b/data/magic-m15-adventure.mse-style/multicolor_blend_spot2.png
deleted file mode 100644
index f89154b4b..000000000
Binary files a/data/magic-m15-adventure.mse-style/multicolor_blend_spot2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/apage.png b/data/magic-m15-adventure.mse-style/null_page/apage.png
new file mode 100644
index 000000000..599115a73
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/apage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/bpage.png b/data/magic-m15-adventure.mse-style/null_page/bpage.png
new file mode 100644
index 000000000..f860ef2d9
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/bpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/cpage.png b/data/magic-m15-adventure.mse-style/null_page/cpage.png
new file mode 100644
index 000000000..0e90a6b7d
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/cpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/gpage.png b/data/magic-m15-adventure.mse-style/null_page/gpage.png
new file mode 100644
index 000000000..dc9fac7cd
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/gpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/mpage.png b/data/magic-m15-adventure.mse-style/null_page/mpage.png
new file mode 100644
index 000000000..1119f1539
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/mpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/rpage.png b/data/magic-m15-adventure.mse-style/null_page/rpage.png
new file mode 100644
index 000000000..0cba8a8a6
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/rpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/upage.png b/data/magic-m15-adventure.mse-style/null_page/upage.png
new file mode 100644
index 000000000..197e53e9a
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/upage.png differ
diff --git a/data/magic-m15-adventure.mse-style/null_page/wpage.png b/data/magic-m15-adventure.mse-style/null_page/wpage.png
new file mode 100644
index 000000000..acb1b4880
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/null_page/wpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/blnyx.png b/data/magic-m15-adventure.mse-style/nyx/blnyx.png
deleted file mode 100644
index ba0fe8262..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/blnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/clnyx.png b/data/magic-m15-adventure.mse-style/nyx/clnyx.png
deleted file mode 100644
index bb847d98b..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/clnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/glnyx.png b/data/magic-m15-adventure.mse-style/nyx/glnyx.png
deleted file mode 100644
index f17de9137..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/glnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/mask.png b/data/magic-m15-adventure.mse-style/nyx/mask.png
deleted file mode 100644
index 46226483c..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/mask.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/mlnyx.png b/data/magic-m15-adventure.mse-style/nyx/mlnyx.png
deleted file mode 100644
index 0594a2a5a..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/mlnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/rlnyx.png b/data/magic-m15-adventure.mse-style/nyx/rlnyx.png
deleted file mode 100644
index c48c6a3df..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/rlnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/ulnyx.png b/data/magic-m15-adventure.mse-style/nyx/ulnyx.png
deleted file mode 100644
index 3c9aa07eb..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/ulnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/v_mask.png b/data/magic-m15-adventure.mse-style/nyx/v_mask.png
deleted file mode 100644
index 65fdd8646..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/v_mask.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/nyx/wlnyx.png b/data/magic-m15-adventure.mse-style/nyx/wlnyx.png
deleted file mode 100644
index 872758081..000000000
Binary files a/data/magic-m15-adventure.mse-style/nyx/wlnyx.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/pages_mask.jpg b/data/magic-m15-adventure.mse-style/pages_mask.jpg
new file mode 100644
index 000000000..b2f9b1a88
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/pages_mask.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/pages_mask.png b/data/magic-m15-adventure.mse-style/pages_mask.png
new file mode 100644
index 000000000..fbe08e1f1
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/pages_mask.png differ
diff --git a/data/magic-m15-adventure.mse-style/apt.png b/data/magic-m15-adventure.mse-style/pts/apt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/apt.png
rename to data/magic-m15-adventure.mse-style/pts/apt.png
diff --git a/data/magic-m15-adventure.mse-style/blpt.png b/data/magic-m15-adventure.mse-style/pts/blpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/blpt.png
rename to data/magic-m15-adventure.mse-style/pts/blpt.png
diff --git a/data/magic-m15-adventure.mse-style/bpt.png b/data/magic-m15-adventure.mse-style/pts/bpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/bpt.png
rename to data/magic-m15-adventure.mse-style/pts/bpt.png
diff --git a/data/magic-m15-adventure.mse-style/clpt.png b/data/magic-m15-adventure.mse-style/pts/clpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/clpt.png
rename to data/magic-m15-adventure.mse-style/pts/clpt.png
diff --git a/data/magic-m15-adventure.mse-style/cpt.png b/data/magic-m15-adventure.mse-style/pts/cpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/cpt.png
rename to data/magic-m15-adventure.mse-style/pts/cpt.png
diff --git a/data/magic-m15-adventure.mse-style/glpt.png b/data/magic-m15-adventure.mse-style/pts/glpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/glpt.png
rename to data/magic-m15-adventure.mse-style/pts/glpt.png
diff --git a/data/magic-m15-adventure.mse-style/gpt.png b/data/magic-m15-adventure.mse-style/pts/gpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/gpt.png
rename to data/magic-m15-adventure.mse-style/pts/gpt.png
diff --git a/data/magic-m15-adventure.mse-style/mlpt.png b/data/magic-m15-adventure.mse-style/pts/mlpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/mlpt.png
rename to data/magic-m15-adventure.mse-style/pts/mlpt.png
diff --git a/data/magic-m15-adventure.mse-style/mpt.png b/data/magic-m15-adventure.mse-style/pts/mpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/mpt.png
rename to data/magic-m15-adventure.mse-style/pts/mpt.png
diff --git a/data/magic-m15-adventure.mse-style/rlpt.png b/data/magic-m15-adventure.mse-style/pts/rlpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/rlpt.png
rename to data/magic-m15-adventure.mse-style/pts/rlpt.png
diff --git a/data/magic-m15-adventure.mse-style/rpt.png b/data/magic-m15-adventure.mse-style/pts/rpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/rpt.png
rename to data/magic-m15-adventure.mse-style/pts/rpt.png
diff --git a/data/magic-m15-adventure.mse-style/ulpt.png b/data/magic-m15-adventure.mse-style/pts/ulpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/ulpt.png
rename to data/magic-m15-adventure.mse-style/pts/ulpt.png
diff --git a/data/magic-m15-adventure.mse-style/upt.png b/data/magic-m15-adventure.mse-style/pts/upt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/upt.png
rename to data/magic-m15-adventure.mse-style/pts/upt.png
diff --git a/data/magic-m15-adventure.mse-style/vpt.png b/data/magic-m15-adventure.mse-style/pts/vpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/vpt.png
rename to data/magic-m15-adventure.mse-style/pts/vpt.png
diff --git a/data/magic-m15-adventure.mse-style/wlpt.png b/data/magic-m15-adventure.mse-style/pts/wlpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/wlpt.png
rename to data/magic-m15-adventure.mse-style/pts/wlpt.png
diff --git a/data/magic-m15-adventure.mse-style/wpt.png b/data/magic-m15-adventure.mse-style/pts/wpt.png
similarity index 100%
rename from data/magic-m15-adventure.mse-style/wpt.png
rename to data/magic-m15-adventure.mse-style/pts/wpt.png
diff --git a/data/magic-m15-adventure.mse-style/rcard.jpg b/data/magic-m15-adventure.mse-style/rcard.jpg
deleted file mode 100644
index eae3ab32f..000000000
Binary files a/data/magic-m15-adventure.mse-style/rcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/rcard2.png b/data/magic-m15-adventure.mse-style/rcard2.png
deleted file mode 100644
index 58af2ae4f..000000000
Binary files a/data/magic-m15-adventure.mse-style/rcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/acard.jpg b/data/magic-m15-adventure.mse-style/reverse/acard.jpg
deleted file mode 100644
index 4d8dad33b..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/acard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/acard2.png b/data/magic-m15-adventure.mse-style/reverse/acard2.png
deleted file mode 100644
index 3c04cfa17..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/acard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/alcard2.png b/data/magic-m15-adventure.mse-style/reverse/alcard2.png
deleted file mode 100644
index f0a611cf2..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/alcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/bcard.jpg b/data/magic-m15-adventure.mse-style/reverse/bcard.jpg
deleted file mode 100644
index b9b3ac1b0..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/bcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/bcard2.png b/data/magic-m15-adventure.mse-style/reverse/bcard2.png
deleted file mode 100644
index 13be8091b..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/bcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/blcard.jpg b/data/magic-m15-adventure.mse-style/reverse/blcard.jpg
deleted file mode 100644
index 1c80933ed..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/blcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/blcard2.png b/data/magic-m15-adventure.mse-style/reverse/blcard2.png
deleted file mode 100644
index 2b899dca8..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/blcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/ccard.jpg b/data/magic-m15-adventure.mse-style/reverse/ccard.jpg
deleted file mode 100644
index 0d37206e8..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/ccard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/ccard2.png b/data/magic-m15-adventure.mse-style/reverse/ccard2.png
deleted file mode 100644
index 082d504bc..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/ccard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/clcard.jpg b/data/magic-m15-adventure.mse-style/reverse/clcard.jpg
deleted file mode 100644
index fce6f1d22..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/clcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/clcard2.png b/data/magic-m15-adventure.mse-style/reverse/clcard2.png
deleted file mode 100644
index e689a77f8..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/clcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/gcard.jpg b/data/magic-m15-adventure.mse-style/reverse/gcard.jpg
deleted file mode 100644
index be7707de9..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/gcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/gcard2.png b/data/magic-m15-adventure.mse-style/reverse/gcard2.png
deleted file mode 100644
index 99485c356..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/gcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/glcard.jpg b/data/magic-m15-adventure.mse-style/reverse/glcard.jpg
deleted file mode 100644
index 89c378ea5..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/glcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/glcard2.png b/data/magic-m15-adventure.mse-style/reverse/glcard2.png
deleted file mode 100644
index e4ef9ed36..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/glcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/mcard.jpg b/data/magic-m15-adventure.mse-style/reverse/mcard.jpg
deleted file mode 100644
index 6a1079d35..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/mcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/mcard2.png b/data/magic-m15-adventure.mse-style/reverse/mcard2.png
deleted file mode 100644
index fd58bebdb..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/mcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/mlcard.jpg b/data/magic-m15-adventure.mse-style/reverse/mlcard.jpg
deleted file mode 100644
index 9602067bc..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/mlcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/mlcard2.png b/data/magic-m15-adventure.mse-style/reverse/mlcard2.png
deleted file mode 100644
index ff65cec9f..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/mlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/rcard.jpg b/data/magic-m15-adventure.mse-style/reverse/rcard.jpg
deleted file mode 100644
index 49f8b640a..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/rcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/rcard2.png b/data/magic-m15-adventure.mse-style/reverse/rcard2.png
deleted file mode 100644
index 1e116fc22..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/rcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/rlcard.jpg b/data/magic-m15-adventure.mse-style/reverse/rlcard.jpg
deleted file mode 100644
index 093ba4ec1..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/rlcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/rlcard2.png b/data/magic-m15-adventure.mse-style/reverse/rlcard2.png
deleted file mode 100644
index f27565422..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/rlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/spot_border_mask.png b/data/magic-m15-adventure.mse-style/reverse/spot_border_mask.png
deleted file mode 100644
index b6a1c2d34..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/spot_border_mask.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/spotmask.jpg b/data/magic-m15-adventure.mse-style/reverse/spotmask.jpg
deleted file mode 100644
index 0ad0df824..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/spotmask.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/stampmask.jpg b/data/magic-m15-adventure.mse-style/reverse/stampmask.jpg
deleted file mode 100644
index c61be79ac..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/stampmask.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/ucard.jpg b/data/magic-m15-adventure.mse-style/reverse/ucard.jpg
deleted file mode 100644
index ec10955e8..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/ucard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/ucard2.png b/data/magic-m15-adventure.mse-style/reverse/ucard2.png
deleted file mode 100644
index 9e99bcb7c..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/ucard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/ulcard.jpg b/data/magic-m15-adventure.mse-style/reverse/ulcard.jpg
deleted file mode 100644
index 3cab0dd26..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/ulcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/ulcard2.png b/data/magic-m15-adventure.mse-style/reverse/ulcard2.png
deleted file mode 100644
index 4bbccc02f..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/ulcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/wcard.jpg b/data/magic-m15-adventure.mse-style/reverse/wcard.jpg
deleted file mode 100644
index aa02f605b..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/wcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/wcard2.png b/data/magic-m15-adventure.mse-style/reverse/wcard2.png
deleted file mode 100644
index 580505761..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/wcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/wlcard.jpg b/data/magic-m15-adventure.mse-style/reverse/wlcard.jpg
deleted file mode 100644
index d6aa5b02b..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/wlcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/reverse/wlcard2.png b/data/magic-m15-adventure.mse-style/reverse/wlcard2.png
deleted file mode 100644
index 143a7b206..000000000
Binary files a/data/magic-m15-adventure.mse-style/reverse/wlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/rlcard.jpg b/data/magic-m15-adventure.mse-style/rlcard.jpg
deleted file mode 100644
index 420850444..000000000
Binary files a/data/magic-m15-adventure.mse-style/rlcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/rlcard2.png b/data/magic-m15-adventure.mse-style/rlcard2.png
deleted file mode 100644
index 2e16412c9..000000000
Binary files a/data/magic-m15-adventure.mse-style/rlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/apage.png b/data/magic-m15-adventure.mse-style/single_flat/apage.png
new file mode 100644
index 000000000..d03b424b1
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/apage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/bpage.png b/data/magic-m15-adventure.mse-style/single_flat/bpage.png
new file mode 100644
index 000000000..952382987
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/bpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/cpage.png b/data/magic-m15-adventure.mse-style/single_flat/cpage.png
new file mode 100644
index 000000000..92eb7edd7
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/cpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/gpage.png b/data/magic-m15-adventure.mse-style/single_flat/gpage.png
new file mode 100644
index 000000000..8bc301ad3
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/gpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/mpage.png b/data/magic-m15-adventure.mse-style/single_flat/mpage.png
new file mode 100644
index 000000000..1d3a54395
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/mpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/rpage.png b/data/magic-m15-adventure.mse-style/single_flat/rpage.png
new file mode 100644
index 000000000..7ea522bb7
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/rpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/upage.png b/data/magic-m15-adventure.mse-style/single_flat/upage.png
new file mode 100644
index 000000000..1a2f9c558
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/upage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_flat/wpage.png b/data/magic-m15-adventure.mse-style/single_flat/wpage.png
new file mode 100644
index 000000000..1097ca754
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_flat/wpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_mask.png b/data/magic-m15-adventure.mse-style/single_mask.png
new file mode 100644
index 000000000..74a105980
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_mask.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/apage.png b/data/magic-m15-adventure.mse-style/single_page/apage.png
new file mode 100644
index 000000000..ef8fd967c
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/apage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/bpage.png b/data/magic-m15-adventure.mse-style/single_page/bpage.png
new file mode 100644
index 000000000..c1301bb43
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/bpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/cpage.png b/data/magic-m15-adventure.mse-style/single_page/cpage.png
new file mode 100644
index 000000000..dcb52e334
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/cpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/gpage.png b/data/magic-m15-adventure.mse-style/single_page/gpage.png
new file mode 100644
index 000000000..eab6e3ede
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/gpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/mpage.png b/data/magic-m15-adventure.mse-style/single_page/mpage.png
new file mode 100644
index 000000000..b178b1e1f
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/mpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/rpage.png b/data/magic-m15-adventure.mse-style/single_page/rpage.png
new file mode 100644
index 000000000..ced56b91a
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/rpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/upage.png b/data/magic-m15-adventure.mse-style/single_page/upage.png
new file mode 100644
index 000000000..55ffb97fb
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/upage.png differ
diff --git a/data/magic-m15-adventure.mse-style/single_page/wpage.png b/data/magic-m15-adventure.mse-style/single_page/wpage.png
new file mode 100644
index 000000000..6a8641b19
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/single_page/wpage.png differ
diff --git a/data/magic-m15-adventure.mse-style/snow/snow_mask.png b/data/magic-m15-adventure.mse-style/snow/snow_mask.png
deleted file mode 100644
index f1f55efa4..000000000
Binary files a/data/magic-m15-adventure.mse-style/snow/snow_mask.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/alcard.png b/data/magic-m15-adventure.mse-style/spotlight/alcard.png
deleted file mode 100644
index 6bba94663..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/alcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/alcard2.png b/data/magic-m15-adventure.mse-style/spotlight/alcard2.png
deleted file mode 100644
index f30c7c4e0..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/alcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/alpt.png b/data/magic-m15-adventure.mse-style/spotlight/alpt.png
deleted file mode 100644
index 381b18125..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/alpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/blcard.png b/data/magic-m15-adventure.mse-style/spotlight/blcard.png
deleted file mode 100644
index 9b90d2e30..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/blcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/blcard2.png b/data/magic-m15-adventure.mse-style/spotlight/blcard2.png
deleted file mode 100644
index 915029b13..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/blcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/blpt.png b/data/magic-m15-adventure.mse-style/spotlight/blpt.png
deleted file mode 100644
index b72debbed..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/blpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/clcard.png b/data/magic-m15-adventure.mse-style/spotlight/clcard.png
deleted file mode 100644
index 6bba94663..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/clcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/clcard2.png b/data/magic-m15-adventure.mse-style/spotlight/clcard2.png
deleted file mode 100644
index f30c7c4e0..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/clcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/clpt.png b/data/magic-m15-adventure.mse-style/spotlight/clpt.png
deleted file mode 100644
index 54db8498d..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/clpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/glcard.png b/data/magic-m15-adventure.mse-style/spotlight/glcard.png
deleted file mode 100644
index ccf07ccfb..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/glcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/glcard2.png b/data/magic-m15-adventure.mse-style/spotlight/glcard2.png
deleted file mode 100644
index 76553f183..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/glcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/glpt.png b/data/magic-m15-adventure.mse-style/spotlight/glpt.png
deleted file mode 100644
index 5c1e7ed62..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/glpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/mlcard.png b/data/magic-m15-adventure.mse-style/spotlight/mlcard.png
deleted file mode 100644
index f3c93db8a..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/mlcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/mlcard2.png b/data/magic-m15-adventure.mse-style/spotlight/mlcard2.png
deleted file mode 100644
index 5ea4c7628..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/mlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/mlpt.png b/data/magic-m15-adventure.mse-style/spotlight/mlpt.png
deleted file mode 100644
index 3a037d05e..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/mlpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/rlcard.png b/data/magic-m15-adventure.mse-style/spotlight/rlcard.png
deleted file mode 100644
index 83697466e..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/rlcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/rlcard2.png b/data/magic-m15-adventure.mse-style/spotlight/rlcard2.png
deleted file mode 100644
index 0f66bfc57..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/rlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/rlpt.png b/data/magic-m15-adventure.mse-style/spotlight/rlpt.png
deleted file mode 100644
index 3119f29aa..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/rlpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/ulcard.png b/data/magic-m15-adventure.mse-style/spotlight/ulcard.png
deleted file mode 100644
index 4904efb06..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/ulcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/ulcard2.png b/data/magic-m15-adventure.mse-style/spotlight/ulcard2.png
deleted file mode 100644
index b0d9b08cb..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/ulcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/ulpt.png b/data/magic-m15-adventure.mse-style/spotlight/ulpt.png
deleted file mode 100644
index 203d6f7cc..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/ulpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/wlcard.png b/data/magic-m15-adventure.mse-style/spotlight/wlcard.png
deleted file mode 100644
index 35b48c854..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/wlcard.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/wlcard2.png b/data/magic-m15-adventure.mse-style/spotlight/wlcard2.png
deleted file mode 100644
index 7bc9166fc..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/wlcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/spotlight/wlpt.png b/data/magic-m15-adventure.mse-style/spotlight/wlpt.png
deleted file mode 100644
index 72f7ac1f4..000000000
Binary files a/data/magic-m15-adventure.mse-style/spotlight/wlpt.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/astamp.jpg b/data/magic-m15-adventure.mse-style/stamps/astamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/astamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/astamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/blstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/blstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/blstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/blstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/bstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/bstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/bstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/bstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/clstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/clstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/clstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/clstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/cstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/cstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/cstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/cstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/glstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/glstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/glstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/glstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/gstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/gstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/gstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/gstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/mlstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/mlstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/mlstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/mlstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/mstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/mstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/mstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/mstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/rlstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/rlstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/rlstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/rlstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/rstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/rstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/rstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/rstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/ulstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/ulstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/ulstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/ulstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/ustamp.jpg b/data/magic-m15-adventure.mse-style/stamps/ustamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/ustamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/ustamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/wlstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/wlstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/wlstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/wlstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/wstamp.jpg b/data/magic-m15-adventure.mse-style/stamps/wstamp.jpg
similarity index 100%
rename from data/magic-m15-adventure.mse-style/wstamp.jpg
rename to data/magic-m15-adventure.mse-style/stamps/wstamp.jpg
diff --git a/data/magic-m15-adventure.mse-style/style b/data/magic-m15-adventure.mse-style/style
index bf98ac913..29b7fd89f 100644
--- a/data/magic-m15-adventure.mse-style/style
+++ b/data/magic-m15-adventure.mse-style/style
@@ -1,12 +1,12 @@
 mse version: 2.0.0
 game: magic
-short name: M15 Adventures
-full name: After M15 Adventures
+short name: M15 Adventure
+full name: Mainframe
 icon: card-sample.png
 installer group: magic/m15 style/split cards
 position hint: 011
 
-version: 2024-01-05
+version: 2024-05-24
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -48,22 +48,99 @@ init script:
 	#Should multicolor lands with basic land types have a colored name?
 	mask_multi_land_with_color := { styling.colored_multicolor_land_name }
 	
-	template_prefix := [card: "" card2: "" card3: "reverse/" card4: "reverse/" crown: "legend/" nyx: "nyx/" spotpt: "spotlight/" spot: "spotlight/" page: "spotlight/" pt: "" stamp: "" snowtexture:"snow/" alias:"alias/" identity: "/magic-identity-new.mse-include/" identity2: "/magic-identity-new.mse-include/"]
-	template_suffix := [card: "card.jpg" card2: "card2.png" card3: "card.jpg" card4: "card2.png" crown: "crown.png" nyx: "nyx.png" spotpt: "pt.png" spot: "card.png" page: "card2.png" pt: "pt.png", stamp: "stamp.jpg" alias:"alias.png" snowtexture:"snow.png" identity: "identity.png" identity2: "identity.png"]
-	template      := { template_prefix[type] + input + template_suffix[type] }
-	land_template := { template_prefix[type] + input + (if input == "a" or type == "nyx" then "" else "l") + template_suffix[type] }
+	template_prefix := [
+		card: "cards/",
+		double_page: "double_page/",
+		single_page: "single_page/",
+		null_page: "null_page/",
+		binding: "binding/",
+		double_flat: "double_flat/",
+		single_flat: "single_flat/",
+		pt: "pts/",
+		stamp: "stamps/",
+		spot: "spotlight/",
+		spotpt: "spotlight/",
+		spotpage: "spotlight/",
+		crown: "legend/",
+		nyx: "nyx/",
+		snowtexture: "snow/",
+		alias: "alias/",
+		identity: "/magic-identity-new.mse-include/",
+		identity2: "/magic-identity-new.mse-include/"
+	]
+	template_suffix := [
+		card: "card.jpg",
+		double_page: "page.png",
+		single_page: "page.png",
+		null_page: "page.png",
+		binding: "block.jpg",
+		double_flat: "page.png",
+		single_flat: "page.png",
+		pt: "pt.png",
+		stamp: "stamp.jpg",
+		spot: "card.png",
+		spotpt: "pt.png",
+		spotpage: "card2.png",
+		crown: "crown.png",
+		nyx: "nyx.png",
+		alias: "alias.png",
+		snowtexture: "snow.png",
+		identity: "identity.png",
+		identity2: "identity.png"
+	]
+	template := { 
+		if type_name(harder_script[type] or else nil) == "function"
+			then harder_script[type](input, land:false)
+		else template_prefix[type] + input + template_suffix[type]
+	}
+	land_template := {
+		if type == "decoration" 
+			then page_decoration_template(input, land:true)
+		else template_prefix[type] + input + (if landless(type) or input == "a" then "" else "l") + template_suffix[type]
+	}
+	landless := {
+		landless_ar[input] or else false
+	}
+	landless_ar := [
+		alias: true,
+		binding: true,
+		double_flat: true,
+		double_page: true,
+		null_page: true,
+		nyx: true,
+		single_flat: true,
+		single_page: true,
+		spot: true,
+		spotpage: true,
+		spotpt: true
+	]
 	# Use land templates for previews because they show more contrast
 	hybrid_previews := "land,hybrid"
-	card_background2 := { color_background(type:"card2", base_hybrid:card_hybrid) }
-	card_background3 := { color_background(type:"card3", base_hybrid:card_hybrid) }
-	card_background4 := { color_background(type:"card4", base_hybrid:card_hybrid) }
-	spot_background := { color_background(type:"spot", base_hybrid:card_hybrid) }
-	page_background := { color_background(type:"page", base_hybrid:card_hybrid) }
-	alias_bar := { color_background(type:"alias",     base_hybrid:card_hybrid) }
-	spot_pt := { color_background(type:"spotpt", base_hybrid:card_hybrid) }
-	crown_background := { color_background(type:"crown", base_hybrid: card_hybrid)}
-	nyx_background := { color_background(type:"nyx",     base_hybrid:card_hybrid) }
-	snow_background := { color_background(type:"snowtexture",     base_hybrid:card_hybrid) }
+
+	card_background		:= { color_background(type:"card",	base_hybrid:card_hybrid, folder:"blend_masks/")		}@(offset:0 )
+	card_ptbox		:= { color_background(type:"pt",	base_hybrid:pt_hybrid, folder:"blend_masks/")			}@(offset:0 )
+	card_identity		:= { color_background(type:"identity",	base_hybrid:identity_hybrid, folder:"blend_masks/")		}@(offset:0 )
+	card_identity_2		:= { color_background(type:"identity2",	base_hybrid:identity_hybrid, folder:"blend_masks/")		}@(offset:0 )
+	card_stamp		:= { color_background(type:"stamp",	base_hybrid:stamp_hybrid, folder:"blend_masks/")		}@(offset:0 )
+
+	null_page_blend := { color_background(type:"null_page", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	single_page_blend := { color_background(type:"single_page", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	double_page_blend := { color_background(type:"double_page", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	binding_background := { color_background(type:"binding", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	double_flat_page_blend := { color_background(type:"double_flat", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	single_flat_page_blend := { color_background(type:"single_flat", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	page_spread_blend := { color_background(type:"pages", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	decoration_background := { color_background(type:"decoration", base_hybrid:card_hybrid, folder:"blend_masks/")}
+
+	spot_background := { color_background(type:"spot", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	spot_page_background := { color_background(type:"spotpage", base_hybrid:card_hybrid, folder:"blend_masks/") }
+	spot_pt := { color_background(type:"spotpt", base_hybrid:card_hybrid, folder:"blend_masks/") }
+
+	alias_bar := { color_background(type:"alias",     base_hybrid:card_hybrid, folder:"blend_masks/") }
+	crown_background := { color_background(type:"crown", base_hybrid: card_hybrid, folder:"blend_masks/")}
+	nyx_background := { color_background(type:"nyx",     base_hybrid:card_hybrid, folder:"blend_masks/") }
+	snow_background := { color_background(type:"snowtexture",     base_hybrid:card_hybrid, folder:"blend_masks/") }
+
 	# Use the normal tap symbol
 	mana_t := {
 		if      styling.tap_symbol == "old"        then "old"
@@ -106,196 +183,242 @@ init script:
 	chop_correction2 := { 0 }
 	is_unsorted := {styling.remove_from_autocount}
 	
-	shrink_type := {if styling.shrink_typeline_text != "" then to_int((if comma_count(styling.shrink_typeline_text) == "" then styling.shrink_typeline_text else split_text(match:",", styling.shrink_typeline_text).0)) else 0 }
-	shrink_name := {if styling.shrink_name_text != "" then to_int((if comma_count(styling.shrink_name_text) == "" then styling.shrink_name_text else split_text(match:",", styling.shrink_name_text).0)) else 0 }
-	shrink_type2 := {if styling.shrink_typeline_text != "" then to_int((if comma_count(styling.shrink_typeline_text) != "" then split_text(match:",", styling.shrink_typeline_text).1)) else 0 }
-	shrink_name2 := {if styling.shrink_name_text != "" then to_int((if comma_count(styling.shrink_name_text) != "" then split_text(match:",", styling.shrink_name_text).1)) else 0 }
+	shrink_type := {if styling.shrink_typeline_text != "" then to_number((if comma_count(styling.shrink_typeline_text) == "" then styling.shrink_typeline_text else split_text(match:",", styling.shrink_typeline_text).0)) else 0 }
+	shrink_name := {if styling.shrink_name_text != "" then to_number((if comma_count(styling.shrink_name_text) == "" then styling.shrink_name_text else split_text(match:",", styling.shrink_name_text).0)) else 0 }
+	shrink_type2 := {if styling.shrink_typeline_text != "" then to_number((if comma_count(styling.shrink_typeline_text) != "" then split_text(match:",", styling.shrink_typeline_text).1)) else 0 }
+	shrink_name2 := {if styling.shrink_name_text != "" then to_number((if comma_count(styling.shrink_name_text) != "" then split_text(match:",", styling.shrink_name_text).1)) else 0 }
 	use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")}
 	un_png := replace@(match:".png", replace: "")
 	use_evobar := {contains(styling.other_options, match:"pokemon evobar")}
 	is_skinned := {contains(styling.other_options, match:"godzilla style alias")}
 
 	card_shape := {"adventure"}
-	
-	# alternate rarity color
-	alt_rarity := {styling.alt_rarity_color}
-	
+
 	### Customize fonts
-	swap_font := {styling.apply_custom_fonts}
-	name_font := {
-		swap_font_name(
-			src:styling.custom_name_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	name_font_size := {
-		swap_font_size(
-			src:styling.custom_name_font, 
-			font_size: 16
-		) - shrink_name()
-	}
-	name_font_color := {
-		swap_font_color(
-			src: styling.custom_name_font,
-			font_color: "black"
-		)
-	}
-	name_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_name_font
-		)
-	}
-	name_font_italic := {
-		swap_font_italic(
-			src: styling.custom_name_font
-		)
-	}
+	swap_fonts_name2_default := [
+		name: {"Beleren Bold"},
+		size: {12},
+		color: {"white"},
+		vertical: {0},
+		italic: {""}
+	]
+	swap_fonts_type2_default := [
+		name: {"Beleren Bold"},
+		size: {11},
+		color: {"white"},
+		vertical: {0},
+		italic: {""}
+	]
+	swap_fonts_pt_default := [
+		name: {"Beleren Bold"},
+		size: {16},
+		color: {if is_vehicle() then "white" else "black"},
+		vertical: {0},
+		italic: {""}
+	]
 	
-	name2_font := {
-		swap_font_name(
-			src:styling.custom_name_2_font, 
-			font_name: "Beleren Bold"
+	page_decoration_template := {
+		src := "/magic-mainframe-extras.mse-include/"
+		str := styling.page_decoration
+		if not contains(str, match:".png") then (
+			src := ""
+			str := ""
 		)
-	}
-	name2_font_size := {
-		swap_font_size(
-			src:styling.custom_name_2_font, 
-			font_size: 12
-		) - shrink_name2()
-	}
-	name2_font_color := {
-		swap_font_color(
-			src: styling.custom_name_2_font,
-			font_color: "white"
-		)
-	}
-	name2_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_name_2_font
-		)
-	}
-	name2_font_italic := {
-		swap_font_italic(
-			src: styling.custom_name_2_font
-		)
-	}
-	
-	type_font := {
-		swap_font_name(
-			src:styling.custom_type_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	type_font_size := {
-		swap_font_size(
-			src:styling.custom_type_font, 
-			font_size: 13
-		) - shrink_type()
-	}
-	type_font_color := {
-		swap_font_color(
-			src: styling.custom_type_font,
-			font_color: "black"
-		)
-	}
-	type_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_type_font
-		)
-	}
-	type_font_italic := {
-		swap_font_italic(
-			src: styling.custom_type_font
-		)
-	}
-	
-	type2_font := {
-		swap_font_name(
-			src:styling.custom_type_2_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	type2_font_size := {
-		swap_font_size(
-			src:styling.custom_type_2_font, 
-			font_size: 11
-		) - shrink_type2()
-	}
-	type2_font_color := {
-		swap_font_color(
-			src: styling.custom_type_2_font,
-			font_color: "white"
-		)
-	}
-	type2_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_type_2_font
-		)
-	}
-	type2_font_italic := {
-		swap_font_italic(
-			src: styling.custom_type_2_font
-		)
-	}
-	
-	body_font := {
-		swap_font_name(
-			src:styling.custom_body_font, 
-			font_name: "MPlantin"
-		)
-	}
-	body_font_size := {
-		swap_font_size(
-			src:styling.custom_body_font, 
-			font_size: 13
-		)
-	}
-	body_font_color := {
-		swap_font_color(
-			src: styling.custom_body_font,
-			font_color: "black"
-		)
-	}
-	body_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_body_font
-		)
-	}
-	body_font_italic := {
-		swap_font_italic(
-			src: styling.custom_body_font
-		)
-	}
 
-	pt_font := {
-		swap_font_name(
-			src:styling.custom_pt_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	pt_font_size := {
-		swap_font_size(
-			src:styling.custom_pt_font, 
-			font_size: 16
-		)
-	}
-	pt_font_color := {
-		swap_font_color(
-			src: styling.custom_pt_font,
-			font_color: if is_vehicle() then "white" else "black"
-		)
-	}
-	pt_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_pt_font
-		)
-	}
-	pt_font_italic := {
-		swap_font_italic(
-			src: styling.custom_pt_font
+		c := ""
+		pt := ""
+		l := ""
+		
+		if contains(str, match:";color") then c := input
+			
+		if contains(str, match:";pt")
+		and (right_name() and card.pt != "") then pt := "_pt";
+		
+		if land and contains(str, match:";land") then l := "l"
+		
+		replace(
+			str,
+			match:"([^;]*/)?([^/;]+)([.]png)(;.+)?",
+			replace:{src + _1 + c + l + _2 + pt + _3}
 		)
 	}
+	
+	page_script := {
+		flip := if input == "none"
+			then false
+		else if input == "blank page" then
+			if side == "left" then true else false
+		else if side == "right" then
+			true
+		else false;
 
+		adj_color := if flip then color + ", reversed" else color
+
+		img := case input of
+			"name and type page": double_page_blend(adj_color),
+			"name page": single_page_blend(adj_color),
+			"blank page": null_page_blend(adj_color),
+			"name and type flat": mask_dblflat(double_flat_page_blend(adj_color)),
+			"name flat": mask_sngflat(single_flat_page_blend(adj_color)),
+			else: "";
+
+		if flip then flip_horizontal(img) else img
+	}
+	mask_dblflat := {
+		if no_divider() then
+			set_mask(image: input, mask:"double_mask.png")
+		else input
+	}
+	mask_sngflat := {
+		if no_divider() then
+			set_mask(image:input, mask:"single_mask.png")
+		else input
+	}
+	named_page := contains@(match:"name")
+	left_name := {
+		style_check := if is_spot() then "name and type page" else if is_reversed() then styling.right_style else styling.left_style
+		named_page(style_check)
+	}
+	right_name := {
+		style_check := if is_spot() then "none" else if is_reversed() then styling.left_style else styling.right_style
+		named_page(style_check)
+	}
+	left_page_img := {
+		page_script(
+			if is_spot() then "name and type page" else if is_reversed() then styling.right_style else styling.left_style,
+			color: (if left_name() then card.card_color_2 else card.card_color),
+			side: "left"
+		)
+	}
+	right_page_img := {
+		page_script(
+			if is_spot() then "none" else if is_reversed() then styling.left_style else styling.right_style,
+			color: (if right_name() then (if left_name() then card.card_color_3 else card.card_color_2) else card.card_color),
+			side: "right"
+		)
+	}
+	
+	page_1_side := {
+		## the main text of the card
+		## two pages, gone
+		## left side page, on the right
+		## right side page or no pages, on the left
+		if left_name() and right_name() then "none"
+		else if left_name() then "right"
+		else "left"
+	}
+	page_2_side := {
+		## the adventure text of the card
+		## two pages, left (check reverse)
+		## left side page, left
+		## right side page, right
+		## no pages, gone
+		if left_name() and right_name() then
+			if is_reversed() then "right" else "left"
+		else if left_name() then "left"
+		else if right_name() then "right"
+		else "none"
+	}
+	page_3_side := {
+		## the second adventure text of the card
+		## two pages, right (check reverse)
+		## else, gone
+		if left_name() and right_name() then
+			if is_reversed() then "left" else "right"
+		else if left_name() == right_name() then
+			if is_reversed() then "left" else "right"
+		else "none"
+	}
+	
+	reverser := ["left":"right", "right":"left"]
+	page_style := {
+		str := if input == "none" then ""
+			else if is_reversed() then styling[reverser[input] + "_style"]
+			else styling[input + "_style"]
+			
+		if is_spot() then
+			"double"
+		else if contains(str, match:"type") then
+			"double"
+		else if contains(str, match:"name") then
+			"single"
+		else "null"
+	}
+	page_flat := {
+		str := if input == "none" then ""
+			else if is_reversed() then styling[reverser[input] + "_style"]
+			else styling[input + "_style"]
+			
+		if is_spot() then false else contains(str, match:"flat")
+	}
+	page_1_flat := {page_flat(page_1_side())}
+	page_2_flat := {page_flat(page_2_side())}
+	page_3_flat := {page_flat(page_3_side())}
+	page_top := [
+		"double": 375,
+		"single": 358,
+		"null": 332
+	]
+	page_1_top := {page_top[page_style(page_1_side())]}
+	page_2_top := {page_top[page_style(page_2_side())]}
+	page_3_top := {page_top[page_style(page_3_side())]}
+	page_coords := [
+		"left": [
+			"page": 18,
+			"name_left": 32,
+			"name_right": 178,
+			"cost": 180,
+			"type": 32,
+			"text": 27,
+			"decoration": 0,
+			"flavor bar": 10,
+			"watermark": 20,
+			"spot_watermark": 30
+		],
+		"right": [
+			"page": 188,
+			"name_left": 197,
+			"name_right": 28,
+			"cost": 345,
+			"type": 197,
+			"text": 190,
+			"decoration": 175,
+			"flavor bar": 175
+			"watermark": 188,
+			"spot_watermark": 195
+		],
+		"none": [
+			"page": 500,
+			"name_left": 500,
+			"name_right": -10,
+			"cost": 500,
+			"type": 500,
+			"text": 500,
+			"decoration": 500,
+			"flavor bar": 500
+			"watermark": 500,
+			"spot_watermark": 500
+		]
+	]
+	
+	no_divider := {chosen(styling.other_options, choice:"no flat page divider")}
+	
+	custom_border_image := {
+		src := styling.custom_border_source
+		ps := split_text(src, match:"-color-")
+		if length(ps) > 1 then
+			"/magic-mainframe-extras.mse-include/" + ps[0] + input + (if land then "l" else "") + ps[1]
+		else
+			"/magic-mainframe-extras.mse-include/" + src
+	}
+	custom_border_blend := { color_background(type:"custom_border",     base_hybrid:card_hybrid, folder:"blend_masks/") }
+	is_custom := {contains(styling.frames, match:"custom border") and contains(styling.custom_border_source, match:".png")}
+
+	# this goes at the very end
+	harder_script := [
+		custom_border: custom_border_image,
+		decoration: page_decoration_template
+	]
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -331,6 +454,11 @@ styling field:
 	choice: nyx
 	choice: vehicle
 	choice: snow
+	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
@@ -346,6 +474,33 @@ styling field:
 	choice: godzilla style alias
 	choice: pokemon evobar
 	choice: prerelease stamp
+	choice: no flat page divider
+styling field:
+	type: choice
+	name: left style
+	description: Choose the type of the page section.
+	choice: name and type page
+	choice: name page
+	choice: blank page
+	choice: name and type flat
+	choice: name flat
+	choice: none
+	initial: name and type page
+styling field:
+	type: choice
+	name: right style
+	description: Choose the type of the page section.
+	choice: name and type page
+	choice: name page
+	choice: blank page
+	choice: name and type flat
+	choice: name flat
+	choice: none
+	initial: blank page
+styling field:
+	type: text
+	name: page decoration
+	description: Image link from magic-mainframe-extras to layer over the adventure. Add ";color" for color dependent or ";pt" for pt dependent.
 styling field:
 	type: boolean
 	name: remove from autocount
@@ -498,19 +653,28 @@ card style:
 		top:	0
 		width:	375
 		height:	523
-		z index: 0
+		z index: -1
 		render style: image
 		popup style: in place
-		image: { if is_spot() then spot_background() else if is_reversed() then card_background3() else card_background() }
+		image: { if is_spot() then spot_background() else card_background() }
 	card color 2:
-		left:	{if is_spot() then 21 else if is_reversed() then 187 else 20}
+		left:	{if is_spot() then 21 else page_coords[page_2_side()]["page"]}
 		top:	{if is_spot() then 319 else 327}
-		width:	{if is_spot() then 170 else 169}
-		height:	{if is_spot() then 170 else 155}
-		z index: 0
+		width:	170
+		height:	{if is_spot() then 170 else 156.5}
+		z index: 1
 		render style: image
 		popup style: in place
-		image: { if is_spot() then page_background() else if is_reversed() then card_background4() else card_background2() }
+		image: { if is_spot() then spot_page_background() else if left_name() then left_page_img() else right_page_img() }
+	card color 3:
+		left: {page_coords[page_3_side()]["page"]}
+		top: 327
+		width: 170
+		height: 156.5
+		z index: 1
+		render style: image
+		image: {right_page_img()}
+		visible: {left_name() and right_name()}
 	############################# Name line
 	name:
 		left: { (if is_spot() then 22 else 0) + (if card.card_symbol=="none" then 32 else 50) }
@@ -526,9 +690,9 @@ card style:
 			size: { name_font_size() }
 			color: { name_font_color() }
 	name 2:
-		left: { if is_reversed() then 197 else 32}
-		top: { 328 + (if is_spot() then 2 else 0)+ name2_font_vertical()}
-		right: { (if is_reversed() then 28 else 178) - card_style.casting_cost_2.content_width }
+		left: { page_coords[page_2_side()]["name_left"] }
+		top: { (if is_spot() or not page_2_flat() then 330 else 328) + (if is_spot() then 2 else 0)+ name2_font_vertical()}
+		right: { page_coords[page_2_side()]["name_right"] - card_style.casting_cost_2.content_width }
 		height: { 20 - shrink_name2() }
 		alignment: bottom shrink-overflow
 		z index: 2
@@ -537,6 +701,18 @@ card style:
 			italic name: { name2_font_italic() }
 			size: { name2_font_size() }
 			color: { name2_font_color() }
+	name 3:
+		left: { page_coords[page_3_side()]["name_left"] }
+		top: { (if is_spot() or not page_3_flat() then 330 else 328) + (if is_spot() then 2 else 0)+ name2_font_vertical()}
+		right: { page_coords[page_3_side()]["name_right"] - card_style.casting_cost_3.content_width }
+		height: {if page_style(page_3_side()) == "null" then 0 else 20 - shrink_name2() }
+		alignment: bottom shrink-overflow
+		z index: 2
+		font:
+			name: { name2_font() }
+			italic name: { name2_font_italic() }
+			size: { name2_font_size() }
+			color: { name2_font_color() }
 	alias: 
 		left: {if is_skinned() then 45 else 33}
 		top: 53
@@ -568,8 +744,8 @@ card style:
 		z index: 2
 		padding top: 0
 	casting cost 2:
-		right: {if is_reversed() then 345 else 180}
-		top: { if is_spot() then 330 else 328}
+		right: {page_coords[page_2_side()]["cost"]}
+		top: { if is_spot() then 330 else if page_2_flat() then 328 else 329}
 		width: { max(30, card_style.casting_cost_2.content_width) + 5 }
 		height: 23
 		alignment: middle right
@@ -580,6 +756,19 @@ card style:
 		always symbol: true
 		z index: 2
 		padding top: 0
+	casting cost 3:
+		right: {page_coords[page_3_side()]["cost"]}
+		top: { if is_spot() then 330 else if page_3_flat() then 328 else 329}
+		width: { max(30, card_style.casting_cost_3.content_width) + 5 }
+		height: {if page_style(page_3_side()) == "null" then 0 else 23}
+		alignment: middle right
+		symbol font:
+			name: magic-mana-large
+			size: 12
+			alignment: middle right
+		always symbol: true
+		z index: 2
+		padding top: 0
 	card symbol:
 		left: {if card.card_symbol=="none" then 20 else 30}
 		top: 29
@@ -610,7 +799,7 @@ card style:
 		image: { card_identity() }
 	type:
 		left: { (if is_spot() then 50 else 0) + (if has_identity() then (if is_spot() then 50 else 52) else 32) }
-		top: { shrink_type() + if is_spot() then 298 else 296}
+		top: { shrink_type() + type_font_vertical() + if is_spot() then 298 else 296}
 		width: { (if has_identity() then "290" else "310") - rare_width() - (if is_spot() then 73 else 0) }
 		height: { 20 - shrink_type() }
 		alignment: { if is_spot() then "top center shrink-overflow" else "top shrink-overflow"}
@@ -632,10 +821,24 @@ card style:
 		visible: {has_identity2()}
 		image: {card_identity_2()}
 	type 2:
-		left: {(if is_reversed() then 197 else 32) + (if has_identity2() then 20 else 0)}
-		top: {shrink_type2() + 352 + (if is_spot() then 1 else 0)}
+		left: {page_coords[page_2_side()]["type"] + (if has_identity2() then 20 else 0)}
+		top: {shrink_type2() + (if is_spot() or not page_2_flat() then 353 else 352)}
 		width: {155 - (if has_identity2() then 20 else 0)}
-		height: { 20 - shrink_type2() }
+		height: { if page_style(page_2_side()) == "double" then 20 - shrink_type2() else 0}
+		alignment: top shrink-overflow
+		z index: 1
+		padding top: 2
+		font:
+			name: { type2_font() }
+			italic name: { type2_font_italic() }
+			size: { type2_font_size() }
+			color: { type2_font_color() }
+			separator color: red
+	type 3:
+		left: {page_coords[page_3_side()]["type"] + (if has_identity2() then 20 else 0)}
+		top: {shrink_type2() + (if is_spot() or not page_3_flat() then 353 else 352)}
+		width: {155 - (if has_identity2() then 20 else 0)}
+		height: { if page_style(page_3_side()) == "double" then 20 - shrink_type2() else 0 }
 		alignment: top shrink-overflow
 		z index: 1
 		padding top: 2
@@ -693,9 +896,9 @@ card style:
 					else symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
 	############################# Text box
 	text:
-		left: {if is_reversed() then 27 else 200}
-		top: { 328 + to_int(chop_top()) + body_font_vertical() }
-		width: {if is_reversed() then 157 else 143}
+		left: {page_coords[page_1_side()]["text"]}
+		top: { (if is_spot() then 335 else page_1_top()) + to_int(chop_top()) + body_font_vertical() }
+		width: {if is_spot() then 157 else if page_style(page_1_side()) == "null" then 157 else 143}
 		bottom: { (if is_spot() then 464 else 481) - to_int(chop_bot()) }
 		font:
 			name: { body_font() }
@@ -724,9 +927,9 @@ card style:
 		line height hard max: {if is_modal(card.rule_text) then 1.0 else 1.3 }
 		line height line max: 1.6
 	text 2:
-		left: {if is_reversed() then 190 else 29}
-		top: { 375 + to_int(back_chop_top()) + body_font_vertical()}
-		width: 157
+		left: {page_coords[page_2_side()]["text"]}
+		top: { page_2_top() + to_int(back_chop_top()) + body_font_vertical()}
+		width: {if is_spot() then 157 else if page_style(page_1_side()) == "null" then 157 else 143}
 		bottom: { (if is_spot() then 464 else 481) - to_int(back_chop_bot()) }
 		font:
 			name: { body_font() }
@@ -754,21 +957,52 @@ card style:
 		line height soft: 0.9
 		line height hard max: {if is_modal(card.rule_text_2) then 1.0 else 1.3 }
 		line height line max: 1.6
+	text 3:
+		left: {page_coords[page_3_side()]["text"]}
+		top: { page_3_top() + to_int(chop_top()) + body_font_vertical() }
+		width: {if page_style(page_1_side()) == "null" then 157 else 143}
+		bottom: { (if is_spot() then 464 else 481) - to_int(chop_bot()) }
+		font:
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
+			scale down to: 6
+			color: { body_font_color() }
+		symbol font:
+			name: { styling.text_box_mana_symbols }
+			size: 13
+		alignment:
+			script:
+				if (styling.center_text == "short text only" and
+				   not contains(match:"\n", card.rule_text) and
+				   card.flavor_text == "<i-flavor></i-flavor>" and
+				   card_style.text.content_lines <= 2) or
+				   styling.center_text == "always"
+				then "middle center"
+				else "middle left"
+		z index: 2
+		padding left:   6
+		padding right:  4
+		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
+		line height line: 1.5
+		line height soft: 0.9
+		line height hard max: {if is_modal(card.rule_text) then 1.0 else 1.3 }
+		line height line max: 1.6
 	watermark:
-		left: { if is_reversed() then (if is_spot() then 30 else 20) else if is_spot() then 195 else 188}
-		top: { if is_spot() then 340 else 328}
+		left: { min(page_coords[page_1_side()][(if is_spot() then "spot_watermark" else "watermark")], page_coords[page_3_side()][(if is_spot() then "spot_watermark" else "watermark")]) }
+		top: { if is_spot() then 330 else max(page_1_top(), page_3_top()) }
 		width: { if is_spot() then 150 else 168}
-		height: { if is_spot() then 130 else 153 }
+		bottom: {if is_spot() then 470 else 481}
 		z index: 1
 		render style: image
 		popup style: in place
 		alignment: middle center
 		include file: /magic-watermarks.mse-include/watermarks
 	watermark 2:
-		left: { if is_reversed() then (if is_spot() then 195 else 188) else if is_spot() then 30 else 20}
-		top: { if is_spot() then 380 else 375}
+		left: { min(page_coords[page_2_side()][(if is_spot() then "spot_watermark" else "watermark")], page_coords[page_3_side()][(if is_spot() then "spot_watermark" else "watermark")]) }
+		top: { page_2_top() }
 		width: { if is_spot() then 154 else 167}
-		height: { if is_spot() then 88 else 108}
+		bottom: {if is_spot() then 470 else 481}
 		z index: 1
 		render style: image
 		popup style: in place
@@ -823,16 +1057,50 @@ card style:
 			size: 7
 			color: white
 			weight: bold
+	partition select:
+		left: 24
+		top: 488
+		width: {if not use_auto_numbers() then 0 else if contains(set.card_number_style, match:"/0") then 50 else 35}
+		height: 10
+		z index: 3
+		render style: hidden
+
 ############################################################## Extra card fields
+extra card field:
+	type: choice
+	name: color page
+	script: card.card_color
+	save value: false
+	editable: false
+extra card field:
+	type: choice
+	name: backup page
+	script: card.card_color
+	save value: false
+	editable: false
+extra card field:
+	type: choice
+	name: left decoration
+	script: card.card_color_2
+	save value: false
+	editable: false
+extra card field:
+	type: choice
+	name: right decoration
+	script: if left_name() then card.card_color_3 else card.card_color_2
+	save value: false
+	editable: false
+extra card field:
+	type: choice
+	name: binding
+	script: card.card_color
+	save value: false
+	editable: false
 extra card field:
 	type: text
 	name: card code
 	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
+	script: card_number_script_core()
 extra card field:
 	type: choice
 	name: artist arrow
@@ -906,6 +1174,12 @@ extra card field:
 	editable: false
 	save value: false
 	show statistics: false
+extra card field:
+	type: choice
+	name: custom overlay
+	choice: car door
+	save value: false
+	editable: false
 extra card field:
 	type: choice
 	name: nyx overlay
@@ -958,6 +1232,33 @@ extra card field:
 	save value: true
 	editable: true
 extra card style:
+	color page:
+		left: {page_coords[page_1_side()]["page"]}
+		top: 327
+		width: 170
+		height: 156.5
+		z index: 1
+		render style: image
+		image: {if not left_name() then left_page_img() else right_page_img()}
+		visible: {not (left_name() and right_name())}
+	backup page:
+		left: {page_coords[page_3_side()]["page"]}
+		top: 327
+		width: 170
+		height: 156.5
+		z index: 1
+		render style: image
+		image: {right_page_img()}
+		visible: {not left_name() and not right_name()}
+	binding:
+		left: {if (styling.left_style == "none" and not is_reversed()) or (styling.right_style == "none" and is_reversed()) then 188 else 28 }
+		top: 326
+		width: {if styling.left_style == "none" or styling.right_style == "none" then 160 else 321}
+		height:{if is_spot() then 0 else 10}
+		render style: image
+		z index: -1
+		image: {binding_background()}
+		visible: {not (styling.left_style == "none" and styling.right_style == "none")}
 	card code:
 		left: 24
 		top: 488
@@ -996,13 +1297,13 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		image: { if is_spot() then spot_pt() else if is_vehicle() then "vpt.png" else card_ptbox() }
+		image: { if is_spot() then spot_pt() else if is_vehicle() then "pts/vpt.png" else card_ptbox() }
 	stamp:
 		left: 165
 		top: 472
 		width: 46
 		height: 26
-		z index: 1
+		z index: 5
 		render style: image
 		image: { card_stamp() }
 		mask: { if is_spot() then "spotmask.jpg" else "stampmask.jpg"}
@@ -1012,7 +1313,7 @@ extra card style:
 		top: 472
 		width: 46
 		height: 26
-		z index: 1
+		z index: 5
 		visible: { is_rare() and styling.use_holofoil_stamps }
 		render style: image
 		image: foil_stamp.png
@@ -1026,7 +1327,7 @@ extra card style:
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
 		mask: { if is_rare() then "foil_mask_rare.png" else "foil_mask.png" }
 	flavor bar:
-		left: { if is_reversed() then 10 else 175}
+		left: { page_coords[page_1_side()]["flavor bar"]}
 		top: { bar_equation() }
 		width: 188
 		height: 1
@@ -1035,7 +1336,7 @@ extra card style:
 		image: bar.png
 		visible: { card.rule_text != "" and remove_tags(card.flavor_text) != "" and set.use_flavor_bar }
 	flavor bar 2:
-		left: {if is_reversed() then 175 else 10}
+		left: {page_coords[page_2_side()]["flavor bar"]}
 		top: { bar_equation2() }
 		width: 188
 		height: 1
@@ -1061,6 +1362,16 @@ extra card style:
 		image: {"voverlay.png" }
 		z index: 0
 		visible: {is_vehicle()}
+	custom overlay:
+		left: 0
+		top: 0
+		width: 375
+		height: 523
+		render style: image
+		image: { custom_border_blend() }
+		z index: 0
+		visible: {is_custom()}
+		mask: {(if is_vehicle() or is_snow() or is_nyx() then "double_") + "frame_border_mask.png"}
 	nyx overlay:
 		left: 0
 		top: 0
@@ -1070,7 +1381,7 @@ extra card style:
 		image: {nyx_background()}
 		z index: 0
 		visible: {is_nyx()}
-		mask: {"nyx/" + (if is_vehicle() or is_snow() then "v_") + "mask.png"}
+		mask: {(if is_vehicle() or is_snow() then "double_") + "frame_border_mask.png"}
 	snow overlay:
 		left: 0
 		top: 0
@@ -1080,7 +1391,7 @@ extra card style:
 		image: {snow_background()}
 		z index: 0
 		visible: {is_snow()}
-		mask: {"snow/snow_mask.png"}
+		mask: {"frame_border_mask.png"}
 	evobar:
 		left: 27
 		top: 57
@@ -1140,4 +1451,22 @@ extra card style:
 		render style: image
 		choice images:
 			the list: /magic-mainframe-extras.mse-include/mfsfiles/list.png
+		z index: 1
+	left decoration:
+		left: {page_coords["left"]["decoration"]}
+		top: 293
+		width: 200
+		height: 230
 		z index: 4
+		render style: image
+		image: {decoration_background()}
+		visible: {left_name()}
+	right decoration:
+		left: {page_coords["right"]["decoration"]}
+		top: 293
+		width: 200
+		height: 230
+		z index: 4
+		render style: image
+		image: {decoration_background()}
+		visible: {right_name()}
diff --git a/data/magic-m15-adventure.mse-style/tale_mask.jpg b/data/magic-m15-adventure.mse-style/tale_mask.jpg
new file mode 100644
index 000000000..daa8c27ff
Binary files /dev/null and b/data/magic-m15-adventure.mse-style/tale_mask.jpg differ
diff --git a/data/magic-m15-adventure.mse-style/ucard.jpg b/data/magic-m15-adventure.mse-style/ucard.jpg
deleted file mode 100644
index d431572b7..000000000
Binary files a/data/magic-m15-adventure.mse-style/ucard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/ucard2.png b/data/magic-m15-adventure.mse-style/ucard2.png
deleted file mode 100644
index a5092de17..000000000
Binary files a/data/magic-m15-adventure.mse-style/ucard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/ulcard.jpg b/data/magic-m15-adventure.mse-style/ulcard.jpg
deleted file mode 100644
index abb9e1af4..000000000
Binary files a/data/magic-m15-adventure.mse-style/ulcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/ulcard2.png b/data/magic-m15-adventure.mse-style/ulcard2.png
deleted file mode 100644
index 8df61475c..000000000
Binary files a/data/magic-m15-adventure.mse-style/ulcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/voverlay.png b/data/magic-m15-adventure.mse-style/voverlay.png
index 55269308c..bfca25453 100644
Binary files a/data/magic-m15-adventure.mse-style/voverlay.png and b/data/magic-m15-adventure.mse-style/voverlay.png differ
diff --git a/data/magic-m15-adventure.mse-style/wcard.jpg b/data/magic-m15-adventure.mse-style/wcard.jpg
deleted file mode 100644
index d77e294c7..000000000
Binary files a/data/magic-m15-adventure.mse-style/wcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/wcard2.png b/data/magic-m15-adventure.mse-style/wcard2.png
deleted file mode 100644
index 8986c8da1..000000000
Binary files a/data/magic-m15-adventure.mse-style/wcard2.png and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/wlcard.jpg b/data/magic-m15-adventure.mse-style/wlcard.jpg
deleted file mode 100644
index 12c5fcbce..000000000
Binary files a/data/magic-m15-adventure.mse-style/wlcard.jpg and /dev/null differ
diff --git a/data/magic-m15-adventure.mse-style/wlcard2.png b/data/magic-m15-adventure.mse-style/wlcard2.png
deleted file mode 100644
index dd9253d62..000000000
Binary files a/data/magic-m15-adventure.mse-style/wlcard2.png and /dev/null differ
diff --git a/data/magic-m15-altered.mse-style/artifact_blend_custom_border.png b/data/magic-m15-altered.mse-style/artifact_blend_custom_border.png
new file mode 100644
index 000000000..350da1644
Binary files /dev/null and b/data/magic-m15-altered.mse-style/artifact_blend_custom_border.png differ
diff --git a/data/magic-m15-altered.mse-style/hybrid_blend_custom_border.png b/data/magic-m15-altered.mse-style/hybrid_blend_custom_border.png
new file mode 100644
index 000000000..5d72dec02
Binary files /dev/null and b/data/magic-m15-altered.mse-style/hybrid_blend_custom_border.png differ
diff --git a/data/magic-m15-altered.mse-style/multicolor_blend_custom_border.png b/data/magic-m15-altered.mse-style/multicolor_blend_custom_border.png
new file mode 100644
index 000000000..350da1644
Binary files /dev/null and b/data/magic-m15-altered.mse-style/multicolor_blend_custom_border.png differ
diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style
index 5ee2b6574..79215ed88 100644
--- a/data/magic-m15-altered.mse-style/style
+++ b/data/magic-m15-altered.mse-style/style
@@ -57,8 +57,9 @@ init script:
 	shifted_template_prefix := [card: "shifted/" alias: "shifted/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "shifted/"  node:"shifted/" promo: "promo/" crown: "shifted/" cons:"conspiracy/" curtain: "curtains/" fnm:"fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "shifted/", slide: "shifted/", slide2: "shifted/", slide3: "shifted/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "shifted/" identity: "/magic-identity-new.mse-include/", puma: "puma/shifted/"]
 	template_prefix := { if type == "miracle" and pure_snow() then [miracle:"snow/"] else if is_shifted() then shifted_template_prefix else base_template_prefix }
 	template_suffix := [card: "card.jpg"  node:"node.png" alias:"alias.png" devoid:"card.png" snow:"card.jpg" snowtexture:"snow.png" nyx: "nyx.png" miracle: "miracle.png" promo: "card.jpg" crown: "crown.png" cons:"cons.png" curtain: "card.png" fnm:"card.png", fnmpt: "pt.png", inverted: "card.png", invertedpt: "pt.png", map: "card.png", energy: "card.png", mappt: "pt.png" pt: "pt.png", slide: "slide.png", slide2: "slide2.png", slide3: "slide3.png", stamp: "stamp.jpg", arrow: "arrow.png", arrow2: "arrow2.png", arrow3: "arrow3.png", season: "flag.png" identity: "identity.png", puma: "puma.png"]
-	template      := { crown_lead(type) + template_prefix()[type] + input + crown_follow(type) + template_suffix[type] }
-	land_template := { crown_lead(type) + template_prefix()[type] + (if input == "a" then "c" else input) + (if landless(type) then "" else "l") + crown_follow(type) + template_suffix[type] }
+	
+	template      := { if type_name(harder_script[type] or else nil) == "function" then harder_script[type](input, land:false) else crown_lead(type) + template_prefix()[type] + input + crown_follow(type) + template_suffix[type] }
+	land_template := { if type_name(harder_script[type] or else nil) == "function" then harder_script[type](input, land:true) else crown_lead(type) + template_prefix()[type] + (if input == "a" then "c" else input) + (if landless(type) then "" else "l") + crown_follow(type) + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
 	hybrid_previews := "land,hybrid"
 
@@ -107,6 +108,7 @@ init script:
 	background_slide_2 := { color_background(type:"slide2", base_hybrid: card_hybrid)}
 	background_slide_3 := { color_background(type:"slide3", base_hybrid: card_hybrid)}
 	season_background := { color_background(type:"season",     base_hybrid:card_hybrid) }
+	custom_border_blend := { color_background(type:"custom_border",     base_hybrid:card_hybrid) }
 	# Use the normal tap symbol
 	mana_t := {
 		if      styling.tap_symbol == "old"        then "old"
@@ -197,8 +199,6 @@ init script:
 
 	center_map := {is_map() and (card.casting_cost == "" or chosen(styling.other_options, choice:"always center map names"))}
 	use_evobar := {chosen(styling.other_options, choice:"pokemon evobar")}
-	# alternate rarity color
-	alt_rarity := {styling.alt_rarity_color}
 
 	is_skinned := {chosen(styling.other_options, choice:"godzilla style alias")}
 	use_vorthos := {((not is_leveler() or lone_pt()) and card.pt != "") or chosen(styling.other_options, choice:"vorthos box")}
@@ -266,101 +266,39 @@ init script:
 	}
 	
 	### Customize fonts
-	swap_font := {styling.apply_custom_fonts}
-	name_font := {
-		swap_font_name(
-			src:styling.custom_name_font, 
-			font_name: if is_map() then "Beleren Small Caps" else "Beleren Bold"
-		)
-	}
-	name_font_size := {
-		swap_font_size(
-			src:styling.custom_name_font, 
-			font_size: if is_map() then 14.8 else 16
-		) - shrink_name()
-	}
-	name_font_color := {
-		swap_font_color(
-			src: styling.custom_name_font,
-			font_color: if is_shifted() or is_fnm() or is_inverted() then "white" else "black"
-		)
-	}
-	name_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_name_font
-		)
-	}
-	name_font_italic := {
-		swap_font_italic(
-			src: styling.custom_name_font
-		)
-	}
-	
-	type_font := {
-		swap_font_name(
-			src:styling.custom_type_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	type_font_size := {
-		swap_font_size(
-			src:styling.custom_type_font, 
-			font_size: if is_map() then 12 else 13
-		) - shrink_type()
-	}
-	type_font_color := {
-		swap_font_color(
-			src: styling.custom_type_font,
-			font_color: if is_full_art() or is_puma() or is_shifted() or is_fnm() or is_inverted() then "white" else "black"
-		)
-	}
-	type_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_type_font
-		)
-	}
-	type_font_italic := {
-		swap_font_italic(
-			src: styling.custom_type_font
-		)
-	}
-	
-	body_font := {
-		swap_font_name(
-			src:styling.custom_body_font, 
-			font_name: "MPlantin"
-		)
-	}
-	body_font_size := {
-		swap_font_size(
-			src:styling.custom_body_font, 
-			font_size: if styling.font_cap != "" then to_number(styling.font_cap) else if is_mutate() then 12 else 14
-		)
-	}
-	body_font_color := {
-		swap_font_color(
-			src: styling.custom_body_font,
-			font_color: if is_full_art() or is_fnm() or is_inverted() then "white" else "black"
-		)
-	}
-	body_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_body_font
-		)
-	}
-	body_font_italic := {
-		swap_font_italic(
-			src: styling.custom_body_font,
-			font_name: "MPlantin-Italic"
-		)
-	}
-
-	pt_font := {
-		swap_font_name(
-			src:styling.custom_pt_font, 
-			font_name: "Beleren Bold"
-		)
-	}
+	## redefine these since Maps make them annoying
+	swap_fonts_name_default := [
+		name: {if is_map() then "Beleren Small Caps" else "Beleren Bold"},
+		size: {if is_map() then 14.8 else 16},
+		color: {if is_shifted() or is_fnm() or is_inverted() then "white" else "black"},
+		vertical: {0},
+		italic: {""}
+	]
+	swap_fonts_type_default := [
+		name: {"Beleren Bold"},
+		size: {if is_map() then 12 else 13},
+		color: {if is_full_art() or is_puma() or is_shifted() or is_fnm() or is_inverted() then "white" else "black"},
+		vertical: {0},
+		italic: {""}
+	]
+	swap_fonts_body_default := [
+		name: {"MPlantin"},
+		size: {if styling.font_cap != "" then to_number(styling.font_cap) else if is_mutate() then 12 else 14},
+		color: {if is_full_art() or is_fnm() or is_inverted() then "white" else "black"},
+		vertical: {0},
+		italic: {"MPlantin-Italic"}
+	]
+	swap_fonts_pt_default := [
+		name: {"Beleren Bold"},
+		size: {if is_map() then 14 else 16},
+		color: {
+			if is_shifted() or is_fnm() or is_inverted() then "white"
+			else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white"
+			else "black"
+		},
+		vertical: {0},
+		italic: {""}
+	]
 	loyalty_font_size := {
 		swap_font_size(
 			src:styling.custom_pt_font, 
@@ -373,30 +311,23 @@ init script:
 			font_color: "white"
 		)
 	}
-	pt_font_size := {
-		swap_font_size(
-			src:styling.custom_pt_font, 
-			font_size: if is_map() then 14 else 16
-		)
-	}
-	pt_font_color := {
-		swap_font_color(
-			src: styling.custom_pt_font,
-			font_color: if is_shifted() or is_fnm() or is_inverted() then "white" else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white" else "black"
-		)
-	}
-	pt_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_pt_font
-		)
-	}
-	pt_font_italic := {
-		swap_font_italic(
-			src: styling.custom_pt_font
-		)
-	}
 
 	use_flash_dot := {false}
+	custom_border_image := {
+		src := styling.custom_border_source
+		ps := split_text(src, match:"-color-")
+		if length(ps) > 1 then
+			"/magic-mainframe-extras.mse-include/" + ps[0] + input + (if land then "l" else "") + ps[1]
+		else
+			"/magic-mainframe-extras.mse-include/" + src
+	}
+	is_custom := {contains(styling.frames, match:"custom border") and contains(styling.custom_border_source, match:".png")}
+
+	# this goes at the very end
+	harder_script := [
+		custom_border: custom_border_image
+	]
+
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -456,6 +387,11 @@ styling field:
 	choice: nyx
 	choice: leveler
 	choice: snow
+	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: text
 	name: popout image style
@@ -1207,17 +1143,20 @@ card style:
 			color: white
 			weight: bold
 			
+	partition select:
+		left: 24
+		top: 488
+		width: {if not use_auto_numbers() then 0 else if contains(set.card_number_style, match:"/0") then 50 else 35}
+		height: 10
+		z index: 3
+		render style: hidden
 
 ############################################################## Extra card fields
 extra card field:
 	type: text
 	name: card code
 	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
+	script: card_number_script_core()
 extra card field:
 	type: choice
 	name: artist arrow
@@ -1297,6 +1236,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
@@ -1592,7 +1537,7 @@ extra card style:
 		top: 488
 		width: 120
 		height: 10
-		z index: 3
+		z index: 2
 		font:
 			name: Relay-Medium
 			size: 7
@@ -1768,6 +1713,16 @@ extra card style:
 		image: {"voverlay" + (if is_full_art() then "_full" else "") + ".png" }
 		z index: 0
 		visible: {is_vehicle()}
+	custom overlay:
+		left: 0
+		top: 0
+		width: 375
+		height: 523
+		render style: image
+		image: { custom_border_blend() }
+		z index: 0
+		visible: {is_custom()}
+		mask: {"nyx/" + (if is_vehicle() then "v_" else "") + (if is_full_art() then "full" else "") + "mask.png"}
 	clear frame:
 		left: 0
 		top: 0
@@ -2086,4 +2041,4 @@ extra card style:
 		render style: image
 		choice images:
 			the list: /magic-mainframe-extras.mse-include/mfsfiles/list.png
-		z index: 4
+		z index: 1
diff --git a/data/magic-m15-mainframe-tokens.mse-style/style b/data/magic-m15-mainframe-tokens.mse-style/style
index 1512e8a75..c841ac777 100644
--- a/data/magic-m15-mainframe-tokens.mse-style/style
+++ b/data/magic-m15-mainframe-tokens.mse-style/style
@@ -113,126 +113,48 @@ init script:
 	archetype_image := {is_archetype() and contains(styling.other_options, match:"archetype image")}
 	use_drop_shadow := {is_weird_token() and contains(styling.other_options, match:"state drop shadow")}
 
-	# alternate rarity color
-	alt_rarity := {styling.alt_rarity_color}
-
 	### Customize fonts
-	swap_font := {styling.apply_custom_fonts}
-	name_font := {
-		swap_font_name(
-			src:styling.custom_name_font, 
-			font_name: if is_archetype() then "Gotham Medium" else if is_copy() or mtgo_abil() then "Beleren Bold" else "Beleren Small Caps Bold"
-		)
-	}
-	name_font_size := {
-		swap_font_size(
-			src:styling.custom_name_font, 
-			font_size: if is_archetype() then 9 else if is_copy() or mtgo_abil() then 18 else 19
-		) - shrink_name()
-	}
-	name_font_color := {
-		swap_font_color(
-			src: styling.custom_name_font,
-			font_color: if is_weird_token() then "white" else if is_m20() and card.card_color == "white" and not is_clear() then "black" else if is_m20() then "white" else rgb(255,239,128)
-		)
-	}
-	name_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_name_font
-		)
-	}
-	name_font_italic := {
-		swap_font_italic(
-			src: styling.custom_name_font
-		)
-	}
-	
-	type_font := {
-		swap_font_name(
-			src:styling.custom_type_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	type_font_size := {
-		swap_font_size(
-			src:styling.custom_type_font, 
-			font_size: 14
-		) - shrink_type()
-	}
-	type_font_color := {
-		swap_font_color(
-			src: styling.custom_type_font,
-			font_color: if mtgo_abil() then rgb(255,239,128) else "black"
-		)
-	}
-	type_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_type_font
-		)
-	}
-	type_font_italic := {
-		swap_font_italic(
-			src: styling.custom_type_font
-		)
-	}
-	
-	body_font := {
-		swap_font_name(
-			src:styling.custom_body_font, 
-			font_name: if is_archetype() then "Gotham Pro" else "MPlantin"
-		)
-	}
-	body_font_size := {
-		swap_font_size(
-			src:styling.custom_body_font, 
-			font_size: if styling.shrink_font_size != "" then 14 - to_number(styling.shrink_font_size) else 14
-		)
-	}
-	body_font_color := {
-		swap_font_color(
-			src: styling.custom_body_font,
-			font_color: if white_state_font() then "white" else "black"
-		)
-	}
-	body_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_body_font
-		)
-	}
-	body_font_italic := {
-		swap_font_italic(
-			src: styling.custom_body_font
-		)
-	}
-
-	pt_font := {
-		swap_font_name(
-			src:styling.custom_pt_font, 
-			font_name: "Beleren Bold"
-		)
-	}
-	pt_font_size := {
-		swap_font_size(
-			src:styling.custom_pt_font, 
-			font_size: 16
-		)
-	}
-	pt_font_color := {
-		swap_font_color(
-			src: styling.custom_pt_font,
-			font_color: if is_vehicle() then "white" else "black"
-		)
-	}
-	pt_font_vertical := {
-		swap_font_vertical(
-			src: styling.custom_pt_font
-		)
-	}
-	pt_font_italic := {
-		swap_font_italic(
-			src: styling.custom_pt_font
-		)
-	}
+	swap_fonts_type_default := [
+		name: {
+			if is_archetype() then "Gotham Medium"
+			else if is_copy() or mtgo_abil() then "Beleren Bold"
+			else "Beleren Small Caps Bold"
+		},
+		size: {
+			if is_archetype() then 9
+			else if is_copy() or mtgo_abil() then 18
+			else 19
+		},
+		color: {
+			if is_weird_token() then "white"
+			else if is_m20() and card.card_color == "white" and not is_clear() then "black"
+			else if is_m20() then "white"
+			else rgb(255,239,128)
+		},
+		vertical: {0},
+		italic: {""}
+	]
+	swap_fonts_type_default := [
+		name: {"Beleren Bold"},
+		size: {13},
+		color: {if mtgo_abil() then rgb(255,239,128) else "black"},
+		vertical: {0},
+		italic: {""}
+	]
+	swap_fonts_body_default := [
+		name: {if is_archetype() then "Gotham Pro" else "MPlantin"},
+		size: 14,
+		color: {if white_state_font() then "white" else "black"},
+		vertical: 0,
+		italic: "MPlantin-Italic"
+	]
+	swap_fonts_pt_default := [
+		name: {"Beleren Bold"},
+		size: {16},
+		color: {if is_vehicle() then "white" else "black"},
+		vertical: {0},
+		italic: {""}
+	]
 ############################################################## Set info fields
 set info style:
 	symbol:
diff --git a/data/magic-mainframe-extras.mse-include/colorless.png b/data/magic-mainframe-extras.mse-include/colorless.png
new file mode 100644
index 000000000..b6e4b290b
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/colorless.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/alight.png b/data/magic-mainframe-extras.mse-include/decoration/alight.png
new file mode 100644
index 000000000..e6b287bda
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/alight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/blight.png b/data/magic-mainframe-extras.mse-include/decoration/blight.png
new file mode 100644
index 000000000..f04dd8e24
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/blight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/clight.png b/data/magic-mainframe-extras.mse-include/decoration/clight.png
new file mode 100644
index 000000000..e6b287bda
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/clight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/cllight.png b/data/magic-mainframe-extras.mse-include/decoration/cllight.png
new file mode 100644
index 000000000..13dbe6e42
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/cllight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/glight.png b/data/magic-mainframe-extras.mse-include/decoration/glight.png
new file mode 100644
index 000000000..ac83deb1f
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/glight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/mlight.png b/data/magic-mainframe-extras.mse-include/decoration/mlight.png
new file mode 100644
index 000000000..08acc4847
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/mlight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/rlight.png b/data/magic-mainframe-extras.mse-include/decoration/rlight.png
new file mode 100644
index 000000000..7ca04044f
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/rlight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/ulight.png b/data/magic-mainframe-extras.mse-include/decoration/ulight.png
new file mode 100644
index 000000000..ae635938b
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/ulight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/decoration/wlight.png b/data/magic-mainframe-extras.mse-include/decoration/wlight.png
new file mode 100644
index 000000000..02f348748
Binary files /dev/null and b/data/magic-mainframe-extras.mse-include/decoration/wlight.png differ
diff --git a/data/magic-mainframe-extras.mse-include/readme.txt b/data/magic-mainframe-extras.mse-include/readme.txt
index 1b6919977..3601e5f09 100644
--- a/data/magic-mainframe-extras.mse-include/readme.txt
+++ b/data/magic-mainframe-extras.mse-include/readme.txt
@@ -3,11 +3,11 @@ previously impossible. Try to give your images unique or personalized names, or
 avoid overwriting others' public images.
 
 To use these images, type name.png or folder/name.png into the custom masks or other fields of the style tab,
-and Mainframe will handle the directories.
+and Mainframe will handle the magic-mainframe-extras/ part.
 
 When you release your set, include any custom masks you have made so they can be added to others' folders.
 
-mfsfiles/ contains images that are shared across most Mainframe templates
+mfsfiles/ contains images that can be shared across most Mainframe templates
 
 Some example images are provided:
 Transform/Lesson Circles
@@ -21,4 +21,11 @@ Replacement Saga chapters
 Custom Legend Crowns
 	cajun/legend/ folder
 Mainframe Custom Mana
-	cajun/small, cajun/large, cajun/future folders
\ No newline at end of file
+	cajun/small, cajun/large, cajun/future folders
+Custom Border
+	colorless.png
+Adventure Decorations
+	decoration/ folder
+	these images can be used as the forms
+		decoration/clight.png
+		decoration/light.png;color
\ No newline at end of file
diff --git a/data/magic-watermarks.mse-include/cajun/afnan_gouge.png b/data/magic-watermarks.mse-include/cajun/afnan_gouge.png
deleted file mode 100644
index 3c96eb65d..000000000
Binary files a/data/magic-watermarks.mse-include/cajun/afnan_gouge.png and /dev/null differ
diff --git a/data/magic-watermarks.mse-include/cajun/afnan_stand.png b/data/magic-watermarks.mse-include/cajun/afnan_stand.png
deleted file mode 100644
index 091d8fce6..000000000
Binary files a/data/magic-watermarks.mse-include/cajun/afnan_stand.png and /dev/null differ
diff --git a/data/magic-watermarks.mse-include/kxp/arc.png b/data/magic-watermarks.mse-include/kxp/arc.png
new file mode 100644
index 000000000..951e3d6dc
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/arc.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/arena.png b/data/magic-watermarks.mse-include/kxp/arena.png
new file mode 100644
index 000000000..b8e6eff16
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/arena.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/aus.png b/data/magic-watermarks.mse-include/kxp/aus.png
new file mode 100644
index 000000000..d27f5c9ba
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/aus.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/books.png b/data/magic-watermarks.mse-include/kxp/books.png
new file mode 100644
index 000000000..01fd32e46
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/books.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/chikyu.png b/data/magic-watermarks.mse-include/kxp/chikyu.png
new file mode 100644
index 000000000..71af9b957
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/chikyu.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/circuit.png b/data/magic-watermarks.mse-include/kxp/circuit.png
new file mode 100644
index 000000000..75ec177bb
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/circuit.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/festenya.png b/data/magic-watermarks.mse-include/kxp/festenya.png
new file mode 100644
index 000000000..d23271595
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/festenya.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/processor.png b/data/magic-watermarks.mse-include/kxp/processor.png
new file mode 100644
index 000000000..a3b20991e
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/processor.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/skalor.png b/data/magic-watermarks.mse-include/kxp/skalor.png
new file mode 100644
index 000000000..4af6ed18c
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/skalor.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/skalor_smol.png b/data/magic-watermarks.mse-include/kxp/skalor_smol.png
new file mode 100644
index 000000000..cef27c0ff
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/skalor_smol.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/tirvana.png b/data/magic-watermarks.mse-include/kxp/tirvana.png
new file mode 100644
index 000000000..7471f8c8d
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/tirvana.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/usona.png b/data/magic-watermarks.mse-include/kxp/usona.png
new file mode 100644
index 000000000..ded45ad7d
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/usona.png differ
diff --git a/data/magic-watermarks.mse-include/kxp/usona_light.png b/data/magic-watermarks.mse-include/kxp/usona_light.png
new file mode 100644
index 000000000..15c9581a3
Binary files /dev/null and b/data/magic-watermarks.mse-include/kxp/usona_light.png differ
diff --git a/data/magic-watermarks.mse-include/cajun/arqaan_stand.png b/data/magic-watermarks.mse-include/kxp/way.png
similarity index 83%
rename from data/magic-watermarks.mse-include/cajun/arqaan_stand.png
rename to data/magic-watermarks.mse-include/kxp/way.png
index 1a5bac225..b4b6ada40 100644
Binary files a/data/magic-watermarks.mse-include/cajun/arqaan_stand.png and b/data/magic-watermarks.mse-include/kxp/way.png differ
diff --git a/data/magic.mse-game/card_fields b/data/magic.mse-game/card_fields
index c1a305422..c4d34f003 100644
--- a/data/magic.mse-game/card_fields
+++ b/data/magic.mse-game/card_fields
@@ -477,7 +477,7 @@ card field:
 	name: card number
 	save value: false
 	script:      card_number() + "/" + card_count()
-	sort script: rarity_sort() + card.card_number
+	sort script: rarity_partition_sort() + card_number_mom()
 	card list visible: true
 	card list column: 10
 	card list width: 50
@@ -607,6 +607,48 @@ card field:
 	default: card_color(casting_cost: card.casting_cost_2, type: card.super_type_2, rules_text: card.rule_text_2, watermark: card.watermark_2, card_name: card.name_2, default: "colorless")
 	show statistics: false
 	description: The frame of a card
+card field:
+	type: multiple choice
+	name: card color 3
+	icon: stats/color.png
+	empty choice: colorless
+	choice: white
+	choice: blue
+	choice: black
+	choice: red
+	choice:
+		name: green
+		line below: true
+	choice: artifact
+	choice: land
+	choice: multicolor
+	choice:
+		name: hybrid
+		enabled: { card_color_color_count(card.card_color_3) >= 2 }
+		line below: true
+	choice:
+		name: horizontal
+		enabled: { card_color_color_count(card.card_color_3) >= 2 }
+		type: radio
+	choice:
+		name: vertical
+		enabled: { card_color_color_count(card.card_color_3) >= 2 }
+		type: radio
+	choice:
+		name: radial
+		enabled: { card_color_color_count(card.card_color_3) >= 2 }
+		type: radio
+	choice:
+		name: overlay
+		enabled: { card_color_color_count(card.card_color_3) == 2 and chosen(choice:"hybrid",card.card_color_3) }
+		type: radio
+	choice:
+		name: reversed
+		enabled: { card_color_color_count(card.card_color_3) >= 2 and not chosen(choice:"overlay",card.card_color_3) }
+	script: card_color_filter(value)
+	default: card_color(casting_cost: card.casting_cost_3, type: card.super_type_3, rules_text: card.rule_text_3, watermark: card.watermark_3, card_name: card.name_3, default: "colorless")
+	show statistics: false
+	description: The frame of a card
 card field:
 	type: text
 	name: name 2
@@ -1359,6 +1401,69 @@ card field:
 	script: special_text2()
 	save value: true
 	description: Full text for exporting.
+card field:
+	type: choice
+	name: partition select
+	show statistics: false
+	choice:
+		name: before normal
+		choice: 0
+		choice: 1
+		choice: 2
+		choice: 3
+		choice: 4
+		choice: 5
+		choice: 6
+		choice: 7
+		choice: 8
+		choice: 9
+	choice: A
+	choice:
+		name: after normal, main set
+		choice: B
+		choice: C
+		choice: D
+		choice: E
+		choice: F
+		choice: G
+		choice: H
+		choice: I
+		choice: J
+		choice: K
+		choice: L
+		choice: M
+	choice:
+		name: after main set
+		choice: N
+		choice: O
+		choice: P
+		choice: Q
+		choice: R
+		choice: S
+		choice: T
+		choice: U
+		choice: V
+		choice: W
+		choice: X
+		choice: Y
+		choice: Z
+	choice:
+		name: help
+		choice: This is the partition selecter
+		choice: You can use this to sort cards in different sublayers
+		choice: 0-9 go before the main count, like face commanders
+		choice: A is the main count
+		choice: B-M go after, but still count in the set total
+		choice: N-Z go over the set total, like #301/300
+		choice: You can change the flip point in the Set tab if you need to
+		choice: with option "Last main partition", which defaults to M
+	initial: A
+	description: The partition index for card sorting.
+card field:
+	type: text
+	name: partition
+	script: partition_index()
+	save value: false
 card field:
 	type: text
 	name: time modified
diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index 0fdee2007..2f90f7e7a 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -7,7 +7,8 @@ include file: /magic-blends.mse-include/new-blends
 include file: statistics_script
 
 ############################################################## version check
-version_date := {"2023-02-21"}
+version_date := {"2024-05-10 Mainframe 1.3.a Showcase Catchup: Adventures"}
+version := version_date
 ############################################################## Sorting mana symbols
 
 # correctly sort a mana symbol (no guild mana)
@@ -338,27 +339,61 @@ color_of_card := {
 	)
 }
 
+token_shape := {
+	case input of
+		"token": true,
+		"emblem": true,
+		"counter": true,
+		"rulestip": true,
+		"checklist": true,
+		else: false;
+}
 rarity_sort := {
-	if card.shape == "token" then "T1"
+	if is_unsorted() then "R0"
+	else if card.shape == "token" then "T1"
 	else if card.shape == "emblem" then "T2"
 	else if card.shape == "rulestip" then "T3"
 	else if card.shape == "counter" then "T4"
 	else if card.shape == "checklist" then "T5"
 	else if is_masterpiece() then "T6"
-	else if set.sort_special_rarity == "with the rest" or card.rarity != "special" then " "
-	else "S"
+	else if set.sort_special_rarity == "separate numbering" and card.rarity == "special" then "S1"
+	else if set.sort_special_rarity == "with the rest" or card.rarity != "special" then "R1"
+	else "R2"
 }
-card_partition := {"A"}
+rarity_partition_sort := {
+	main := rarity_sort()
+	main.0 + partition_index() + main.1
+}
+card_partition := {
+	if styling.card_number_partition or else "" != ""
+		then styling.card_number_partition
+	else "A"
+}
+## MSE doesn't do "A" > "B" like some languages do
+## Originally this put partition_index() and mn_pos in an array and sorted that
+## but that crashed mse on startup once it was added to sort the card number column
+## but you also couldn't use position() because it inherits order_by and filter from card_number()
+## and MSE yells at you if you do that and you're not sorting a set
+## and replacing them with nil doesn't work, it still complains if they're nil???
+## so instead hard-coded map of indices
+## you'll never catch me i'm behind seven workarounds
+partition_scores := [
+	0:0, 1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8, 9:9,
+	A:10, B:11, C:12, D:13, E:14, F:15, G:16, H:17, I:18,
+	J:19, K:20, L:21, M:22, N:23, O:24, P:25, Q:26, R:27,
+	S:28, T:29, U:30, V:31, W:32, X:33, Y:34, Z:35
+]
 over_partition := {
-	my_pos := number_partition()
 	mn_pos := if set.last_main_partition == "" then "M" else to_upper(substring(set.last_main_partition, end:1))
-	posis := [my_pos, mn_pos]
-	higher := sort_list(posis).0
-	my_pos != higher
+	partition_scores[partition_index()] > partition_scores[mn_pos]
+}
+partition_filter := replace@(match:"(before normal|after normal, main set|after main set|secret|help.*) ?", replace:"")
+partition_index := { 
+	ind := partition_filter(card.partition_select)
+	if ind == "" then ind := "A"
+	ind
 }
-number_partition := { to_upper(substring(card_partition(), end:1)) }
 set_filter := {
-	# TODO: what about rulestips?
 	if is_unsorted() then 
 		{ is_unsorted() }
 	else if card.shape == "token" or card.shape == "emblem" then
@@ -369,14 +404,37 @@ set_filter := {
 		{ card.shape == "counter" }
 	else if card.shape == "checklist" then
 		{ card.shape == "checklist" }
-	else if is_masterpiece() and card.shape != "token" and card.shape != "emblem" then
-		{ is_masterpiece() and card.shape != "token" and card.shape != "emblem" }
+	else if is_masterpiece() and not token_shape(card.shape) then
+		{ is_masterpiece() and not token_shape(card.shape) }
 	else if set.sort_special_rarity != "separate numbering" then
-		{ not over_partition() and not is_unsorted() and card.shape != "token" and not is_masterpiece() and card.shape != "emblem" and card.shape != "rulestip" and card.shape != "counter" and card.shape != "checklist"}
+		{ not is_unsorted() and not token_shape(card.shape) }
 	else if card.rarity == "special" then
-		{ not over_partition() and not is_unsorted() and card.shape != "token" and not is_masterpiece() and card.shape != "emblem" and card.shape != "rulestip" and card.shape != "counter" and card.shape != "checklist" and card.rarity == "special" }
+		{ not is_unsorted() and not token_shape(card.shape) and card.rarity == "special" }
 	else
-		{ not over_partition() and not is_unsorted() and card.shape != "token" and not is_masterpiece() and card.shape != "emblem" and card.shape != "rulestip" and card.shape != "counter" and card.shape != "checklist" and card.rarity != "special" }
+		{ not is_unsorted() and not token_shape(card.shape) and card.rarity != "special" }
+}
+## over-partition cards need to be counted during the card number count
+## but need to be skipped during the card count count
+## so this is a copy of set_filter but it skips over-partition cards
+set_filter_under_partition := {
+	if is_unsorted() then 
+		{ is_unsorted() }
+	else if card.shape == "token" or card.shape == "emblem" then
+		{ card.shape == "token" or card.shape == "emblem" and not over_partition() }
+	else if card.shape == "rulestip" then
+		{ card.shape == "rulestip" and not over_partition() }
+	else if card.shape == "counter" then
+		{ card.shape == "counter" and not over_partition() }
+	else if card.shape == "checklist" then
+		{ card.shape == "checklist" and not over_partition() }
+	else if is_masterpiece() and not token_shape(card.shape) then
+		{ is_masterpiece() and not token_shape(card.shape) and not over_partition() }
+	else if set.sort_special_rarity != "separate numbering" then
+		{ not is_unsorted() and not token_shape(card.shape) and not over_partition() }
+	else if card.rarity == "special" then
+		{ not is_unsorted() and not token_shape(card.shape) and card.rarity == "special" and not over_partition() }
+	else
+		{ not is_unsorted() and not token_shape(card.shape) and card.rarity != "special" and not over_partition() }
 }
 card_number_offset := {pull_comma_array(set.card_number_offsets, cell:0, end:false, default:0)}
 set_number_offset := {pull_comma_array(set.card_number_offsets, cell:1, end:false, default:0)}
@@ -384,12 +442,12 @@ card_number := {
 	position (
 		of: card
 		in: set
-		order_by: { number_partition() + rarity_sort() + sort_index() + sort_name(card.name) + sort_name(export_name())}
+		order_by: { partition_index() + rarity_sort() + sort_index() + sort_name(card.name) + sort_name(export_name())}
 		filter:   set_filter()
 	) + 1 + to_number(card_number_offset())
 }
 card_count := {
-	number_of_items(in: set, filter: set_filter()) + to_number(set_number_offset())
+	number_of_items(in: set, filter: set_filter_under_partition()) + to_number(set_number_offset())
 }
 
 #Starting with M15, zero digits in card numbers should be shown up to three.
@@ -397,18 +455,23 @@ card_number_m15 := { (if card_number() < 100 then "0" else "") + (if card_number
 card_count_m15 := { (if card_count() < 100 then "0" else "") + (if card_count() < 10 then "0" else "") + card_count() }
 #Starting with MOM, zero digits in card numbers should be shown up to four
 card_number_mom := { (if card_number() < 1000 then "0" else "") + (if card_number() < 100 then "0" else "") + (if card_number() < 10 then "0" else "") + card_number() }
+card_count_mom := { (if card_count() < 1000 then "0" else "") + (if card_count() < 100 then "0" else "") + (if card_count() < 10 then "0" else "") + card_count() }
 
+use_auto_numbers := {set.automatic_card_numbers and not is_unsorted()}
+# Use this in templates so we don't have to update 700 templates the next time they change the ordering
 card_number_script_core := {
-	if is_unsorted() or not set.automatic_card_numbers then
+	if not use_auto_numbers() then
 		combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
+	else if set.card_number_style == "0001/0099" then
+		forward_editor(prefix: rarity_code() + " " + card_number_mom() + (if over_partition() and set.over_partition_display == "100" then "" else "/" + card_count_mom()) + " ", field: card.card_code_text)
 	else if set.card_number_style == "0001" then
 		forward_editor(prefix: rarity_code() + " " + card_number_mom() + " ", field: card.card_code_text)
 	else if set.card_number_style == "001/099" then
-		forward_editor(prefix: card_number_m15() + (if over_partition() then "" else "/" + card_count_m15()) + " " + rarity_code() + " ", field: card.card_code_text)
+		forward_editor(prefix: card_number_m15() + (if over_partition() and set.over_partition_display == "100" then "" else "/" + card_count_m15()) + " " + rarity_code() + " ", field: card.card_code_text)
 	else if set.card_number_style == "001" then
 		forward_editor(prefix: card_number_m15() + " " + rarity_code() + " ", field: card.card_code_text)
 	else if set.card_number_style == "1/99" then
-		forward_editor(prefix: card_number() + (if over_partition() then "" else "/" + card_count()) + " " + rarity_code() + " ", field: card.card_code_text)
+		forward_editor(prefix: card_number() + (if over_partition() and set.over_partition_display == "100" then "" else "/" + card_count()) + " " + rarity_code() + " ", field: card.card_code_text)
 	else
 		forward_editor(prefix: card_number() + " " + rarity_code() + " ", field: card.card_code_text)
 }
@@ -417,7 +480,6 @@ card_number_script_core := {
 is_token_card   := { card.shape == "token" or card.shape == "rulestip" or card.shape == "counter" or card.shape == "checklist" or card.shape == "emblem"}
 is_shifted_card := { contains(card.shape, match:"shifted") }
 is_masterpiece := { card.rarity == "masterpiece" }
-is_nightbreak := { card.shape == "nightbreak" }
 
 
 ############################################################## Utilities for keywords
@@ -777,6 +839,7 @@ mana_context :=
 		(
 				<match>:                                        # G: something
 			|	<match>,                                        # G, tap: something
+			|   [+][ ]?<match>[ ]?—								# Spree
 			|	or[ ]<match>                                    # Add X, Y, or Z.
 			|	<match>[ ]to[ ]your                             # Add X, Y, or Z to your mana pool.
 			|	you[ ]get[ ]<match>                             # You get E, you get TK
@@ -1053,7 +1116,7 @@ text_filter :=
 	 	replace: "<i-auto>&</i-auto>") +
 	# step 7b : indent bullets
 	 replace@(
-	 	match: "^(• )([^•]+)",
+	 	match: "^(• |[+] ?)([^\n]+\n?)",
 	 	replace: {"<li><bullet>" + _1 + "</bullet>" + _2 + "</li>"}
 	 )+
 	# step 7c : clean up modals
@@ -2148,14 +2211,14 @@ rare_width := {
 }
 
 ### Customize fonts
-swap_font := {false} ##{styling.apply_custom_fonts}
+swap_font := {styling.apply_custom_fonts or else false}
 split_font := split_text@(match:";")
 pop_font_name := {split_font(input).0 or else ""}
 pop_font_size := {split_font(input).1 or else ""}
 pop_font_color := {split_font(input).2 or else ""}
 pop_font_vertical := {split_font(input).3 or else ""}
 pop_font_italic := {split_font(input).4 or else ""}
-
+## General swap functions
 swap_font_name := {
 	if swap_font() then (
 		test := pop_font_name(src)
@@ -2163,7 +2226,7 @@ swap_font_name := {
 	)
 	
 	font_name
-}@(font_name:"", src:"")
+}
 swap_font_size := {
 	if swap_font() then (
 		test := pop_font_size(src)
@@ -2171,7 +2234,7 @@ swap_font_size := {
 	)
 	
 	font_size
-}@(font_size:16, src:"")
+}
 swap_font_color := {
 	if swap_font() then (
 		test := pop_font_color(src)
@@ -2185,7 +2248,7 @@ swap_font_color := {
 	) else ""
 	
 	font_color
-}@(font_color:"", src:"")
+}
 swap_font_vertical := {
 	if swap_font() then (
 		test := pop_font_vertical(src)
@@ -2193,7 +2256,7 @@ swap_font_vertical := {
 	)
 	
 	vertical
-}@(vertical:0, src:"")
+}
 swap_font_italic := {
 	if swap_font() then (
 		test := pop_font_italic(src)
@@ -2203,10 +2266,249 @@ swap_font_italic := {
 	)
 	
 	font_name
-}@(font_name:"", src:"")
+}
+## defaults, can be changed in style
+swap_fonts_name_default := [
+	name: {"Beleren Bold"},
+	size: {16},
+	color: {"black"},
+	vertical: {0},
+	italic: {""}
+]
+swap_fonts_name2_default := [
+	name: {"Beleren Bold"},
+	size: {16},
+	color: {"black"},
+	vertical: {0},
+	italic: {""}
+]
+swap_fonts_type_default := [
+	name: {"Beleren Bold"},
+	size: {13},
+	color: {"black"},
+	vertical: {0},
+	italic: {""}
+]
+swap_fonts_type2_default := [
+	name: {"Beleren Bold"},
+	size: {13},
+	color: {"white"},
+	vertical: {0},
+	italic: {""}
+]
+swap_fonts_body_default := [
+	name: {"MPlantin"},
+	size: {13},
+	color: {"black"},
+	vertical: {0},
+	italic: {"MPlantin-Italic"}
+]
+swap_fonts_pt_default := [
+	name: {"Beleren Bold"},
+	size: {16},
+	color: {"black"},
+	vertical: {0},
+	italic: {""}
+]
+swap_fonts_name_src := {styling.custom_name_font or else ""}
+swap_fonts_name_src := {styling.custom_name_font or else ""}
+swap_fonts_name2_src := {styling.custom_name_2_font or else ""}
+swap_fonts_type_src := {styling.custom_type_font or else ""}
+swap_fonts_type2_src := {styling.custom_type_2_font or else ""}
+swap_fonts_body_src := {styling.custom_body_font or else ""}
+swap_fonts_pt_src := {styling.custom_pt_font or else ""}
+## specific swap functions
+name_font := {
+	swap_font_name(
+		src: swap_fonts_name_src(), 
+		font_name: swap_fonts_name_default.name()
+	)
+}
+name_font_size := {
+	swap_font_size(
+		src: swap_fonts_name_src(), 
+		font_size: swap_fonts_name_default.size()
+	) - shrink_name()
+}
+name_font_color := {
+	swap_font_color(
+		src: swap_fonts_name_src(),
+		font_color: swap_fonts_name_default.color()
+	)
+}
+name_font_vertical := {
+	swap_font_vertical(
+		src: swap_fonts_name_src(),
+		vertical: swap_fonts_name_default.vertical()
+	)
+}
+name_font_italic := {
+	swap_font_italic(
+		src: swap_fonts_name_src(),
+		font_name: swap_fonts_name_default.italic()
+	)
+}
 
+name2_font := {
+	swap_font_name(
+		src: swap_fonts_name2_src(), 
+		font_name: swap_fonts_name2_default.name()
+	)
+}
+name2_font_size := {
+	swap_font_size(
+		src: swap_fonts_name2_src(), 
+		font_size: swap_fonts_name2_default.size()
+	) - shrink_name2()
+}
+name2_font_color := {
+	swap_font_color(
+		src: swap_fonts_name2_src(),
+		font_color: swap_fonts_name2_default.color()
+	)
+}
+name2_font_vertical := {
+	swap_font_vertical(
+		src: swap_fonts_name2_src(),
+		vertical: swap_fonts_name2_default.vertical()
+	)
+}
+name2_font_italic := {
+	swap_font_italic(
+		src: swap_fonts_name2_src(),
+		font_name: swap_fonts_name2_default.italic()
+	)
+}
+
+type_font := {
+	swap_font_name(
+		src: swap_fonts_type_src(), 
+		font_name: swap_fonts_type_default.name()
+	)
+}
+type_font_size := {
+	swap_font_size(
+		src: swap_fonts_type_src(), 
+		font_size: swap_fonts_type_default.size()
+	) - shrink_type()
+}
+type_font_color := {
+	swap_font_color(
+		src: swap_fonts_type_src(),
+		font_color: swap_fonts_type_default.color()
+	)
+}
+type_font_vertical := {
+	swap_font_vertical(
+		src: swap_fonts_type_src(),
+		vertical: swap_fonts_type_default.vertical()
+	)
+}
+type_font_italic := {
+	swap_font_italic(
+		src: swap_fonts_type_src(),
+		font_name: swap_fonts_type_default.italic()
+	)
+}
+
+type2_font := {
+	swap_font_name(
+		src: swap_fonts_type2_src(), 
+		font_name: swap_fonts_type2_default.name()
+	)
+}
+type2_font_size := {
+	swap_font_size(
+		src: swap_fonts_type2_src(), 
+		font_size: swap_fonts_type2_default.size()
+	) - shrink_type2()
+}
+type2_font_color := {
+	swap_font_color(
+		src: swap_fonts_type2_src(),
+		font_color: swap_fonts_type2_default.color()
+	)
+}
+type2_font_vertical := {
+	swap_font_vertical(
+		src: swap_fonts_type2_src(),
+		vertical: swap_fonts_type2_default.vertical()
+	)
+}
+type2_font_italic := {
+	swap_font_italic(
+		src: swap_fonts_type2_src(),
+		font_name: swap_fonts_type2_default.italic()
+	)
+}
+
+body_font := {
+	swap_font_name(
+		src: swap_fonts_body_src(), 
+		font_name: swap_fonts_body_default.name()
+	)
+}
+body_font_size := {
+	swap_font_size(
+		src: swap_fonts_body_src(), 
+		font_size: swap_fonts_body_default.size()
+	)
+}
+body_font_color := {
+	swap_font_color(
+		src: swap_fonts_body_src(),
+		font_color: swap_fonts_body_default.color()
+	)
+}
+body_font_vertical := {
+	swap_font_vertical(
+		src: swap_fonts_body_src(),
+		vertical: swap_fonts_body_default.vertical()
+	)
+}
+body_font_italic := {
+	swap_font_italic(
+		src: swap_fonts_body_src(),
+		font_name: swap_fonts_body_default.italic()
+	)
+}
+
+pt_font := {
+	swap_font_name(
+		src: swap_fonts_pt_src(), 
+		font_name: swap_fonts_pt_default.name()
+	)
+}
+pt_font_size := {
+	swap_font_size(
+		src: swap_fonts_pt_src(), 
+		font_size: swap_fonts_pt_default.size()
+	)
+}
+pt_font_color := {
+	swap_font_color(
+		src: swap_fonts_pt_src(),
+		font_color: swap_fonts_pt_default.color()
+	)
+}
+pt_font_vertical := {
+	swap_font_vertical(
+		src: swap_fonts_pt_src(),
+		vertical: swap_fonts_pt_default.vertical()
+	)
+}
+pt_font_italic := {
+	swap_font_italic(
+		src: swap_fonts_pt_src(),
+		font_name: swap_fonts_pt_default.italic()
+	)
+}
+shrink_name  := {0}
+shrink_type  := {0}
+shrink_name2 := {0}
+shrink_type2 := {0}
 #### Customize rarity symbol
-alt_rarity := {""} ##{styling.alt_rarity_color}
+alt_rarity := {styling.alt_rarity_color or else ""}
 use_alt_rarity := {alt_rarity() != ""}
 alt_rarity_color := {
 	string := "83,67,53:177,150,131:0,0,0:0,0,0:0.07:"
diff --git a/data/magic.mse-game/set_fields b/data/magic.mse-game/set_fields
index bc6c0d942..70a0e8ce0 100644
--- a/data/magic.mse-game/set_fields
+++ b/data/magic.mse-game/set_fields
@@ -143,6 +143,17 @@ set field:
 	choice: 001
 	choice: 1/99
 	choice: 1
+	choice: 0001/0099
+set field:
+	type: text
+	name: last main partition
+	description: Card Number Partitions after this one aren't counted as the main part of the set, ex "301" or "301/300" rather than "301/900". Default is M.
+set field:
+	type: choice
+	name: over partition display
+	description: How to display card numbers larger than the main set?
+	choice: 100
+	choice: 100/099
 set field:
 	type: text
 	name: card number offsets
@@ -298,10 +309,6 @@ set field:
 	type: boolean
 	name: use flavor bar
 	description: Enables the flavor bar on Mainframe templates.
-set field:
-	type: text
-	name: last main partition
-	description: Card Number Partitions after this one aren't counted as the main part of the set, ex "301" rather than "301/300" or "301/900". Default is M.
 set field:
 	type: choice
 	name: default stamp