diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index d9683cb0..5456a53f 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -785,6 +785,7 @@ symbol font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Tap symbol	 T
+		menu item Q:			&Untap symbol	 Q
 		menu item W:			&White mana	 W
 		menu item U:			Bl&ue mana	 U
 		menu item B:			&Black mana	 B
diff --git a/data/fr.mse-locale/locale b/data/fr.mse-locale/locale
index eef73293..53a3ea29 100644
--- a/data/fr.mse-locale/locale
+++ b/data/fr.mse-locale/locale
@@ -1,7 +1,7 @@
 mse version: 0.3.6
 installer group: locales
 full name: Français
-version: 2008-03-12
+version: 2008-04-01
 icon: fr.png
 
 ############################################################## Menu items
@@ -757,6 +757,7 @@ symbol font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Tap symbol	 T
+		menu item Q:			&Untap symbol	 Q
 		menu item W:			Mana &Blanc	 W
 		menu item U:			Mana Bl&ue	 U
 		menu item B:			Mana &Noir	 B
diff --git a/data/it.mse-locale/locale b/data/it.mse-locale/locale
index a0848a25..fc4ac477 100644
--- a/data/it.mse-locale/locale
+++ b/data/it.mse-locale/locale
@@ -1,7 +1,7 @@
 mse version: 0.3.6
 installer group: locales
 full name: Italiano
-version: 2008-03-12
+version: 2008-04-01
 icon: it.png
 
 ############################################################## Menu items
@@ -785,6 +785,7 @@ symbol font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Simbolo TAP	 T
+		menu item Q:			&Simbolo 	UNTAP	 Q
 		menu item W:			&Mana Bianco	 W
 		menu item U:			Ma&na Blu	 U
 		menu item B:			&Mana Nero	 B
diff --git a/data/jp.mse-locale/locale b/data/jp.mse-locale/locale
index aff4c401..95119547 100644
--- a/data/jp.mse-locale/locale
+++ b/data/jp.mse-locale/locale
@@ -1,7 +1,7 @@
 mse version: 0.3.6
 installer group: locales
 full name: Japanese
-version: 2008-03-12
+version: 2008-04-01
 icon: jp.png
 
 ############################################################## Menu items
@@ -749,6 +749,7 @@ symbol font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
 		menu item T:			&Tap symbol	 T
+		menu item Q:			&Untap symbol	 Q
 		menu item W:			&White mana	 W
 		menu item U:			Bl&ue mana	 U
 		menu item B:			&Black mana	 B
diff --git a/data/magic-extended-art.mse-style/style b/data/magic-extended-art.mse-style/style
index 52599716..b8887f83 100644
--- a/data/magic-extended-art.mse-style/style
+++ b/data/magic-extended-art.mse-style/style
@@ -5,7 +5,7 @@ short name: Extended Art
 icon: card-sample.png
 position hint: 006
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -92,7 +92,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-firepenguinmaster-flip.mse-style/style b/data/magic-firepenguinmaster-flip.mse-style/style
index 4fc26070..f890d277 100644
--- a/data/magic-firepenguinmaster-flip.mse-style/style
+++ b/data/magic-firepenguinmaster-flip.mse-style/style
@@ -4,7 +4,8 @@ full name: FPM's Flip Magic
 short name: FPM Flip
 icon: card-sample.png
 position hint: 402
-version: 2007-12-29
+
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -75,7 +76,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style
index 888da4d4..d25bc67f 100644
--- a/data/magic-firepenguinmaster.mse-style/style
+++ b/data/magic-firepenguinmaster.mse-style/style
@@ -5,7 +5,7 @@ short name: FPM Normal
 icon: card-sample.png
 position hint: 401
 
-version: 2007-12-29
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -98,7 +98,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-firepenguinmasterpromo.mse-style/style b/data/magic-firepenguinmasterpromo.mse-style/style
index 8617c62d..4e67dd88 100644
--- a/data/magic-firepenguinmasterpromo.mse-style/style
+++ b/data/magic-firepenguinmasterpromo.mse-style/style
@@ -5,7 +5,7 @@ short name: FPM Promo
 icon: card-sample.png
 position hint: 404
 
-version: 2007-12-29
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -98,7 +98,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-firepenguinmastersplit.mse-style/style b/data/magic-firepenguinmastersplit.mse-style/style
index 69ec316b..e352d98b 100644
--- a/data/magic-firepenguinmastersplit.mse-style/style
+++ b/data/magic-firepenguinmastersplit.mse-style/style
@@ -5,7 +5,7 @@ short name: FPM Split
 icon: card-sample.png
 position hint: 403
 
