diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 8228613d..a65e8095 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -1,4 +1,4 @@
-mse version: 0.3.5
+mse version: 0.3.5
 short name: Magic
 full name: Magic the Gathering
 icon: card-back.png
@@ -1318,34 +1318,500 @@ word list:
 	word:
 		script: all_races()
 		line below: true
-	word: Beast
-	word: Bird
-	word: Elemental
-	word: Elf
-	word: Goblin
-	word: Human
-	word: Merfolk
-	word: Zombie
-	# TODO: lots more?
+	word:
+		name: All Types
+		word: A
+			word: Advisor
+			word: Anemone
+			word: Angel
+			word: Anteater
+			word: Antelope
+			word: Ape
+			word: Archer
+			word: Archon
+			word: Artificer
+			word: Assassin
+			word: Assembly-Worker
+			word: Atog
+			word: Aurochs
+			word: Avatar
+		word: B
+			word: Badger
+			word: Barbarian
+			word: Basilisk
+			word: Bat
+			word: Bear
+			word: Beast
+			word: Beeble
+			word: Berserker
+			word: Bird
+			word: Blinkmoth
+			word: Boar
+			word: Bringer
+			word: Brushwagg
+		word: C
+			word: Camarid
+			word: Camel
+			word: Caribou
+			word: Carrier
+			word: Cat
+			word: Centaur
+			word: Cephalid
+			word: Chimera
+			word: Citizen
+			word: Cleric
+			word: Cockatrice
+			word: Construct
+			word: Coward
+			word: Crab
+			word: Crocodile
+			word: Cyclops
+		word: D
+			word: Dauthi
+			word: Demon
+			word: Deserter
+			word: Devil
+			word: Djinn
+			word: Dragon
+			word: Drake
+			word: Dreadnought
+			word: Drone
+			word: Druid
+			word: Dryad
+			word: Dwarf
+		word: E
+			word: Efreet
+			word: Egg
+			word: Elder
+			word: Elemental
+			word: Elephant
+			word: Elf
+			word: Elk
+			word: Eye
+		word: F
+			word: Faerie
+			word: Ferret
+			word: Fish
+			word: Flagbearer
+			word: Fox
+			word: Frog
+			word: Fungus
+		word: G
+			word: Gargoyle
+			word: Giant
+			word: Gnome
+			word: Goat
+			word: Goblin
+			word: Golem
+			word: Gorgon
+			word: Graveborn
+			word: Gremlin
+			word: Griffin
+		word: H
+			word: Hag
+			word: Harpy
+			word: Hellion
+			word: Hippo
+			word: Homarid
+			word: Homunculus
+			word: Horror
+			word: Horse
+			word: Hound
+			word: Human
+			word: Hydra
+		word: I
+			word: Illusion
+			word: Imp
+			word: Incarnation
+			word: Insect
+		word: J
+			word: Jellyfish
+			word: Juggernaut
+		word: K
+			word: Kavu
+			word: Kirin
+			word: Kithkin
+			word: Knight
+			word: Kobold
+			word: Kor
+			word: Kraken
+		word: L
+			word: Lammasu
+			word: Leech
+			word: Leviathan
+			word: Lhurgoyf
+			word: Licid
+			word: Lizard
+		word: M
+			word: Manticore
+			word: Masticore
+			word: Mercenary
+			word: Merfolk
+			word: Metathran
+			word: Minion
+			word: Minotaur
+			word: Monger
+			word: Mongoose
+			word: Monk
+			word: Moonfolk
+			word: Mutant
+			word: Myr
+			word: Mystic
+		word: N
+			word: Nautilus
+			word: Nephilim
+			word: Nightmare
+			word: Nightstalker
+			word: Ninja
+			word: Nomad
+		word: O
+			word: Octopus
+			word: Ogre
+			word: Ooze
+			word: Orb
+			word: Orc
+			word: Orgg
+			word: Ouphe
+			word: Ox
+			word: Oyster
+		word: P
+			word: Pegasus
+			word: Pentavite
+			word: Pest
+			word: Phelddagrif
+			word: Phoenix
+			word: Pincher
+			word: Pirate
+			word: Plant
+			word: Prism
+		word: R
+			word: Rabbit
+			word: Rat
+			word: Rebel
+			word: Reflection
+			word: Rhino
+			word: Rigger
+			word: Rogue
+		word: S
+			word: Sa-Sl
+				word: Salamander
+				word: Samurai
+				word: Sand
+				word: Saproling
+				word: Satyr
+				word: Scarecrow
+				word: Scorpion
+				word: Scout
+				word: Serf
+				word: Serpent
+				word: Shade
+				word: Shaman
+				word: Shapeshifter
+				word: Sheep
+				word: Skeleton
+				word: Slith
+				word: Sliver
+				word: Slug
+			word: Sn-Sz
+				word: Snake
+				word: Soldier
+				word: Soltari
+				word: Spawn
+				word: Specter
+				word: Spellshaper
+				word: Sphinx
+				word: Spider
+				word: Spike
+				word: Spirit
+				word: Splinter
+				word: Sponge
+				word: Squid
+				word: Squirrel
+				word: Starfish
+				word: Survivor
+		word: T
+			word: Tetravite
+			word: Thalakos
+			word: Thopter
+			word: Thrull
+			word: Treefolk
+			word: Triskelavite
+			word: Troll
+			word: Turtle
+		word: U
+			word: Unicorn
+		word: V
+			word: Vampire
+			word: Vedalken
+			word: Viashino
+			word: Volver
+		word: W
+			word: Wall
+			word: Warrior
+			word: Weird
+			word: Whale
+			word: Wizard
+			word: Wolf
+			word: Wolverine
+			word: Wombat
+			word: Worm
+			word: Wraith
+			word: Wurm
+		word: Y
+			word: Yeti
+		word: Z
+			word: Zombie
+			word: Zubera
+
 word list:
 	name: class
 	word:
 		script: all_classes()
 		line below: true
