diff --git a/Wrench/data/wrench/functions/config.mcfunction b/Wrench/data/wrench/functions/config.mcfunction
index 646bb14..89339fa 100644
--- a/Wrench/data/wrench/functions/config.mcfunction
+++ b/Wrench/data/wrench/functions/config.mcfunction
@@ -1,5 +1,5 @@
 # Config
-tellraw @s [{"text":"                        ","strikethrough":true},{"text":" LZ's Wrench Config ","color":"gold","strikethrough":false,"bold":true},{"text":"                         ","strikethrough":true}]
+tellraw @s [{"text":"                     ","strikethrough":true},{"text":" Rotator Wrench Config ","color":"gold","strikethrough":false,"bold":true},{"text":"                       ","strikethrough":true}]
 tellraw @s {"text":"Which catagories should be wrenchable?"}
 function wrench:config/pillars/main
 function wrench:config/redstone/main
diff --git a/Wrench/data/wrench/functions/rotate/glazed_terracotta.mcfunction b/Wrench/data/wrench/functions/rotate/glazed_terracotta.mcfunction
index 8c91f5d..1372782 100644
--- a/Wrench/data/wrench/functions/rotate/glazed_terracotta.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/glazed_terracotta.mcfunction
@@ -1,3 +1,3 @@
 ### Glazed Terracotta
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}']}}}}] run function wrench:rotate/glazed_terracotta_mode
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"Terracotta"']}}}] run function wrench:rotate/glazed_terracotta_mode
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/glazed_terracotta_cycle
diff --git a/Wrench/data/wrench/functions/rotate/glazed_terracotta_mode.mcfunction b/Wrench/data/wrench/functions/rotate/glazed_terracotta_mode.mcfunction
index fc543ce..7fab3b9 100644
--- a/Wrench/data/wrench/functions/rotate/glazed_terracotta_mode.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/glazed_terracotta_mode.mcfunction
@@ -1,10 +1,10 @@
 ### Rotate Glazed Terracotta
 
 # Terracotta Mode Rotation
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"North"}']}}}}] run tag @s add TerracottaNORTH
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"East"}']}}}}] run tag @s add TerracottaEAST
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"South"}']}}}}] run tag @s add TerracottaSOUTH
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"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
 
 ## Shades
 
diff --git a/Wrench/data/wrench/functions/rotate/pillars.mcfunction b/Wrench/data/wrench/functions/rotate/pillars.mcfunction
index 4ef3d01..dfb1272 100644
--- a/Wrench/data/wrench/functions/rotate/pillars.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/pillars.mcfunction
@@ -1,6 +1,6 @@
 ### Pillars
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/pillars_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Click"}']}}}}] run function wrench:rotate/pillars_click
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/pillars_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/pillars_click
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/pillars_cycle
diff --git a/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction b/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction
index 8775378..9ec7a32 100644
--- a/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction
@@ -45,16 +45,6 @@ execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1.
 execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=y] replace minecraft:stripped_acacia_wood
 execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood
 
-# Bamboo
-execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block
-
-# Bamboo (Stripped)
-execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block
-
 # Birch Log
 execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=z] replace minecraft:birch_log
 execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log
diff --git a/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction b/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction
index 0d2ac6a..46f00dc 100644
--- a/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction
@@ -22,16 +22,6 @@ execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=y] replace minecraft:stripped_acacia_wood[axis=x]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood[axis=z]
 
-# Bamboo
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block[axis=y]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block[axis=x]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block[axis=z]
-
-# Bamboo (Stripped)
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block[axis=y]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block[axis=x]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block[axis=z]
-
 # Birch Log
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=z] replace minecraft:birch_log[axis=y]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log[axis=x]
diff --git a/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction b/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction
index 0b794af..5e5bdc1 100644
--- a/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction
@@ -34,22 +34,6 @@ execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood
 
-# Bamboo
-execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block
-
-# Bamboo (Stripped)
-execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block
-execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block
-
 # Birch Log
 execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log
diff --git a/Wrench/data/wrench/functions/rotate/rails.mcfunction b/Wrench/data/wrench/functions/rotate/rails.mcfunction
index 5aeaccc..7e95803 100644
--- a/Wrench/data/wrench/functions/rotate/rails.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/rails.mcfunction
@@ -1,5 +1,5 @@
 ### Rails
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/rails_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/rails_player
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/rails_cycle
diff --git a/Wrench/data/wrench/functions/rotate/redstone.mcfunction b/Wrench/data/wrench/functions/rotate/redstone.mcfunction
index 44de0fb..24e72ab 100644
--- a/Wrench/data/wrench/functions/rotate/redstone.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/redstone.mcfunction
@@ -4,9 +4,9 @@
 execute if block ~ ~ ~ #wrench:redstone{Items:[{}]} run scoreboard players set @s WrenchSuccess -1
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Flip"}']}}}}] run function wrench:rotate/redstone_flip
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/redstone_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Click"}']}}}}] run function wrench:rotate/redstone_click
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Flip"']}}}] run function wrench:rotate/redstone_flip
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/redstone_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/redstone_click
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/redstone_cycle
 
 # Container Full Show Error