-version: 2007-12-29
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -102,7 +102,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style
index 2478bedc..58be30bc 100644
--- a/data/magic-firepenguinmastertokens.mse-style/style
+++ b/data/magic-firepenguinmastertokens.mse-style/style
@@ -5,7 +5,7 @@ short name: FPM Token
 icon: card-sample.png
 position hint: 407
 
-version: 2007-12-29
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -97,7 +97,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style
index e6943b21..38269a5d 100644
--- a/data/magic-future.mse-style/style
+++ b/data/magic-future.mse-style/style
@@ -5,7 +5,7 @@ full name: Futureshift
 icon: card-sample.png
 position hint: 050
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -189,7 +189,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_q.png b/data/magic-mana-beveled.mse-symbol-font/mana_q.png
new file mode 100644
index 00000000..40c6cfa3
Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_q.png differ
diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_q_old.png b/data/magic-mana-beveled.mse-symbol-font/mana_q_old.png
new file mode 100644
index 00000000..cbf41c5d
Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_q_old.png differ
diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_q_older.png b/data/magic-mana-beveled.mse-symbol-font/mana_q_older.png
new file mode 100644
index 00000000..427ba731
Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_q_older.png differ
diff --git a/data/magic-mana-beveled.mse-symbol-font/symbol-font b/data/magic-mana-beveled.mse-symbol-font/symbol-font
index 27c94e7d..2d47265b 100644
--- a/data/magic-mana-beveled.mse-symbol-font/symbol-font
+++ b/data/magic-mana-beveled.mse-symbol-font/symbol-font
@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2007-10-12
+version: 2008-04-01
 short name: beveled style (firepenguinmaster)
 position hint: 101
 icon: mana_r.png
@@ -27,6 +27,17 @@ symbol:
 symbol:
 	code: T
 	image: mana_t.png
+symbol:
+	code: Q
+	image: mana_q_older.png
+	enabled: { mana_t() == "older" }
+symbol:
+	code: Q
+	image: mana_q_old.png
+	enabled: { mana_t() == "old" }
+symbol:
+	code: Q
+	image: mana_q.png
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -206,6 +217,7 @@ text margin bottom: -.12
 # Insert-symbol menu
 insert symbol menu:
 	item: T
+	item: Q
 	item:
 		type: line
 	item: X
diff --git a/data/magic-mana-future.mse-symbol-font/mana_q.png b/data/magic-mana-future.mse-symbol-font/mana_q.png
new file mode 100644
index 00000000..1f77bf37
Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_q.png differ
diff --git a/data/magic-mana-future.mse-symbol-font/symbol-font b/data/magic-mana-future.mse-symbol-font/symbol-font
index 7a1884a5..9efb7efa 100644
--- a/data/magic-mana-future.mse-symbol-font/symbol-font
+++ b/data/magic-mana-future.mse-symbol-font/symbol-font
@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2007-10-12
+version: 2008-04-01
 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
 short name: Future Sight style
 position hint: 005
@@ -28,6 +28,9 @@ symbol:
 symbol:
 	code: T
 	image: mana_t.png
+symbol:
+	code: Q
+	image: mana_q.png
 symbol:
 	code: W/U
 	image: mana_guild_wu.png
@@ -159,6 +162,7 @@ text margin bottom: 0.1
 # Insert-symbol menu
 insert symbol menu:
 	item: T
+	item: Q
 	item:
 		type: line
 	item: I
diff --git a/data/magic-mana-large.mse-symbol-font/mana_q.png b/data/magic-mana-large.mse-symbol-font/mana_q.png
new file mode 100644
index 00000000..6107403a
Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_q.png differ
diff --git a/data/magic-mana-large.mse-symbol-font/mana_q_old.png b/data/magic-mana-large.mse-symbol-font/mana_q_old.png
new file mode 100644
index 00000000..911dc397
Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_q_old.png differ
diff --git a/data/magic-mana-large.mse-symbol-font/mana_q_older.png b/data/magic-mana-large.mse-symbol-font/mana_q_older.png
new file mode 100644
index 00000000..525d0e6c
Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_q_older.png differ
diff --git a/data/magic-mana-large.mse-symbol-font/symbol-font b/data/magic-mana-large.mse-symbol-font/symbol-font
index 243a7c5b..93b788b7 100644
--- a/data/magic-mana-large.mse-symbol-font/symbol-font
+++ b/data/magic-mana-large.mse-symbol-font/symbol-font
@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2007-10-12
+version: 2008-04-01
 # Symbol font in the 'popup' style, used for casting costs on modern cards
 short name: popup style
 position hint: 002
