diff --git a/data/magic.mse-game/keywords b/data/magic.mse-game/keywords
index cdb0cc8b6..846d3db37 100644
--- a/data/magic.mse-game/keywords
+++ b/data/magic.mse-game/keywords
@@ -1834,3 +1834,33 @@ keyword:
 	match: crime
 	mode: expert
 	reminder: Targeting opponents, anything they control, and/or cards in their graveyards is a crime.
+keyword:
+	keyword: Outlaw
+	match: outlaw
+	mode: action
+	reminder: Assassins, Mercenaries, Pirates, Rogues, and Warlocks are outlaws.
+keyword:
+	keyword: Outlaws
+	match: outlaws
+	mode: action
+	reminder: Assassins, Mercenaries, Pirates, Rogues, and Warlocks are outlaws.
+keyword:
+	keyword: Plot
+	match: Plot <atom-param>cost</atom-param>
+	mode: expert
+	reminder: You may {for_mana_costs(add:"pay ", param1)} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.
+keyword:
+	keyword: becomes plotted
+	match: becom<atom-param>*s</atom-param> plotted
+	mode: expert
+	reminder: You may cast it as a sorcery on a later turn without paying its mana cost.
+keyword:
+	keyword: Saddle
+	match: Saddle <atom-param>number</atom-param>
+	mode: expert
+	reminder: Tap any number of other creatures you control with total power {param1} or more: This Mount becomes saddled until end of turn. Saddle only as a sorcery.
+keyword:
+	keyword: Spree
+	match: Spree
+	mode: expert
+	reminder: Choose one or more additional costs.
\ No newline at end of file
diff --git a/data/magic.mse-game/keywords_de b/data/magic.mse-game/keywords_de
index 3140db4ff..e7cb0440d 100644
--- a/data/magic.mse-game/keywords_de
+++ b/data/magic.mse-game/keywords_de
@@ -2265,3 +2265,58 @@ keyword:
 	reminder: Sie sind Artefakte mit „<sym-auto>T</sym-auto>, opfere dieses Artefakt: Schicke die oberste Karte deiner Bibliothek ins Exil. Du kannst sie in diesem Zug spielen. Akiviere diese Fähigkeit wie eine Hexerei."
 	#example: Commander Sofia Daguerre
 
+# Outlaws of Thunder Junction
+keyword:
+	#english keyword: commit a crime
+	keyword: Verbrechen
+	match: Verbrechen
+	mode: expert
+	reminder: Es ist ein Verbrechen, einen Gegner, Karten in seinem Friedhof oder etwas unter seiner Kontrolle als Ziel zu bestimmen.
+	#example: Marauding Sphinx
+
+keyword:
+	#english keyword: Plot
+	keyword: Aushecken
+	match: Aushecken <atom-param>Kosten</atom-param>
+	mode: expert
+	reminder: Du kannst {param1} bezahlen und diese Karte aus deiner Hand ins Exil schicken. Wirke sie in einem späteren Zug wie eine Hexerei, ohne ihre Manakosten zu bezahlen. Spiele Aushecken wie eine Herexei.
+	#example: Cunning Coyote
+	
+keyword:
+	#english keyword: becomes plotted
+	keyword: ausgeheckt
+	match: ausgeheckt
+	reminder: Du kannst sie in einem späteren Zug wie Hexerei wirken, ohne ihre Manakosten zu bezahlen.
+	#example: Kellan Joins Up
+
+keyword:
+	#english keyword: Saddle
+	keyword: Aufsatteln
+	match: Aufsatteln <atom-param>Nummer</atom-param>
+	mode: expert
+	reminder: Tappe eine beliebige Anzahl anderer Kreaturen, die du kontrollierst und die zusammen Stärke {param1} oder mehr haben: Dieses Reittier ist bis zum Ende des Zuges gesattelt. Spiele Aufsatteln wie eine Herexei.
+	#example: Rambling Possum
+
+keyword:
+	#english keyword: Spree
+	keyword: Exzess
+	match: Exzess
+	mode: expert
+	reminder: Bestimme eines oder mehrere als zusätz-liche Kosten.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaw
+	keyword: Gesetzlose
+	match: gesetzlose
+	mode: expert
+	reminder: Assassinen, Hexenmeister, Piraten, Räuber und Söldner sind Gesetzlose.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaws
+	keyword: Gesetzlosen
+	match: gesetzlosen
+	mode: expert
+	reminder: Assassinen, Hexenmeister, Piraten, Räuber und Söldner sind Gesetzlose.
+	#example: Caught in the Crossfire
\ No newline at end of file
diff --git a/data/magic.mse-game/keywords_es b/data/magic.mse-game/keywords_es
index c0d6161f8..c586a9c52 100644
--- a/data/magic.mse-game/keywords_es
+++ b/data/magic.mse-game/keywords_es
@@ -2288,3 +2288,59 @@ keyword:
 	mode: expert
 	reminder: Es un artefacto con "<sym-auto>T</sym-auto>, sacrificar este artefacto: Exilia la primera carta de tu biblioteca. Puedes jugar esa carta este turno. Activa esto solo como un conjuro".
 	#example: Commander Sofia Daguerre
+
+# Outlaws of Thunder Junction
+keyword:
+	#english keyword: commit a crime
+	keyword: crimen
+	match: crimen
+	mode: expert
+	reminder: Hacer objectivo a oponentes, a cualquier objeto que controlan y/o a cartas en sus cementerios es un crimen.
+	#example: Marauding Sphinx
+
+keyword:
+	#english keyword: Plot
+	keyword: Tramar
+	match: Tramar <atom-param>coste</atom-param>
+	mode: expert
+	reminder: Puedes pagar {param1} y exiliar esta carte de tun mano Lánzala como un conjuro en un turno posterior sin pagar su coste de maná. Activa la habilidad de tramar solo como un conjuro.
+	#example: Cunning Coyote
+
+keyword:
+	#english keyword: becomes plotted
+	keyword: se trama
+	match: se trama
+	reminder: Puedes lanzarla como un conjuro en un turno posterior sin pagar su coste de maná.
+	#example: Kellan Joins Up
+
+keyword:
+	#english keyword: Saddle
+	keyword: Ensillar
+	match: Ensillar <atom-param>número</atom-param>
+	mode: expert
+	reminder: Girar cualquier cantidad de otras criaturas que controlas con una fuerza total de {param1} o más: Esta Montura está ensillada hasta el final del turno. Activa la habilidad de ensillar solo como un conjuro.
+	#example: Rambling Possum
+
+keyword:
+	#english keyword: Spree
+	keyword: Arrebato
+	match: Arrebato
+	mode: expert
+	reminder: Elige uno o más costes adicionales.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaw
+	keyword: Forajida
+	match: forajida
+	mode: expert
+	reminder: Los Asesinos, Mercenarios, Piratas, Bribones y Brujos son forajidos.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaws
+	keyword: Forajidas
+	match: forajidas
+	mode: expert
+	reminder: Los Asesinos, Mercenarios, Piratas, Bribones y Brujos son forajidos.
+	#example: Caught in the Crossfire
\ No newline at end of file
diff --git a/data/magic.mse-game/keywords_fr b/data/magic.mse-game/keywords_fr
index 28ad55b8d..2b857b423 100644
--- a/data/magic.mse-game/keywords_fr
+++ b/data/magic.mse-game/keywords_fr
@@ -2366,3 +2366,52 @@ keyword:
 	mode: expert
 	reminder: C'est un artefact avec « <sym-auto>T</sym-auto>, sacrifiez cet artefact : Exilez la carte du dessus de votre bibliothèque. Vous pouvez jouer cette carte ce tour-ci. N'activez que lorsque vous pourriez lancer un rituel. »
 	#example: Commander Sofia Daguerre