-	word: Cleric
-	word: Druid
-	word: Lord
-	word: Shaman
-	word: Soldier
-	word: Warrior
 	word:
-		name: Wizard
-	#	line below: true
-	#word:
-	#	name: All types
-	#	word: A
-	#	word: B
-	#	# TODO: Add all types here
+		name: All Types
+		word: A
+			word: Advisor
+			word: Anemone
+			word: Angel
+			word: Anteater
+			word: Antelope
+			word: Ape
+			word: Archer
+			word: Archon
+			word: Artificer
+			word: Assassin
+			word: Assembly-Worker
+			word: Atog
+			word: Aurochs
+			word: Avatar
+		word: B
+			word: Badger
+			word: Barbarian
+			word: Basilisk
+			word: Bat
+			word: Bear
+			word: Beast
+			word: Beeble
+			word: Berserker
+			word: Bird
+			word: Blinkmoth
+			word: Boar
+			word: Bringer
+			word: Brushwagg
+		word: C
+			word: Camarid
+			word: Camel
+			word: Caribou
+			word: Carrier
+			word: Cat
+			word: Centaur
+			word: Cephalid
+			word: Chimera
+			word: Citizen
+			word: Cleric
+			word: Cockatrice
+			word: Construct
+			word: Coward
+			word: Crab
+			word: Crocodile
+			word: Cyclops
+		word: D
+			word: Dauthi
+			word: Demon
+			word: Deserter
+			word: Devil
+			word: Djinn
+			word: Dragon
+			word: Drake
+			word: Dreadnought
+			word: Drone
+			word: Druid
+			word: Dryad
+			word: Dwarf
+		word: E
+			word: Efreet
+			word: Egg
+			word: Elder
+			word: Elemental
+			word: Elephant
+			word: Elf
+			word: Elk
+			word: Eye
+		word: F
+			word: Faerie
+			word: Ferret
+			word: Fish
+			word: Flagbearer
+			word: Fox
+			word: Frog
+			word: Fungus
+		word: G
+			word: Gargoyle
+			word: Giant
+			word: Gnome
+			word: Goat
+			word: Goblin
+			word: Golem
+			word: Gorgon
+			word: Graveborn
+			word: Gremlin
+			word: Griffin
+		word: H
+			word: Hag
+			word: Harpy
+			word: Hellion
+			word: Hippo
+			word: Homarid
+			word: Homunculus
+			word: Horror
+			word: Horse
+			word: Hound
+			word: Human
+			word: Hydra
+		word: I
+			word: Illusion
+			word: Imp
+			word: Incarnation
+			word: Insect
+		word: J
+			word: Jellyfish
+			word: Juggernaut
+		word: K
+			word: Kavu
+			word: Kirin
+			word: Kithkin
+			word: Knight
+			word: Kobold
+			word: Kor
+			word: Kraken
+		word: L
+			word: Lammasu
+			word: Leech
+			word: Leviathan
+			word: Lhurgoyf
+			word: Licid
+			word: Lizard
+		word: M
+			word: Manticore
+			word: Masticore
+			word: Mercenary
+			word: Merfolk
+			word: Metathran
+			word: Minion
+			word: Minotaur
+			word: Monger
+			word: Mongoose
+			word: Monk
+			word: Moonfolk
+			word: Mutant
+			word: Myr
+			word: Mystic
+		word: N
+			word: Nautilus
+			word: Nephilim
+			word: Nightmare
+			word: Nightstalker
+			word: Ninja
+			word: Nomad
+		word: O
+			word: Octopus
+			word: Ogre
+			word: Ooze
+			word: Orb
+			word: Orc
+			word: Orgg
+			word: Ouphe
+			word: Ox
+			word: Oyster
+		word: P
+			word: Pegasus
+			word: Pentavite
+			word: Pest
+			word: Phelddagrif
+			word: Phoenix
+			word: Pincher
+			word: Pirate
+			word: Plant
+			word: Prism
+		word: R
+			word: Rabbit
+			word: Rat
+			word: Rebel
+			word: Reflection
+			word: Rhino
+			word: Rigger
+			word: Rogue
+		word: S
+			word: Sa-Sl
+				word: Salamander
+				word: Samurai
+				word: Sand
+				word: Saproling
+				word: Satyr
+				word: Scarecrow
+				word: Scorpion
+				word: Scout
+				word: Serf
+				word: Serpent
+				word: Shade
+				word: Shaman
+				word: Shapeshifter
+				word: Sheep
+				word: Skeleton
+				word: Slith
+				word: Sliver
+				word: Slug
+			word: Sn-Sz
+				word: Snake
+				word: Soldier
+				word: Soltari
+				word: Spawn
+				word: Specter
+				word: Spellshaper
+				word: Sphinx
+				word: Spider
+				word: Spike
+				word: Spirit
+				word: Splinter
+				word: Sponge
+				word: Squid
+				word: Squirrel
+				word: Starfish
+				word: Survivor
+		word: T
+			word: Tetravite
+			word: Thalakos
+			word: Thopter
+			word: Thrull
+			word: Treefolk
+			word: Triskelavite
+			word: Troll
+			word: Turtle
+		word: U
+			word: Unicorn
+		word: V
+			word: Vampire
+			word: Vedalken
+			word: Viashino
+			word: Volver
+		word: W
+			word: Wall
+			word: Warrior
+			word: Weird
+			word: Whale
+			word: Wizard
+			word: Wolf
+			word: Wolverine
+			word: Wombat
+			word: Worm
+			word: Wraith
+			word: Wurm
+		word: Y
+			word: Yeti
+		word: Z
+			word: Zombie
+			word: Zubera
 
 word list:
 	name: artifact