@@ -20,6 +20,17 @@ symbol:
 symbol:
 	code: T
 	image: mana_t.png
+symbol:
+	code: Q
+	image: mana_q_older.png
+	enabled: { mana_t() == "older" }
+symbol:
+	code: Q
+	image: mana_q_old.png
+	enabled: { mana_t() == "old" }
+symbol:
+	code: Q
+	image: mana_q.png
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -220,6 +231,7 @@ text margin bottom: -.06
 # Insert-symbol menu
 insert symbol menu:
 	item: T
+	item: Q
 	item:
 		type: line
 	item: X
diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_q.png b/data/magic-mana-small-grey.mse-symbol-font/mana_q.png
new file mode 100644
index 00000000..c12358f6
Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_q.png differ
diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_q_old.png b/data/magic-mana-small-grey.mse-symbol-font/mana_q_old.png
new file mode 100644
index 00000000..1fad39c4
Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_q_old.png differ
diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_q_older.png b/data/magic-mana-small-grey.mse-symbol-font/mana_q_older.png
new file mode 100644
index 00000000..0bf2d6ff
Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_q_older.png differ
diff --git a/data/magic-mana-small-grey.mse-symbol-font/symbol-font b/data/magic-mana-small-grey.mse-symbol-font/symbol-font
index 69e64269..9ed9c64d 100644
--- a/data/magic-mana-small-grey.mse-symbol-font/symbol-font
+++ b/data/magic-mana-small-grey.mse-symbol-font/symbol-font
@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2008-01-10
+version: 2008-04-01
 short name: normal (colorless)
 position hint: 21
 icon: mana_r.png
@@ -27,6 +27,17 @@ symbol:
 symbol:
 	code: T
 	image: mana_t.png
+symbol:
+	code: Q
+	image: mana_q_older.png
+	enabled: { mana_t() == "older" }
+symbol:
+	code: Q
+	image: mana_q_old.png
+	enabled: { mana_t() == "old" }
+symbol:
+	code: Q
+	image: mana_q.png
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -226,6 +237,7 @@ text margin bottom: -.14
 # Insert-symbol menu
 insert symbol menu:
 	item: T
+	item: Q
 	item:
 		type: line
 	item: X
diff --git a/data/magic-mana-small.mse-symbol-font/mana_q.png b/data/magic-mana-small.mse-symbol-font/mana_q.png
new file mode 100644
index 00000000..c12358f6
Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_q.png differ
diff --git a/data/magic-mana-small.mse-symbol-font/mana_q_old.png b/data/magic-mana-small.mse-symbol-font/mana_q_old.png
new file mode 100644
index 00000000..1fad39c4
Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_q_old.png differ
diff --git a/data/magic-mana-small.mse-symbol-font/mana_q_older.png b/data/magic-mana-small.mse-symbol-font/mana_q_older.png
new file mode 100644
index 00000000..0bf2d6ff
Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_q_older.png differ
diff --git a/data/magic-mana-small.mse-symbol-font/symbol-font b/data/magic-mana-small.mse-symbol-font/symbol-font
index a7097f59..ce0e2d49 100644
--- a/data/magic-mana-small.mse-symbol-font/symbol-font
+++ b/data/magic-mana-small.mse-symbol-font/symbol-font
@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2007-10-12
+version: 2008-04-01
 short name: normal
 position hint: 001
 icon: mana_r.png
@@ -27,6 +27,17 @@ symbol:
 symbol:
 	code: T
 	image: mana_t.png
+symbol:
+	code: Q
+	image: mana_q_older.png
+	enabled: { mana_t() == "older" }
+symbol:
+	code: Q
+	image: mana_q_old.png
+	enabled: { mana_t() == "old" }
+symbol:
+	code: Q
+	image: mana_q.png
 symbol:
 	code: B/G/W
 	image: mana_bgw.png
@@ -226,6 +237,7 @@ text margin bottom: -.14
 # Insert-symbol menu
 insert symbol menu:
 	item: T
+	item: Q
 	item:
 		type: line
 	item: X
diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style
index f9700693..1f1f4605 100644
--- a/data/magic-new-flip.mse-style/style
+++ b/data/magic-new-flip.mse-style/style
@@ -5,7 +5,7 @@ full name: Modern flip cards
 icon: card-sample.png
 position hint: 002
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -82,7 +82,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-new-planeswalker.mse-style/style b/data/magic-new-planeswalker.mse-style/style
index 686fc5a7..67e689af 100644
--- a/data/magic-new-planeswalker.mse-style/style
+++ b/data/magic-new-planeswalker.mse-style/style
@@ -5,7 +5,7 @@ full name: Modern Planeswalkers
 icon: card-sample.png
 position hint: 008
 
-version: 2007-12-29
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -99,7 +99,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style
index d6e157ad..15542258 100644
--- a/data/magic-new-promo.mse-style/style
+++ b/data/magic-new-promo.mse-style/style
@@ -5,7 +5,7 @@ full name: Large image
 icon: card-sample.png
 position hint: 004
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -84,7 +84,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-new-split.mse-style/style b/data/magic-new-split.mse-style/style
index f3ca16c0..343e5017 100644
--- a/data/magic-new-split.mse-style/style
+++ b/data/magic-new-split.mse-style/style
@@ -5,7 +5,7 @@ full name: Modern split cards
 icon: card-sample.png
 position hint: 003
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -98,7 +98,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style
index dee9a51b..cb9eb113 100644
--- a/data/magic-new-token.mse-style/style
+++ b/data/magic-new-token.mse-style/style
@@ -5,7 +5,7 @@ full name: Modern style
 icon: card-sample.png
 position hint: 007
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -106,7 +106,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style
index 0bb4a4a4..119d9d96 100644
--- a/data/magic-new.mse-style/style
+++ b/data/magic-new.mse-style/style
@@ -5,7 +5,7 @@ full name: After 8th edition
 icon: card-sample.png
 position hint: 001
 
-version: 2008-03-13
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -107,7 +107,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-old-split.mse-style/style b/data/magic-old-split.mse-style/style
index bca2aacd..5fdf736c 100644
--- a/data/magic-old-split.mse-style/style
+++ b/data/magic-old-split.mse-style/style
@@ -5,7 +5,7 @@ short name: Old Splits
 icon: card-sample.png
 position hint: 103
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -127,7 +127,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: old
 	choice: modern
 	choice: old
diff --git a/data/magic-old-token.mse-style/style b/data/magic-old-token.mse-style/style
index 2c1d9e1a..a9fff177 100644
--- a/data/magic-old-token.mse-style/style
+++ b/data/magic-old-token.mse-style/style
@@ -11,7 +11,7 @@ full name: Old style
 icon: card-sample.png
 position hint: 107
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -124,7 +124,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: old
 	choice: modern
 	choice: old
diff --git a/data/magic-old.mse-style/style b/data/magic-old.mse-style/style
index 80372703..56eb2ca2 100644
--- a/data/magic-old.mse-style/style
+++ b/data/magic-old.mse-style/style
@@ -11,7 +11,7 @@ full name: Before 8th edition
 icon: card-sample.png
 position hint: 101
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -135,7 +135,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: old
 	choice: modern
 	choice: old
diff --git a/data/magic-planeshifted.mse-style/style b/data/magic-planeshifted.mse-style/style
index e0c3ca79..2231b47b 100644
--- a/data/magic-planeshifted.mse-style/style
+++ b/data/magic-planeshifted.mse-style/style
@@ -5,7 +5,7 @@ full name: Planar Chaos Timeshifts
 icon: card-sample.png
 position hint: 011
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -87,7 +87,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: modern
 	choice: modern
 	choice: old
diff --git a/data/magic-textless.mse-style/style b/data/magic-textless.mse-style/style
index faa0c724..84ee8995 100644
--- a/data/magic-textless.mse-style/style
+++ b/data/magic-textless.mse-style/style
@@ -5,7 +5,7 @@ full name: Modern style
 icon: card-sample.png
 position hint: 005
 
-version: 2008-03-12
+version: 2008-04-01
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -77,14 +77,6 @@ styling field:
 	name: use guild mana symbols
 	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
 	initial: no
-styling field:
-	type: choice
-	name: tap symbol
-	description: What tap symbol should be used on cards?
-	initial: modern
-	choice: modern
-	choice: old
-	choice: diagonal T
 styling field:
 	type: boolean
 	name: inverted common symbol
@@ -95,13 +87,6 @@ styling style:
 		choice images:
 			yes: /magic-mana-large.mse-symbol-font/mana_guild_rg.png
 			no:  /magic-mana-large.mse-symbol-font/mana_rg.png
