diff --git a/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.json b/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.json
index bfd095d6bed3..9cdea7f9bfef 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.json
+++ b/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.json
@@ -72,7 +72,7 @@
   "trickster.trick.trickster.write_spell": "Notulist's Ploy",
   "trickster.trick.trickster.write_closed_spell": "Proprietary Notulist's Ploy",
   "trickster.trick.trickster.read_macro_ring": "Macro Delusion",
-  "trickster.trick.trickster.reveal": "Showcase Stratagem",
+  "trickster.trick.trickster.reveal": "Showcase Ploy",
   "trickster.trick.trickster.read_crow_mind": "Crow Mind Delusion",
   "trickster.trick.trickster.write_crow_mind": "Crow Mind Ploy",
   "trickster.trick.trickster.cost": "Cost Ploy",
@@ -111,14 +111,15 @@
   "trickster.trick.trickster.summon_tnt": "Demolitionist's Ploy",
   "trickster.trick.trickster.block_find_entity": "Embracing Ingress",
   "trickster.trick.trickster.range_find_entity": "Ingress of Shared Fate",
-  "trickster.trick.trickster.execute": "Grand Stratagem",
-  "trickster.trick.trickster.execute_same_scope": "Quiet Distortion",
-  "trickster.trick.trickster.fork": "Utensil Stratagem",
-  "trickster.trick.trickster.fold": "Folding Distortion",
-  "trickster.trick.trickster.try_catch": "Cautious Stratagem",
-  "trickster.trick.trickster.closure": "Closure Stratagem",
-  "trickster.trick.trickster.supplier": "Supply Distortion",
-  "trickster.trick.trickster.kill_thread": "Executioner's Ploy",
+  "trickster.trick.trickster.import": "Assistance Deviation",
+  "trickster.trick.trickster.import_hat": "Cranium Deviation",
+  "trickster.trick.trickster.execute": "Grand Deviation",
+  "trickster.trick.trickster.execute_same_scope": "Quiet Deviation",
+  "trickster.trick.trickster.fork": "Utensil Deviation",
+  "trickster.trick.trickster.fold": "Folding Deviation",
+  "trickster.trick.trickster.try_catch": "Cautious Deviation",
+  "trickster.trick.trickster.delay_execution": "Deviation of Suspension",
+  "trickster.trick.trickster.kill_thread": "Executioner's Deviation",
   "trickster.trick.trickster.current_thread": "Delusion of Order",
   "trickster.trick.trickster.load_argument_1": "Primary Delusion",
   "trickster.trick.trickster.load_argument_2": "Secondary Delusion",
@@ -140,6 +141,8 @@
   "trickster.trick.trickster.list_remove_element": "Eviction Stratagem",
   "trickster.trick.trickster.list_size": "Tally Distortion",
   "trickster.trick.trickster.create_number_range": "Interlude Distortion",
+  "trickster.trick.trickster.closure": "Closure Stratagem",
+  "trickster.trick.trickster.supplier": "Supply Distortion",
   "trickster.trick.trickster.locate_glyph": "Pinpoint Distortion",
   "trickster.trick.trickster.locate_glyphs": "Discovering Distortion",
   "trickster.trick.trickster.retrieve_glyph": "Retrieval Distortion",
@@ -169,8 +172,6 @@
   "trickster.trick.trickster.can_place_block": "Ingress of Suitability",
   "trickster.trick.trickster.check_resonator": "Ingress of Resonance",
   "trickster.trick.trickster.get_redstone_power": "Ingress of Logic",
-  "trickster.trick.trickster.import": "Assistance Stratagem",
-  "trickster.trick.trickster.import_hat": "Cranium Stratagem",
   "trickster.trick.trickster.check_hat": "Cranium Delusion",
   "trickster.trick.trickster.set_hat": "Cranial Shift Ploy",
   "trickster.trick.trickster.other_hand": "Juggling Delusion",
@@ -186,7 +187,6 @@
   "trickster.trick.trickster.item_from_block": "Pickup Distortion",
   "trickster.trick.trickster.type_fragment": "Argumentative Distortion",
   "trickster.trick.trickster.hash_values": "Decaying Distortion",
-  "trickster.trick.trickster.delay_execution": "Ploy of Suspension",
   "trickster.trick.trickster.pin_chunk": "Ploy of Celestial Pin",
   "trickster.trick.trickster.get_dimension": "Dimensional Delusion",
   "trickster.trick.trickster.show_bar": "Ploy of Clarity",
@@ -195,7 +195,7 @@
   "trickster.trick.trickster.draw_spell": "Marketer's Ploy",
   "trickster.trick.trickster.draw_line": "Artist's Ploy",
   "trickster.trick.trickster.get_flecks": "Observer's Ingress",
-  "trickster.trick.trickster.get_scale": "Distortion of Occupation",
+  "trickster.trick.trickster.get_scale": "Ingress of Occupation",
   "trickster.trick.trickster.set_scale": "Ploy of Occupation",
   "trickster.trick.trickster.transmog": "Ploy of Transmogrification",
   "trickster.trick.trickster.hidden_transmog": "Ploy of Subterfuge",
@@ -322,9 +322,14 @@
   "key.trickster.take_hat": "Take Hat",
   "key.trickster.modify_spell": "Modify Spell (Creative only)",
   "text.config.trickster-config.title": "Trickster Config",
+  "text.config.trickster-config.section.accessibility": "Accessibility",
   "text.config.trickster-config.section.client": "Client",
   "text.config.trickster-config.section.server": "Server",
   "text.config.trickster-config.section.aurora-client": "Aurora's Personal Client Tweaks",
+  "text.config.trickster-config.option.dotEmphasis": "Terminal dot emphasis",
+  "text.config.trickster-config.option.dotEmphasisColor": "Terminal dot color",
+  "text.config.trickster-config.option.whorlMaxMana": "Whorl maximum mana in kG",
+  "text.config.trickster-config.option.whorlRechargeRate": "Whorl recharge rate in kG",
   "text.config.trickster-config.option.topHatInterceptScrolling": "Offhand hat intercepts hotbar scrolling",
   "text.config.trickster-config.option.invertTopHatScrolling": "Invert hat scrolling",
   "text.config.trickster-config.option.revealToHotbar": "Write revealed values to action bar",
@@ -333,5 +338,6 @@
   "text.config.trickster-config.option.maxBlockBreakingHardness": "Max hardness for Ploy of Destruction",
   "text.config.trickster-config.option.dragDrawing": "Draw by dragging",
   "text.config.trickster-config.option.barsHorizontal": "Show spell-created bars horizontally",
-  "text.config.trickster-config.option.disableOffhandScrollOpening": "Require scroll in main hand to edit"
+  "text.config.trickster-config.option.disableOffhandScrollOpening": "Require scroll in main hand to edit",
+  "text.config.trickster-config.option.adjacentPixelCollisionOffset": "Offset factor of adjacent pixels"
 }
\ No newline at end of file
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.yml b/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.yml
index 9865f34a97b4..74aba05e0e3c 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.yml
+++ b/projects/1.21-fabric/assets/trickster/trickster/lang/en_us.yml
@@ -96,7 +96,7 @@ trickster:
     write_spell: Notulist's Ploy
     write_closed_spell: Proprietary Notulist's Ploy
     read_macro_ring: Macro Delusion
-    reveal: Showcase Stratagem
+    reveal: Showcase Ploy
     read_crow_mind: Crow Mind Delusion
     write_crow_mind: Crow Mind Ploy
     cost: Cost Ploy
@@ -141,14 +141,16 @@ trickster:
     block_find_entity: Embracing Ingress
     range_find_entity: Ingress of Shared Fate
 
-    execute: Grand Stratagem
-    execute_same_scope: Quiet Distortion
-    fork: Utensil Stratagem
-    fold: Folding Distortion
-    try_catch: Cautious Stratagem
-    closure: Closure Stratagem
-    supplier: Supply Distortion
-    kill_thread: Executioner's Ploy
+    import: Assistance Deviation
+    import_hat: Cranium Deviation
+
+    execute: Grand Deviation
+    execute_same_scope: Quiet Deviation
+    fork: Utensil Deviation
+    fold: Folding Deviation
+    try_catch: Cautious Deviation
+    delay_execution: Deviation of Suspension
+    kill_thread: Executioner's Deviation
     current_thread: Delusion of Order
     load_argument_1: Primary Delusion
     load_argument_2: Secondary Delusion
@@ -172,6 +174,8 @@ trickster:
     list_size: Tally Distortion
     create_number_range: Interlude Distortion
 
+    closure: Closure Stratagem
+    supplier: Supply Distortion
     locate_glyph: Pinpoint Distortion
     locate_glyphs: Discovering Distortion
     retrieve_glyph: Retrieval Distortion
@@ -205,8 +209,6 @@ trickster:
     check_resonator: Ingress of Resonance
     get_redstone_power: Ingress of Logic
 
-    import: Assistance Stratagem
-    import_hat: Cranium Stratagem
     check_hat: Cranium Delusion
     set_hat: Cranial Shift Ploy
     other_hand: Juggling Delusion
@@ -223,7 +225,6 @@ trickster:
 
     type_fragment: Argumentative Distortion
     hash_values: Decaying Distortion
-    delay_execution: Ploy of Suspension
     pin_chunk: Ploy of Celestial Pin
     get_dimension: Dimensional Delusion
     show_bar: Ploy of Clarity
@@ -235,7 +236,7 @@ trickster:
     draw_line: Artist's Ploy
     get_flecks: Observer's Ingress
 
-    get_scale: Distortion of Occupation
+    get_scale: Ingress of Occupation
     set_scale: Ploy of Occupation
 
     transmog: Ploy of Transmogrification
@@ -394,10 +395,15 @@ key:
 text.config.trickster-config:
   title: Trickster Config
   section:
+    accessibility: Accessibility
     client: Client
     server: Server
     aurora-client: Aurora's Personal Client Tweaks
   option:
+    dotEmphasis: Terminal dot emphasis
+    dotEmphasisColor: Terminal dot color
+    whorlMaxMana: Whorl maximum mana in kG
+    whorlRechargeRate: Whorl recharge rate in kG
     topHatInterceptScrolling: Offhand hat intercepts hotbar scrolling
     invertTopHatScrolling: Invert hat scrolling
     revealToHotbar: Write revealed values to action bar
@@ -408,3 +414,4 @@ text.config.trickster-config:
     dragDrawing: Draw by dragging
     barsHorizontal: Show spell-created bars horizontally
     disableOffhandScrollOpening: Require scroll in main hand to edit
+    adjacentPixelCollisionOffset: Offset factor of adjacent pixels
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lang/zh_cn.json b/projects/1.21-fabric/assets/trickster/trickster/lang/zh_cn.json
index cc7302988c76..20229e090134 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lang/zh_cn.json
+++ b/projects/1.21-fabric/assets/trickster/trickster/lang/zh_cn.json
@@ -72,7 +72,7 @@
   "trickster.trick.trickster.write_spell": "记事员之技巧",
   "trickster.trick.trickster.write_closed_spell": "禁文记事员之技巧",
   "trickster.trick.trickster.read_macro_ring": "宏之错觉",
-  "trickster.trick.trickster.reveal": "展示之谋略",
+  "trickster.trick.trickster.reveal": "展示之技巧",
   "trickster.trick.trickster.read_crow_mind": "乌鸦灵思之错觉",
   "trickster.trick.trickster.write_crow_mind": "乌鸦灵思之技巧",
   "trickster.trick.trickster.cost": "消耗之技巧",
@@ -111,14 +111,15 @@
   "trickster.trick.trickster.summon_tnt": "爆破师之技巧",
   "trickster.trick.trickster.block_find_entity": "怀抱之辑流",
   "trickster.trick.trickster.range_find_entity": "同命之辑流",
-  "trickster.trick.trickster.execute": "宏伟之谋略",
-  "trickster.trick.trickster.execute_same_scope": "静默之曲变",
-  "trickster.trick.trickster.fork": "器具之谋略",
-  "trickster.trick.trickster.fold": "折叠之曲变",
-  "trickster.trick.trickster.try_catch": "谨慎之谋略",
-  "trickster.trick.trickster.closure": "闭包之谋略",
-  "trickster.trick.trickster.supplier": "供给之曲变",
-  "trickster.trick.trickster.kill_thread": "行刑者之技巧",
+  "trickster.trick.trickster.import": "协助之转离",
+  "trickster.trick.trickster.import_hat": "颅骨之转离",
+  "trickster.trick.trickster.execute": "宏伟之转离",
+  "trickster.trick.trickster.execute_same_scope": "静默之转离",
+  "trickster.trick.trickster.fork": "器具之转离",
+  "trickster.trick.trickster.fold": "折叠之转离",
+  "trickster.trick.trickster.try_catch": "谨慎之转离",
+  "trickster.trick.trickster.delay_execution": "挂起之转离",
+  "trickster.trick.trickster.kill_thread": "行刑者之转离",
   "trickster.trick.trickster.current_thread": "序数之错觉",
   "trickster.trick.trickster.load_argument_1": "甲参之错觉",
   "trickster.trick.trickster.load_argument_2": "乙参之错觉",
@@ -140,6 +141,8 @@
   "trickster.trick.trickster.list_remove_element": "放逐之谋略",
   "trickster.trick.trickster.list_size": "计量之曲变",
   "trickster.trick.trickster.create_number_range": "间奏之曲变",
+  "trickster.trick.trickster.closure": "闭包之谋略",
+  "trickster.trick.trickster.supplier": "供给之曲变",
   "trickster.trick.trickster.locate_glyph": "定址之曲变",
   "trickster.trick.trickster.locate_glyphs": "发现之曲变",
   "trickster.trick.trickster.retrieve_glyph": "检索之曲变",
@@ -169,8 +172,6 @@
   "trickster.trick.trickster.can_place_block": "适用之辑流",
   "trickster.trick.trickster.check_resonator": "谐振之辑流",
   "trickster.trick.trickster.get_redstone_power": "逻辑之辑流",
-  "trickster.trick.trickster.import": "协助之谋略",
-  "trickster.trick.trickster.import_hat": "颅骨之谋略",
   "trickster.trick.trickster.check_hat": "颅骨之错觉",
   "trickster.trick.trickster.set_hat": "颅骨挪移之技巧",
   "trickster.trick.trickster.other_hand": "杂耍之错觉",
@@ -186,7 +187,6 @@
   "trickster.trick.trickster.item_from_block": "拾取之曲变",
   "trickster.trick.trickster.type_fragment": "参量之曲变",
   "trickster.trick.trickster.hash_values": "衰朽之曲变",
-  "trickster.trick.trickster.delay_execution": "挂起之技巧",
   "trickster.trick.trickster.pin_chunk": "天钉之技巧",
   "trickster.trick.trickster.get_dimension": "维度之错觉",
   "trickster.trick.trickster.show_bar": "清晰之技巧",
@@ -195,7 +195,7 @@
   "trickster.trick.trickster.draw_spell": "营销员之技巧",
   "trickster.trick.trickster.draw_line": "艺术家之技巧",
   "trickster.trick.trickster.get_flecks": "观察者之辑流",
-  "trickster.trick.trickster.get_scale": "居形之曲变",
+  "trickster.trick.trickster.get_scale": "居形之辑流",
   "trickster.trick.trickster.set_scale": "居形之技巧",
   "trickster.trick.trickster.transmog": "幻化之技巧",
   "trickster.trick.trickster.hidden_transmog": "诡谋之技巧",
@@ -322,9 +322,14 @@
   "key.trickster.take_hat": "取下帽子",
   "key.trickster.modify_spell": "修改法术（仅创造）",
   "text.config.trickster-config.title": "戏法师（Trickster）配置",
+  "text.config.trickster-config.section.accessibility": "辅助功能",
   "text.config.trickster-config.section.client": "客户端",
   "text.config.trickster-config.section.server": "服务端",
   "text.config.trickster-config.section.aurora-client": "Aurora的专属客户端微调",
+  "text.config.trickster-config.option.dotEmphasis": "界面中着重强调点",
+  "text.config.trickster-config.option.dotEmphasisColor": "界面中点的强调色",
+  "text.config.trickster-config.option.whorlMaxMana": "螺坠最大魔力，以kG计",
+  "text.config.trickster-config.option.whorlRechargeRate": "螺坠充能速度，以kG计",
   "text.config.trickster-config.option.topHatInterceptScrolling": "副手持帽子时拦截快捷栏滚选",
   "text.config.trickster-config.option.invertTopHatScrolling": "反转帽子滚选方向",
   "text.config.trickster-config.option.revealToHotbar": "展示的值显示到动作栏中",
@@ -333,5 +338,6 @@
   "text.config.trickster-config.option.maxBlockBreakingHardness": "摧毁之技巧可摧毁方块的最大硬度",
   "text.config.trickster-config.option.dragDrawing": "拖动绘制",
   "text.config.trickster-config.option.barsHorizontal": "条栏水平显示",
-  "text.config.trickster-config.option.disableOffhandScrollOpening": "主手持有卷轴才可修改"
+  "text.config.trickster-config.option.disableOffhandScrollOpening": "主手持有卷轴才可修改",
+  "text.config.trickster-config.option.adjacentPixelCollisionOffset": "相邻像素的偏移因数"
 }
\ No newline at end of file
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/distortions.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/distortions.md
index 30a8064bc651..67679a7a4651 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/distortions.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/distortions.md
@@ -1,11 +1,14 @@
 ```json
 {
-  "title": "Distortions",
+  "title": "Distortions & Stratagems",
   "icon": "trickster:scroll_and_quill",
   "ordinal": 2,
   "parent": "trickster:tricks"
 }
 ```
 
-Distortions are tricks that purely manipulate data. 
-When given the same set of inputs, these will always give the same output.
\ No newline at end of file
+Distortions tricks purely manipulate data. 
+When given the same set of inputs, these will always give the same output.
+
+
+Stratagem tricks are distortions which take a variable amount of inputs.
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/zh_cn/distortions.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/zh_cn/distortions.md
index d98692b756dd..0d492b467f1b 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/zh_cn/distortions.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/zh_cn/distortions.md
@@ -1,10 +1,13 @@
 ```json
 {
-  "title": "曲变术",
+  "title": "曲变术与谋略术",
   "icon": "trickster:scroll_and_quill",
   "ordinal": 2,
   "parent": "trickster:tricks"
 }
 ```
 
-曲变术是仅对数据进行操作的戏法。给定相同的输入，必定得出同样的输出。
\ No newline at end of file
+曲变术是仅对数据进行操作的戏法。给定相同的输入，必定得出同样的输出。
+
+
+谋略术是输入参数的数目可变的曲变术。
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/concepts/tricks_explanation.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/concepts/tricks_explanation.md
index 2dd0a40d0596..8f7d86e3a0e7 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/concepts/tricks_explanation.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/concepts/tricks_explanation.md
@@ -8,15 +8,16 @@
 
 All tricks fit in the following categories:
 
-- Delusion: no-input value-generating tricks
-- Distortion: fixed-input pure tricks
+- Delusion: tricks that gather information purely from context
 - Ingress: tricks that gather information based on input
-- Ploy: input-only and/or mana-consuming tricks
+- Distortion: fixed-input pure tricks
+- Stratagem: variable-input pure tricks
 
 ;;;;;
 
+- Ploy: world-manipulating and/or mana-consuming tricks
+- Deviation: tricks which modify the state of the spell itself
 - Revision: scribing patterns
-- Stratagem: any trick that operates on a variable amount of inputs
 
 These categories are roughly followed, but in many cases, 
 tricks will be sorted based more on intention than rigid definition.
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/caster_tricks.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/caster_tricks.md
index db520e3c043e..a58b999ec195 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/caster_tricks.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/caster_tricks.md
@@ -83,11 +83,11 @@ Returns the maximum amount of mana that *could be* available to the spell.
 
 <|glyph@trickster:templates|trick-id=trickster:current_thread,title=Delusion of Order|>
 
--> number
+-> number | void
 
 ---
 
-Returns the slot running this spell, or -1 if slots are not supported.
+Returns the spell slot running this spell, or void if spell slots are not supported.
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/entity.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/entity.md
index 14efe4944c7b..af33f361b3c8 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/entity.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/entity.md
@@ -17,7 +17,7 @@
     "Vigor Ingress",
     "Fettle Ingress",
     "Bulwark Ingress",
-    "Distortion of Occupation",
+    "Ingress of Occupation",
     "Observer's Ingress"
   ]
 }
@@ -157,7 +157,7 @@ Given an entity, returns its total armor value.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:get_scale,title=Distortion of Occupation|>
+<|glyph@trickster:templates|trick-id=trickster:get_scale,title=Ingress of Occupation|>
 
 entity -> number
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/list.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/list.md
index 379288ccf6a3..c7eb72580074 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/list.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/list.md
@@ -22,7 +22,7 @@
 Within spells, it is possible to create lists of an arbitrary amount of fragments merged into a single value.
 
 
-Lists are zero indexed.
+Lists are zero indexed. To acquire an empty list constant, see the relevant [revision](^trickster:constants#3).
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/map.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/map.md
index 5507f1bc47cd..b56fb44f9828 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/map.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/map.md
@@ -17,6 +17,8 @@ Maps allow for an association between one fragment and another,
 similarly to how a dictionary associates a word to a definition.
 
 
+To acquire an empty map constant, see the relevant [revision](^trickster:constants#4).
+
 ;;;;;
 
 <|glyph@trickster:templates|trick-id=trickster:map_insert,title=Charting Stratagem|>
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/tree.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/tree.md
index ac8e129421b0..4f3673115124 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/tree.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/tree.md
@@ -1,9 +1,11 @@
 ```json
 {
-  "title": "Spell Manipulation",
+  "title": "Spells",
   "icon": "minecraft:oak_sapling",
   "category": "trickster:distortions",
   "additional_search_terms": [
+    "Supply Distortion",
+    "Closure Stratagem",
     "Pinpoint Distortion",
     "Discovering Distortion",
     "Retrieval Distortion",
@@ -22,6 +24,26 @@ the following patterns allow for a spell to modify other spells *during* the cas
 
 ;;;;;
 
+<|glyph@trickster:templates|trick-id=trickster:supplier,title=Supply Distortion|>
+
+any -> spell
+
+---
+
+Creates a new spell fragment which returns the previously provided fragment when executed.
+
+;;;;;
+
+<|glyph@trickster:templates|trick-id=trickster:closure,title=Closure Stratagem|>
+
+spell, {any: any} -> spell
+
+---
+
+Replaces the keys of the map that are in the given spell with the value they map to.
+
+;;;;;
+
 <|page-title@lavender:book_components|title=Note: Addresses|>Just as elements of a list are accessed by their index, 
 parts of a spell are accessed by their address. 
 An address is a list of integers that forms a path to a specific circle in a spell.
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_hint.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_hint.md
index 6fd4591d0e50..84e1eda4a1a0 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_hint.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_hint.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:trigger/nether_star"
   ],
-  "secret": true,
   "ordinal": 24
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_knot.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_knot.md
index 03688f36be45..549a2ca8e4dd 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_knot.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/astral_knot.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:astral_knot"
   ],
-  "secret": true,
   "ordinal": 26
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/cracked_echo_knot.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/cracked_echo_knot.md
index e8257414777f..7b59b9a19a90 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/cracked_echo_knot.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/cracked_echo_knot.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:cracked_echo_knot"
   ],
-  "secret": true,
   "ordinal": 15
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/echo_knot.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/echo_knot.md
index 95348d636690..ea00fd29cf97 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/echo_knot.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/echo_knot.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:echo_knot"
   ],
-  "secret": true,
   "ordinal": 20
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/ominous_spell_core.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/ominous_spell_core.md
index 271fa528b6f3..a0434c5cad4f 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/ominous_spell_core.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/ominous_spell_core.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:ominous_spell_core"
   ],
-  "secret": true,
   "ordinal": 130
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/rusted_spell_core.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/rusted_spell_core.md
index e587c6edd67c..f1ff481e5f69 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/rusted_spell_core.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/items/rusted_spell_core.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:rusted_spell_core"
   ],
-  "secret": true,
   "ordinal": 120
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/flecks.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/flecks.md
index 1f7849f1daf0..a283dfc6bdf8 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/flecks.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/flecks.md
@@ -46,11 +46,11 @@ All flecks can also take an optional list of players, or a sole player, for whic
 
 <|glyph@trickster:templates|trick-id=trickster:draw_spell,title=Marketer's Ploy|>
 
-number, vector, vector, spell, [entity[] | entity] -> number
+number, vector, vector, spell, [number], [entity[] | entity] -> number
 
 ---
 
-At the given position, with the given facing, display the given spell.
+At the given position, with the given facing, display a spell, optionally scaled.
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/misc.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/misc.md
index f4dc1ebecbc6..bda1318fc3ae 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/misc.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/ploys/misc.md
@@ -4,11 +4,9 @@
   "icon": "minecraft:iron_ingot",
   "category": "trickster:ploys",
   "additional_search_terms": [
-    "Ploy of Suspension",
     "Ploy of Celestial Pin",
     "Ploy of Clarity",
-    "Ploy of Obfuscation",
-    "Executioner's Ploy"
+    "Ploy of Obfuscation"
   ]
 }
 ```
@@ -17,17 +15,6 @@ A few miscellaneous ploys that don't fit into any other category.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:delay_execution,title=Ploy of Suspension|>
-
-[number] -> number
-
----
-
-Delays the execution of the current spell by the given number of ticks, or until the next tick. 
-Returns the delay.
-
-;;;;;
-
 <|glyph@trickster:templates|trick-id=trickster:pin_chunk,title=Ploy of Celestial Pin|>
 
 vector -> vector
@@ -71,13 +58,3 @@ number -> number
 ---
 
 Immediately clears a bar from the caster's screen identified by the given number.
-
-;;;;;
-
-<|glyph@trickster:templates|trick-id=trickster:kill_thread,title=Executioner's Ploy|>
-
-[number] -> boolean
-
----
-
-Terminates the spell running at the given spell slot, or the current spell if no slot is provided. Returns a boolean based on success.
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/basic.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/basic.md
index 40233177130c..85c061da9762 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/basic.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/basic.md
@@ -8,10 +8,9 @@
     "Notulist's Ploy",
     "Proprietary Notulist's Ploy",
     "Alethophobe's Ploy",
-    "Showcase Stratagem",
+    "Showcase Ploy",
     "Crow Mind Delusion",
-    "Crow Mind Ploy",
-    "Cost Ploy"
+    "Crow Mind Ploy"
   ]
 }
 ```
@@ -72,7 +71,7 @@ Clears any fragment inscribed onto the item in the given slot or in the caster's
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:reveal,title=Showcase Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:reveal,title=Showcase Ploy|>
 
 any... -> any
 
@@ -110,20 +109,3 @@ any -> any
 Stores the supplied value in the caster's Crow Mind, overwriting any value that might already be present.
 
 ;;;;;
-
-<|page-title@lavender:book_components|title=Note: Casting Cost|>After receiving multiple complaints at Tomfoolery Inc. HQ about the balance of this mod,
-we've decided to properly implement material spell casting costs.
-
-
-However, player freedom and choice is also very important to us.
-As such, this system operates on an opt-in basis.
-
-;;;;;
-
-<|glyph@trickster:templates|trick-id=trickster:cost,title=Cost Ploy|>
-
-->
-
----
-
-Consumes one amethyst shard from the caster's inventory. Will blunder if none are available.
\ No newline at end of file
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/cost.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/cost.md
new file mode 100644
index 000000000000..42cb34c76545
--- /dev/null
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/cost.md
@@ -0,0 +1,31 @@
+```json
+{
+  "title": "Casting Cost",
+  "icon": "minecraft:amethyst_shard",
+  "category": "trickster:tricks",
+  "required_advancements": [
+    "trickster:cost_ploy"
+  ],
+  "secret": true,
+  "additional_search_terms": [
+    "Cost Ploy"
+  ]
+}
+```
+
+After receiving multiple complaints at Tomfoolery Inc. HQ about the balance of this mod,
+we've decided to properly implement material spell casting costs.
+
+
+However, player freedom and choice is also very important to us.
+As such, this system operates on an opt-in basis.
+
+;;;;;
+
+<|glyph@trickster:templates|trick-id=trickster:cost,title=Cost Ploy|>
+
+->
+
+---
+
+Consumes one amethyst shard from the caster's inventory. Will blunder if none are available.
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/functions.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/functions.md
similarity index 76%
rename from projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/functions.md
rename to projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/functions.md
index fcfa413c9c5a..4c187e6d388f 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/functions.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/functions.md
@@ -1,17 +1,17 @@
 ```json
 {
-  "title": "Spell Fragments",
+  "title": "Spell Deviations",
   "icon": "minecraft:paper",
-  "category": "trickster:distortions",
+  "category": "trickster:tricks",
   "additional_search_terms": [
-    "Grand Stratagem",
-    "Quiet Distortion",
-    "Utensil Stratagem",
-    "Folding Distortion",
-    "Cautious Stratagem",
-    "Stratagem of Singularity",
-    "Supply Distortion",
-    "Closure Stratagem"
+    "Deviation of Suspension",
+    "Grand Deviation",
+    "Quiet Deviation",
+    "Utensil Deviation",
+    "Folding Deviation",
+    "Cautious Deviation",
+    "Deviation of Singularity",
+    "Executioner's Deviation"
   ]
 }
 ```
@@ -34,7 +34,18 @@ using recursion to create what is essentially a loop.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:execute,title=Grand Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:delay_execution,title=Deviation of Suspension|>
+
+[number] -> number
+
+---
+
+Delays the execution of the current spell by the given number of ticks, or until the next tick. 
+Returns the delay.
+
+;;;;;
+
+<|glyph@trickster:templates|trick-id=trickster:execute,title=Grand Deviation|>
 
 spell, any... -> any
 
@@ -45,7 +56,7 @@ providing it with all other passed in fragments as arguments.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:execute_same_scope,title=Quiet Distortion|>
+<|glyph@trickster:templates|trick-id=trickster:execute_same_scope,title=Quiet Deviation|>
 
 spell -> any
 
@@ -55,7 +66,7 @@ Executes the given spell with the current spell's arguments.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:fork,title=Utensil Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:fork,title=Utensil Deviation|>
 
 spell, any... -> number
 
@@ -71,7 +82,7 @@ Maps are also collections, though their keys may be any value and aren't automat
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:fold,title=Folding Distortion|>
+<|glyph@trickster:templates|trick-id=trickster:fold,title=Folding Deviation|>
 
 spell, collection, any -> any
 
@@ -98,7 +109,7 @@ The result of each execution is passed as the first argument to the next, where
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:try_catch,title=Cautious Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:try_catch,title=Cautious Deviation|>
 
 spell, spell, any... -> any
 
@@ -108,7 +119,7 @@ Attempts to execute the first spell. If it blunders, the second spell is run and
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:atomic,title=Stratagem of Singularity|>
+<|glyph@trickster:templates|trick-id=trickster:atomic,title=Deviation of Singularity|>
 
 spell, any... -> any
 
@@ -118,23 +129,13 @@ Executes the given spell in a single tick, blundering if it's not possible due t
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:supplier,title=Supply Distortion|>
-
-any -> spell
-
----
-
-Creates a new spell fragment which returns the previously provided fragment when executed.
-
-;;;;;
-
-<|glyph@trickster:templates|trick-id=trickster:closure,title=Closure Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:kill_thread,title=Executioner's Deviation|>
 
-spell, {any: any} -> spell
+[number] -> boolean
 
 ---
 
-Replaces the keys of the map that are in the given spell with the value they map to.
+Ends the spell running in the given spell slot or the current slot if not provided. Returns whether it succeeded.
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/imports.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/imports.md
similarity index 86%
rename from projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/imports.md
rename to projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/imports.md
index 39ffb788019a..03d5763d75cc 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/imports.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/tricks/imports.md
@@ -2,10 +2,10 @@
 {
   "title": "Reusability",
   "icon": "trickster:top_hat",
-  "category": "trickster:delusions_ingresses",
+  "category": "trickster:tricks",
   "additional_search_terms": [
-    "Assistance Stratagem",
-    "Cranium Stratagem"
+    "Assistance Deviation",
+    "Cranium Deviation"
   ]
 }
 ```
@@ -19,7 +19,7 @@ or have other side effects.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:import,title=Assistance Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:import,title=Assistance Deviation|>
 
 item, any... -> any
 
@@ -30,7 +30,7 @@ The first item found with an inscribed spell will be cast with the provided argu
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:import_hat,title=Cranium Stratagem|>
+<|glyph@trickster:templates|trick-id=trickster:import_hat,title=Cranium Deviation|>
 
 number, any... -> any
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/concepts/tricks_explanation.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/concepts/tricks_explanation.md
index 91294905527b..eb3ab83d1ae5 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/concepts/tricks_explanation.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/concepts/tricks_explanation.md
@@ -8,14 +8,15 @@
 
 所有的戏法均可分到如下类别中：
 
-- 错觉术：产生值的无输入戏法
-- 曲变术：输入数目固定的戏法
+- 错觉术：完全根据上下文收集信息的戏法
 - 辑流术：根据输入收集信息的戏法
-- 技巧术：仅有输入、或消耗魔力、或二者兼有的戏法
+- 曲变术：输入数目固定的纯戏法
+- 谋略术：输入数目不固定的纯戏法
 
 ;;;;;
 
+- 技巧术：仅影响世界、或仅消耗魔力、或二者兼有的戏法
+- 转离术：会修改法术自身状态的戏法
 - 修订术：抄绘图案
-- 谋略术：输入数目不固定的戏法
 
 这些分类并不十分严谨；在许多情况下，戏法更常由其意图分类，而非完全采用严格定义。
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/caster_tricks.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/caster_tricks.md
index eaca777d711b..b4b463d20626 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/caster_tricks.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/caster_tricks.md
@@ -83,11 +83,11 @@
 
 <|glyph@trickster:templates|trick-id=trickster:current_thread,title=序数之错觉|>
 
--> number
+-> number | void
 
 ---
 
-返回运行此法术的槽位；若不支持槽位，返回-1。
+返回运行此法术的法术槽；若不支持法术槽，返回void。
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/entity.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/entity.md
index 91eb72f56973..69774b7027e0 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/entity.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/entity.md
@@ -17,7 +17,7 @@
     "活力之辑流",
     "体健之辑流",
     "垒墙之辑流",
-    "居形之曲变",
+    "居形之辑流",
     "观察者之辑流"
   ]
 }
