LCI Keyword/Type Update

Fixes #17

data/magic-agclassic.mse-style/style

@@ -45,7 +45,7 @@ init script:
 		else "old"
 	}
 	## Use guild mana symbols?
-	#guild_mana := { styling.use_guild_mana_symbols }
+	guild_mana := { styling.use_guild_mana_symbols }
 	
 	# Only white cards use a black font
 	font_colors_white := { input != "w" }
@@ -161,11 +161,11 @@ styling field:
 	name: use color indicator
 	description: Use color indicator symbol on typeline? Default: No
 	initial: no
-#styling field:
-#	type: boolean
-#	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: boolean
+	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: package choice
 	name: mana cost mana symbols

data/magic-m15-altered.mse-style/style

@@ -275,6 +275,13 @@ init script:
 
 	white_text := {is_full_art() or is_fnm() or is_inverted()}
 
+	rare_width := {
+		cw := card_style.rarity.content_width
+		cw := if cw > 44 then (if set.print_fix != "" then set.print_fix else 22) else if cw < 22 then 22 else cw
+		if card_style.rarity.width == 0 then 0 else cw
+	}
+
+
 	use_flash_dot := {false}
 ############################################################## Set info fields
 set info style:
@@ -472,6 +479,7 @@ styling field:
 	choice: always
 	choice: short text only
 	choice: never
+	choice: right align
 	initial: never
 styling field:
 	type: boolean
@@ -623,7 +631,7 @@ card style:
 	type:
 		left: { if is_map() then 85 else (if use_flash_dot() then 3 else 0) + if is_season() then (if styling.color_indicator_dot then 64 else 44)+(if is_clear() then 4 else 0) else (if styling.color_indicator_dot then 52 else 32) + (if is_clear() then 4 else 0) }
 		top: { (if is_map() then 297.5 else if is_clear() then 294 else if is_thbland() then 444 else if is_full_art() then 329 else 296) + shrink_type() }
-		width: { if is_map() then 205 else (if styling.color_indicator_dot then "290" else "310") - (if card_style.rarity.width == 0 then 0 else max(22,card_style.rarity.content_width)) - (if is_season() then 12 else 0) }
+		width: { if is_map() then 205 else (if styling.color_indicator_dot then "290" else "310") - rare_width() - (if is_season() then 12 else 0) }
 		height: { (if is_map() then 18 else 20) - shrink_type() }
 		alignment: { if is_map() then "center top shrink-overflow" else "top shrink-overflow"}
 		z index: 5
@@ -709,6 +717,7 @@ card style:
 				   card_style.text.content_lines <= 2) or
 				   styling.center_text == "always"
 				then "middle center"
+				else if styling.center_text == "right align" then "middle right"
 				else "middle left"
 		z index: 4
 		padding left:   6

data/magic-m15-mainframe-dfc.mse-style/style

@@ -970,6 +970,7 @@ styling field:
 	choice: center back
 	choice: center first name
 	choice: center second name
+	choice: right align
 	choice: clear front
 	choice: clear back
 	choice: nyx front
@@ -1369,7 +1370,7 @@ card style:
 			name: { styling.text_box_mana_symbols }
 			size: { if styling.front_font_cap != "" then styling.front_font_cap else (if is_mutate() then 12 else 14) }
 		alignment:
-			script:	if chosen(styling.other_options, choice:"center front") then "middle center" else "middle left"
+			script:	if chosen(styling.other_options, choice:"center front") then "middle center" else if chosen(styling.other_options, choice:"right align") then "middle right" else "middle left"
 		z index: 5
 		padding left:   6
 		padding right:  4
@@ -1392,7 +1393,7 @@ card style:
 			name: { styling.text_box_mana_symbols }
 			size: { if styling.back_font_cap != "" then styling.back_font_cap else (if back_mutate() then 12 else 14) }
 		alignment:
-			script:	if chosen(styling.other_options, choice:"center back") then "middle center" else "middle left"
+			script:	if chosen(styling.other_options, choice:"center back") then "middle center" else if chosen(styling.other_options, choice:"right align") then "middle right" else "middle left"
 		z index: 5
 		padding left:   6
 		padding right:  4

data/magic.mse-game/keywords

@@ -69,7 +69,7 @@ keyword parameter type:
 
 keyword parameter type:
 	name: number