-	tap symbol:
-		render style: both
-		choice images:
-			modern:     /magic-mana-large.mse-symbol-font/mana_t.png
-			old:        /magic-mana-large.mse-symbol-font/mana_t_old.png
-			diagonal T: /magic-mana-large.mse-symbol-font/mana_t_older.png
-
 
 ############################################################## Card fields
 card style:
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 44b8ea4d..fd1be68a 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -5,7 +5,7 @@ installer group: magic/game files
 icon: card-back.png
 position hint: 01
 
-version: 2008-03-25
+version: 2008-04-01
 depends on:
 	package: magic-blends.mse-include
 	version: 2007-09-23
@@ -35,7 +35,7 @@ init script:
 		else                     mana_sort()
 	}
 	# Like mana filter, only also allow tap symbols:
-	tap_filter := sort_rule(order: "<T>")
+	tap_filter := sort_rule(order: "<TQ>")
 	mana_filter_t := replace_rule(               # Remove [] used for forcing mana symbols
 				match: "[\\[\\]]",
 				replace: ""
@@ -262,7 +262,7 @@ init script:
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" and contains(input.param, match: " ") then (
 			if contains(input.param, match:",") then (
-				if match(match: "^[STXYZIWUBRG0-9/|]+,", input.param) then
+				if match(match: "^[STQXYZIWUBRG0-9/|]+,", input.param) then
 					"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
 				else "<param-cost>{combined_cost(input.param)}</param-cost>"
 			) else
@@ -273,7 +273,7 @@ init script:
 	alternative_cost := replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	combined_cost := replace_rule(match:", [A-Z]", replace: { to_lower() })+
 		replace_rule(match:",", replace:" and")+
-		replace_rule(match:"^[STXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
+		replace_rule(match:"^[STQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
 		replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	long_dash := replace_rule(match:"-", replace:"—")
 	# Utilities for keywords
@@ -296,8 +296,8 @@ init script:
 		    |adds?|pay(ed)?[ ](with|using)
 		    )
 		    ([ ]either)?			 # pay either X or Y
-		    ([ ]<sym[^>]*>[STXYZIWUBRG0-9/|]+</sym[^>]*>,)* # pay X, Y or Z
-		    ([ ]<sym[^>]*>[STXYZIWUBRG0-9/|]+</sym[^>]*>[ ](and|or|and/or))* # pay X or Y
+		    ([ ]<sym[^>]*>[STQXYZIWUBRG0-9/|]+</sym[^>]*>,)* # pay X, Y or Z
+		    ([ ]<sym[^>]*>[STQXYZIWUBRG0-9/|]+</sym[^>]*>[ ](and|or|and/or))* # pay X or Y
 		    [ ]<match> 
 		    ([,.)]|$				# (end of word)
 		    |[ ][^ .,]*$			# still typing...
@@ -345,16 +345,16 @@ init script:
 			) +
 		# step 4 : explict non mana symbols
 		replace_rule(
-			match: "\\][STXYZIWUBRG0-9/|]+\\[",
+			match: "\\][STQXYZIWUBRG0-9/|]+\\[",
 			replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
 		# step 5 : add mana & tap symbols
 		replace_rule(
-			match: "[STXYZIWUBRG0-9/|]+",
+			match: "[STQXYZIWUBRG0-9/|]+",
 			in_context: mana_context,
 			replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
 		# step 5b : add explict mana symbols
 		replace_rule(
-			match: "\\[[STXYZIWUBRG0-9/|]+\\]",
+			match: "\\[[STQXYZIWUBRG0-9/|]+\\]",
 			replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
 		# step 7 : italic reminder text
 		replace_rule(
@@ -1859,7 +1859,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [STXYZI0-9WUBRG/|]+
+	match: [STQXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -1872,7 +1872,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][STXYZI0-9WUBRG/|]*|[-—][^(\n]*
+	match: [ ][STQXYZI0-9WUBRG/|]*|[-—][^(\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false
@@ -2414,3 +2414,13 @@ keyword:
 	match: Kinship
 	mode: pseudo
 	rules: Kinship — At the beginning of your upkeep, you may look at the top card of your library. If that card shares a creature type with ~, you may reveal it. If you do, [effect].
+keyword:
+	keyword: Persist
+	match: Persist
+	mode: expert
+	reminder: When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.
+keyword:
+	keyword: Wither
+	match: Wither
+	mode: expert
+	reminder: This deals damage to creatures in the form of -1/-1 counters.
diff --git a/data/vanguard-standard.mse-style/style b/data/vanguard-standard.mse-style/style
index 9bf3fdd1..1903b9ca 100644
--- a/data/vanguard-standard.mse-style/style
+++ b/data/vanguard-standard.mse-style/style
@@ -4,7 +4,7 @@ short name: Standard
 icon: card-sample.png
 position hint: 01
 
-version: 2007-12-30
+version: 2008-04-01
 depends on:
 	package: vanguard.mse-game
 	version: 2007-12-29
@@ -36,7 +36,6 @@ init script:
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
 
-
 ############################################################## Extra style options
 
 styling field:
@@ -52,7 +51,7 @@ styling field:
 styling field:
 	type: choice
 	name: tap symbol
-	description: What tap symbol should be used on cards?
+	description: What tap and untap symbols should be used on cards?
 	initial: old
 	choice: modern
 	choice: old
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index c425380d..2c20789e 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -4,7 +4,7 @@ full name: Magic Vanguard
 icon: card-sample.png
 position hint: 02
 
-version: 2008-03-18
+version: 2008-04-01
 
 # Author : Wolfwood
 # Most stuff is copy/pasted from magic.mse-game
@@ -30,7 +30,7 @@ init script:
 		else                         mana_sort()
 	}
 	# Like mana filter, only also allow tap symbols:
-	tap_filter := sort_rule(order: "<T>")
+	tap_filter := sort_rule(order: "<TQ>")
 	mana_filter_t := replace_rule(               # Remove [] used for forcing mana symbols
 				match: "[\\[\\]]",
 				replace: ""
@@ -43,7 +43,7 @@ init script:
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" and contains(input.param, " ") then (
 			if contains(input.param, match:",") then (
-				if match(match: "^[STXYZIWUBRG0-9/|]+,", input.param) then
+				if match(match: "^[STQXYZIWUBRG0-9/|]+,", input.param) then
 					"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
 				else "<param-cost>{combined_cost(input.param)}</param-cost>"
 			) else
@@ -54,7 +54,7 @@ init script:
 	alternative_cost := replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	combined_cost := replace_rule(match:", [A-Z]", replace: { to_lower() })+
 		replace_rule(match:",", replace:" and")+
-		replace_rule(match:"^[STXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
+		replace_rule(match:"^[STQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
 		replace_rule(match:"^[A-Z]", replace: { to_lower() })
 	long_dash := replace_rule(match:"-", replace:"—")
 	# Utilities for keywords
@@ -82,7 +82,7 @@ init script:
 		    |adds?|pay(ed)?[ ](with|using)
 		    )
 		    ([ ]either)?			 # pay either X or Y
-		    ([ ]<sym[^>]*>[TSXYZIWUBRG0-9/|]+</sym[^>]*>[ ](and|or))* # pay X or Y
+		    ([ ]<sym[^>]*>[TQSXYZIWUBRG0-9/|]+</sym[^>]*>[ ](and|or))* # pay X or Y
 		    [ ]<match> 
 		    ([,.)]|$				# (end of word)
 		    |[ ][^ .,]*$			# still typing...
@@ -133,16 +133,16 @@ init script:
 			) +
 		# step 4.5 : explict non mana symbols
 		replace_rule(
-			match: "\\][STXYZIWUBRG0-9/|]+\\[",
+			match: "\\][STQXYZIWUBRG0-9/|]+\\[",
 			replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
 		# step 5 : add mana & tap symbols
 		replace_rule(
-			match: "[STXYZIWUBRG0-9/|]+",
+			match: "[STQXYZIWUBRG0-9/|]+",
 			in_context: mana_context,
 			replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
 		# step 5b : add explict mana symbols
 		replace_rule(
-			match: "\\[[STXYZIWUBRG0-9/|]+\\]",
+			match: "\\[[STQXYZIWUBRG0-9/|]+\\]",
 			replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
 		# step 7 : italic reminder text
 		replace_rule(
@@ -422,7 +422,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [STXYZI0-9WUBRG/|]+
+	match: [STQXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -435,7 +435,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][STXYZI0-9WUBRG/|]*|[-—][^(\n]*
+	match: [ ][STQXYZI0-9WUBRG/|]*|[-—][^(\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false
@@ -956,3 +956,13 @@ keyword:
 	keyword: Kinship
 	match: Kinship
 	mode: pseudo
+keyword:
+	keyword: Persist
+	match: persist
+	mode: expert
+	reminder: When it is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.
+keyword:
+	keyword: Wither
+	match: wither
+	mode: expert
+	reminder: It deals damage to creatures in the form of -1/-1 counters.