diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java
index b95d8350..f15c228e 100644
--- a/src/main/java/com/minelittlepony/unicopia/UTags.java
+++ b/src/main/java/com/minelittlepony/unicopia/UTags.java
@@ -26,6 +26,7 @@ public interface UTags {
     TagKey<Item> IS_DELIVERED_AGGRESSIVELY = item("is_delivered_aggressively");
     TagKey<Item> FLOATS_ON_CLOUDS = item("floats_on_clouds");
     TagKey<Item> COOLS_OFF_KIRINS = item("cools_off_kirins");
+    TagKey<Item> LOOT_BUG_HIGH_VALUE_DROPS = item("loot_bug_high_value_drops");
 
     TagKey<Item> SHELLS = item("food_types/shells");
 
diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java
index 72b6e5a7..9e319abf 100644
--- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java
@@ -90,6 +90,11 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider {
         getOrCreateTagBuilder(UTags.FALLS_SLOWLY).add(Items.FEATHER, UItems.CLOUD_LUMP).forceAddTag(UTags.MAGIC_FEATHERS);
         getOrCreateTagBuilder(UTags.IS_DELIVERED_AGGRESSIVELY).forceAddTag(ItemTags.ANVIL);
         getOrCreateTagBuilder(UTags.SPOOKED_MOB_DROPS).add(Items.BRICK);
+        getOrCreateTagBuilder(UTags.SHADES).add(
+                Items.CARVED_PUMPKIN, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.PLAYER_HEAD,
+                Items.ZOMBIE_HEAD, Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PIGLIN_HEAD,
+                UItems.SUNGLASSES
+        );
         getOrCreateTagBuilder(UTags.FLOATS_ON_CLOUDS)
             .forceAddTag(UTags.Items.CLOUD_BEDS)
             .forceAddTag(UTags.Items.CLOUD_SLABS)
@@ -103,6 +108,16 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider {
                 Items.DEBUG_STICK, Items.COMMAND_BLOCK_MINECART,
                 UItems.PLUNDER_VINE
         ).forceAddTag(UTags.BADGES);
+        getOrCreateTagBuilder(UTags.LOOT_BUG_HIGH_VALUE_DROPS).add(
+                    Items.DIAMOND, Items.GOLDEN_APPLE, Items.GOLDEN_CARROT,
+                    Items.GOLDEN_HELMET, Items.GOLDEN_BOOTS, Items.GOLDEN_LEGGINGS, Items.GOLDEN_CHESTPLATE,
+                    Items.GOLDEN_HORSE_ARMOR,
+                    Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_SWORD, Items.GOLDEN_HOE,
+                    UItems.GOLDEN_HORSE_SHOE, UItems.GOLDEN_POLEARM, UItems.GOLDEN_FEATHER, UItems.GOLDEN_WING,
+                    UItems.GOLDEN_OAK_SEEDS
+            ).forceAddTag(ConventionalItemTags.NUGGETS)
+            .forceAddTag(ConventionalItemTags.GOLD_INGOTS).forceAddTag(ConventionalItemTags.RAW_GOLD_ORES).forceAddTag(ConventionalItemTags.RAW_GOLD_BLOCKS)
+            .addOptionalTag(new Identifier("farmersdelight:golden_knife"));
 
         exportFarmersDelightItems();
     }
diff --git a/src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json b/src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json
deleted file mode 100644
index c0417584..00000000
--- a/src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "minecraft:diamond",
-    "minecraft:gold_nugget",
-    "minecraft:iron_nugget",
-    "#c:gold_ingots",
-    "#c:raw_gold_ores",
-    "#c:raw_gold_blocks",
-    "minecraft:golden_apple",
-    "minecraft:golden_carrot",
-    "minecraft:golden_boots",
-    "minecraft:golden_leggings",
-    "minecraft:golden_chestplate",
-    "minecraft:golden_helmet",
-    "minecraft:golden_horse_armor",
-    "unicopia:golden_horse_shoe",
-    "minecraft:golden_pickaxe",
-    "minecraft:golden_axe",
-    "minecraft:golden_shovel",
-    "minecraft:golden_sword",
-    "minecraft:golden_hoe",
-    "unicopia:golden_polearm",
-    "unicopia:golden_feather",
-    "unicopia:golden_wing",
-    "unicopia:golden_oak_seeds",
-    { "id": "farmersdelight:golden_knife", "required": false }
-  ]
-}
diff --git a/src/main/resources/data/unicopia/tags/items/shades.json b/src/main/resources/data/unicopia/tags/items/shades.json
deleted file mode 100644
index 69cc87df..00000000
--- a/src/main/resources/data/unicopia/tags/items/shades.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "minecraft:carved_pumpkin",
-    "minecraft:skeleton_skull",
-    "minecraft:wither_skeleton_skull",
-    "minecraft:player_head",
-    "minecraft:zombie_head",
-    "minecraft:creeper_head",
-    "minecraft:dragon_head",
-    "unicopia:sunglasses"
-  ]
-}