-	match: [XYZ0-9]+
+	match: [XYZ0-9%]+
 	refer script:
 		name: normal
 		description: (1,2,3)
@@ -341,7 +341,7 @@ keyword:
 	keyword: Storm
 	match: Storm
 	mode: expert
-	reminder: When you cast this spell, copy it for each spell cast before it this turn.{ if is_targeted() then " You may choose new targets for the copies." }
+	reminder: When you cast this spell, copy it for each spell cast before it this turn.{ if is_targeted() then " You may choose new targets for the copies." }{if not is_spell(card.card_type) then " Copies become tokens."}
 # Mirrodin
 keyword:
 	keyword: Affinity for
@@ -647,9 +647,9 @@ keyword:
 	reminder: This card is every creature type.
 keyword:
 	keyword: Hideaway
-	match: Hideaway
+	match: Hideaway <atom-param>number</atom-param>
 	mode: expert
-	reminder: {this_or_that("land", upper:true)} enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.
+	reminder: When {this_or_that("type", upper:false)} enters the battlefield, look at the top {english_number_multiple(param1)} card(s) of your library, exile one face down, then put the rest on the bottom of your library.
 # Morningtide
 keyword:
 	keyword: Prowl
@@ -756,8 +756,8 @@ keyword:
 	mode: expert
 	reminder: If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.
 keyword:
-	keyword: Totem armor
-	match: Totem armor
+	keyword: Umbra armor
+	match: Umbra armor
 	mode: expert
 	reminder: If enchanted {if contains(card.text, match:"Enchant <param-name>creature</param-name>") then "creature" else "permanent"} would be destroyed, instead remove all damage from it and destroy this Aura.
 keyword:
@@ -1376,9 +1376,9 @@ keyword:
 #War of the Spark
 keyword:
 	keyword: Amass
-	match: Amass <atom-param>number</atom-param>
+	match: Amass <atom-param>name</atom-param> <atom-param>number</atom-param>
 	mode: action
-	reminder: Put {english_number_a(param1)} +1/+1 counter(s) on an Army you control. If you don't control one, create a 0/0 black Zombie Army creature token first.
+	reminder: Put {english_number_a(param2)} +1/+1 counter(s) on an Army you control. It's also a {if param1.value == "Zombies" then "Zombie" else english_singular(param1)}. If you don't control one, create a 0/0 black {if param1.value == "Zombies" then "Zombie" else english_singular(param1)} Army creature token first.
 #Throne of Eldraine
 keyword:
 	keyword: Adamant
@@ -1552,4 +1552,247 @@ keyword:
 	keyword: Compleated
 	match: Compleated
 	mode: expert
-	reminder: {phy_reminder(card.casting_cost)} If life was paid, this planeswalker enters with two fewer loyalty counters.
+	reminder: {phy_reminder(card.casting_cost)} If life was paid, this planeswalker enters with two fewer loyalty counters.
+# Streets of New Capenna
+keyword:
+	keyword: Casualty
+	match: Casualty <atom-param>number</atom-param>
+	mode: expert
+	reminder: As you cast this spell, you may sacrifice a creature with power {param1}{if param1 == "X" then "." else " or greater."} When you do, copy this spell.
+keyword:
+	keyword: Connive
+	match: connive
+	mode: action
+	reminder: To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.
+keyword:
+	keyword: Connives
+	match: connives
+	mode: action
+	reminder: Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on {this_or_that("creature")}.
+keyword:
+	keyword: Connives N
+	match: connives <atom-param>number</atom-param>
+	mode: action
+	reminder: Draw {english_number_a(param1)} card(s), then discard {english_number_a(param1)} card(s). Put a +1/+1 counter on {this_or_that("creature")} for each nonland card discarded this way.
+keyword:
+	keyword: Blitz
+	match: Blitz <atom-param>cost</atom-param>
+	mode: expert
+	reminder: If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card". Sacrifice it at the beginning of the next end step.
+keyword:
+	keyword: Shield counter
+	match: shield counter
+	mode: action
+	reminder: If it would be dealt damage or destroyed, remove a shield counter from it instead.
+keyword:
+	keyword: Shield counter
+	match: shield counters
+	mode: action
+	reminder: If a permanent with a shield counter on it would be dealt damage or destroyed, remove a shield counter from it instead.
+keyword:
+	keyword: Alliance
+	match: Alliance
+	mode: pseudo
+	rules: Alliance — Whenever another creature enters the battlefield under your control, [effect].
+# Secret Lair
+keyword:
+	keyword: Friends forever
+	match: Friends forever
+	mode: expert
+	reminder: You can have two commanders if they both have friends forever.
+# Commander Legends Battle for Baldur's Gate
+keyword:
+	keyword: Choose a Background
+	match: Choose a Background
+	mode: expert
+	reminder: You can have a Background as a second commander.
+keyword:
+	keyword: Double team
+	match: Double team
+	mode: expert
+	reminder: When this creature attacks, if it's not a token, conjure a duplicate of it into your hand. Then both cards perpetually lose double team.
+# Warhammer 40k
+keyword:
+	keyword: Squad
+	match: Squad <atom-param>cost</atom-param>
+	mode: expert
+	reminder: As an additional cost to cast this spell, you may pay {param1} any number of times. When this creature enters the battlefield, create that many tokens that are copies of it.
+keyword:
+	keyword: Ravenous
+	match: Ravenous
+	mode: expert
+	reminder: This creature enters the battlefield with X +1/+1 counters on it. If X is 5 or more, draw a card when it enters.
+# Dominaria United
+keyword:
+	keyword: Read ahead
+	match: Read ahead
+	mode: expert
+	reminder: Choose a chapter and start with that many lore counters. Add one after your draw step. Skipped chapters don't trigger. Sacrifice after III.
+keyword:
+	keyword: Enlist
+	match: Enlist
+	mode: expert
+	reminder: As this creature attacks, you may tap a nonattacking creature you control without summoning sickness. When you do, add its power to this creature's until end of turn.
+keyword:
+	keyword: Stun counters
+	match: stun counte<atom-param>*s</atom-param>
+	mode: core
+	reminder: If a permanent with a stun counter would become untapped, remove one from it instead.
+keyword:
+	keyword: Powerstone token
+	match: Powerstone toke<atom-param>*s</atom-param>
+	mode: expert
+	reminder: {if param1.value == "ns" then "They’re artifacts" else "It’s an artifact"} with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell."
+# Brother's War
+keyword:
+	keyword: Prototype
+	match: Prototype
+	mode: expert
+	reminder: You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.
+keyword:
+	keyword: More Than Meets the Eye
+	match: More Than Meets the Eye <atom-param>cost</atom-param>
+	mode: expert
+	reminder: You may cast this card converted for {param1}.
+# Phrexia: All Will Be One
+keyword:
+	keyword: Corrupted
+	match: Corrupted
+	mode: pseudo
+	rules: Corrupted — If an opponent has three or more poison counters, [effect].
+keyword:
+	keyword: For Mirrodin!
+	match: For Mirrodin!
+	mode: expert
+	reminder: When this Equipment enters the battlefield, create a 2/2 red Rebel creature token, then attach this to it.
+keyword:
+	keyword: Toxic
+	mode: expert
+	match: Toxic <atom-param>number</atom-param>
+	reminder: Players dealt combat damage by this creature also get {english_number_a(param1)} poison counter(s).
+# March of the Machine
+keyword:
+	keyword: Backup
+	match: Backup <atom-param>number</atom-param>
+	mode: expert
+	reminder: When this creature enters the battlefield, put {english_number_a(param1)} +1/+1 counter(s) on target creature. If that's another creature, it gains the following abilities until end of turn.
+keyword:
+	keyword: Incubate
+	match: Incubate <atom-param>number</atom-param>
+	mode: action
+	reminder: Create an Incubator token wit {english_number_a(param1)} +1/+1 counter(s) on it and "[2]: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.
+# Wilds of Eldraine
+keyword:
+	keyword: Bargain
+	match: Bargain
+	mode: expert
+	reminder: You may sacrifice an artifact, enchantment, or token as you cast this spell.
+keyword:
+	keyword: Celebration
+	match: Celebration
+	mode: pseudo
+	rules: Celebration — If two or more nonland permanents entered the battlefield under your turn, [effect].
+keyword:
+	keyword: Cursed Role
+	match: Cursed Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature is 1/1.
+keyword:
+	keyword: Monster Role
+	match: Monster Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature gets +1/+1 and has trample.
+keyword:
+	keyword: Royal Role
+	match: Royal Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature gets +1/+1 and has ward [1].
+keyword:
+	keyword: Sorcerer Role
+	match: Sorcerer Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature gets +1/+1 and has "Whenever this creature attacks, scry 1."
+keyword:
+	keyword: Virtuous Role
+	match: Virtuous Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature gets +1/+1 for each enchantment you control.
+keyword:
+	keyword: Wicked Role
+	match: Wicked Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature gets +1/+1. When this Aura is put into a graveyard, each opponent loses 1 life.
+keyword:
+	keyword: Young Hero Role
+	match: Young Hero Role token
+	mode: expert
+	reminder: face_if_type_contains_Adventure_then__else_If you control another Role on it, put that one into the graveyard. _endEnchanted creature has "Whenever this creature attacks, if its toughness is 3 or less, put a +1/+1 counter on it."
+# Ponies the Galloping
+keyword:
+	keyword: Coolness
+	match: <atom-param>number</atom-param> cooler
+	mode: expert
+	reminder: You start at 0% coolness.
+keyword:
+	keyword: Stare down
+	match: Stare down
+	mode: expert
+	reminder: It can't attack or block as long as you're looking directly at it.
+# Dr Who
+keyword:
+	keyword: Doctor’s companion
+	match: Doctor’s companion
+	mode: expert
+	reminder: You can have two commanders if the other is the Doctor.
+keyword:
+	keyword: Paradox
+	match: Paradox
+	mode: pseudo
+	rules: Paradox — Whenever you cast a spell from anywhere but your hand, [effect].
+keyword:
+	keyword: Time travel
+	match: Time travel
+	mode: action
+	reminder: For each suspended card you own and each permanent you control with a time counter on it, you may add or remove a time counter.
+# Lost Caverns of Ixalan
+keyword:
+	keyword: Map token
+	match: Map toke<atom-param>*s</atom-param>
+	mode: expert
+	reminder: {if param1.value == "ns" then "They’re artifacts" else "It’s an artifact"} with "1, T, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery."
+keyword:
+	keyword: Craft
+	match: Craft with <atom-param>name</atom-param> <atom-param>cost</atom-param>
+	mode: expert
+	reminder: {rem := param2.value + ", Exile this artifact, Exile ";count := filter_text(param1.value, match:"^(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty|thirty|forty|fifty|sixty|seventy|eighty|ninety|[0-9]+)(-(one|two|three|four|five|six|seven|eight|nine))? (or more)?");commas := filter_text(param1.value, match:",");vowel := match(param1.value, match:"^[aeiouAEIOU]");if commas != "" then count := english_number(length(commas)+1);count := replace(count, match:" $", replace:"");if count == param1.value then (rem := rem + param1.value + " other permanents you control and/or cards from your graveyard: ") else if count != "" then (rem := rem + (if count == "one or more" then param1.value else "the " + count) + " from among other permanents you control and/or cards in your graveyard: ") else rem := rem + "another " + param1.value + " you control or " + (if vowel then "an " else "a ") + param1.value + " card from your graveyard: ";rem := rem + "Return this card transformed under its owner's control. Craft only as a sorcery.";rem;}
+keyword:
+	keyword: Descend
+	match: Descend <atom-param>number</atom-param>
+	mode: pseudo
+	rules: Descend N - If there are N or more permanent cards in your graveyard, [effect].
+keyword:
+	keyword: Fathomless descend
+	match: Fathomless descend
+	mode: pseudo
+	rules: Fathomless descend - [effect], where X is the number of permanent cards in your graveyard.
+keyword:
+	keyword: Descended
+	match: descended
+	mode: expert
+	reminder: You descended if a permanent card was put into your graveyard from anywhere this turn.
+keyword:
+	keyword: Discover
+	match: Discover <atom-param>number</atom-param>
+	mode: action
+	reminder: Exile cards from the top of your library until you exile a nonland card with mana value {param1} or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.
+keyword:
+	keyword: Finality counters
+	match: finality counter
+	mode: core
+	reminder: If a creature with a finality counter would die, exile it instead.
+# Fallout
+keyword:
+	keyword: Junk token
+	match: Junk toke<atom-param>*s</atom-param>
+	mode: expert
+	reminder: {if param1.value == "ns" then "They’re artifacts" else "It’s an artifact"} with "T, Sacrifice this artifact: Exile the top card of your library. You may play that card this turn. Activate only as a sorcery."

data/magic.mse-game/set_fields

@@ -300,6 +300,10 @@ set field:
 	choice: Your mana symbol will now be keyed to V (and V/W, V/U, etc. for colored/hybrid symbols).
 	choice: You can change number hybrids (2/V etc) to different mana symbols for even more custom symbols.
 	choice: Put the highest number to change (from 0 to 11) in "number hybrid variants" and save as NAME_0.png etc.
+set field:
+	type: text
+	name: print fix
+	description: An override fix for printing typeline issues. Enter card_style.rarity.content_width in the console tab, then put the number it puts here.
 ############################# Default style
 
 default set style:

data/magic.mse-game/word_lists

@@ -9,14 +9,14 @@ word list:
 	word:
 		name: Legendary 
 		is prefix: true
-	word:
-		name: Snow 
-		is prefix: true
 	word:
 		name: Token 
 		is prefix: true
 	word:
-		name: Tribal 
+		name: Snow 
+		is prefix: true
+	word:
+		name: Kindred 
 		is prefix: true
 	word:
 		name: World 
@@ -32,6 +32,7 @@ word list:
 	word: Sorcery
 	word: Land
 	word: Planeswalker
+	word: Battle
 	word: Emblem
 	word: Phenomenon
 	word: Plane
@@ -59,11 +60,13 @@ word list:
 		word:
 			name: A
 			word: Aetherborn
+			word: Alien
 			word: Angel
 			word: Antelope
 			word: Ape
 			word: Archon
 			word: Assembly-Worker
+			word: Astartes
 			word: Atog
 			word: Aurochs
 			word: Avatar
@@ -71,6 +74,7 @@ word list:
 		word:
 			name: B
 			word: Badger
+			word: Balloon
 			word: Basilisk
 			word: Bat
 			word: Bear
@@ -84,8 +88,10 @@ word list:
 			word: Brushwagg
 		word:
 			name: C
+			word: C'tan
 			word: Camarid
 			word: Camel
+			word: Capybara
 			word: Caribou
 			word: Carrier
 			word: Cat
@@ -96,15 +102,19 @@ word list:
 			word: Construct
 			word: Crab
 			word: Crocodile
+			word: Custodes
+			word: Cyberman
 			word: Cyclops
 		word:
 			name: D
+			word: Dalek
 			word: Dauthi
 			word: Demigod
 			word: Demon
 			word: Devil
 			word: Dinosaur
 			word: Djinn
+			word: Dog
 			word: Dragon
 			word: Drake
 			word: Dreadnought
@@ -113,8 +123,8 @@ word list:
 			word: Dwarf
 		word:
 			name: E
-			word: Egg
 			word: Efreet
+			word: Egg
 			word: Eldrazi
 			word: Elemental
 			word: Elephant
@@ -135,6 +145,7 @@ word list:
 			word: Gargoyle
 			word: Germ
 			word: Giant
+			word: Gith
 			word: Gnoll
 			word: Gnome
 			word: Goat
@@ -191,6 +202,7 @@ word list:
 			word: Lhurgoyf
 			word: Licid
 			word: Lizard
+			word: Llama
 		word:
 			name: M
 			word: Manticore
@@ -198,6 +210,7 @@ word list:
 			word: Merfolk
 			word: Metathran
 			word: Minotaur
+			word: Mite
 			word: Mole
 			word: Mongoose
 			word: Monkey
@@ -207,8 +220,8 @@ word list:
 			word: Myr
 		word:
 			name: N
-			word: Naga
 			word: Nautilus
+			word: Necron
 			word: Nephilim
 			word: Nightmare
 			word: Nightstalker
@@ -234,16 +247,18 @@ word list:
 			word: Pest
 			word: Phelddagrif
 			word: Phoenix
+			word: Phyrexian
 			word: Pincher
 			word: Plant
-			word: Praetor
 			word: Prism
 		word:
 			name: R
 			word: Rabbit
+			word: Raccoon
 			word: Rat
 			word: Reflection
 			word: Rhino
+			word: Robot
 		word:
 			name: S
 			word:
@@ -269,6 +284,7 @@ word list:
 				word: Slug
 			word:
 				name: Sn-Sz
+				word: Snail
 				word: Snake
 				word: Soltari
 				word: Spawn
@@ -291,11 +307,13 @@ word list:
 			word: Thopter
 			word: Thrull
 			word: Tiefling
+			word: Time Lord
 			word: Treefolk
 			word: Trilobite
 			word: Triskelavite
 			word: Troll
 			word: Turtle
+			word: Tyranid
 		word:
 			name: U
 			word: Unicorn
@@ -308,6 +326,7 @@ word list:
 		word:
 			name: W
 			word: Wall
+			word: Walrus
 			word: Weird
 			word: Werewolf
 			word: Whale
@@ -355,22 +374,29 @@ word list:
 			word: Bard
 			word: Beast
 			word: Berserker
-			word: Bringer
 			word: Carrier
+			word: Child
 			word: Citizen
 			word: Cleric
+			word: Clown
 			word: Coward
 		word:
 			name: D-I
 			word: Deserter
+			word: Detective
+			word: Doctor
 			word: Dreadnought
 			word: Drone
 			word: Druid
 			word: Egg
 			word: Elder
+			word: Employee
 			word: Flagbearer
+			word: Gamer
+			word: Guest
 			word: Horror
 			word: Incarnation
+			word: Inquisitor
 		word:
 			name: J-P
 			word: Juggernaut
@@ -386,8 +412,11 @@ word list:
 			word: Noble
 			word: Nomad
 			word: Peasant
+			word: Performer
 			word: Pilot
 			word: Pirate
+			word: Praetor
+			word: Primarch
 			word: Processor
 		word:
 			name: R-S
@@ -397,6 +426,7 @@ word list:
 			word: Rigger
 			word: Rogue
 			word: Samurai
+			word: Scientist
 			word: Scion
 			word: Scout
 			word: Serf
@@ -422,12 +452,18 @@ word list:
 	word:
 		script: all_sub_types(match: "Artifact")
 		line below: true
-	word: Contraption
+	word: Attraction
+	word: Blood
 	word: Clue
+	word: Contraption
 	word: Equipment
 	word: Food
 	word: Fortification
 	word: Gold
+	word: Incubator
+	word: Junk
+	word: Map
+	word: Powerstone
 	word: Treasure
 	word: Vehicle
 
@@ -441,12 +477,14 @@ word list:
 	word: Swamp
 	word: Mountain
 	word: Forest
+	word: Cave
 	word: Desert
 	word: Gate
 	word: Lair
 	word: Locus
 	word: Mine
 	word: Power-Plant
+	word: Sphere
 	word: Tower
 	word: Urza's
 
@@ -456,20 +494,25 @@ word list:
 		script: all_sub_types(match: "Enchantment")
 		line below: true
 	word: Aura
-	word: Curse
-	word: Shrine
+	word: Background
 	word: Cartouche
+	word: Class
+	word: Curse
+	word: Role
+	word: Rune
 	word: Saga
+	word: Shard
+	word: Shrine
 
 word list:
 	name: spell
 	word:
 		script: all_sub_types(match: "Instant") + "," + all_sub_types(match: "Sorcery")
 		line below: true
+	word: Adventure
 	word: Arcane
 	word: Lesson
 	word: Trap
-	word: Adventure
 
 word list:
 	name: planeswalker
@@ -481,9 +524,12 @@ word list:
 	word: Angrath
 	word: Arlinn
 	word: Ashiok
+	word: Bahamut
+	word: Basri
 	word: Bolas
 	word: Calix
 	word: Chandra
+	word: Comet
 	word: Dack
 	word: Dakkon
 	word: Daretti
@@ -492,15 +538,20 @@ word list:
 	word: Domri
 	word: Dovin
 	word: Ellywick
+	word: Elminister
 	word: Elspeth
 	word: Estrid
 	word: Freyalise
 	word: Garruk
 	word: Gideon
 	word: Grist
+	word: Guff
 	word: Huatli
 	word: Jace
+	word: Jared
 	word: Jaya
+	word: Jeska
+	word: Kaito
 	word: Karn
 	word: Kasmina
 	word: Kaya
@@ -509,6 +560,7 @@ word list:
 	word: Liliana
 	word: Lolth
 	word: Lukka
+	word: Minsc
 	word: Mordenkainen
 	word: Nahiri
 	word: Narset
@@ -516,23 +568,29 @@ word list:
 	word: Nissa
 	word: Nixilis
 	word: Oko
+	word: Quintorius
 	word: Ral
 	word: Rowan
 	word: Saheeli
 	word: Samut
 	word: Sarkhan
 	word: Serra
+	word: Sivitri
 	word: Sorin
+	word: Szat
 	word: Tamiyo
+	word: Tasha
 	word: Teferi
 	word: Teyo
 	word: Tezzeret
 	word: Tibalt
 	word: Tyvar
 	word: Ugin
+	word: Urza
 	word: Venser
 	word: Vivien
 	word: Vraska
+	word: Vronos
 	word: Will
 	word: Windgrace
 	word: Wrenn
@@ -541,179 +599,238 @@ word list:
 	word: Yanling
 	word: Zariel
 	word:
-		name: Last Seen on Faerun
-		word: Ellywick
-		word: Lolth
-		word: Mordenkainen
-		word: Zariel
+		name: Last Seen on Ixalan
+		word: Huatli
+		word: Saheeli
 	word:
-		name: Last Seen on Strixhaven
-		word: Kasmina
-		word: Liliana
-		word: Lukka
+		name: Last Seen on Eldraine
+		word: Ashiok
+		word: Garruk
+		word: Oko
 		word: Rowan
 		word: Will
 	word:
-		name: Last Seen on Kaldheim
-		word: Kaya
-		word: Niko
-		word: Tibalt
-		word: Tyvar
-	word:
-		name: Last Seen on Zendikar
+		name: Last Seen on New Phyrexia
+		word: Chandra
+		word: Elspeth
 		word: Jace
-		word: Kiora
+		word: Kaito
+		word: Kaya
+		word: Koth
+		word: Lukka
 		word: Nahiri
 		word: Nissa
+		word: Teferi
+		word: Tyvar
+		word: Venser
+		word: Vraska
+		word: Wrenn
+	word:
+		name: Last Seen in the Past
+		word: Urza
+	word:
+		name: Last Seen in Unland
+		word: Comet
+	word: 
+		name: Last Seen on Dominaria
+		word: Ajani
+		word: Dihada
+		word: Jared
+		word: Jaya
+		word: Karn
+		word: Sivitri
+	word:
+		name: Last Seen on Capenna
+		word: Vivien
 		word: Nixilis
+	word:
+		name: Last Seen on Kamigawa
+		word: Tezzeret
+		word: Tamiyo		
+	word:
+		name: Last Seen on Innistrad
+		word: Arlinn
+		word: Sorin
+	word:
+		name: Last Seen on Faerûn
+		word: Bahamut
+		word: Ellywick
+		word: Elminister
+		word: Lolth
+		word: Minsc
+		word: Mordenkainen
+		word: Tasha
+		word: Zariel
+	word:
+		name: Last Seen on Arcavios
+		word: Kasmina
+		word: Liliana
+	word:
+		name: Last Seen on Kaldheim
+		word: Niko
+		word: Tibalt
+	word:
+		name: Last Seen on Zendikar
+		word: Kiora
 	word:
 		name: Last Seen on Ikoria
 		word: Narset
-		word: Vivien
 	word:
 		name: Last Seen on Theros
 		word: Ashiok
 		word: Calix
-		word: Elspeth
 		word: Xenagos
-	word:
-		name: Last Seen on Eldraine
-		word: Garruk
-		word: Oko
 	word:
 		name: Last Seen on Ravnica
+		word: Angrath
 		word: Bolas
 		word: Gideon
 		word: Davriel
 		word: Domri
 		word: Dovin
 		word: Ral
+		word: Sarkhan
+		word: Samut
 		word: Teyo
-		word: Vraska
+		word: Ugin
 		word: Yanggu
 		word: Yanling
-	word: 
-		name: Last Seen on Dominaria
-		word: Chandra
-		word: Jaya
-		word: Karn
-		word: Teferi
-	word:
-		name: Last Seen on Ixalan
-		word: Angrath
-		word: Huatli
-	word:
-		name: Last Seen on Amonkhet
-		word: Liliana
-		word: Samut
-	word:
-		name: Last Seen on Kaladesh
-		word: Ajani
-		word: Saheeli
-		word: Tezzeret
 	word:
 		name: Last Seen on Fiore
 		name: Dack
 		name: Daretti
-	word:
-		name: Last Seen on Innistrad
-		word: Arlinn
-		word: Sorin
-		word: Tamiyo
-	word:
-		name: Last Seen on Tarkir
-		word: Sarkhan
-		word: Ugin
-	word:
-		name: Last Seen on New Phyrexia
-		word: Koth
-		word: Venser
 	word:
 		name: Last Seen on ???
 		word: Aminatou
 		word: Estrid
-		word: Wrenn
-	word: Last Seen Pre-Mending
+		word: Grist
+	word:
+		name: Last Seen Pre-Mending
+		word: Dakkon
 		word: Freyalise
 		word: Serra
 		word: Windgrace
-		
+
+word list:
+	name: battle
+	word: Siege
+
 word list:
 	name: plane
 	word:
 		script: all_sub_types(match: "Plane")
 		line below: true
-	word: Eldraine
-	word: Dominaria
-	word: Ixalan
-	word: Amonkhet
-	word: Kaladesh
 	word:
-		name: Post-Mending Planes
+		name: Standard Planes
 		word: Alara
 		word: Amonkhet
+		word: Arcavios
+		word: Bloomburrow
+		word: Capenna
+		word: Dominaria
+		word: Duskmourn
 		word: Eldraine
-		word: Fiora
+		word: Ikoria
 		word: Innistrad
 		word: Ixalan
 		word: Kaladesh
-		word: Kylem
+		word: Kaldheim
+		word: Kamigawa
 		word: Lorwyn
+		word: Mercadia
+		word: Mirrodin
 		word: New Phyrexia
+		word: Rath
+		word: Ravnica
 		word: Shadowmoor
 		word: Tarkir
 		word: Theros
+		word: Thunder Junction
+		word: Ulgrotha
 		word: Zendikar
-	word:
-		name: Pre-Mending Planes
-		word: Kamigawa
-		word: Mercadia
-		word: Mirrodin
-		word: Rath
-		word: Ravnica
-		word: Serra's Realm
-	word:
-		name: Old Planes
-		word: Aranzhur
-		word: Azoria
-		word: Bolas's Meditation Realm
-		word: Cabralin
-		word: Cridhe
-		word: Dominaria
-		word: Equilor
-		word: Ergamon
-		word: Gastal
-		word: Ilcae
-		word: Moag
-		word: Nether Void
-		word: Phyrexia
-		word: Pyrulea
-		word: Rabiah
-		word: Segovia
-		word: Shandalar
-		word: Ulgrotha
-		word: Vatraquaz
-		word: Wildfire
 	word:
 		name: Planechase Planes
+		word: The Abyss
+		word: Antausia
 		word: Arkhos
 		word: Azgol
 		word: Belenon
-		word: Diraden
+		word: Bolas's Meditation Realm
+		word: Cridhe
+		word: Echoir
+		word: Equilor
+		word: Ergamon
 		word: Fabacin
+		word: Fiora
+		word: Gargantikar
+		word: Gobakhan
 		word: Iquatana
 		word: Ir
-		word: Kaldheim
 		word: Karsus
 		word: Kephalai
 		word: Kinshala
 		word: Kolbahan
+		word: Kylem
 		word: Kyneth
 		word: Luvion
+		word: Moag
 		word: Mongseng
 		word: Muraganda
+		word: Phyrexia
+		word: Pyrulea
+		word: Rabiah
 		word: Regatha
+		word: Segovia
+		word: Serra's Realm
+		word: Shandalar
+		word: Shenmeng
 		word: Tavelia
 		word: Valla
 		word: Vryn
-		word: Xerex
+		word: Wildfire
+		word: Xerex
+		word: Zhalfir
+	word: 
+		name: Other Modern Planes
+		word: Alkabah
+		word: Aranzhur
+		word: Diraden
+		word: Kodisha
+		word: Metal Island
+		word: Skalla
+		word: Tavelia
+		word: Tolvada
+	word:
+		name: Very Old Planes
+		word: Azoria
+		word: Cabralin
+		word: Celesta
+		word: Gastal
+		word: Ilcae
+		word: Mirrankkar
+		word: Nether Void
+		word: Obsidias
+		word: Torwynn
+		word: Vatraquaz
+	word:
+		name: Dr Who Planes
+		word: Alfava Metraxis
+		word: Androzani Minor
+		word: Apalapucia
+		word: The Dalek Asylum
+		word: Darillium
+		word: Earth
+		word: Gallifrey
+		word: Horsehead Nebula
+		word: Kandoka
+		word: The Library
+		word: Mars
+		word: Moon
+		word: Necros
+		word: New Earth
+		word: Outside Mutter's Spiral
+		word: Skaro
+		word: Spacecraft
+		word: Time
+		word: Trenzalore
+		word: Unknown Planet