+
+# Outlaws of Thunder Junction
+keyword:
+	#english keyword: commit a crime
+	keyword: crime
+	match: crime
+	mode: expert
+	reminder: Cibler des adversaires, tout ce qu'ils contrôlent et/ou es cartes de leur cimetière est un crime.
+	#example: Marauding Sphinx
+
+keyword:
+	#english keyword: Plot
+	keyword: Complot
+	match: Complot <atom-param>coût</atom-param>
+	mode: expert
+	reminder: Vous pouvez payer {param1} et exiler cette carte depuis votre main. Lancez-la comme un rituel pendant un autre tour sans payer son coût de mana. Ne complotez que lorsque vous pourriez lancer un rituel.
+	#example: Cunning Coyote
+
+keyword:
+	#english keyword: becomes plotted
+	keyword: comploteé
+	match: comploteé
+	reminder: Vous pouvez la lancer comme un rituel pendant un autre tour sans payer son coût de mana.
+	#example: Kellan Joins Up
+
+keyword:
+	#english keyword: Saddle
+	keyword: Seller
+	match: Seller <atom-param>nombre</atom-param>
+	mode: expert
+	reminder: Engagez n'importe quel nombre d'autres créature que vous contrôlez dont la force totale est supérieure ou égale à {param1} : Cette monture devient sellée jusqu'à la fin du tour. Ne sellez que lorsque vous pourriez lancer un rituel.
+	#example: Rambling Possum
+
+
+keyword:
+	#english keyword: Spree
+	keyword: Impétuosité
+	match: Impétuosité
+	mode: expert
+	reminder: Choisissez au moins un coût supplémentaire.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaw
+	keyword: Hors-la-loi
+	match: forajida
+	mode: expert
+	reminder: Les assassins, les mercenaires, les pirates, les gredins et les psychagogues sont des hors-la-loi.
+	#example: Caught in the Crossfire
diff --git a/data/magic.mse-game/keywords_it b/data/magic.mse-game/keywords_it
index 301f0326d..265ed6b5a 100644
--- a/data/magic.mse-game/keywords_it
+++ b/data/magic.mse-game/keywords_it
@@ -2392,3 +2392,51 @@ keyword:
 	mode: expert
 	reminder: È un artefatto con "<sym-auto>T</sym-auto>, Sacrifica questo artefatto: Esilia la prima carta del tuo grimorio. Puoi giocare quella carta in questo turno. Attiva solo come una stregoneria".
 	#example: Commander Sofia Daguerre
+
+# Outlaws of Thunder Junction
+keyword:
+	#english keyword: commit a crime
+	keyword: crimine
+	match: crimine
+	mode: expert
+	reminder: Bersagliare gli avversari, qualsiasi cosa controllino e/o le carte nei loro cimiteri è un crimine.
+	#example: Marauding Sphinx
+
+keyword:
+	#english keyword: Plot
+	keyword: Tramare
+	match: Tramare <atom-param>costo</atom-param>
+	mode: expert
+	reminder: Puoi pagare {param1} ed esilare questa carta dalla tua mano. Lanciala come una stregoneria in un turno successivo senza pagare il suo costo di mana. Trama solo come una stregoneria.
+	#example: Cunning Coyote
+
+keyword:
+	#english keyword: becomes plotted
+	keyword: diventa tramata
+	match: diventa tramata
+	reminder: Puoi lanciarla come una stregoneria in un turno successivo sensa pagare iil suo costo di mana.
+	#example: Kellan Joins Up
+
+keyword:
+	#english keyword: Saddle
+	keyword: Sellare
+	match: Sellare <atom-param>numero</atom-param>
+	mode: expert
+	reminder: TAPpa un qualsiasi numero di altre creature che controlli con forza totale pari o superiore a {param1}: Questa Cavalcatura diventa sellata ino alla fine del turno. Sella solo come una stregoneria.
+	#example: Rambling Possum
+
+keyword:
+	#english keyword: Spree
+	keyword: Frenesia
+	match: Frenesia
+	mode: expert
+	reminder: Scegli uno più costi addizionali.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaw
+	keyword: Fuorilegge
+	match: fuorilegge
+	mode: expert
+	reminder: Assassini, Farabutti, Mercenari, Pirati e Warlock sono fuorilegge.
+	#example: Caught in the Crossfire
diff --git a/data/magic.mse-game/keywords_ja b/data/magic.mse-game/keywords_ja
index 4a3dca4f7..6ae9b90c2 100644
--- a/data/magic.mse-game/keywords_ja
+++ b/data/magic.mse-game/keywords_ja
@@ -2215,4 +2215,53 @@ keyword:
 	match: ジャンク・トークン
 	mode: expert
 	reminder: それは「<sym-auto>T</sym-auto>, このアーティファクトを生け贄に捧げる：あなた のライブラリーの一番上にあるカード1体を追放する。このターン、そのカードをプレイしてもよい。起動はソーサリーとしてのみ行う。」を持つアーティファクトである。
-	#example: Commander Sofia Daguerre
\ No newline at end of file
+	#example: Commander Sofia Daguerre
+	
+# Outlaws of Thunder Junction
+keyword:
+	#english keyword: commit a crime
+	keyword: 悪事を働く
+	match: 悪事を働く
+	mode: expert
+	reminder: 悪事を働くとは、対戦相手や対戦相手がコントロールしているものや対戦相手の墓地にあるカードを対象とすることである。
+	#example: Marauding Sphinx
+
+keyword:
+	#english keyword: Outlaw
+	keyword: 無法者
+	match: 無法者
+	mode: action
+	reminder: 暗殺者、海賊、邪術師、ならず者、傭兵が無法者である。
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Plot
+	keyword: 計画
+	match: 計画 <atom-param>コスト</atom-param>
+	mode: expert
+	reminder: {param1}を支払ってあなたの手札にあるこのカードを追放してもよい。後のターンに、これをソーサリーとしてマナ・コストを支払うことなく唱えてもよい。計画はソーサリーとしてのみ行う。
+	#example: Cunning Coyote
+	
+keyword:
+	#english keyword: becomes plotted
+	keyword: 計画された
+	match: 計画された
+	mode: expert
+	reminder: それをソーサリーとして、後のターンにマナ・コストを支払うことなく唱えてもよい。
+	#example: Aven Interruptor
+
+keyword:
+	#english keyword: Saddle
+	keyword: 騎乗
+	match: 騎乗<atom-param>番号</atom-param>
+	mode: expert
+	reminder: あなたがコントロールしていてこれでない望む数のクリーチャーをパワーの合計が{param1}以上になるように選び、タップする：ターン終了時まで、この乗騎は騎乗された状態になる。騎乗はソーサリーとしてのみ行う。
+	#example: Rambling Possum
+
+keyword:
+	#english keyword: Spree
+	keyword: 放題
+	match: 放題
+	mode: expert
+	reminder: 以下から１つ以上の追加コストを選ぶ。
+	#example: Caught in the Crossfire
\ No newline at end of file
diff --git a/data/magic.mse-game/keywords_zhs b/data/magic.mse-game/keywords_zhs
index 19f471027..fb3defa22 100644
--- a/data/magic.mse-game/keywords_zhs
+++ b/data/magic.mse-game/keywords_zhs
@@ -2215,4 +2215,60 @@ keyword:
 	match: 怀疑
 	mode: action
 	reminder: 已遭疑的生物具有威慑异能且不能进行阻挡。
