diff --git a/AATool/assets/objectives/1.14/advancements/adventure.xml b/AATool/assets/objectives/1.14/advancements/adventure.xml
index 557e35b..d3a7fc8 100644
--- a/AATool/assets/objectives/1.14/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.14/advancements/adventure.xml
@@ -16,7 +16,7 @@
 
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF"/>
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
 
     <advancement id="minecraft:adventure/kill_all_mobs" name="Monsters Hunted" short_name="Monsters" type="challenge">
diff --git a/AATool/assets/objectives/1.15/advancements/adventure.xml b/AATool/assets/objectives/1.15/advancements/adventure.xml
index a990cad..b6f3747 100644
--- a/AATool/assets/objectives/1.15/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.15/advancements/adventure.xml
@@ -17,7 +17,7 @@
     
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF"/>
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
     
     <advancement id="minecraft:adventure/kill_all_mobs" name="Monsters Hunted" short_name="Monsters" type="challenge">
diff --git a/AATool/assets/objectives/1.16.5/advancements/adventure.xml b/AATool/assets/objectives/1.16.5/advancements/adventure.xml
index eadfa60..d329048 100644
--- a/AATool/assets/objectives/1.16.5/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.16.5/advancements/adventure.xml
@@ -16,7 +16,7 @@
     <advancement id="minecraft:adventure/sniper_duel"           name="Sniper Duel"              type="challenge"/>
 
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ"/>
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF"/>
 
diff --git a/AATool/assets/objectives/1.16/advancements/adventure.xml b/AATool/assets/objectives/1.16/advancements/adventure.xml
index 483c8ed..8f7d0f6 100644
--- a/AATool/assets/objectives/1.16/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.16/advancements/adventure.xml
@@ -16,7 +16,7 @@
     <advancement id="minecraft:adventure/sniper_duel"           name="Sniper Duel"              type="challenge"/>
 
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner" half="false"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero OTV" icon="pillager_banner" type="challenge" half="false"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero" icon="pillager_banner" type="challenge" half="false"/>
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ" half="false"/>
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF" half="false"/>
 
diff --git a/AATool/assets/objectives/1.17/advancements/adventure.xml b/AATool/assets/objectives/1.17/advancements/adventure.xml
index 11bbdc8..4e542d4 100644
--- a/AATool/assets/objectives/1.17/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.17/advancements/adventure.xml
@@ -19,7 +19,7 @@
     <advancement id="minecraft:adventure/bullseye"              name="Bullseye"                 type="challenge" half="false"/>
 
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the Village"      short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/lightning_rod_with_villager_no_fire" name="Surge Protector"  short_name="Surge Prot" icon="lightning_rod"/>
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ"/>
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF"/>
diff --git a/AATool/assets/objectives/1.18/advancements/adventure.xml b/AATool/assets/objectives/1.18/advancements/adventure.xml
index 989b164..eb98fce 100644
--- a/AATool/assets/objectives/1.18/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.18/advancements/adventure.xml
@@ -26,7 +26,7 @@
     <advancement id="minecraft:adventure/totem_of_undying"      name="Postmortal"               type="goal"/>
     <advancement id="minecraft:adventure/walk_on_powder_snow_with_leather_boots"   name="Light as a&#160;Rabbit" short_name="LaaR"  icon="leather_boots"/>
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero" icon="pillager_banner" type="challenge"/>
 
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ"/>
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF"/>
diff --git a/AATool/assets/objectives/1.19/advancements/adventure.xml b/AATool/assets/objectives/1.19/advancements/adventure.xml
index d84efd9..2e7a567 100644
--- a/AATool/assets/objectives/1.19/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.19/advancements/adventure.xml
@@ -25,7 +25,7 @@
     <advancement id="minecraft:adventure/lightning_rod_with_villager_no_fire" name="Surge Protector"  short_name="Surge Prot" icon="lightning_rod"/>
     <advancement id="minecraft:adventure/walk_on_powder_snow_with_leather_boots"   name="Light as a&#160;Rabbit" short_name="LaaR"  icon="leather_boots"/>
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/totem_of_undying"      name="Postmortal"               type="goal"/>
 
     <advancement id="minecraft:adventure/avoid_vibration"  name="Sneak 100" icon="sculk_sensor"/>
diff --git a/AATool/assets/objectives/1.20.5/advancements/adventure.xml b/AATool/assets/objectives/1.20.5/advancements/adventure.xml
index 95512da..593134d 100644
--- a/AATool/assets/objectives/1.20.5/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.20.5/advancements/adventure.xml
@@ -51,7 +51,7 @@
     <advancement id="minecraft:adventure/lightning_rod_with_villager_no_fire" name="Surge Protector"  short_name="Surge Prot" icon="lightning_rod"/>
     <advancement id="minecraft:adventure/walk_on_powder_snow_with_leather_boots"   name="Light as a&#160;Rabbit" short_name="LaaR"  icon="leather_boots"/>
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/totem_of_undying"      name="Postmortal"               type="goal"/>
 
     <advancement id="minecraft:adventure/avoid_vibration"  name="Sneak 100" icon="sculk_sensor"/>
