diff --git a/data/magic-embossedletters.mse-symbol-font/symbol-font b/data/magic-embossedletters.mse-symbol-font/symbol-font
index 26bf552a..53cec389 100644
--- a/data/magic-embossedletters.mse-symbol-font/symbol-font
+++ b/data/magic-embossedletters.mse-symbol-font/symbol-font
@@ -1,4 +1,4 @@
-mse version: 0.3.5
+mse version: 0.3.5
 version: 2007-10-13
 
 image font size: 46
diff --git a/data/magic-firepenguinmaster-planeswalker.mse-style/style b/data/magic-firepenguinmaster-planeswalker.mse-style/style
index 940e9770..401f3384 100644
--- a/data/magic-firepenguinmaster-planeswalker.mse-style/style
+++ b/data/magic-firepenguinmaster-planeswalker.mse-style/style
@@ -1,4 +1,4 @@
-mse version: 0.3.7
+mse version: 0.3.7
 game: magic
 full name: FPM Planeswalkers
 short name: FPM 'Walkers
diff --git a/data/magic-mana-beveled.mse-symbol-font/symbol-font b/data/magic-mana-beveled.mse-symbol-font/symbol-font
index 70f6674e..4b18722f 100644
--- a/data/magic-mana-beveled.mse-symbol-font/symbol-font
+++ b/data/magic-mana-beveled.mse-symbol-font/symbol-font
@@ -1,4 +1,4 @@
-mse version: 0.3.7
+mse version: 0.3.7
 version: 2008-08-13
 short name: beveled style (firepenguinmaster)
 installer group: magic/Mana symbols/beveled style (FirePenguinMaster)
diff --git a/data/magic-mana-large.mse-symbol-font/symbol-font b/data/magic-mana-large.mse-symbol-font/symbol-font
index 8ad8245e..46294a71 100644
--- a/data/magic-mana-large.mse-symbol-font/symbol-font
+++ b/data/magic-mana-large.mse-symbol-font/symbol-font
@@ -1,4 +1,4 @@
-mse version: 0.3.7
+mse version: 0.3.7
 version: 2008-08-13
 # Symbol font in the 'popup' style, used for casting costs on modern cards
 short name: popup style
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 9f60eaa6..a9e448cf 100644
--- a/data/magic-mana-small-grey.mse-symbol-font/symbol-font
+++ b/data/magic-mana-small-grey.mse-symbol-font/symbol-font
@@ -1,4 +1,4 @@
-mse version: 0.3.7
+mse version: 0.3.7
 version: 2008-08-12
 short name: normal (colorless)
 position hint: 11
diff --git a/data/magic-mana-small.mse-symbol-font/symbol-font b/data/magic-mana-small.mse-symbol-font/symbol-font
index f2abaffc..327386ee 100644
--- a/data/magic-mana-small.mse-symbol-font/symbol-font
+++ b/data/magic-mana-small.mse-symbol-font/symbol-font
@@ -1,4 +1,4 @@
-mse version: 0.3.7
+mse version: 0.3.7
 version: 2008-08-12
 short name: normal
 installer group: magic/Mana symbols/normal style
diff --git a/data/magic.mse-game/auto_replace b/data/magic.mse-game/auto_replace
index ac303432..1a57018c 100644
--- a/data/magic.mse-game/auto_replace
+++ b/data/magic.mse-game/auto_replace
@@ -1,4 +1,4 @@
-
+
 ############################################################## Auto replace
 
 # Do we need categories?
@@ -34,3 +34,9 @@ auto replace:
 auto replace:
 	match: @
 	replace: LEGENDNAME
+auto replace:
+	match: ~
+	replace: CARDNAME
+auto replace:
+	match: ~THIS~
+	replace: CARDNAME
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 188b688d..efaca644 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -1,4 +1,4 @@
-mse version: 0.3.8
+mse version: 0.3.7
 short name: Magic
 full name: Magic the Gathering
 installer group: magic/game files
diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index e2cce3d6..90fa2aac 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -392,13 +392,13 @@ text_filter :=
 		match: "(<atom-reminder-[^>]*>[^)]+[)]</atom-reminder-[^>]*>)([^\n]+)\\1"
 		replace: "\\2\\1"
 		) +
-	# step 3a : expand shortcut words ~ and CARDNAME
+	# step 3a : expand shortcut word CARDNAME
 	replace@(
-		match: "~|~THIS~|CARDNAME",
+		match: "CARDNAME",
 		in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
 		replace: "<atom-cardname></atom-cardname>"
 		) +
-	# step 3b : expand shortcut words ` and shortened LEGENDNAME
+	# step 3b : expand shortcut word LEGENDNAME
 	replace@(
 		match: "LEGENDNAME",
 		in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
diff --git a/src/util/version.cpp b/src/util/version.cpp
index 5c1e0f7c..0bd337da 100644
--- a/src/util/version.cpp
+++ b/src/util/version.cpp
@@ -72,7 +72,7 @@ const Char* version_suffix = _(" (beta, ascii build)");
  *     0.3.3 : keyword separator before/after
  *     0.3.4 : html export; choice rendering based on scripted 'image'
  *     0.3.5 : word lists, symbol font 'as text'
- *     0.3.6 : free rotation, rotation behaviour changed. 
+ *     0.3.6 : free rotation, rotation behaviour changed.
  *     0.3.7 : scripting language changes (@ operator, stricter type conversion).
  */
 const Version file_version_locale          = 307; // 0.3.7