diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style
index c6f15307..6b73ba87 100644
--- a/data/magic-future-textless.mse-style/style
+++ b/data/magic-future-textless.mse-style/style
@@ -90,29 +90,6 @@ init script:
 		else "white"
 	}
 	
-	typesymbol_type:= { if contains(card.type, match:"Tribal") then "multitype"
-		else if contains(card.type, match:"Sorcery") then "sorcery"
-		else if contains(card.type, match:"Instant") then "instant"
-		else if contains(card.type, match:"Planeswalker") then "multitype"
-		else if contains(card.type, match:"Creature") and
-		   not contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Enchantment") then "creature"
-		else if contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Creature") and
-		   not contains(card.type, match:"Enchantment") then "artifact"
-		else if contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Creature") and
-		   not contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Enchantment") then "land"
-		else if contains(card.type, match:"Enchantment") and
-		   not contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Creature") then "enchantment"
-		else "multitype"
-	}
-	
 	card_shape := { "shifted" }
 
 ############################################################## Set info fields
@@ -240,6 +217,21 @@ card style:
 		render style: image
 		choice images:
 			tombstone: tombstone.png
+	type symbol:
+		left: 23
+		top: 25
+		width: 21
+		height: 20
+		z index: 2
+		render style: image
+		choice images:
+			artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
+			creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
+			enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
+			instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
+			land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
+			multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
+			sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
 
 	############################# Image
 	image:
@@ -377,17 +369,6 @@ extra card field:
 	name: pt box
 	script: card.card_color
 	editable: false
-extra card field:
-	type: choice
-	name: type symbol
-	default: typesymbol_type()
-	choice: artifact
-	choice: creature
-	choice: enchantment
-	choice: instant
-	choice: land
-	choice: multitype
-	choice: sorcery
 extra card field:
 	type: choice
 	name: paintbrush
@@ -406,21 +387,6 @@ extra card style:
 		render style: image
 		image: { card_ptbox() }
 		mask: mask_pt.png
-	type symbol:
-		left: 24
-		top: 25
-		width: 21
-		height: 20
-		z index: 2
-		render style: image
-		choice images:
-			artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
-			creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
-			enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
-			instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
-			land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
-			multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
-			sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
 	paintbrush:
 		right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width }
 		top : 479
diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style
index 28976f2f..d779cca2 100644
--- a/data/magic-future.mse-style/style
+++ b/data/magic-future.mse-style/style
@@ -121,29 +121,6 @@ init script:
 		else "white"
 	}
 	
-	typesymbol_type:= { if contains(card.type, match:"Tribal") then "multitype"
-		else if contains(card.type, match:"Sorcery") then "sorcery"
-		else if contains(card.type, match:"Instant") then "instant"
-		else if contains(card.type, match:"Planeswalker") then "multitype"
-		else if contains(card.type, match:"Creature") and
-		   not contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Enchantment") then "creature"
-		else if contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Creature") and
-		   not contains(card.type, match:"Enchantment") then "artifact"
-		else if contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Creature") and
-		   not contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Enchantment") then "land"
-		else if contains(card.type, match:"Enchantment") and
-		   not contains(card.type, match:"Land") and
-		   not contains(card.type, match:"Artifact") and
-		   not contains(card.type, match:"Creature") then "enchantment"
-		else "multitype"
-	}
-	
 	card_shape := { "shifted" }
 
 ############################################################## Set info fields
@@ -289,6 +266,21 @@ card style:
 		render style: image
 		choice images:
 			tombstone: tombstone.png
+	type symbol:
+		left: 24
+		top: 24
+		width: 21
+		height: 20
+		z index: 4
+		render style: image
+		choice images:
+			artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
+			creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
+			enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
+			instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
+			land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
+			multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
+			sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
 
 	############################# Image
 	image:
@@ -485,17 +477,6 @@ extra card field:
 	script: card.card_color
 	editable: false
 	save value: false
-extra card field:
-	type: choice
-	name: type symbol
-	default: typesymbol_type(value)
-	choice: artifact
-	choice: creature
-	choice: enchantment
-	choice: instant
-	choice: land
-	choice: multitype
-	choice: sorcery
 extra card field:
 	type: choice
 	name: paintbrush
@@ -531,21 +512,6 @@ extra card style:
 		visible: { card.pt != "" }
 		render style: image
 		image: { card_ptbox() }
-	type symbol:
-		left: 24
-		top: 24
-		width: 21
-		height: 20
-		z index: 4
-		render style: image
-		choice images:
-			artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
-			creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
-			enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
-			instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
-			land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
-			multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
-			sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
 	paintbrush
 		right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
 		top : 476
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 27329d30..69ca01ab 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -430,6 +430,31 @@ init script:
 	# Shape of cards, can be changed in style files
 	card_shape := { "normal" }
 	
+	typesymbol_type:= {
+		type := to_text(card.super_type)
+		if contains(type, match:"Tribal") then "multitype"
+		else if contains(type, match:"Sorcery") then "sorcery"
+		else if contains(type, match:"Instant") then "instant"
+		else if contains(type, match:"Planeswalker") then "multitype"
+		else if contains(type, match:"Creature") and
+		   not contains(type, match:"Land") and
+		   not contains(type, match:"Artifact") and
+		   not contains(type, match:"Enchantment") then "creature"
+		else if contains(type, match:"Artifact") and
+		   not contains(type, match:"Land") and
+		   not contains(type, match:"Creature") and
+		   not contains(type, match:"Enchantment") then "artifact"
+		else if contains(type, match:"Land") and
+		   not contains(type, match:"Creature") and
+		   not contains(type, match:"Artifact") and
+		   not contains(type, match:"Enchantment") then "land"
+		else if contains(type, match:"Enchantment") and
+		   not contains(type, match:"Land") and
+		   not contains(type, match:"Artifact") and
+		   not contains(type, match:"Creature") then "enchantment"
+		else "multitype"
+	}
+	
 	############################################################## Statistics utilities
 	
 	# Converted mana cost
@@ -717,6 +742,19 @@ card field:
 	choice: none
 	choice: tombstone
 	description: Symbol for this card (tombstone)
+card field:
+	type: choice
+	name: type symbol
+	default: typesymbol_type(value)
+	card list visible: false
+	show statistics: false
+	choice: artifact
+	choice: creature
+	choice: enchantment
+	choice: instant
+	choice: land
+	choice: multitype
+	choice: sorcery
 
 ############################# Image
 card field: