diff --git a/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction b/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction
index ab52ce2..1200a96 100644
--- a/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction
+++ b/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction
@@ -1,10 +1,10 @@
 ## Mode Glazed Terracotta
 
 # Terracotta Mode Rotation
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}] run tag @s add TerracottaNORTH
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}] run tag @s add TerracottaEAST
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}] run tag @s add TerracottaSOUTH
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}] run tag @s add TerracottaWEST
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["North"]}}}] run tag @s add TerracottaNORTH
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["East"]}}}] run tag @s add TerracottaEAST
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["South"]}}}] run tag @s add TerracottaSOUTH
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["West"]}}}] run tag @s add TerracottaWEST
 
 $execute as @s[scores={lzt_wrench_success=0}, tag=TerracottaNORTH] store result score @s lzt_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=north] replace
 $execute as @s[scores={lzt_wrench_success=0}, tag=TerracottaEAST] store result score @s lzt_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=east] replace
diff --git a/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction b/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction
index cec62d7..2897e2f 100644
--- a/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction
+++ b/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction
@@ -1,7 +1,6 @@
 ## Glazed Terracotta
 
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench
-execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["Terracotta"]}}}]
+ run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench
+execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/glazed_terracotta/cycle with storage lzstools:wrench
 execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/glazed_terracotta/cycle with storage lzstools:wrench
diff --git a/data/lzstools_wrench/function/wrench/offhand.mcfunction b/data/lzstools_wrench/function/wrench/offhand.mcfunction
index 0129373..98e70c3 100644
--- a/data/lzstools_wrench/function/wrench/offhand.mcfunction
+++ b/data/lzstools_wrench/function/wrench/offhand.mcfunction
@@ -2,22 +2,18 @@
 scoreboard players set @s lzt_wrench_success 0
 
 # Change wrench mode
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_default"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:flip
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_player
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_click
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_north
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_east
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_south
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_west
-execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:default
+execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Default"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:flip
+execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Flip"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_player
+execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Player"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_click
+execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Click"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_north
+
+# Return to Default
+execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Terracotta"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:default
 
 
 # Confirm with action bar
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_default"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
-title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
\ No newline at end of file
+title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Default"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Flip"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Player"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Click"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Terracotta"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
\ No newline at end of file
diff --git a/data/lzstools_wrench/item_modifier/terracotta_east.json b/data/lzstools_wrench/item_modifier/terracotta_east.json
index f3c3df1..b783e28 100644
--- a/data/lzstools_wrench/item_modifier/terracotta_east.json
+++ b/data/lzstools_wrench/item_modifier/terracotta_east.json
@@ -16,7 +16,7 @@
         "function": "minecraft:set_custom_model_data",
         "strings": {
             "values": [
-                "lzstools:wrench_terracotta_east"
+                "lzstools:wrench_terracotta"
             ],
             "mode": "replace_all"
         }
diff --git a/data/lzstools_wrench/item_modifier/terracotta_north.json b/data/lzstools_wrench/item_modifier/terracotta_north.json
index e709dae..8eacd38 100644
--- a/data/lzstools_wrench/item_modifier/terracotta_north.json
+++ b/data/lzstools_wrench/item_modifier/terracotta_north.json
@@ -16,7 +16,7 @@
         "function": "minecraft:set_custom_model_data",
         "strings": {
             "values": [
-                "lzstools:wrench_terracotta_north"
+                "lzstools:wrench_terracotta"
             ],
             "mode": "replace_all"
         }
diff --git a/data/lzstools_wrench/item_modifier/terracotta_south.json b/data/lzstools_wrench/item_modifier/terracotta_south.json
index 049b8c1..27f8662 100644
--- a/data/lzstools_wrench/item_modifier/terracotta_south.json
+++ b/data/lzstools_wrench/item_modifier/terracotta_south.json
@@ -16,7 +16,7 @@
         "function": "minecraft:set_custom_model_data",
         "strings": {
             "values": [
-                "lzstools:wrench_terracotta_south"
+                "lzstools:wrench_terracotta"
             ],
             "mode": "replace_all"
         }
diff --git a/data/lzstools_wrench/item_modifier/terracotta_west.json b/data/lzstools_wrench/item_modifier/terracotta_west.json
index a9e4053..c303926 100644
--- a/data/lzstools_wrench/item_modifier/terracotta_west.json
+++ b/data/lzstools_wrench/item_modifier/terracotta_west.json
@@ -16,7 +16,7 @@
 		"function": "minecraft:set_custom_model_data",
 		"strings": {
 			"values": [
-				"lzstools:wrench_terracotta_west"
+				"lzstools:wrench_terracotta"
 			],
 			"mode": "replace_all"
 		}