diff --git a/data/magic.mse-game/language_map b/data/magic.mse-game/language_map
index 2d2a76ea4..447b87790 100644
--- a/data/magic.mse-game/language_map
+++ b/data/magic.mse-game/language_map
@@ -2019,23 +2019,25 @@ languages := [
 			+ "Cobarde,"
 			+ "Consejero,"
 			+ "Destructor,"
+			+ "Detective,"
 			+ "Doctor,"
-			+ "Druida,"
-			+ "Ejército,"
+			+ "Druida",
+
+			  "Ejército,"
 			+ "Encarnación,"
 			+ "Engendro,"
 			+ "Espíritu,"
 			+ "Esqueleto,"
-			+ "Explorador",
-
-			  "Guardabosque,"
+			+ "Explorador,"
+			+ "Guardabosque,"
 			+ "Guerrero,"
 			+ "Hechicero,"
 			+ "Horror,"
 			+ "Huevo,"
 			+ "Leviatán,"
-			+ "Licántropo,"
-			+ "Magistrado,"
+			+ "Licántropo",
+
+			  "Magistrado,"
 			+ "Mercenario,"
 			+ "Metabolizador,"
 			+ "Místico,"
@@ -2043,16 +2045,16 @@ languages := [
 			+ "Mutante,"
 			+ "Ninja,"
 			+ "Noble,"
-			+ "Nómada",
-
-			  "Pícaro,"
+			+ "Nómada,"
+			+ "Pícaro,"
 			+ "Piloto,"
 			+ "Pirata,"
 			+ "Plebeyo,"
 			+ "Portador,"
 			+ "Rebelde,"
-			+ "Reflejo,"
-			+ "Samurái,"
+			+ "Reflejo",
+
+			  "Samurái,"
 			+ "Sicario,"
 			+ "Siervo,"
 			+ "Soldado,"
@@ -2060,9 +2062,8 @@ languages := [
 			+ "Tóptero,"
 			+ "Traficante,"
 			+ "Vampiro,"
-			+ "Vástago",
-
-			  "Zángano,"
+			+ "Vástago,"
+			+ "Zángano,"
 			+ "Zombie"
 		]
 		word_lists_plane: [
@@ -3440,7 +3441,8 @@ languages := [
 			+ "Commerciante,"
 			+ "Consigliere",
 
-			  "Discendente,"
+			  "Detective,"
+			+ "Discendente,"
 			+ "Dottore,"
 			+ "Druido,"
 			+ "Esercito,"
@@ -5610,6 +5612,7 @@ languages := [
 			+ "Conselheiro,"
 			+ "Couraçado,"
 			+ "Covarde,"
+			+ "Detetive,"
 			+ "Druida,"
 			+ "Encarnação,"
 			+ "Espírito,"
@@ -6988,6 +6991,7 @@ languages := [
 		word_lists_class: [
 			  "伙伴,"
 			+ "佣兵,"
+			+ "侦探,"
 			+ "修行僧,"
 			+ "僧侣,"
 			+ "军队,"
@@ -7001,10 +7005,10 @@ languages := [
 			+ "塑法师,"
 			+ "士兵,"
 			+ "奴仆,"
-			+ "奴兽,"
-			+ "孽裔",
+			+ "奴兽",
 
-			  "市民,"
+			  "孽裔,"
+			+ "市民,"
 			+ "平民,"
 			+ "弓箭手,"
 			+ "德鲁伊,"
@@ -7019,10 +7023,10 @@ languages := [
 			+ "旗手,"
 			+ "无畏舰,"
 			+ "映影,"
-			+ "术士,"
-			+ "杀手",
+			+ "术士",
 
-			  "武士,"
+			  "杀手,"
+			+ "武士,"
 			+ "法术师,"
 			+ "浪客,"
 			+ "海怪,"
@@ -7037,10 +7041,10 @@ languages := [
 			+ "神器师,"
 			+ "祭师,"
 			+ "科学家,"
-			+ "秘教徒,"
-			+ "突变体",
+			+ "秘教徒",
 
-			  "精怪,"
+			  "突变体,"
+			+ "精怪,"
 			+ "统领,"
 			+ "蛋,"
 			+ "诗人,"
@@ -7683,6 +7687,7 @@ languages := [
 		word_lists_class: [
 			  "伙伴,"
 			+ "佣兵,"
+			+ "侦探,"
 			+ "修行僧,"
 			+ "倖存者,"
 			+ "僧侶,"
@@ -7696,10 +7701,10 @@ languages := [
 			+ "奴僕,"
 			+ "奴獸,"
 			+ "孽裔,"
-			+ "市民,"
-			+ "平民",
+			+ "市民",
 
-			  "弓箭手,"
+			  "平民,"
+			+ "弓箭手,"
 			+ "後裔,"
 			+ "德魯伊,"
 			+ "忍者,"
@@ -7714,10 +7719,10 @@ languages := [
 			+ "映影,"
 			+ "武士,"
 			+ "殭屍,"
-			+ "殺手,"
-			+ "浪客",
+			+ "殺手",
 
-			  "海怪,"
+			  "浪客,"
+			+ "海怪,"
 			+ "海盜,"
 			+ "游牧人,"
 			+ "狂戰士,"
@@ -7732,10 +7737,10 @@ languages := [
 			+ "統領,"
 			+ "蛋,"
 			+ "術士,"
-			+ "詩人,"
-			+ "貴族",
+			+ "詩人",
 
-			  "軍隊,"
+			  "貴族,"
+			+ "軍隊,"
 			+ "農奴,"
 			+ "遊俠,"
 			+ "野獸,"
diff --git a/data/magic.mse-game/word_lists b/data/magic.mse-game/word_lists
index b1075e43b..6e8ddd893 100644
--- a/data/magic.mse-game/word_lists
+++ b/data/magic.mse-game/word_lists
@@ -349,14 +349,14 @@ word list:
 	word: Criatura Artefato
 	word: Encantamento
 	word: Criatura Encantamento
-	word: Istantaneo
+	word: Mágica Istantaneo
 	word: Feitiço
 	word: Terreno
 	word: Planeswalker
 	word: Batalha
 	word: Emblema
 	word:
-		script: " Tribale"
+		script: " Tribal"
 		is prefix: true
 		line below: true
 	word:
@@ -1241,19 +1241,19 @@ word list:
 			word:
 				script: lang_setting("word_lists_class").0
 		word:
-			name: C-E
+			name: C-D
 			word:
 				script: lang_setting("word_lists_class").1
 		word:
-			name: G-N
+			name: E-L
 			word:
 				script: lang_setting("word_lists_class").2
 		word:
-			name: P-V
+			name: M-R
 			word:
 				script: lang_setting("word_lists_class").3
 		word:
-			name: Z
+			name: S-Z
 			word:
 				script: lang_setting("word_lists_class").4
 
@@ -2573,19 +2573,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
 
@@ -2693,19 +2693,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