diff --git a/AATool/assets/objectives/1.20/advancements/adventure.xml b/AATool/assets/objectives/1.20/advancements/adventure.xml
index c693890..aaafda7 100644
--- a/AATool/assets/objectives/1.20/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.20/advancements/adventure.xml
@@ -50,7 +50,7 @@
     <advancement id="minecraft:adventure/lightning_rod_with_villager_no_fire" name="Surge Protector"  short_name="Surge Prot" icon="lightning_rod"/>
     <advancement id="minecraft:adventure/walk_on_powder_snow_with_leather_boots"   name="Light as a&#160;Rabbit" short_name="LaaR"  icon="leather_boots"/>
     <advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/totem_of_undying"      name="Postmortal"               type="goal"/>
 
     <advancement id="minecraft:adventure/avoid_vibration"  name="Sneak 100" icon="sculk_sensor"/>
diff --git a/AATool/assets/objectives/1.21/advancements/adventure.xml b/AATool/assets/objectives/1.21/advancements/adventure.xml
index 21d24c0..5ac086a 100644
--- a/AATool/assets/objectives/1.21/advancements/adventure.xml
+++ b/AATool/assets/objectives/1.21/advancements/adventure.xml
@@ -64,7 +64,7 @@
     <advancement id="minecraft:adventure/lightning_rod_with_villager_no_fire" name="Surge Protector"  short_name="Surge Prot" icon="lightning_rod"/>
     
 	<advancement id="minecraft:adventure/voluntary_exile"       name="Voluntary Exile"          short_name="Exile" icon="pillager_banner"/>
-    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero OTV" icon="pillager_banner" type="challenge"/>
+    <advancement id="minecraft:adventure/hero_of_the_village"   name="Hero of the&#160;Village" short_name="Hero" icon="pillager_banner" type="challenge"/>
     <advancement id="minecraft:adventure/throw_trident"         name="A Throwaway Joke"         short_name="ATJ"/>
     <advancement id="minecraft:adventure/very_very_frightening" name="Very Very Frightening"    short_name="VVF"/>
     <advancement id="minecraft:adventure/adventuring_time" name="Adventuring Time" short_name="Adventuring" type="challenge">
diff --git a/AATool/assets/views/all_advancements/1.21/main_compact.xml b/AATool/assets/views/all_advancements/1.21/main_compact.xml
index 9802388..6bce065 100644
--- a/AATool/assets/views/all_advancements/1.21/main_compact.xml
+++ b/AATool/assets/views/all_advancements/1.21/main_compact.xml
@@ -23,7 +23,7 @@
             <advancement_group group="nether"    width="8 * 66" height="3 * 68" margin_left="5 * 66" horizontal_align="left" vertical_align="top" direction="righttoleft"/>
             <advancement_group group="end"       width="3 * 66" height="3 * 68" margin_top="3 * 68" horizontal_align="left" vertical_align="top"/>
             <advancement_group group="adventure" width="7 * 66" height="6 * 68" margin_left="13 * 66" horizontal_align="left" vertical_align="top" exclude="minecraft:adventure/spyglass_at_parrot,minecraft:adventure/spyglass_at_ghast,minecraft:adventure/spyglass_at_dragon"/>
-            <advancement_group group="husbandry" end="minecraft:husbandry/whole_pack" exclude="minecraft:husbandry/root,minecraft:husbandry/breed_an_animal" width="8 * 66" height="3 * 68" margin_left="3 * 66" margin_top="3 * 68" horizontal_align="left" vertical_align="top"/>
+            <advancement_group group="husbandry" end="minecraft:husbandry/obtain_netherite_hoe" exclude="minecraft:husbandry/root,minecraft:husbandry/breed_an_animal" width="8 * 66" height="3 * 68" margin_left="3 * 66" margin_top="3 * 68" horizontal_align="left" vertical_align="top"/>
             
 			<advancement_group group="husbandry" start="minecraft:husbandry/froglights" width="66" height="3 * 68" margin_left="11 * 66" margin_top="3 * 68" horizontal_align="left" vertical_align="top"/>
             <advancement_group group="adventure" start="minecraft:adventure/spyglass_at_parrot" end="minecraft:adventure/spyglass_at_dragon" width="66" height="3 * 68" margin_left="12 * 66" margin_top="3 * 68" horizontal_align="left" vertical_align="top"/>