@@ -157,7 +157,7 @@ entity -> number
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:get_scale,title=居形之曲变|>
+<|glyph@trickster:templates|trick-id=trickster:get_scale,title=居形之辑流|>
 
 entity -> number
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/list.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/list.md
index fe4380d5a972..24c50c043baf 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/list.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/list.md
@@ -22,7 +22,7 @@
 法术中可以创建列表。列表中能容纳任意个片段，整体又被视为单个值。
 
 
-列表索引自零起始。
+列表索引自零起始。如需生成空列表常量，请参见相关的[修订术](^trickster:constants#3)。
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/map.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/map.md
index 13127c377efd..e501824a8611 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/map.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/map.md
@@ -15,6 +15,8 @@
 本节的图案用于操纵映射。映射能建立法术片段到法术片段的联系，类似于字典能将字和其释义联系起来。
 
 
+如需生成空映射常量，请参见相关的[修订术](^trickster:constants#4)。
+
 ;;;;;
 
 <|glyph@trickster:templates|trick-id=trickster:map_insert,title=编表之谋略|>
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/tree.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/tree.md
index 333fb70b5cae..ac3ea717a28b 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/tree.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/tree.md
@@ -1,9 +1,11 @@
 ```json
 {
-  "title": "法术操纵",
+  "title": "法术",
   "icon": "minecraft:oak_sapling",
   "category": "trickster:distortions",
   "additional_search_terms": [
+    "供给之曲变",
+    "闭包之谋略",
     "定址之曲变",
     "发现之曲变",
     "检索之曲变",
@@ -21,6 +23,26 @@
 
 ;;;;;
 
+<|glyph@trickster:templates|trick-id=trickster:supplier,title=供给之曲变|>
+
+any -> spell
+
+---
+
+创建一个新法术片段，其执行结果即是所给参数。
+
+;;;;;
+
+<|glyph@trickster:templates|trick-id=trickster:closure,title=闭包之谋略|>
+
+spell, {any: any} -> spell
+
+---
+
+将所给法术中与所给映射键对应的符记换成其映射的值。
+
+;;;;;
+
 <|page-title@lavender:book_components|title=笔记：地址|>正如列表中的元素可通过索引访问，法术的部件也可由其地址访问。地址是一个整数列表，用以表示法术中前往该圆的路径。
 
 ;;;;;
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_hint.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_hint.md
index ea1de2ff1bce..51f7e8abee6b 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_hint.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_hint.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:trigger/nether_star"
   ],
-  "secret": true,
   "ordinal": 24
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_knot.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_knot.md
index 8e82cd7f0435..f24788cc945a 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_knot.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/astral_knot.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:astral_knot"
   ],
-  "secret": true,
   "ordinal": 26
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/cracked_echo_knot.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/cracked_echo_knot.md
index 44afc534946a..e2bcb4b7cc76 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/cracked_echo_knot.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/cracked_echo_knot.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:cracked_echo_knot"
   ],
-  "secret": true,
   "ordinal": 15
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/echo_knot.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/echo_knot.md
index 124396eb7ee2..1cc79ffbc639 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/echo_knot.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/echo_knot.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:echo_knot"
   ],
-  "secret": true,
   "ordinal": 20
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/ominous_spell_core.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/ominous_spell_core.md
index 6838c5322cae..9c49042a1e94 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/ominous_spell_core.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/ominous_spell_core.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:ominous_spell_core"
   ],
-  "secret": true,
   "ordinal": 130
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/rusted_spell_core.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/rusted_spell_core.md
index 46afa20ba31b..75a1b3261441 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/rusted_spell_core.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/items/rusted_spell_core.md
@@ -6,7 +6,6 @@
   "required_advancements": [
     "trickster:rusted_spell_core"
   ],
-  "secret": true,
   "ordinal": 120
 }
 ```
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/flecks.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/flecks.md
index 95d9c017980a..d4c51ceaa0aa 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/flecks.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/flecks.md
@@ -43,11 +43,11 @@
 
 <|glyph@trickster:templates|trick-id=trickster:draw_spell,title=营销员之技巧|>
 
-number, vector, vector, spell, [entity[] | entity] -> number
+number, vector, vector, spell, [number], [entity[] | entity] -> number
 
 ---
 
-在所给位置以所给朝向显示所给法术。
+在所给位置以所给朝向显示所给法术，缩放参数可选。
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/misc.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/misc.md
index 685abbaa8feb..6d00146bdc85 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/misc.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/ploys/misc.md
@@ -4,11 +4,9 @@
   "icon": "minecraft:iron_ingot",
   "category": "trickster:ploys",
   "additional_search_terms": [
-    "挂起之技巧",
     "天钉之技巧",
     "清晰之技巧",
-    "混淆之技巧",
-    "行刑者之技巧"
+    "混淆之技巧"
   ]
 }
 ```
@@ -17,16 +15,6 @@
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:delay_execution,title=挂起之技巧|>
-
-[number] -> number
-
----
-
-将当前法术的执行延迟所给数刻，未指定则延迟一刻。返回延迟量。
-
-;;;;;
-
 <|glyph@trickster:templates|trick-id=trickster:pin_chunk,title=天钉之技巧|>
 
 vector -> vector
@@ -68,13 +56,3 @@ number -> number
 ---
 
 立即清除施法者屏幕中标识符为所给数的条栏。
-
-;;;;;
-
-<|glyph@trickster:templates|trick-id=trickster:kill_thread,title=行刑者之技巧|>
-
-[number] -> boolean
-
----
-
-终止所给法术槽中的法术，若未指定法术槽则终止当前法术。根据成功与否返回布尔值。
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/basic.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/basic.md
index 866ec41b2383..54bea789d4fd 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/basic.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/basic.md
@@ -8,10 +8,9 @@
     "记事员之技巧",
     "禁文记事员之技巧",
     "畏真者之技巧",
-    "展示之谋略",
+    "展示之技巧",
     "乌鸦灵思之错觉",
-    "乌鸦灵思之技巧",
-    "消耗之技巧"
+    "乌鸦灵思之技巧"
   ]
 }
 ```
@@ -67,7 +66,7 @@ any, [slot] -> any
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:reveal,title=展示之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:reveal,title=展示之技巧|>
 
 any... -> any
 
@@ -101,20 +100,3 @@ any -> any
 ---
 
 将所给值存进施法者的乌鸦之思，并覆盖其中的值。
-
-;;;;;
-
-<|page-title@lavender:book_components|title=笔记：施法消耗|>在收到多封来自魔术把戏股份有限公司总部关于本模组平衡性的投诉信后，我们决定正式实装物质层面上的法术消耗。
-
-
-但是，玩家们的自由和选择权利也对我们至关重要。因此，本系统不作强制要求。
-
-;;;;;
-
-<|glyph@trickster:templates|trick-id=trickster:cost,title=消耗之技巧|>
-
-->
-
----
-
-消耗施法者物品栏中的一个紫水晶碎片。若无则产生失策。
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/cost.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/cost.md
new file mode 100644
index 000000000000..f76bbe9b91c7
--- /dev/null
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/cost.md
@@ -0,0 +1,29 @@
+```json
+{
+  "title": "施法消耗",
+  "icon": "minecraft:amethyst_shard",
+  "category": "trickster:tricks",
+  "required_advancements": [
+    "trickster:cost_ploy"
+  ],
+  "secret": true,
+  "additional_search_terms": [
+    "消耗之技巧"
+  ]
+}
+```
+
+在收到多封来自魔术把戏股份有限公司总部关于本模组平衡性的投诉信后，我们决定正式实装物质层面上的法术消耗。
+
+
+但是，玩家们的自由和选择权利也对我们至关重要。因此，本系统不作强制要求。
+
+;;;;;
+
+<|glyph@trickster:templates|trick-id=trickster:cost,title=消耗之技巧|>
+
+->
+
+---
+
+消耗施法者物品栏中的一个紫水晶碎片。若无则产生失策。
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/functions.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/functions.md
similarity index 78%
rename from projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/functions.md
rename to projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/functions.md
index 2b9b75b97e92..72687d79479c 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/distortions/functions.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/functions.md
@@ -1,17 +1,17 @@
 ```json
 {
-  "title": "法术片段",
+  "title": "法术转离",
   "icon": "minecraft:paper",
-  "category": "trickster:distortions",
+  "category": "trickster:tricks",
   "additional_search_terms": [
-    "宏伟之谋略",
-    "静默之曲变",
-    "器具之谋略",
-    "折叠之曲变",
-    "谨慎之谋略",
-    "奇点之谋略",
-    "供给之曲变",
-    "闭包之谋略"
+    "挂起之转离",
+    "宏伟之转离",
+    "静默之转离",
+    "器具之转离",
+    "折叠之转离",
+    "谨慎之转离",
+    "奇点之转离",
+    "行刑者之转离"
   ]
 }
 ```
@@ -30,7 +30,17 @@
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:execute,title=宏伟之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:delay_execution,title=挂起之转离|>
+
+[number] -> number
+
+---
+
+将当前法术的执行延迟所给数刻，未指定则延迟一刻。返回延迟量。
+
+;;;;;
+
+<|glyph@trickster:templates|trick-id=trickster:execute,title=宏伟之转离|>
 
 spell, any... -> any
 
@@ -40,7 +50,7 @@ spell, any... -> any
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:execute_same_scope,title=静默之曲变|>
+<|glyph@trickster:templates|trick-id=trickster:execute_same_scope,title=静默之转离|>
 
 spell -> any
 
@@ -50,7 +60,7 @@ spell -> any
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:fork,title=器具之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:fork,title=器具之转离|>
 
 spell, any... -> number
 
@@ -64,7 +74,7 @@ spell, any... -> number
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:fold,title=折叠之曲变|>
+<|glyph@trickster:templates|trick-id=trickster:fold,title=折叠之转离|>
 
 spell, collection, any -> any
 
@@ -90,7 +100,7 @@ any, any, any, collection
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:try_catch,title=谨慎之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:try_catch,title=谨慎之转离|>
 
 spell, spell, any... -> any
 
@@ -100,7 +110,7 @@ spell, spell, any... -> any
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:atomic,title=奇点之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:atomic,title=奇点之转离|>
 
 spell, any... -> any
 
@@ -110,23 +120,13 @@ spell, any... -> any
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:supplier,title=供给之曲变|>
-
-any -> spell
-
----
-
-创建一个新法术片段，其执行结果即是所给参数。
-
-;;;;;
-
-<|glyph@trickster:templates|trick-id=trickster:closure,title=闭包之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:kill_thread,title=行刑者之转离|>
 
-spell, {any: any} -> spell
+[number] -> boolean
 
 ---
 
-将所给法术中与所给映射键对应的符记换成其映射的值。
+终止所给法术槽中的法术，若未指定法术槽则终止当前法术。根据成功与否返回布尔值。
 
 ;;;;;
 
diff --git a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/imports.md b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/imports.md
similarity index 87%
rename from projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/imports.md
rename to projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/imports.md
index 775f5637e337..61beba6fc86f 100644
--- a/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/delusions_ingresses/imports.md
+++ b/projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/zh_cn/tricks/imports.md
@@ -2,10 +2,10 @@
 {
   "title": "可重用性",
   "icon": "trickster:top_hat",
-  "category": "trickster:delusions_ingresses",
+  "category": "trickster:tricks",
   "additional_search_terms": [
-    "协助之谋略",
-    "颅骨之谋略"
+    "协助之转离",
+    "颅骨之转离"
   ]
 }
 ```
@@ -17,7 +17,7 @@
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:import,title=协助之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:import,title=协助之转离|>
 
 item, any... -> any
 
@@ -27,7 +27,7 @@ item, any... -> any
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:import_hat,title=颅骨之谋略|>
+<|glyph@trickster:templates|trick-id=trickster:import_hat,title=颅骨之转离|>
 
 number, any... -> any