diff --git a/parts/language/dict_en.lua b/parts/language/dict_en.lua
index 524b9d8a..218c88c1 100644
--- a/parts/language/dict_en.lua
+++ b/parts/language/dict_en.lua
@@ -26,6 +26,7 @@ return{
 		"http://tetris.huijiwiki.com",
 	},
 
+	--Games
 	{"TTT",
 		"ttt tetris trainer tres bien",
 		"game",
@@ -163,6 +164,8 @@ return{
 		"game",
 		"*Windows | Multiplayer*\nChinese: 火拼俄罗斯\nThe Tetris game on Tencent Game Center, 12-wide board, DAS/ARR the same as your typing, 1 next, no hold. Can only send garbage though Tetris (sends 3 lines) and Triple (sends 2 lines). Garbage is checker-board-shaped and very difficult to dig through.",
 	},
+
+	--Terms
 	{
 		"Translator Note 2",
 		"",
@@ -281,6 +284,27 @@ return{
 		"The name of the game (and its trademark). Also the name for clearing 4 lines.\nCoined from Tetra (greek for \"four\") and Tennis (favorite sport of Alexey Pajitnov, creator of Tetris).",
 	},
 
+	{"Spin",
+		"spin",
+		"term",
+		"Use rotation to move a piece into a position otherwise unreachable. In some games, this sends extra attack or awards extra score.",
+	},
+	{"All-Spin",
+		"allspin",
+		"term",
+		"A rule in which spins of all pieces are awarded extra attack/score, rather than just spins of the T piece (\"T-Spin only\").",
+	},
+	{"T-Spin",
+		"tspin",
+		"term",
+		"A spin using the T piece.\nIn modern official games, T-Spins are detected using the 3-corner rule, i.e. if at least three of the four cells diagonal to the rotation center, it is a T-Spin. Some games have extra rules to mark a T-Spin as a Mini T-Spin instead, which has reduced attack/score.",
+	},
+	{"O-Spin",
+		"ospin",
+		"term",
+		"In most cases, it's a meme.\nThe O Tetrimino (a.k.a. the Square) does not change upon rotation, thus making it lack interesting spins/kicks that other Tetriminoes have, or be stuck in a place unable to get out.\nAs a joke, some people have made heavily edited videos or even programmed games where the O piece can change shape and \"spin\" into different positions.\nTechmino also supports O-Spin in most modes.",
+	},
+	--{"Wall-Kick"},
 	{"SRS",
 		"srs superrotationsystem",
 		"term",
@@ -307,21 +331,6 @@ return{
 		"*Techmino-exclusive*\nTechmino Rotation System\nThe rotation system used in Techmino.\nIt is based on SRS, with fixes on common cases where S/Z are locked from rotating, and some extra useful kicks. Each pentomino also has a kick table roughly based on SRS logic.",
 	},
 
-	{"Spin",
-		"spin",
-		"term",
-		"Use rotation to move a piece into a position otherwise unreachable. In some games, this sends extra attack or awards extra score.",
-	},
-	{"All-Spin",
-		"allspin",
-		"term",
-		"A rule in which spins of all pieces are awarded extra attack/score, rather than just spins of the T piece (\"T-Spin only\").",
-	},
-	{"T-Spin",
-		"tspin",
-		"term",
-		"A spin using the T piece.\nIn modern official games, T-Spins are detected using the 3-corner rule, i.e. if at least three of the four cells diagonal to the rotation center, it is a T-Spin. Some games have extra rules to mark a T-Spin as a Mini T-Spin instead, which has reduced attack/score.",
-	},
 
 	{"IRS",
 		"irs initialrotationsystem",
@@ -338,7 +347,6 @@ return{
 		"term",
 		"*Techmino-exclusive*\nInitial Movement System\nHolding a sideways movement key during spawn delay to spawn the piece one block off to the side. Sometimes prevents death.",
 	},
-
 	{"Next",
 		"nextpreview",
 		"term",
@@ -349,7 +357,6 @@ return{
 		"term",
 		"Save your current piece for later use, and take out a previously held piece (or next piece in the next queue, if no piece was held) to place instead. You can only perform this once per piece.",
 	},
-
 	{"Misdrop",
 		"md misdrop",
 		"term",
@@ -360,7 +367,6 @@ return{
 		"term",
 		"Accidentally pressed held key. This can lead to having to use an undesired piece or missing out a chance to All Clear.",
 	},
-
 	{"sub",
 		"sub",
 		"term",
@@ -396,7 +402,6 @@ return{
 		"term",
 		"Attacking: send garbage lines to your opponent by clearing lines.\nDefending: after your opponent send you lines, you offset this garbage by clearing lines.\nCounter attack: Send attack back at your opponent after offseting incoming garbage, or taking the hit then attack back.\nIn most games, garbage offsetting is 1:1, i.e. one attack offsets one incoming garbage.",
 	},
-
 	{"Side well",
 		"sidewell",
 		"term",
@@ -442,150 +447,6 @@ return{
 		"term",
 		"The stacking method where you leave a 4-block-wide well in the middle.\nThe infamous combo setup that not only makes a lot of combos, but also abuses the death conditions and won't die even if you receive some garbage. This technique is often disliked by players due to how unbalanced it is.",
 	},
-
-	{"DT Cannon",
-		"dtcannon doubletriplecannon",
-		"term",
-		"Double-Triple Cannon"..HDwiki,
-		HDsearch.."dt",
-	},
-	{"DTPC",
-		"dtpc dtcannon doubletriplecannon",
-		"term",
-		"A follow-up of the DT Cannon that ends with an All Clear"..HDwiki,
-		HDsearch.."dt",
-	},
-	{"BT Cannon",
-		"btcannon betacannon",
-		"term",
-		"β Cannon, Beta Cannon"..HDwiki,
-		HDsearch.."bt_cannon",
-	},
-	{"BTPC",
-		"btpc btcannon betacannon",
-		"term",
-		"A follow-up of the BT Cannon that ends with an All Clear"..HDwiki,
-		HDsearch.."bt_cannon",
-	},
-	{"TKI 3 Perfect Clear",
-		"ddpc tki3perfectclear",
-		"term",
-		"A TSD opener that leads to a Double-Double-All Clear."..HDwiki,
-		HDsearch.."TKI_3_Perfect_Clear",
-	},
-	{"QT Cannon",
-		"qtcannon",
-		"term",
-		"We don't know much about this.",
-	},
-	{"Mini-Triple",
-		"mt minitriple",
-		"term",
-		"A Mini T-Spin - T-Spin Triple structure",
-		HDsearch.."mt",
-	},
-	{"Wolfmoon Cannon",
-		"wolfmooncannon",
-		"term",
-		"We don't know much about this."..HDwiki,
-		HDsearch.."wolfmoon_cannon",
-	},
-	{"ASC opener",
-		"ascopener",
-		"term",
-		"We don't know much about this.",
-	},
-	{"Sewer",
-		"sewer",
-		"term",
-		"An opener."..HDwiki,
-		HDsearch.."sewer",
-	},
-	{"TKI",
-		"tki",
-		"term",
-		"Can refer to a TSD opener or a C Spin opener."..HDwiki,
-		HDsearch.."tki",
-	},
-	{"God Spin",
-		"godspin",
-		"term",
-		"a setup that is fancy on the eyes but awkward to use in action. Invented by Windkey."..HDwiki,
-		HDsearch.."godspin",
-	},
-
-	{"STSD",
-		"stsd",
-		"term",
-		"Super T-Spin Double, a setup that allows two T-Spin Doubles."..HDwiki,
-		HDsearch.."stsd",
-	},
-	{"STMB",
-		"stmb",
-		"term",
-		"STMB cave, a donation setup by using S/Z to block off a 3-wide well and clear a T-Spin Double."..HDwiki,
-		HDsearch.."stmb_cave",
-	},
-	{"C-spin",
-		"cspin",
-		"term",
-		"Placing a J on top of an L (or vice versa) to form a C shape, filling the rest with appropriate shapes to perform a T-Spin Triple + T-Spin Double."..HDwiki,
-		HDsearch.."c-spin",
-	},
-	{"LST stacking",
-		"lst",
-		"term",
-		"An infinite T-Spin Double setup"..HDwiki,
-		HDsearch.."st_stacking",
-	},
-	{"Amemiya Cannon",
-		"amemiyacannon",
-		"term",
-		"Donation T-Spin Double then Tetris, often a variation of a DT cannon",
-	},
-	{"千鸟格子",
-		"",
-		"term",
-		"A setup to donate a T-Spin Double over a small hole and can do another T-Spin Double after that",
-	},
-	{"Imperial Cross",
-		"imperialcross",
-		"term",
-		"Cover a cross-shaped hole with an overhang to do two T-Spin Doubles"..HDwiki,
-		HDsearch.."imperial_cross",
-	},
-	{"Hamburger",
-		"hamburger",
-		"term",
-		"A donation setup that still opens up for Tetrises"..HDwiki,
-		HDsearch.."hamburger",
-	},
-	{"6-piece puzzle",
-		"liuqiaoban",
-		"term",
-		"a setup that is often used to increase chances of a mid-game All Clear.",
-	},
-	{"Albatross",
-		"albatross",
-		"term",
-		"A fancy, fast paced opener with TSD-TST-TSD-All Clear, hardly wasting any T pieces.",
-	},
-	{"鹈鹕",
-		"",
-		"term",
-		"An Albatross-ish opener to use when the piece orders do not support that",
-	},
-	{"King Crimson",
-		"kingcrimson",
-		"term",
-		"Stacking a TST on top of a STSD",
-	},
-	{"Setup",
-		"setup",
-		"term",
-		"Good setups often satisfy two to three of the following:\n- Can adapt to many piece orders,\n- Strong attack, minimal waste of the T piece,\n- require minimal soft dropping for more fast placement and using finesse,\n- has clear follow-up strategies with few branches.",
-	},
-
 	{"6-3 Stacking",
 		"63stacking",
 		"term",
@@ -646,11 +507,6 @@ return{
 		"term",
 		"A way to generate pieces, notably used in Tetris: The Grand Master games. Every time a random Tetrimino is selected, but if this Tetrimino is the same as one of the few previous pieces, then reroll until a different piece is rolled or until a reroll limit is reached.\nFor example, a \"his 4 roll 6\" (h4r6) generator rerolls when the piece is the same as one of the 4 previous pieces, and rerolls up to 6 times.",
 	},
-	{"O-Spin",
-		"ospin",
-		"term",
-		"In most cases, it's a meme.\nThe O Tetrimino (a.k.a. the Square) does not change upon rotation, thus making it lack interesting spins/kicks that other Tetriminoes have, or be stuck in a place unable to get out.\nAs a joke, some people have made heavily edited videos or even programmed games where the O piece can change shape and \"spin\" into different positions.\nTechmino also supports O-Spin in most modes.",
-	},
 	{"Hypertapping",
 		"hypertapping",
 		"term",
@@ -717,6 +573,154 @@ return{
 		"A Tetris bot. Built by the Chinese Tetris player 奏之章, has decent performance in many games",
 	},
 
+	--Setups
+	{"Setup",
+		"setup opening",
+		"setup",
+		"Good setups often satisfy two to three of the following:\n- Can adapt to many piece orders,\n- Strong attack, minimal waste of the T piece,\n- require minimal soft dropping for more fast placement and using finesse,\n- has clear follow-up strategies with few branches.",--Edited
+	},
+	{"DT Cannon",
+		"dtcannon doubletriplecannon",
+		"setup",
+		"Double-Triple Cannon"..HDwiki,
+		HDsearch.."dt",
+	},
+	{"DTPC",
+		"dtpc dtcannon doubletriplecannon",
+		"setup",
+		"A follow-up of the DT Cannon that ends with an All Clear"..HDwiki,
+		HDsearch.."dt",
+	},
+	{"BT Cannon",
+		"btcannon betacannon",
+		"setup",
+		"β Cannon, Beta Cannon"..HDwiki,
+		HDsearch.."bt_cannon",
+	},
+	{"BTPC",
+		"btpc btcannon betacannon",
+		"setup",
+		"A follow-up of the BT Cannon that ends with an All Clear"..HDwiki,
+		HDsearch.."bt_cannon",
+	},
+	{"TKI 3 Perfect Clear",
+		"ddpc tki3perfectclear",
+		"setup",
+		"A TSD opener that leads to a Double-Double-All Clear."..HDwiki,
+		HDsearch.."TKI_3_Perfect_Clear",
+	},
+	{"QT Cannon",
+		"qtcannon",
+		"setup",
+		"We don't know much about this.",
+	},
+	{"Mini-Triple",
+		"mt minitriple",
+		"setup",
+		"A Mini T-Spin - T-Spin Triple structure",
+		HDsearch.."mt",
+	},
+	{"Wolfmoon Cannon",
+		"wolfmooncannon",
+		"setup",
+		"We don't know much about this."..HDwiki,
+		HDsearch.."wolfmoon_cannon",
+	},
+	{"ASC opener",
+		"ascopener",
+		"setup",
+		"We don't know much about this.",
+	},
+	{"Sewer",
+		"sewer",
+		"setup",
+		"An opener."..HDwiki,
+		HDsearch.."sewer",
+	},
+	{"TKI",
+		"tki",
+		"setup",
+		"Can refer to a TSD opener or a C Spin opener."..HDwiki,
+		HDsearch.."tki",
+	},
+	{"God Spin",
+		"godspin",
+		"setup",
+		"a setup that is fancy on the eyes but awkward to use in action. Invented by Windkey."..HDwiki,
+		HDsearch.."godspin",
+	},
+	{"Albatross",
+		"albatross",
+		"setup",
+		"A fancy, fast paced opener with TSD-TST-TSD-All Clear, hardly wasting any T pieces.",
+	},
+	{"鹈鹕",
+		"",
+		"setup",
+		"An Albatross-ish opener to use when the piece orders do not support that",
+	},
+	--{"7-piece puzzle"},
+
+	--Pattern
+	-- {"Pattern"},
+	{"C-spin",
+		"cspin",
+		"pattern",
+		"Placing a J on top of an L (or vice versa) to form a C shape, filling the rest with appropriate shapes to perform a T-Spin Triple + T-Spin Double."..HDwiki,
+		HDsearch.."c-spin",
+	},
+	{"STSD",
+		"stsd",
+		"pattern",
+		"Super T-Spin Double, a setup that allows two T-Spin Doubles."..HDwiki,
+		HDsearch.."stsd",
+	},
+	{"STMB",
+		"stmb",
+		"pattern",
+		"STMB cave, a donation setup by using S/Z to block off a 3-wide well and clear a T-Spin Double."..HDwiki,
+		HDsearch.."stmb_cave",
+	},
+	{"LST stacking",
+		"lst",
+		"pattern",
+		"An infinite T-Spin Double setup"..HDwiki,
+		HDsearch.."st_stacking",
+	},
+	{"Hamburger",
+		"hamburger",
+		"pattern",
+		"A donation setup that still opens up for Tetrises"..HDwiki,
+		HDsearch.."hamburger",
+	},
+	{"Imperial Cross",
+		"imperialcross",
+		"pattern",
+		"Cover a cross-shaped hole with an overhang to do two T-Spin Doubles"..HDwiki,
+		HDsearch.."imperial_cross",
+	},
+	{"Amemiya Cannon",
+		"amemiyacannon",
+		"pattern",
+		"Donation T-Spin Double then Tetris, often a variation of a DT cannon",
+	},
+	{"千鸟格子",
+		"",
+		"pattern",
+		"A setup to donate a T-Spin Double over a small hole and can do another T-Spin Double after that",
+	},
+	{"6-piece puzzle",
+		"liuqiaoban",
+		"pattern",
+		"a setup that is often used to increase chances of a mid-game All Clear.",
+	},
+	{"King Crimson",
+		"kingcrimson",
+		"pattern",
+		"Stacking TST(s) on top of a STSD",
+	},
+
+	--Other
 	{"Communities",
 		"community communities",
 		"other",
@@ -741,7 +745,7 @@ return{
 		"Input these to play free minigames!\n\n15-Puzzle: 15p\nSchulte Grid: sltg\nPong: pong\nAtoZ: atoz\nUltimate Tic-tac-toe: uttt\ncubefield: cbf\n2048: 2048",
 	},
 
-
+	--English
 	{"SFX",
 		"sfx soundeffects",
 		"english",
@@ -758,6 +762,7 @@ return{
 		"\"Away from keyboard\", or in a broader sense, a period of time when you are not playing.\nTaking regular breaks helps relief your muscle strain and help you player better when you come back.",
 	},
 
+	--Famous
 	{"Hebomai",
 		"hebomai hbm",
 		"name",
diff --git a/parts/language/dict_zh.lua b/parts/language/dict_zh.lua
index 9192c3e9..89a16766 100644
--- a/parts/language/dict_zh.lua
+++ b/parts/language/dict_zh.lua
@@ -20,6 +20,7 @@ return{
 		"http://tetris.huijiwiki.com",
 	},
 
+	--游戏(题库)
 	{"TTT",
 		"ttt",
 		"game",
@@ -39,6 +40,7 @@ return{
 		"http://139.199.75.237/nazo",
 	},
 
+	--游戏(网页)
 	{"King of Stackers",
 		"kos kingofstackers",
 		"game",
@@ -87,6 +89,7 @@ return{
 		"一个已经关服了的网页版方块，曾经是一个不错的对战平台",
 	},
 
+	--游戏(街机/类街机)
 	{"TGM",
 		"tgm tetrisgrandmaster",
 		"game",
@@ -109,6 +112,7 @@ return{
 		"一个win平台方块，包含TGM的所有模式，可以用来练习TGM，手感比真版较好，不足的是world规则不完全一样(如软降到底无锁延，踢墙表有细节不同等)",
 	},
 
+	--游戏(PC/主机)
 	{"Tetris99",
 		"t99 tetris99",
 		"game",
@@ -165,8 +169,7 @@ return{
 		"腾讯游戏大厅的方块，场地12列，打字的das和arr，1next，无hold，攻击途径只有 消4打3 消3打2，垃圾行为国际象棋棋盘式，几乎不可能挖掘",
 	},
 
-
-
+	--术语(缩写)
 	{"LPM",
 		"lpm sudu",
 		"term",
@@ -218,6 +221,7 @@ return{
 		"Attack per Line\n攻击每行，也叫效率，体现玩家攻击的的行利用率。",
 	},
 
+	--术语(消除名)
 	{"PC",
 		"pc perfectclear ac allclear quanxiao quanqing",
 		"term",
@@ -279,6 +283,32 @@ return{
 		"商标，Tetris游戏名，同时也是别的方块游戏里消四行的名字。\n含义是Tetra(古希腊语 四)+Tennis(作者喜欢的运动)。",
 	},
 
+	--术语(旋转相关)
+	{"Spin",
+		"spin",
+		"term",
+		"(部分游戏中)使用旋转将方块卡进不能直接移动进入的位置，具体判定规则不同游戏不一样，可能会有攻击加成。",
+	},
+	{"Allspin",
+		"allspin",
+		"term",
+		"一种规则，指所有方块的spin都有攻击力，而不止是Tspin才有攻击(Tspin only)。",
+	},
+	{"Tspin",
+		"tspin txuan",
+		"term",
+		"在官方规则中，当T方块在锁定前的最后一个操作是旋转，并且锁定后旋转中心对应的四个斜角位置有三个不是空气，那么这就是一个Tspin。PS:如果满足一些额外条件会被打上mini标签减少攻击力。",
+	},
+	{"Ospin",
+		"ospin",
+		"term",
+		"由于O方块旋转后形状不变，只能左右移动，所以经常被卡住，于是方块圈就有了ospin的梗:\n有人做过T99/TF中的O变形的特效视频且广为流传;\nT-ex设计的旋转系统可以用spin使O传送进坑;\nTech设计的变形系统中可以旋转O来变形/传送进入一些特定形状的洞。",
+	},
+	{"踢墙",
+		"wallkick tiqiang",
+		"term",
+		"(部分游戏中)方块旋转后系统可能会给方块施加的偏移，详见SRS词条",
+	},
 	{"SRS",
 		"srs rotate",
 		"term",
@@ -305,22 +335,7 @@ return{
 		"Techmino Rotation System\nTechmino独有的旋转系统，基于SRS设计，修补了一些常见SZ卡死的地形，增加了不少实用踢墙，每个五连块也基本按照SRS的spin逻辑单独设计了踢墙表。",
 	},
 
-	{"Spin",
-		"spin",
-		"term",
-		"(部分游戏中)使用旋转将方块卡进不能直接移动进入的位置，在一些规则下有攻击加成。",
-	},
-	{"Allspin",
-		"allspin",
-		"term",
-		"一种规则，指所有方块的spin都有攻击力，而不止是Tspin才有攻击(Tspin only)。",
-	},
-	{"Tspin",
-		"tspin txuan",
-		"term",
-		"在官方规则中，当T方块在锁定前的最后一个操作是旋转，并且锁定后旋转中心对应的四个斜角位置有三个不是空气，那么这就是一个Tspin。PS:如果满足一些额外条件会被打上mini标签减少攻击力。",
-	},
-
+	--术语(其他)
 	{"IRS",
 		"irs initialrotatesystem",
 		"term",
@@ -336,7 +351,6 @@ return{
 		"term",
 		"Initial Move System\n提前移动系统，提前按下移动后方块出现在移动好的位置，有时可以避免死亡。",
 	},
-
 	{"Next",
 		"next yulan xiayige",
 		"term",
@@ -347,7 +361,6 @@ return{
 		"term",
 		"暂存功能，将手里的方块和hold槽中的交换，用来调整块序，不能连续使用，更容易摆出你想要的形状。",
 	},
-
 	{"Misdrop",
 		"md misdrop",
 		"term",
@@ -358,7 +371,6 @@ return{
 		"term",
 		"误hold，就是不小心按到hold导致死亡或失去pc机会等",
 	},
-
 	{"sub",
 		"sub",
 		"term",
@@ -394,7 +406,6 @@ return{
 		"term",
 		"通过消除给对手发送垃圾行=攻击\n别人打过来攻击之后用攻击抵消=防御(相杀)\n抵消/吃下所有攻击后打出攻击=反击\n\n注:大多游戏的攻防是1:1的，4行攻击抵消对手的4行攻击",
 	},
-
 	{"Side",
 		"side",
 		"term",
@@ -440,150 +451,6 @@ return{
 		"term",
 		"Center 4 Wide\n中间空四列，一种连击打法，能打出很高的连击，利用了大多数专业对战方块游戏的死亡判定机制，可以放心堆高不担心被顶死，然后开始连击。是一种利用游戏机制的不平衡策略(尤其在开局时)，观赏性不是很强还可以以弱胜强，成本太低所以成为了部分游戏中约定的类似 禁招 的东西，请在了解情况后再使用，不然可能会被别人骂。\n\n本游戏里做了平衡，c4w强度没有别的游戏高，而且打的是电脑所以放心用~",
 	},
-
-	{"DT炮",
-		"dt",
-		"term",
-		"Double-Triple Cannon"..HDwiki,
-		HDsearch.."dt",
-	},
-	{"DTPC",
-		"dtpc",
-		"term",
-		"DT炮一个能接PC的分支"..HDwiki,
-		HDsearch.."dt",
-	},
-	{"BT炮",
-		"bt",
-		"term",
-		"β炮(Beta炮)"..HDwiki,
-		HDsearch.."bt_cannon",
-	},
-	{"BTPC",
-		"btpc",
-		"term",
-		"BT炮一个能接PC的分支"..HDwiki,
-		HDsearch.."bt_cannon",
-	},
-	{"DDPC",
-		"ddpc",
-		"term",
-		"开局TSD的一个能接Double-Double-PC的分支"..HDwiki,
-		HDsearch.."TKI_3_Perfect_Clear",
-	},
-	{"QT炮",
-		"qt",
-		"term",
-		"QT炮，细节未知",
-	},
-	{"MT",
-		"mt",
-		"term",
-		"Mini-Triple\n一个TSM+TST的结构",
-		HDsearch.."mt",
-	},
-	{"狼月炮",
-		"wolfmoon",
-		"term",
-		"狼月炮"..HDwiki,
-		HDsearch.."wolfmoon_cannon",
-	},
-	{"ASC",
-		"asc",
-		"term",
-		"ASC开局，细节未知",
-	},
-	{"Sewer",
-		"sewer",
-		"term",
-		"Sewer开局"..HDwiki,
-		HDsearch.."sewer",
-	},
-	{"TKI",
-		"tki",
-		"term",
-		"TKI开局\n有两种解释，一个是TSD开局，另一个是Cspin开局。"..HDwiki,
-		HDsearch.."tki",
-	},
-	{"God Spin",
-		"god",
-		"term",
-		"God Spin\nwindkey发明的一个观赏性很强但实战没啥用的炫酷特殊T2+T3开局定式。"..HDwiki,
-		HDsearch.."godspin",
-	},
-
-	{"STSD",
-		"stsd",
-		"term",
-		"Super T-spin Double\n一种能做两个T2的形状"..HDwiki,
-		HDsearch.."stsd",
-	},
-	{"STMB",
-		"stmb",
-		"term",
-		"STMB cave\n在高空3宽坑架SZ捐一个T2的形状"..HDwiki,
-		HDsearch.."stmb_cave",
-	},
-	{"Cspin",
-		"cspin",
-		"term",
-		"JL脚对脚立起来形成一个C形，缺口做适当的填充后可以打T3+T2"..HDwiki,
-		HDsearch.."c-spin",
-	},
-	{"LST堆叠",
-		"lst",
-		"term",
-		"一种不断b2b一直做T2的堆叠方法"..HDwiki,
-		HDsearch.."st_stacking",
-	},
-	{"雨宫炮",
-		"yugong",
-		"term",
-		"一种捐T2后可消四的形状，常见于DT的一个分支",
-	},
-	{"千鸟格子",
-		"qianniaoge",
-		"term",
-		"一种在小洞上捐一个T2后还能做一个T2的形状",
-	},
-	{"皇家十字",
-		"imperial cross huangjiashizi",
-		"term",
-		"在一个十字形洞口盖屋檐后可以做两个T2"..HDwiki,
-		HDsearch.."imperial_cross",
-	},
-	{"汉堡包",
-		"hamburger hanbaobao",
-		"term",
-		"一种边缘捐T不影响消四的堆叠法"..HDwiki,
-		HDsearch.."hamburger",
-	},
-	{"六巧板",
-		"liuqiaoban",
-		"term",
-		"一种常用于增加中局PC概率的形状，本游戏中的pc练习中空出4*4方形区域就是六巧板",
-	},
-	{"信天翁",
-		"xintianweng",
-		"term",
-		"一种高观赏性几乎不浪费T的快节奏强力T2-T3-T2-PC开局",
-	},
-	{"鹈鹕",
-		"tihu",
-		"term",
-		"一种类似信天翁的定式，在块序不能信天翁的时候可以用",
-	},
-	{"绯红之王",
-		"feihongzhiwang",
-		"term",
-		"在STSD上叠一个T3",
-	},
-	{"定式",
-		"setup dingshi",
-		"term",
-		"能称为定式的要尽量满足以下至少2~3条:\n能适应大多数块序\n输出高，尽量不浪费T块\n很多方块无需软降，极简操作数少\n有明确后续，分支尽量少。",
-	},
-
 	{"6-3堆叠法",
 		"63",
 		"term",
@@ -649,11 +516,6 @@ return{
 		"term",
 		"一种出块方式，例如his 4 roll 6 (h4r6) 就是在随机生成新的next的时候，随机一个跟最后4次生成的next中有一样的，就重新随机，直到已经尝试6次或和那4个都不一样。",
 	},
-	{"Ospin",
-		"ospin",
-		"term",
-		"由于O方块旋转后形状不变，只能左右移动，所以经常被卡住，于是方块圈就有了ospin的梗:\n有人做过T99/TF中的O变形的特效视频且广为流传;\nT-ex设计的旋转系统可以用spin使O传送进坑;\nTech设计的变形系统中可以旋转O来变形/传送进入一些特定形状的洞。",
-	},
 	{"Hypertap",
 		"hypertap",
 		"term",
@@ -682,7 +544,7 @@ return{
 	{"堆叠",
 		"duidie stack",
 		"term",
-		"将方块无缝隙地堆起来",
+		"将方块无缝隙地堆起来，需要玩家有预读next的能力，可以通过不使用hold并且用十个消四完成40行模式进行练习。\n这项能力从入坑到封神都是非常重要的。",
 	},
 	{"双旋",
 		"shuangxuan",
@@ -720,6 +582,162 @@ return{
 		"一个ai的名字(就跟alphaGo一样)\n由研究群群友奏之章开发，重新调参后在各个游戏平台上的表现都很不错",
 	},
 
+	--定式
+	{"开局定式",
+		"setup opening kaijudingshi",
+		"setup",
+		"开局定式，定式一般指开局定式这个概念。\n指开局后可以使用的套路摆法。局中情况合适的时候也可以摆出同样的形状，但是和摆法开局一般都不一样。\n\n能称为定式的摆法要尽量满足以下至少2~3条:\n能适应大多数块序\n输出高，尽量不浪费T块\n很多方块无需软降，极简操作数少\n有明确后续，分支尽量少。\n\n注:绝大多数定式基于bag7，序列规律性强才有发明定式的可能。",
+	},
+	{"DT炮",
+		"dt",
+		"setup",
+		"Double-Triple Cannon"..HDwiki,
+		HDsearch.."dt",
+	},
+	{"DTPC",
+		"dtpc",
+		"setup",
+		"DT炮一个能接PC的分支"..HDwiki,
+		HDsearch.."dt",
+	},
+	{"BT炮",
+		"bt",
+		"setup",
+		"β炮(Beta炮)"..HDwiki,
+		HDsearch.."bt_cannon",
+	},
+	{"BTPC",
+		"btpc",
+		"setup",
+		"BT炮一个能接PC的分支"..HDwiki,
+		HDsearch.."bt_cannon",
+	},
+	{"DDPC",
+		"ddpc",
+		"setup",
+		"开局TSD的一个能接Double-Double-PC的分支"..HDwiki,
+		HDsearch.."TKI_3_Perfect_Clear",
+	},
+	{"QT炮",
+		"qt",
+		"setup",
+		"QT炮，细节未知",
+	},
+	{"MT",
+		"mt",
+		"setup",
+		"Mini-Triple\n一个TSM+TST的结构",
+		HDsearch.."mt",
+	},
+	{"狼月炮",
+		"wolfmoon",
+		"setup",
+		"狼月炮"..HDwiki,
+		HDsearch.."wolfmoon_cannon",
+	},
+	{"ASC",
+		"asc",
+		"setup",
+		"ASC开局，细节未知",
+	},
+	{"Sewer",
+		"sewer",
+		"setup",
+		"Sewer开局"..HDwiki,
+		HDsearch.."sewer",
+	},
+	{"TKI",
+		"tki",
+		"setup",
+		"TKI开局\n有两种解释，一个是TSD开局，另一个是Cspin开局。"..HDwiki,
+		HDsearch.."tki",
+	},
+	{"God Spin",
+		"god",
+		"setup",
+		"God Spin\nwindkey发明的一个观赏性很强但实战没啥用的炫酷特殊T2+T3开局定式。"..HDwiki,
+		HDsearch.."godspin",
+	},
+	{"信天翁",
+		"xintianweng",
+		"setup",
+		"一种高观赏性几乎不浪费T的快节奏强力T2-T3-T2-PC开局",
+	},
+	{"鹈鹕",
+		"tihu",
+		"setup",
+		"一种类似信天翁的定式，在块序不能信天翁的时候可以用",
+	},
+	{"七巧板",
+		"qiqiaoban",
+		"setup",
+		"一种极大概率能摆出来并且很大概率能做到PC的定式，本游戏中的pc练习中空出不规则区域的那个就是七巧板",
+	},
+
+	--形状
+	{"中局定式",
+		"setup dingshi",
+		"pattern",
+		"指一些特定的能打出较高伤害的常见典型形状，是中局输出的途径之一，部分也可以在开局做不过不是很有必要，主要见于中局\n另见开局定式，只说定式两个字一般指开局定式而非中局。",
+	},
+	{"Cspin",
+		"cspin",
+		"pattern",
+		"JL脚对脚立起来形成一个C形，缺口做适当的填充后可以打T3+T2"..HDwiki,
+		HDsearch.."c-spin",
+	},
+	{"STSD",
+		"stsd",
+		"pattern",
+		"Super T-spin Double\n一种能做两个T2的形状"..HDwiki,
+		HDsearch.."stsd",
+	},
+	{"STMB",
+		"stmb",
+		"pattern",
+		"STMB cave\n在高空3宽坑架SZ捐一个T2的形状"..HDwiki,
+		HDsearch.."stmb_cave",
+	},
+	{"LST堆叠",
+		"lst",
+		"pattern",
+		"一种不断b2b一直做T2的堆叠方法"..HDwiki,
+		HDsearch.."st_stacking",
+	},
+	{"汉堡包",
+		"hamburger hanbaobao",
+		"pattern",
+		"一种边缘捐T不影响消四的堆叠法"..HDwiki,
+		HDsearch.."hamburger",
+	},
+	{"皇家十字",
+		"imperial cross huangjiashizi",
+		"pattern",
+		"在一个十字形洞口盖屋檐后可以做两个T2的形状"..HDwiki,
+		HDsearch.."imperial_cross",
+	},
+	{"雨宫炮",
+		"yugong",
+		"pattern",
+		"一种捐T2后可消四的形状，常见于DT的一个分支",
+	},
+	{"千鸟格子",
+		"qianniaoge",
+		"pattern",
+		"一种在小洞上捐一个T2后还能做一个T2的形状",
+	},
+	{"六巧板",
+		"liuqiaoban",
+		"pattern",
+		"一种常用于增加中局PC概率的形状，本游戏中的pc练习中空出4*4方形区域就是六巧板",
+	},
+	{"绯红之王",
+		"feihongzhiwang",
+		"pattern",
+		"在STSD上叠若干个T3的形状",
+	},
+
+	--其他
 	{"研究群",
 		"yanjiu study",
 		"other",
@@ -743,6 +761,7 @@ return{
 		"输入以下词语，小游戏免费玩!\n\n15-Puzzle: 15p\nSchulte Grid: sltg\nPong: pong\nAtoZ: atoz\nUltimate Tic-tac-toe: uttt\ncubefield: cbf\n2048: 2048",
 	},
 
+	--英文
 	{"SFX",
 		"sfx",
 		"english",
@@ -759,6 +778,7 @@ return{
 		"Away from keyboard\n一段时间不接触键盘，就是不玩一段时间，可以缓解手部疲劳，休息好之后马上破纪录也是可能的",
 	},
 
+	--人物
 	{"吉备宏纯",
 		"hebomai hbm",
 		"name",
diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua
index d3e30c99..e1392d13 100644
--- a/parts/scenes/dict.lua
+++ b/parts/scenes/dict.lua
@@ -154,11 +154,13 @@ function scene.update(dt)
 end
 
 local typeColor={
-	help=COLOR.lGrey,
+	help=COLOR.yellow,
 	other=COLOR.lOrange,
 	game=COLOR.lCyan,
 	term=COLOR.lRed,
-	english=COLOR.green,
+	setup=COLOR.lYellow,
+	pattern=COLOR.lGrass,
+	english=COLOR.blue,
 	name=COLOR.lPurple,
 }
 function scene.draw()