-	#example: Reasonable Doubt
\ No newline at end of file
+	#example: Reasonable Doubt
+	
+# Outlaws of Thunder Junction
+keyword:
+	#english keyword: commit a crime
+	keyword: 罪行时
+	match: 罪行时
+	mode: expert
+	reminder: 将对手，任何由其操控的东西和／或其坟墓场中的牌指定为目标，即属罪行。
+	#example: Marauding Sphinx
+
+keyword:
+	#english keyword: Plot
+	keyword: 设谋
+	match: 设谋<atom-param>费用</atom-param>
+	mode: expert
+	reminder: 你可以支付{param1}并从你手上放逐此牌。过了该回合后，便可于法术时机施放之，且不需支付其法术力费用。只能于法术时机设谋。
+	#example: Cunning Coyote
+	
+keyword:
+	#english keyword: becomes plotted
+	keyword: 成为已设谋
+	match: 成为已设谋
+	mode: expert
+	reminder: 过了该回合后，其拥有者便可于法术时机施放之，且不需支付其法术力费用。
+	#example: Aven Interruptor
+
+keyword:
+	#english keyword: Saddle
+	keyword: 乘驾
+	match: 乘驾 <atom-param>数字</atom-param>
+	mode: expert
+	reminder: 横置任意数量由你操控且力量总和等于或大于{param1}的其他生物：此坐骑成为已乘驾直到回合结束。只能于法术时机乘驾。
+	#example: Rambling Possum
+
+keyword:
+	#english keyword: Spree
+	keyword: 追欢
+	match: 追欢
+	mode: expert
+	reminder: Choose one or more additional costs.
+	#example: Caught in the Crossfire
+
+keyword:
+	#english keyword: Outlaw
+	keyword: 狂徒
+	match: 狂徒
+	mode: action
+	reminder: 杀手、佣兵、海盗、浪客和邪术师是狂徒。
+	#example: Caught in the Crossfire
+	
+keyword:
+	#english keyword: Outlaws
+	match: outlaws
+	mode: action
+	reminder: Assassins, Mercenaries, Pirates, Rogues, and Warlocks are outlaws.
+	#example: Caught in the Crossfire
diff --git a/data/magic.mse-game/language_map b/data/magic.mse-game/language_map
index 447b87790..1d8c1d9b9 100644
--- a/data/magic.mse-game/language_map
+++ b/data/magic.mse-game/language_map
@@ -305,6 +305,7 @@ languages := [
 			+ "Baumhirte,"
 			+ "Bestie,"
 			+ "Betrachter,"
+			+ "Biber,"
 			+ "Blinkmotte,"
 			+ "Bobbel,"
 			+ "Bold,"
@@ -360,7 +361,8 @@ languages := [
 			+ "Gorgo,"
 			+ "Gott,"
 			+ "Greif,"
-			+ "Gremlin",
+			+ "Gremlin,"
+			+ "Gürteltier",
 
 			  "Hai,"
 			+ "Halbgott,"
@@ -393,6 +395,7 @@ languages := [
 			+ "Kithkin,"
 			+ "Kneifer,"
 			+ "Kobold,"
+			+ "Kojote,"
 			+ "Konstrukt,"
 			+ "Kor,"
 			+ "Krabbe,"
@@ -436,6 +439,7 @@ languages := [
 			+ "Oger,"
 			+ "Oktopus,"
 			+ "Ophis,"
+			+ "Opossum,"
 			+ "Orgg,"
 			+ "Ork,"
 			+ "Otter",
@@ -490,8 +494,10 @@ languages := [
 			+ "Spinne,"
 			+ "Splitter,"
 			+ "Stachel,"
-			+ "Surrakar,"
-			+ "Synth",
+			+ "Stachelschwein,"
+			+ "Surrakar",
+
+			  "Synth",
 
 			  "Tentakel,"
 			+ "Tetravit,"
@@ -507,7 +513,8 @@ languages := [
 			+ "Triskelavit,"
 			+ "Troll",
 
-			  "Überträger",
+			  "Überträger,"
+			+ "Ungeziefer",
 
 			  "Vampir,"
 			+ "Vedalken,"
@@ -586,13 +593,14 @@ languages := [
 			+ "Nomade,"
 			+ "Pilot,"
 			+ "Pirat,"
-			+ "Prätor,"
-			+ "Räuber,"
+			+ "Prätor",
+
+			  "Räuber,"
 			+ "Rebell,"
 			+ "Reflexion,"
-			+ "Ritter",
-
-			  "Samurai,"
+			+ "Reittier,"
+			+ "Ritter,"
+			+ "Samurai,"
 			+ "Schamane,"
 			+ "Schlachtschiff,"
 			+ "Schrecken,"
@@ -603,14 +611,14 @@ languages := [
 			+ "Spruchwandler,"
 			+ "Thopter,"
 			+ "Uberlebender,"
-			+ "Überträger,"
-			+ "Vampir,"
+			+ "Überträger",
+
+			  "Vampir,"
 			+ "Verbündeter,"
 			+ "Verwerter,"
 			+ "Waldläufer,"
-			+ "Werwolf",
-
-			  "Zauberer,"
+			+ "Werwolf,"
+			+ "Zauberer,"
 			+ "Zombie"
 		]
 		word_lists_plane: [
@@ -1017,6 +1025,7 @@ languages := [
 			+ "Antelope,"
 			+ "Ape,"
 			+ "Archon,"
+			+ "Armadillo,"
 			+ "Assembly-Worker,"
 			+ "Astartes,"
 			+ "Atog,"
@@ -1030,6 +1039,7 @@ languages := [
 			+ "Bat,"
 			+ "Bear,"
 			+ "Beast,"
+			+ "Beaver,"
 			+ "Beeble,"
 			+ "Beholder,"
 			+ "Bird,"
@@ -1050,6 +1060,7 @@ languages := [
 			+ "Chimera,"
 			+ "Cockatrice,"
 			+ "Construct,"
+			+ "Coyote,"
 			+ "Crab,"
 			+ "Crocodile,"
 			+ "Custodes,"
@@ -1186,7 +1197,9 @@ languages := [
 			+ "Phyrexian,"
 			+ "Pincher,"
 			+ "Plant,"
-			+ "Prism",
+			+ "Possum,"
+			+ "Prism,"
+			+ "Procupine",
 
 			  "Rabbit,"
 			+ "Raccoon,"
@@ -1251,6 +1264,7 @@ languages := [
 			  "Unicorn",
 
 			  "Vampire,"
+			+ "Varmint,"
 			+ "Vedalken,"
 			+ "Viashino,"
 			+ "Volver",
@@ -1314,25 +1328,27 @@ languages := [
 			+ "Minion,"
 			+ "Monger,"
 			+ "Monk,"
+			+ "Mount,"
 			+ "Mutant,"
 			+ "Mystic,"
 			+ "Ninja,"
 			+ "Noble,"
-			+ "Nomad,"
-			+ "Peasant,"
+			+ "Nomad",
+
+			  "Peasant,"
 			+ "Performer,"
 			+ "Pilot,"
 			+ "Pirate,"
 			+ "Praetor,"
 			+ "Primarch,"
-			+ "Processor",
-
-			  "Ranger,"
+			+ "Processor,"
+			+ "Ranger,"
 			+ "Rebel,"
 			+ "Reflection,"
 			+ "Rigger,"
-			+ "Rogue,"
-			+ "Samurai,"
+			+ "Rogue",
+
+			  "Samurai,"
 			+ "Scientist,"
 			+ "Scion,"
 			+ "Scout,"
@@ -1343,11 +1359,11 @@ languages := [
 			+ "Spawn,"
 			+ "Spellshaper,"
 			+ "Spirit,"
-			+ "Survivor",
+			+ "Survivor,"
+			+ "Thopter,"
+			+ "Vampire",
 
-			  "Thopter,"
-			+ "Vampire,"
-			+ "Warlock,"
+			  "Warlock,"
 			+ "Warrior,"
 			+ "Werewolf,"
 			+ "Wizard,"
@@ -1756,6 +1772,7 @@ languages := [
 			+ "Acorazado,"
 			+ "Adalid,"
 			+ "Alce,"
+			+ "Alimaña,"
 			+ "Ángel,"
 			+ "Antílope,"
 			+ "Aparición,"
@@ -1763,6 +1780,7 @@ languages := [
 			+ "Arconte,"
 			+ "Ardilla,"
 			+ "Arena,"
+			+ "Armadillo,"
 			+ "Arpía,"
 			+ "Atog,"
 			+ "Avatar,"
@@ -1785,6 +1803,7 @@ languages := [
 			+ "Capibara,"
 			+ "Caracol,"
 			+ "Caribú,"
+			+ "Castor,"
 			+ "Cefálido,"
 			+ "Centauro,"
 			+ "Chacal,"
@@ -1795,7 +1814,8 @@ languages := [
 			+ "Cocodrilo,"
 			+ "Conejo,"
 			+ "Constructo,"
-			+ "Contemplador",
+			+ "Contemplador,"
+			+ "Coyote",
 
 			  "Dauti,"
 			+ "Deidad,"
@@ -1933,6 +1953,7 @@ languages := [
 			+ "Primate,"
 			+ "Pueblo-arbóreo,"
 			+ "Pueblo-lunar,"
+			+ "Puercoespín,"
 			+ "Pulpo",
 
 			  "Quimera",
@@ -1992,6 +2013,7 @@ languages := [
 			+ "Yeti",
 
 			  "Zángano,"
+			+ "Zarigüeya,"
 			+ "Zombie,"
 			+ "Zorro"
 		]
@@ -2042,6 +2064,7 @@ languages := [
 			+ "Metabolizador,"
 			+ "Místico,"
 			+ "Monje,"
+			+ "Montura,"
 			+ "Mutante,"
 			+ "Ninja,"
 			+ "Noble,"
@@ -2487,6 +2510,7 @@ languages := [
 			+ "Calamar,"
 			+ "Camaride,"
 			+ "Caribou,"
+			+ "Castor,"
 			+ "Cauchemar,"
 			+ "Centaure,"
 			+ "Céphalide,"
@@ -2502,6 +2526,7 @@ languages := [
 
 			  "Cocatrix,"
 			+ "Construction,"
+			+ "Coyote,"
 			+ "Crabe,"
 			+ "Crocodile,"
 			+ "Cuirassé,"
@@ -2628,6 +2653,7 @@ languages := [
 			+ "Oiseau,"
 			+ "Ombre,"
 			+ "Ondin,"
+			+ "Opossum,"
 			+ "Orgg,"
 			+ "Orphe,"
 			+ "Orque,"
@@ -2646,6 +2672,7 @@ languages := [
 			+ "Pinceur,"
 			+ "Plante,"
 			+ "Poisson,"
+			+ "Porc-épic,"
 			+ "Propagateur,"
 			+ "Puce",
 
@@ -2684,7 +2711,8 @@ languages := [
 			+ "Sylvin,"
 			+ "Synthétique",
 
-			  "Taupe,"
+			  "Tatou,"
+			+ "Taupe,"
 			+ "Tentacule,"
 			+ "Tetravite,"
 			+ "Thalakos,"
@@ -2699,6 +2727,7 @@ languages := [
 			  "Vampire,"
 			+ "Vedalken,"
 			+ "Ver,"
+			+ "Vermine,"
 			+ "Viashino",
 
 			  "Wombat",
@@ -2749,14 +2778,15 @@ languages := [
 			+ "Mercenaire,"
 			+ "Mignon,"
 			+ "Moine,"
+			+ "Monture,"
 			+ "Mutant,"
-			+ "Mystique,"
-			+ "Négociant,"
+			+ "Mystique",
+
+			  "Négociant,"
 			+ "Ninja,"
 			+ "Noble,"
-			+ "Nomade",
-
-			  "Œuf,"
+			+ "Nomade,"
+			+ "Œuf,"
 			+ "Paysan,"
 			+ "Pilote,"
 			+ "Pirate,"
@@ -3185,6 +3215,7 @@ languages := [
 			+ "Angelo,"
 			+ "Antilope,"
 			+ "Arconte,"
+			+ "Armadillo,"
 			+ "Arpia,"
 			+ "Atog,"
 			+ "Avatar,"
@@ -3206,6 +3237,7 @@ languages := [
 			+ "Capibara,"
 			+ "Capra,"
 			+ "Caribù,"
+			+ "Castoro,"
 			+ "Cavallo,"
 			+ "Cefalide,"
 			+ "Centauro,"
@@ -3219,6 +3251,7 @@ languages := [
 			+ "Coccodrillo,"
 			+ "Coniglio,"
 			+ "Costrutto,"
+			+ "Coyote,"
 			+ "Criceto",
 
 			  "Dauthi,"
@@ -3270,7 +3303,8 @@ languages := [
 			+ "Infernale,"
 			+ "Insetto,"
 			+ "Ippogrifo,"
-			+ "Ippopotamo",
+			+ "Ippopotamo,"
+			+ "Istrice",
 
 			  "Juggernaut",
 
@@ -3317,6 +3351,7 @@ languages := [
 			+ "Ogre,"
 			+ "Ombra,"
 			+ "Omuncolo,"
+			+ "Opossum,"
 			+ "Orco,"
 			+ "Orgg,"
 			+ "Orrore,"
@@ -3326,6 +3361,7 @@ languages := [
 
 			  "Palloncino,"
 			+ "Pangolino,"
+			+ "Pangoratto,"
 			+ "Parassita,"
 			+ "Pecora,"
 			+ "Pegaso,"
@@ -3339,8 +3375,9 @@ languages := [
 			+ "Polimorfo,"
 			+ "Portatore,"
 			+ "Procione,"
-			+ "Progenie,"
-			+ "Pungiglione,"
+			+ "Progenie",
+
+			  "Pungiglione,"
 			+ "Pungitore",
 
 			  "Ragno,"
@@ -3435,6 +3472,7 @@ languages := [
 			+ "Bardo,"
 			+ "Berserker,"
 			+ "Bestia,"
+			+ "Cavalcatura,"
 			+ "Cavaliere,"
 			+ "Chierico,"
 			+ "Cittadino,"
@@ -3893,6 +3931,7 @@ languages := [
 		word_lists_basic: ["平地", "島", "沼", "山", "森"],
 		word_lists_race: [
 			  "アンテロープ,"
+			+ "アルマジロ,"
 			+ "アスタルテス,"
 			+ "アバター,"
 			+ "アズラ,"
@@ -3976,11 +4015,13 @@ languages := [
 			+ "鯨,"
 			+ "クズリ",
 
-			  "ケンタクルス",
+			  "ケンタクルス,"
+			+ "匪獣",
 
 			  "コウモリ,"
 			+ "コカトリス,"
 			+ "構築物,"
+			+ "コヨーテ,"
 			+ "近衛団,"
 			+ "恐竜,"
 			+ "巨人,"
@@ -4099,6 +4140,7 @@ languages := [
 			+ "反射",
 
 			  "ビースト,"
+			+ "ビーバー,"
 			+ "ビーブル,"
 			+ "ビホルダー,"
 			+ "ヒポグリフ,"
@@ -4116,6 +4158,7 @@ languages := [
 			+ "フェルダグリフ,"
 			+ "フェニックス,"
 			+ "ファイレクシアン,"
+			+ "フクロネズミ,"
 			+ "プリズム",
 
 			  "ヘリオン,"
@@ -4145,7 +4188,8 @@ languages := [
 
 			  "モグラ",
 
-			  "ヤギ",
+			  "ヤギ,"
+			+ "ヤマアラシ",
 
 			  "ユニコーン",
 
@@ -4222,7 +4266,8 @@ languages := [
 			+ "生存者,"
 			+ "戦士",
 
-			  "操縦士,"
+			  "乗騎,"
+			+ "操縦士,"
 			+ "総主長,"
 			+ "昇華者,"
 			+ "装具,"
@@ -4755,6 +4800,7 @@ languages := [
 			+ "불가사리,"
 			+ "불사조,"
 			+ "브러시와그,"
+			+ "비버,"
 			+ "비아시노,"
 			+ "비홀더",
 
@@ -4783,7 +4829,8 @@ languages := [
 			+ "신,"
 			+ "신령",
 
-			  "아바타,"
+			  "아르마딜로,"
+			+ "아바타,"
 			+ "아우프,"
 			+ "아즈라,"
 			+ "아토그,"
@@ -4795,13 +4842,13 @@ languages := [
 			+ "야마,"
 			+ "야수,"
 			+ "양,"
-			+ "어류,"
-			+ "에테르붙이,"
+			+ "어류",
+
+			  "에테르붙이,"
 			+ "엘드라지,"
 			+ "엘크,"
-			+ "엘프",
-
-			  "여우,"
+			+ "엘프,"
+			+ "여우,"
 			+ "염소,"
 			+ "영양,"
 			+ "오록스,"
@@ -4810,16 +4857,16 @@ languages := [
 			+ "오징어,"
 			+ "오크,"
 			+ "용의,"
-			+ "울버린,"
-			+ "원숭이,"
+			+ "울버린",
+
+			  "원숭이,"
 			+ "월인,"
 			+ "웜,"
 			+ "웜뱃,"
 			+ "위어드,"
 			+ "유니콘,"
-			+ "유인원",
-
-			  "이무기,"
+			+ "유인원,"
+			+ "이무기,"
 			+ "이프리트,"
 			+ "인간,"
 			+ "인어,"
@@ -4850,6 +4897,7 @@ languages := [
 			+ "코르,"
 			+ "코볼드,"
 			+ "코뿔소,"
+			+ "코요테,"
 			+ "코카트리스,"
 			+ "크라켄,"
 			+ "키메라,"
@@ -4884,11 +4932,12 @@ languages := [
 			+ "호러,"
 			+ "호마리드,"
 			+ "호문쿨루스,"
+			+ "호저,"
 			+ "환영,"
-			+ "황소,"
-			+ "흡혈귀",
+			+ "황소",
 
-			  "히드라,"
+			  "흡혈귀,"
+			+ "히드라,"
 			+ "히포그리프"
 		]
 		word_lists_class: [
@@ -5383,6 +5432,7 @@ languages := [
 			+ "Caranguejo,"
 			+ "Carcaju,"
 			+ "Caribu,"
+			+ "Castor,"
 			+ "Cavalo,"
 			+ "Cefálida,"
 			+ "Centauro,"
@@ -5393,6 +5443,7 @@ languages := [
 			  "Cobra,"
 			+ "Cocatriz,"
 			+ "Coelho,"
+			+ "Coiote,"
 			+ "Constructo,"
 			+ "Couraçado,"
 			+ "Crocodilo",
@@ -5526,6 +5577,7 @@ languages := [
 			+ "Phyrexiano,"
 			+ "Planta,"
 			+ "Polvo,"
+			+ "Porco-espinho,"
 			+ "Portador,"
 			+ "Portador,"
 			+ "Preguiça,"
@@ -5555,6 +5607,7 @@ languages := [
 			+ "Surrakar",
 
 			  "Tartaruga,"
+			+ "Tatu,"
 			+ "Tentáculo,"
 			+ "Tetravite,"
 			+ "Texugo,"
@@ -6077,7 +6130,9 @@ languages := [
 			+ "Бегемот,"
 			+ "Белка,"
 			+ "Бес,"
+			+ "Бобр,"
 			+ "Бог,"
+			+ "Броненосец,"
 			+ "Брушвагг,"
 			+ "Бык",
 
@@ -6119,6 +6174,7 @@ languages := [
 			  "Демон,"
 			+ "Джаггернаут,"
 			+ "Джинн,"
+			+ "Дикобраз,"
 			+ "Диковина,"
 			+ "Динозавр,"
 			+ "Доути,"
@@ -6154,15 +6210,16 @@ languages := [
 			+ "Кирин,"
 			+ "Кискен,"
 			+ "Кит,"
-			+ "Клещ,"
-			+ "Кобольд,"
+			+ "Клещ",
+
+			  "Кобольд,"
 			+ "Коза,"
+			+ "Койот,"
 			+ "Конструкция,"
 			+ "Кор,"
 			+ "Кошка,"
-			+ "Кошмар",
-
-			  "Краб,"
+			+ "Кошмар,"
+			+ "Краб,"
 			+ "Кракен,"
 			+ "Крокодил,"
 			+ "Кролик,"
@@ -6811,10 +6868,11 @@ languages := [
 			+ "奥札奇,"
 			+ "奴兽,"
 			+ "宁芙,"
-			+ "害虫,"
-			+ "家鼠",
+			+ "害獸,"
+			+ "害虫",
 
-			  "寇族,"
+			  "家鼠,"
+			+ "寇族,"
 			+ "小恶魔,"
 			+ "山羊,"
 			+ "巨人,"
@@ -6829,10 +6887,10 @@ languages := [
 			+ "怪奇,"
 			+ "怪灵,"
 			+ "恐龙,"
-			+ "恶魔,"
-			+ "惊惧兽",
+			+ "恶魔",
 
-			  "拉弥亚,"
+			  "惊惧兽,"
+			+ "拉弥亚,"
 			+ "拉玛苏,"
 			+ "拉高耶夫,"
 			+ "振翼机,"
@@ -6847,14 +6905,15 @@ languages := [
 			+ "树妖,"
 			+ "树懒,"
 			+ "树灵,"
-			+ "梦魇,"
-			+ "植物",
+			+ "梦魇",
 
-			  "欧格,"
+			  "植物,"
+			+ "欧格,"
 			+ "气球,"
 			+ "水母,"
 			+ "水獭,"
 			+ "水豚,"
+			+ "河狸,"
 			+ "河马,"
 			+ "洁英,"
 			+ "流浆,"
@@ -6864,13 +6923,14 @@ languages := [
 			+ "海绵,"
 			+ "海象,"
 			+ "火蜥蜴,"
-			+ "灵俑,"
-			+ "熊",
+			+ "灵俑",
 
-			  "牛,"
+			  "熊,"
+			+ "牛,"
 			+ "牛头怪,"
 			+ "牡蛎,"
 			+ "犀牛,"
+			+ "犰狳,"
 			+ "狐,"
 			+ "独眼巨人,"
 			+ "独角兽,"
@@ -6881,11 +6941,11 @@ languages := [
 			+ "猎犬,"
 			+ "猫,"
 			+ "猫鼬,"
-			+ "猴,"
-			+ "猿猴,"
-			+ "獾",
+			+ "猴",
 
-			  "病媒,"
+			  "猿猴,"
+			+ "獾,"
+			+ "病媒,"
 			+ "病菌,"
 			+ "盖美拉,"
 			+ "真菌,"
@@ -6899,11 +6959,11 @@ languages := [
 			+ "秘耳,"
 			+ "稻草人,"
 			+ "穿山甲,"
-			+ "突变体,"
-			+ "精怪,"
-			+ "精灵",
+			+ "突变体",
 
-			  "索尔兽,"
+			  "精怪,"
+			+ "精灵,"
+			+ "索尔兽,"
 			+ "索泰利,"
 			+ "紫貂,"
 			+ "组构体,"
@@ -6917,11 +6977,11 @@ languages := [
 			+ "老鼠,"
 			+ "腐生物,"
 			+ "自动机,"
-			+ "苏拉卡,"
-			+ "荷马利,"
-			+ "虚影",
+			+ "苏拉卡",
 
-			  "虫械,"
+			  "荷马利,"
+			+ "虚影,"
+			+ "虫械,"
 			+ "蛇,"
 			+ "蛇发妖,"
 			+ "蛋,"
@@ -6935,28 +6995,31 @@ languages := [
 			+ "蝎子,"
 			+ "蝙蝠,"
 			+ "蟹,"
-			+ "蠕虫,"
-			+ "袋熊,"
-			+ "裂片妖",
+			+ "蠕虫",
 
-			  "触手,"
+			  "袋熊,"
+			+ "裂片妖,"
+			+ "触手,"
 			+ "诺格,"
 			+ "象,"
+			+ "豪猪,"
 			+ "豺狼,"
 			+ "豺狼人,"
+			+ "负鼠,"
 			+ "造妖,"
 			+ "道西,"
+			+ "郊狼,"
 			+ "野兽,"
 			+ "野猪,"
 			+ "钳手,"
 			+ "阴魂,"
-			+ "阿托格,"
-			+ "雕像,"
+			+ "阿托格",
+
+			  "雕像,"
 			+ "雪怪,"
 			+ "雪貂,"
-			+ "非瑞人",
-
-			  "章人,"
+			+ "非瑞人,"
+			+ "章人,"
 			+ "章鱼,"
 			+ "飞马,"
 			+ "食人魔,"
@@ -6968,13 +7031,13 @@ languages := [
 			+ "骷髅妖,"
 			+ "鬣狗,"
 			+ "鬼崽,"
-			+ "鬼魂,"
-			+ "魔人,"
+			+ "鬼魂",
+
+			  "魔人,"
 			+ "魔像,"
 			+ "魔神,"
-			+ "魔鬼",
-
-			  "鱼,"
+			+ "魔鬼,"
+			+ "鱼,"
 			+ "鲨鱼,"
 			+ "鲸鱼,"
 			+ "鳄鱼,"
@@ -7002,12 +7065,14 @@ languages := [
 			+ "后裔,"
 			+ "吸血鬼,"
 			+ "噬体,"
+			+ "坐騎,"
+			+ "坐骑,"
 			+ "塑法师,"
-			+ "士兵,"
-			+ "奴仆,"
-			+ "奴兽",
+			+ "士兵",
 
-			  "孽裔,"
+			  "奴仆,"
+			+ "奴兽,"
+			+ "孽裔,"
 			+ "市民,"
 			+ "平民,"
 			+ "弓箭手,"
@@ -7021,11 +7086,11 @@ languages := [
 			+ "整备师,"
 			+ "斥候,"
 			+ "旗手,"
-			+ "无畏舰,"
-			+ "映影,"
-			+ "术士",
+			+ "无畏舰",
 
-			  "杀手,"
+			  "映影,"
+			+ "术士,"
+			+ "杀手,"
 			+ "武士,"
 			+ "法术师,"
 			+ "浪客,"
@@ -7039,11 +7104,11 @@ languages := [
 			+ "生存者,"
 			+ "病媒,"
 			+ "神器师,"
-			+ "祭师,"
-			+ "科学家,"
-			+ "秘教徒",
+			+ "祭师",
 
-			  "突变体,"
+			  "科学家,"
+			+ "秘教徒,"
+			+ "突变体,"
 			+ "精怪,"
 			+ "统领,"
 			+ "蛋,"
@@ -7469,11 +7534,11 @@ languages := [
 			+ "元素,"
 			+ "光蛾,"
 			+ "兔,"
-			+ "凡爾西諾,"
-			+ "分節,"
-			+ "分靈",
+			+ "凡爾西諾",
 
-			  "化身,"
+			  "分節,"
+			+ "分靈,"
+			+ "化身,"
 			+ "半人馬,"
 			+ "半獸人,"
 			+ "半神,"
@@ -7486,12 +7551,12 @@ languages := [
 			+ "吉斯人,"
 			+ "吸血鬼,"
 			+ "哈痞,"
-			+ "四鈣石,"
-			+ "地侏,"
-			+ "地獄獸,"
-			+ "塔拉科斯",
+			+ "四鈣石",
 
-			  "塞連,"
+			  "地侏,"
+			+ "地獄獸,"
+			+ "塔拉科斯,"
+			+ "塞連,"
 			+ "墓生,"
 			+ "多頭龍,"
 			+ "夢魘,"
@@ -7500,14 +7565,15 @@ languages := [
 			+ "奧札奇,"
 			+ "奴獸,"
 			+ "妖精,"
+			+ "害獸,"
 			+ "害蟲,"
 			+ "家鼠,"
-			+ "寇族,"
-			+ "寧芙,"
-			+ "小惡魔,"
-			+ "山羊",
+			+ "寇族",
 
-			  "巨人,"
+			  "寧芙,"
+			+ "小惡魔,"
+			+ "山羊,"
+			+ "巨人,"
 			+ "巨海獸,"
 			+ "巨神灵,"
 			+ "巨蛇,"
@@ -7519,13 +7585,13 @@ languages := [
 			+ "怪奇,"
 			+ "怪靈,"
 			+ "恐龍,"
-			+ "惡魔,"
-			+ "拉彌亞,"
+			+ "惡魔",
+
+			  "拉彌亞,"
 			+ "拉瑪蘇,"
 			+ "拉高耶夫,"
-			+ "振翼機",
-
-			  "攻城巨車,"
+			+ "振翼機,"
+			+ "攻城巨車,"
 			+ "斯立茲,"
 			+ "无畏舰,"
 			+ "无面鬼,"
@@ -7536,14 +7602,15 @@ languages := [
 			+ "植物,"
 			+ "樹妖,"
 			+ "樹懶,"
-			+ "樹靈,"
-			+ "欧格,"
-			+ "殭屍,"
-			+ "氣球",
+			+ "樹靈",
 
-			  "水母,"
+			  "欧格,"
+			+ "殭屍,"
+			+ "氣球,"
+			+ "水母,"
 			+ "水獺,"
 			+ "水豚,"
+			+ "河狸,"
 			+ "河馬,"
 			+ "流漿,"
 			+ "浣熊,"
@@ -7552,31 +7619,32 @@ languages := [
 			+ "海绵,"
 			+ "海象,"
 			+ "潔英,"
-			+ "火蜥蜴,"
-			+ "烏賊,"
+			+ "火蜥蜴",
+
+			  "烏賊,"
 			+ "熊,"
 			+ "牆,"
 			+ "牛,"
-			+ "牛頭怪",
-
-			  "牡蠣,"
+			+ "牛頭怪,"
+			+ "牡蠣,"
 			+ "犀牛,"
+			+ "犰狳,"
 			+ "狐,"
 			+ "狼,"
 			+ "狼人,"
 			+ "狼獾,"
 			+ "猴,"
 			+ "猿猴,"
-			+ "獅鷲,"
-			+ "獨眼巨人,"
+			+ "獅鷲",
+
+			  "獨眼巨人,"
 			+ "獨角獸,"
 			+ "獵犬,"
 			+ "獾,"
 			+ "異獅,"
 			+ "病媒,"
-			+ "真菌",
-
-			  "眼,"
+			+ "真菌,"
+			+ "眼,"
 			+ "眼魔,"
 			+ "矮人,"
 			+ "石像鬼,"
@@ -7584,16 +7652,16 @@ languages := [
 			+ "砂,"
 			+ "神,"
 			+ "秘耳,"
-			+ "稻草人,"
-			+ "穿山甲,"
+			+ "稻草人",
+
+			  "穿山甲,"
 			+ "突變體,"
 			+ "精靈,"
 			+ "索泰利,"
 			+ "索爾獸,"
 			+ "紫貂,"
-			+ "細菌",
-
-			  "組構體,"
+			+ "細菌,"
+			+ "組構體,"
 			+ "組裝工人,"
 			+ "統領,"
 			+ "維多肯,"
@@ -7601,25 +7669,26 @@ languages := [
 			+ "羊蹄人,"
 			+ "羚羊,"
 			+ "翼獅,"
-			+ "老鼠,"
-			+ "聖者,"
+			+ "老鼠",
+
+			  "聖者,"
 			+ "腐生物,"
 			+ "自動機,"
 			+ "苏拉卡,"
 			+ "荷馬利,"
 			+ "蓋美拉,"
 			+ "虛影,"
-			+ "虫械",
-
-			  "蛇,"
+			+ "虫械,"
+			+ "蛇,"
 			+ "蛇髮妖,"
 			+ "蛋,"
 			+ "蛙,"
 			+ "蛞蝓,"
 			+ "蛭,"
 			+ "蜗牛,"
-			+ "蜘蛛,"
-			+ "蜥怪,"
+			+ "蜘蛛",
+
+			  "蜥怪,"
 			+ "蜥蜴,"
 			+ "蝙蝠,"
 			+ "蟹,"
@@ -7627,17 +7696,20 @@ languages := [
 			+ "蠕蟲,"
 			+ "袋熊,"
 			+ "裂片妖,"
-			+ "觸手",
-
-			  "變形獸,"
+			+ "觸手,"
+			+ "變形獸,"
 			+ "诺格,"
 			+ "象,"
+			+ "豪豬,"
 			+ "豺狼,"
-			+ "豺狼人,"
-			+ "貓,"
+			+ "豺狼人",
+
+			  "貓,"
 			+ "貓鼬,"
+			+ "負鼠,"
 			+ "造妖,"
 			+ "道西,"
+			+ "郊狼,"
 			+ "野獸,"
 			+ "野豬,"
 			+ "钳手,"
@@ -7645,11 +7717,11 @@ languages := [
 			+ "陰魂,"
 			+ "雕像,"
 			+ "雪怪,"
-			+ "雪貂",
+			+ "雪貂,"
+			+ "非瑞人,"
+			+ "章魚",
 
-			  "非瑞人,"
-			+ "章魚,"
-			+ "飛馬,"
+			  "飛馬,"
 			+ "食人魔,"
 			+ "馬,"
 			+ "馴鹿,"
@@ -7661,13 +7733,13 @@ languages := [
 			+ "鬣狗,"
 			+ "鬼崽,"
 			+ "鬼怪,"
-			+ "鬼魂",
-
-			  "魔人,"
+			+ "鬼魂,"
+			+ "魔人,"
 			+ "魔像,"
 			+ "魔神,"
-			+ "魔鬼,"
-			+ "魚,"
+			+ "魔鬼",
+
+			  "魚,"
 			+ "鯊魚,"
 			+ "鯨魚,"
 			+ "鱆人,"
@@ -7678,9 +7750,8 @@ languages := [
 			+ "麋鹿,"
 			+ "麒麟,"
 			+ "墨靈,"
-			+ "鼴鼠",
-
-			  "龍,"
+			+ "鼴鼠,"
+			+ "龍,"
 			+ "龍獸,"
 			+ "龜"
 		]
@@ -7696,14 +7767,16 @@ languages := [
 			+ "反抗軍,"
 			+ "吸血鬼,"
 			+ "噬體,"
+			+ "坐騎,"
+			+ "坐骑,"
 			+ "塑法師,"
 			+ "士兵,"
 			+ "奴僕,"
-			+ "奴獸,"
-			+ "孽裔,"
-			+ "市民",
+			+ "奴獸",
 
-			  "平民,"
+			  "孽裔,"
+			+ "市民,"
+			+ "平民,"
 			+ "弓箭手,"
 			+ "後裔,"
 			+ "德魯伊,"
@@ -7717,11 +7790,11 @@ languages := [
 			+ "旗手,"
 			+ "无畏舰,"
 			+ "映影,"
-			+ "武士,"
-			+ "殭屍,"
-			+ "殺手",
+			+ "武士",
 
-			  "浪客,"
+			  "殭屍,"
+			+ "殺手,"
+			+ "浪客,"
 			+ "海怪,"
 			+ "海盜,"
 			+ "游牧人,"
@@ -7735,11 +7808,11 @@ languages := [
 			+ "突變體,"
 			+ "精靈,"
 			+ "統領,"
-			+ "蛋,"
-			+ "術士,"
-			+ "詩人",
+			+ "蛋",
 
-			  "貴族,"
+			  "術士,"
+			+ "詩人,"
+			+ "貴族,"
 			+ "軍隊,"
 			+ "農奴,"
 			+ "遊俠,"
diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index 449168f45..0fdee2007 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -849,6 +849,11 @@ auto_correct :=
 		     + "(<kw-[^<]><nospellcheck>)" # inside a kw
 			 + "([A-Z])" # match this
 		replace: { _1 + _2 + to_lower(_3)})
+	+replace@(
+		match: "([ ]*: |—| — )" # preceded by this
+		     + "([[:lower:]])" # match this
+		     + "(?![)])",      # not followed by this
+		replace: { _1 + to_upper(_2) })
 auto_errata :=
 	replace@(match:"converted mana cost", replace:"mana value")
 	+replace@(match:"(?i)(Totem armor|Totembeistand|Armadura tótem|totémique|Armatura totem|Armadura de totem|族霊鎧|替身甲)", replace:{errata_map[_1] or else _1})
@@ -1058,20 +1063,17 @@ text_filter :=
 		else input
 	 }+
 	# step 8 : automatic capitalization, but not after "("
-	replace@(
-		match: "([ ]*: |—| — )" # preceded by this
-		     + "([[:lower:]])" # match this
-		     + "(?![)])",      # not followed by this
-		replace: { _1 + to_upper(_2) }) +
 	# step 9 : spellcheck
 	{
 		if set.auto_correct then
 			auto_correct(input)
-		else input } +
+		else input
+	} +
 	{
 		if set.auto_errata then
 			auto_errata(input)
-		else input } +
+		else input
+	} +
 	{ 
 		if language().code == "ja" or language().code == "zht" or language().code == "zhs" then input
 		else if set.mark_errors then
diff --git a/data/magic.mse-game/word_lists b/data/magic.mse-game/word_lists
index 6e8ddd893..cc6a3158f 100644
--- a/data/magic.mse-game/word_lists
+++ b/data/magic.mse-game/word_lists
@@ -850,33 +850,37 @@ word list:
 				word:
 					script: lang_setting("word_lists_race").18
 			word:
-				name: Se-Sz
+				name: Se-Su
 				word:
 					script: lang_setting("word_lists_race").19
+			word:
+				name: Sy-Sz
+				word:
+					script: lang_setting("word_lists_race").20
 		word:
 			name: T
 			word:
-				script: lang_setting("word_lists_race").20
+				script: lang_setting("word_lists_race").21
 		word:
 			name: U
 			word:
-				script: lang_setting("word_lists_race").21
+				script: lang_setting("word_lists_race").22
 		word:
 			name: V
 			word:
-				script: lang_setting("word_lists_race").22
+				script: lang_setting("word_lists_race").23
 		word:
 			name: W
 			word:
-				script: lang_setting("word_lists_race").23
+				script: lang_setting("word_lists_race").24
 		word:
 			name: Y
 			word:
-				script: lang_setting("word_lists_race").24
+				script: lang_setting("word_lists_race").25
 		word:
 			name: Z
 			word:
-				script: lang_setting("word_lists_race").25
+				script: lang_setting("word_lists_race").26
 
 
 word list:
@@ -895,15 +899,15 @@ word list:
 			word:
 				script: lang_setting("word_lists_class").1
 		word:
-			name: K-R
+			name: K-P
 			word:
 				script: lang_setting("word_lists_class").2
 		word:
-			name: S-W
+			name: R-U
 			word:
 				script: lang_setting("word_lists_class").3
 		word:
-			name: Z
+			name: V-Z
 			word:
 				script: lang_setting("word_lists_class").4
 
@@ -1069,17 +1073,21 @@ word list:
 			word:
 				script: lang_setting("word_lists_class").1
 		word:
-			name: L-P
+			name: L-N
 			word:
 				script: lang_setting("word_lists_class").2
 		word:
-			name: R-S
+			name: P-R
 			word:
 				script: lang_setting("word_lists_class").3
 		word:
-			name: T-Z
+			name: S-V
 			word:
 				script: lang_setting("word_lists_class").4
+		word:
+			name: W-Z
+			word:
+				script: lang_setting("word_lists_class").5
 
 
 word list:
@@ -1413,11 +1421,11 @@ word list:
 			word:
 				script: lang_setting("word_lists_class").1
 		word:
-			name: G-N
+			name: G-M
 			word:
 				script: lang_setting("word_lists_class").2
 		word:
-			name: O-R
+			name: N-R
 			word:
 				script: lang_setting("word_lists_class").3
 		word:
@@ -1532,45 +1540,51 @@ word list:
 		word:
 			name: P
 			word:
-				script: lang_setting("word_lists_race").16
+				name: Pa-Pr
+				word:
+					script: lang_setting("word_lists_race").16
+			word:
+				name: Pu-Pz
+				word:
+					script: lang_setting("word_lists_race").17
 		word:
 			name: R
 			word:
-				script: lang_setting("word_lists_race").17
+				script: lang_setting("word_lists_race").18
 		word:
 			name: S
 			word:
 				name: Sa-Se
 				word:
-					script: lang_setting("word_lists_race").18
+					script: lang_setting("word_lists_race").19
 			word:
 				name: Sf-Sz
 				word:
-					script: lang_setting("word_lists_race").19
+					script: lang_setting("word_lists_race").20
 		word:
 			name: T
 			word:
-				script: lang_setting("word_lists_race").20
+				script: lang_setting("word_lists_race").21
 		word:
 			name: U
 			word:
-				script: lang_setting("word_lists_race").21
+				script: lang_setting("word_lists_race").22
 		word:
 			name: V
 			word:
-				script: lang_setting("word_lists_race").22
+				script: lang_setting("word_lists_race").23
 		word:
 			name: W
 			word:
-				script: lang_setting("word_lists_race").23
+				script: lang_setting("word_lists_race").24
 		word:
 			name: Y
 			word:
-				script: lang_setting("word_lists_race").24
+				script: lang_setting("word_lists_race").25
 		word:
 			name: Z
 			word:
-				script: lang_setting("word_lists_race").25
+				script: lang_setting("word_lists_race").26
 
 
 word list:
@@ -2058,15 +2072,15 @@ word list:
 		word:
 			name: ᄋ
 			word:
-				name: 아 - 에
+				name: 아 - 어
 				word:
 					script: lang_setting("word_lists_race").9
 			word:
-				name: 여 - 유
+				name: 에 - 우
 				word:
 					script: lang_setting("word_lists_race").10
 			word:
-				name: 이 - ᄋᄒ
+				name: 워 - ᄋᄒ
 				word:
 					script: lang_setting("word_lists_race").11
 		word:
@@ -2092,11 +2106,11 @@ word list:
 		word:
 			name: ᄒ
 			word:
-				name: 하 - 흐
+				name: 하 - 화
 				word:
 					script: lang_setting("word_lists_race").17
 			word:
-				name: 히 - ᄒᄒ
+				name: 흐 - ᄒᄒ
 				word:
 					script: lang_setting("word_lists_race").18
 
@@ -2372,11 +2386,11 @@ word list:
 		word:
 			name: К
 			word:
-				name: Ка-Ко
+				name: Ка-Кл
 				word:
 					script: lang_setting("word_lists_race").8
 			word:
-				name: Кр-Кя
+				name: Ко-Кя
 				word:
 					script: lang_setting("word_lists_race").9
 		word:
@@ -2520,47 +2534,47 @@ word list:
 			word:
 				script: lang_setting("word_lists_race").1
 		word:
-			name: 四-家
+			name: 四-害
 			word:
 				script: lang_setting("word_lists_race").2
 		word:
-			name: 寇-惊
+			name: 家-恶
 			word:
 				script: lang_setting("word_lists_race").3
 		word:
-			name: 拉-植
+			name: 惊-梦
 			word:
 				script: lang_setting("word_lists_race").4
 		word:
-			name: 欧-熊
+			name: 植-灵
 			word:
 				script: lang_setting("word_lists_race").5
 		word:
-			name: 牛-獾
+			name: 熊-猴
 			word:
 				script: lang_setting("word_lists_race").6
 		word:
-			name: 病-精
+			name: 猿-突
 			word:
 				script: lang_setting("word_lists_race").7
 		word:
-			name: 索-虚
+			name: 精-苏
 			word:
 				script: lang_setting("word_lists_race").8
 		word:
-			name: 虫-裂
+			name: 荷-蠕
 			word:
 				script: lang_setting("word_lists_race").9
 		word:
-			name: 触-非
+			name: 袋-阿
 			word:
 				script: lang_setting("word_lists_race").10
 		word:
-			name: 章-魔
+			name: 雕-鬼
 			word:
 				script: lang_setting("word_lists_race").11
 		word:
-			name: 鱼-龟
+			name: 魔-龟
 			word:
 				script: lang_setting("word_lists_race").12
 
@@ -2573,19 +2587,19 @@ word list:
 	word:
 		name: 所有职业
 		word:
-			name: 伙-奴
+			name: 伙-士
 			word:
 				script: lang_setting("word_lists_class").0
 		word:
-			name: 孽-术
+			name: 奴-无
 			word:
 				script: lang_setting("word_lists_class").1
 		word:
-			name: 杀-秘
+			name: 映-祭
 			word:
 				script: lang_setting("word_lists_class").2
 		word:
-			name: 突-魔
+			name: 科-魔
 			word:
 				script: lang_setting("word_lists_class").3
 
@@ -2628,59 +2642,59 @@ word list:
 	word:
 		name: 所有物種
 		word:
-			name: 三-分
+			name: 三-凡
 			word:
 				script: lang_setting("word_lists_race").0
 		word:
-			name: 化-塔
+			name: 分-四
 			word:
 				script: lang_setting("word_lists_race").1
 		word:
-			name: 塞-山
+			name: 地-寇
 			word:
 				script: lang_setting("word_lists_race").2
 		word:
-			name: 巨-振
+			name: 寧-惡
 			word:
 				script: lang_setting("word_lists_race").3
 		word:
-			name: 攻-氣
+			name: 拉-樹
 			word:
 				script: lang_setting("word_lists_race").4
 		word:
-			name: 水-牛
+			name: 欧-火
 			word:
 				script: lang_setting("word_lists_race").5
 		word:
-			name: 牡-真
+			name: 烏-獅
 			word:
 				script: lang_setting("word_lists_race").6
 		word:
-			name: 眼-細
+			name: 獨-稻
 			word:
 				script: lang_setting("word_lists_race").7
 		word:
-			name: 組-虫
+			name: 穿-老
 			word:
 				script: lang_setting("word_lists_race").8
 		word:
-			name: 蛇-觸
+			name: 聖-蜘
 			word:
 				script: lang_setting("word_lists_race").9
 		word:
-			name: 變-雪
+			name: 蜥-豺
 			word:
 				script: lang_setting("word_lists_race").10
 		word:
-			name: 非-鬼
+			name: 貓-章
 			word:
 				script: lang_setting("word_lists_race").11
 		word:
-			name: 魔-鼴
+			name: 飛-魔
 			word:
 				script: lang_setting("word_lists_race").12
 		word:
-			name: 龍-龜
+			name: 魚-龜
 			word:
 				script: lang_setting("word_lists_race").13
 
@@ -2693,19 +2707,19 @@ word list:
 	word:
 		name: 所有職業
 		word:
-			name: 伙-市
+			name: 伙-奴
 			word:
 				script: lang_setting("word_lists_class").0
 		word:
-			name: 平-殺
+			name: 孽-武
 			word:
 				script: lang_setting("word_lists_class").1
 		word:
-			name: 浪-詩
+			name: 殭-蛋
 			word:
 				script: lang_setting("word_lists_class").2
 		word:
-			name: 貴-魔
+			name: 術-魔
 			word:
 				script: lang_setting("word_lists_class").3