diff --git a/Wrench/data/wrench/functions/rotate/stairs.mcfunction b/Wrench/data/wrench/functions/rotate/stairs.mcfunction
index 553a336..e02356d 100644
--- a/Wrench/data/wrench/functions/rotate/stairs.mcfunction
+++ b/Wrench/data/wrench/functions/rotate/stairs.mcfunction
@@ -1,7 +1,7 @@
 ### Stairs
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Flip"}']}}}}] run function wrench:rotate/stairs_flip
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/stairs_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Click"}']}}}}] run function wrench:rotate/stairs_click
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Flip"']}}}] run function wrench:rotate/stairs_flip
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/stairs_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/stairs_click
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/stairs_cycle
diff --git a/Wrench/data/wrench/functions/use.mcfunction b/Wrench/data/wrench/functions/use.mcfunction
index aa7542e..afaa13e 100644
--- a/Wrench/data/wrench/functions/use.mcfunction
+++ b/Wrench/data/wrench/functions/use.mcfunction
@@ -1,6 +1,6 @@
 #Check for wrench input
-execute if entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag:{Wrench:597832584}}}] run function wrench:rotate
-execute if entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",tag:{Wrench:597832584}}]}] run function wrench:wrench/offhand
+execute if entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{Wrench:597832584}}}}] run function wrench:rotate
+execute if entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{Wrench:597832584}}}]}] run function wrench:wrench/offhand
 
 #Check if wrench has been crafted
 execute as @s[scores={WrenchInput=1..}] run function wrench:wrench/convert
diff --git a/Wrench/data/wrench/functions/wrench/convert.mcfunction b/Wrench/data/wrench/functions/wrench/convert.mcfunction
index e57082d..14346b9 100644
--- a/Wrench/data/wrench/functions/wrench/convert.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/convert.mcfunction
@@ -1,3 +1,3 @@
 #Check if wrench has been crafted
-item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",tag:{display:{Name:'"Wrench"'}}}}] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",tag:{display:{Name:'"Wrench"'}}}]}] weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
+item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
diff --git a/Wrench/data/wrench/functions/wrench/give.mcfunction b/Wrench/data/wrench/functions/wrench/give.mcfunction
index 690d6f9..57af58d 100644
--- a/Wrench/data/wrench/functions/wrench/give.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/give.mcfunction
@@ -1 +1 @@
-give @s minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
\ No newline at end of file
+give @s minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
\ No newline at end of file
diff --git a/Wrench/data/wrench/functions/wrench/offhand.mcfunction b/Wrench/data/wrench/functions/wrench/offhand.mcfunction
index 3f49aaf..0abcb04 100644
--- a/Wrench/data/wrench/functions/wrench/offhand.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/offhand.mcfunction
@@ -2,18 +2,22 @@
 scoreboard players set @s WrenchSuccess 0
 
 #Change wrench mode
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Default"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Flip"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Flip"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Face Player"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Player"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Face Click"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Click"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"North"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Terracotta mode"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
+execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Flip"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Player"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Click"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+# Only allow Terracotta more if terracotta rotating is enabled
+execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 0 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+# Retun to Default
+execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+
 
 #Confirm with action bar
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Default"}']}}}]}] actionbar {"text":"Mode: Default"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Flip"}']}}}]}] actionbar {"text":"Mode: Flip"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Player"}']}}}]}] actionbar {"text":"Mode: Face Player"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Click"}']}}}]}] actionbar {"text":"Mode: Face Click"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Terracotta mode"}']}}}]}] actionbar {"text":"Mode: Terracotta"}
+title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}]
+title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}]
+title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}]
+title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}]
+title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
 
 #Reset input
 scoreboard players set @s WrenchInput 0
diff --git a/Wrench/data/wrench/functions/wrench/terracotta.mcfunction b/Wrench/data/wrench/functions/wrench/terracotta.mcfunction
index 0e27fc2..5b6b937 100644
--- a/Wrench/data/wrench/functions/wrench/terracotta.mcfunction
+++ b/Wrench/data/wrench/functions/wrench/terracotta.mcfunction
@@ -1,9 +1,9 @@
 #Advance terracotta mode rotation, show title
-item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"East"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"South"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"West"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"North"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-title @s[tag=TerracottaNORTH] actionbar {"text":"Terracotta Mode: East"}
-title @s[tag=TerracottaEAST] actionbar {"text":"Terracotta Mode: South"}
-title @s[tag=TerracottaSOUTH] actionbar {"text":"Terracotta Mode: West"}
-title @s[tag=TerracottaWEST] actionbar {"text":"Terracotta Mode: North"}
+item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"East"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"South"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"West"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name=Rotator'{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+title @s[tag=TerracottaNORTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"East","color":"white"}]
+title @s[tag=TerracottaEAST] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"South","color":"white"}]
+title @s[tag=TerracottaSOUTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"West","color":"white"}]
+title @s[tag=TerracottaWEST] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"North","color":"white"}]
\ No newline at end of file
diff --git a/Wrench/data/wrench/tags/blocks/pillars.json b/Wrench/data/wrench/tags/blocks/pillars.json
index ef14b4d..0688b84 100644
--- a/Wrench/data/wrench/tags/blocks/pillars.json
+++ b/Wrench/data/wrench/tags/blocks/pillars.json
@@ -2,7 +2,6 @@
     "replace": false,
     "values": [
         "#minecraft:logs",
-        "#minecraft:bamboo_blocks",
         "minecraft:quartz_pillar",
         "minecraft:purpur_pillar",
         "minecraft:hay_block",
diff --git a/Wrench/pack.mcmeta b/Wrench/pack.mcmeta
index 4dd769b..33624b7 100644
--- a/Wrench/pack.mcmeta
+++ b/Wrench/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
-        "pack_format": 16,
+        "pack_format": 41,
         "description": "Wrench pack to allow easy rotation of blocks. Configurable."
     }
 }
\ No newline at end of file