diff --git a/data/magic-future-common.mse-include/include b/data/magic-future-common.mse-include/include
index 06ced933..d000d51b 100644
--- a/data/magic-future-common.mse-include/include
+++ b/data/magic-future-common.mse-include/include
@@ -1,3 +1,3 @@
-mse version: 0.3.5
+mse version: 0.3.6
 full name: Icons/symbols for futureshifted Magic The Gathering templates
-version: 2007-09-23
+version: 2008-05-21
diff --git a/data/magic-future-common.mse-include/planeswalker_black.png b/data/magic-future-common.mse-include/planeswalker_black.png
new file mode 100644
index 00000000..48501071
Binary files /dev/null and b/data/magic-future-common.mse-include/planeswalker_black.png differ
diff --git a/data/magic-future-common.mse-include/planeswalker_white.png b/data/magic-future-common.mse-include/planeswalker_white.png
new file mode 100644
index 00000000..f6b69b3b
Binary files /dev/null and b/data/magic-future-common.mse-include/planeswalker_white.png differ
diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style
index 34ca1087..26d2d0ae 100644
--- a/data/magic-future-textless.mse-style/style
+++ b/data/magic-future-textless.mse-style/style
@@ -6,13 +6,13 @@ installer group: magic/Future/Textless cards
 icon: card-sample.png
 position hint: 055
 
-version: 2008-04-13
+version: 2008-05-21
 depends on:
 	package: magic.mse-game
 	version: 2007-09-23
 depends on:
 	package: magic-future-common.mse-include
-	version: 2007-09-23
+	version: 2008-05-21
 depends on:
 	package: magic-mana-future.mse-symbol-font
 	version: 2007-09-23
@@ -220,6 +220,7 @@ card style:
 			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" }
+			planeswalker: { "/magic-future-common.mse-include/planeswalker_" + typesymbol_color(value) + ".png" }
 
 	############################# Image
 	image:
diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style
index c6590491..21d63125 100644
--- a/data/magic-future.mse-style/style
+++ b/data/magic-future.mse-style/style
@@ -6,7 +6,7 @@ installer group: magic/Future/Normal cards
 icon: card-sample.png
 position hint: 050
 
-version: 2008-04-13
+version: 2008-05-21
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -15,7 +15,7 @@ depends on:
 	version: 2007-09-23
 depends on:
 	package: magic-future-common.mse-include
-	version: 2007-09-23
+	version: 2008-05-21
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -287,6 +287,7 @@ card style:
 			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" }
+			planeswalker: { "/magic-future-common.mse-include/planeswalker_" + typesymbol_color(value) + ".png" }
 
 	############################# Image
 	image:
diff --git a/data/magic-watermarks.mse-include/futsymbol_planeswalker.png b/data/magic-watermarks.mse-include/futsymbol_planeswalker.png
new file mode 100644
index 00000000..c3da2b5d
Binary files /dev/null and b/data/magic-watermarks.mse-include/futsymbol_planeswalker.png differ
diff --git a/data/magic-watermarks.mse-include/include b/data/magic-watermarks.mse-include/include
index 8acb6c2d..fb42b426 100644
--- a/data/magic-watermarks.mse-include/include
+++ b/data/magic-watermarks.mse-include/include
@@ -1,6 +1,6 @@
-mse version: 0.3.5
+mse version: 0.3.6
 full name: Magic The Gathering, textbox watermarks
-version: 2007-12-29
+version: 2008-05-21
 
 # This file doesn't do anything, other files in this directory can be included
 # in game/style files:
diff --git a/data/magic-watermarks.mse-include/watermark-names b/data/magic-watermarks.mse-include/watermark-names
index 817bc8ce..1f6a08ce 100644
--- a/data/magic-watermarks.mse-include/watermark-names
+++ b/data/magic-watermarks.mse-include/watermark-names
@@ -63,6 +63,7 @@ choice:
 	choice: instant
 	choice: land
 	choice: multiple
+	choice: planeswalker
 	choice: sorcery
 choice:
 	name: set symbol
diff --git a/data/magic-watermarks.mse-include/watermarks b/data/magic-watermarks.mse-include/watermarks
index cf856a40..c39e1b33 100644
--- a/data/magic-watermarks.mse-include/watermarks
+++ b/data/magic-watermarks.mse-include/watermarks
@@ -53,6 +53,7 @@ choice images:
 	future sight type symbols instant:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_instant.png")
 	future sight type symbols land:				script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_land.png")
 	future sight type symbols multiple:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_multiple.png")
+	future sight type symbols planeswalker:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_planeswalker.png")
 	future sight type symbols sorcery:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_sorcery.png")
 
 	set symbol:
diff --git a/data/magic-watermarks.mse-include/watermarks-old b/data/magic-watermarks.mse-include/watermarks-old
index 61a71c7f..47ce0b5d 100644
--- a/data/magic-watermarks.mse-include/watermarks-old
+++ b/data/magic-watermarks.mse-include/watermarks-old
@@ -53,6 +53,7 @@ choice images:
 	future sight type symbols instant:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_instant.png")
 	future sight type symbols land:				script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_land.png")
 	future sight type symbols multiple:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_multiple.png")
+	future sight type symbols planeswalker:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_planeswalker.png")
 	future sight type symbols sorcery:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_sorcery.png")
 
 	set symbol:
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 10744899..b2d8e64d 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-05-18
+version: 2008-05-21
 depends on:
 	package: magic-blends.mse-include
 	version: 2007-09-23
@@ -478,6 +478,7 @@ init script:
 		  else if input == "Artifact"    then "artifact"
 		  else if input == "Enchantment" then "enchantment"
 		  else if input == "Land"        then "land"
+		  else if input == "Planeswalker" then "planeswalker"
 		  else                                "multitype"
 		}
 	typesymbol_type := { typesymbol_for(card.super_type) }
@@ -790,7 +791,9 @@ card field:
 	choice: instant
 	choice: land
 	choice: multitype
+	choice: planeswalker
 	choice: sorcery
+	choice: none
 	description: The card type symbol for this card
 
 ############################# Image