diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b0714f7..467edaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,4 +2,4 @@
 
 ## Fixed
 
-- Rare null pointer expection when mimiced blocks load slowly
\ No newline at end of file
+- The whitelist and blacklist tags not working due to incorrect registration
diff --git a/build.gradle b/build.gradle
index 24e14117..79815e2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
+        maven { url = 'https://maven.creeperhost.net' }
         mavenCentral()
     }
     dependencies {
diff --git a/gradle.properties b/gradle.properties
index 67b9b831..42276ef1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,5 +5,5 @@ minecraft_version=1.16.5
 forge_version=36.2.39
 mcp_mappings=20210309-1.16.5
 # Mod specific
-version=3.8.3
+version=3.8.4
 jei_version=1.16.5:7.7.1.126
diff --git a/src/main/java/com/direwolf20/buildinggadgets/common/items/AbstractGadget.java b/src/main/java/com/direwolf20/buildinggadgets/common/items/AbstractGadget.java
index 663bb4bc..bb7f4a3c 100644
--- a/src/main/java/com/direwolf20/buildinggadgets/common/items/AbstractGadget.java
+++ b/src/main/java/com/direwolf20/buildinggadgets/common/items/AbstractGadget.java
@@ -1,18 +1,18 @@
 package com.direwolf20.buildinggadgets.common.items;
 
 
+import com.direwolf20.buildinggadgets.client.renders.BaseRenderer;
 import com.direwolf20.buildinggadgets.common.BuildingGadgets;
-import com.direwolf20.buildinggadgets.common.tainted.building.view.BuildContext;
 import com.direwolf20.buildinggadgets.common.capability.CapabilityProviderEnergy;
 import com.direwolf20.buildinggadgets.common.capability.IPrivateEnergy;
 import com.direwolf20.buildinggadgets.common.capability.provider.MultiCapabilityProvider;
 import com.direwolf20.buildinggadgets.common.commands.ForceUnloadedCommand;
-import com.direwolf20.buildinggadgets.common.tainted.concurrent.UndoScheduler;
 import com.direwolf20.buildinggadgets.common.config.Config;
+import com.direwolf20.buildinggadgets.common.items.modes.*;
+import com.direwolf20.buildinggadgets.common.tainted.building.view.BuildContext;
+import com.direwolf20.buildinggadgets.common.tainted.concurrent.UndoScheduler;
 import com.direwolf20.buildinggadgets.common.tainted.inventory.IItemIndex;
 import com.direwolf20.buildinggadgets.common.tainted.inventory.InventoryHelper;
-import com.direwolf20.buildinggadgets.common.items.modes.*;
-import com.direwolf20.buildinggadgets.client.renders.BaseRenderer;
 import com.direwolf20.buildinggadgets.common.tainted.save.SaveManager;
 import com.direwolf20.buildinggadgets.common.tainted.save.Undo;
 import com.direwolf20.buildinggadgets.common.tainted.save.UndoWorldSave;
@@ -44,6 +44,7 @@
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.energy.CapabilityEnergy;
@@ -52,6 +53,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nullable;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -62,16 +64,16 @@
 
 public abstract class AbstractGadget extends Item {
     private BaseRenderer renderer;
-    private final ITag.INamedTag<Block> whiteList;
-    private final ITag.INamedTag<Block> blackList;
+    private final Tags.IOptionalNamedTag<Block> whiteList;
+    private final Tags.IOptionalNamedTag<Block> blackList;
     private Supplier<UndoWorldSave> saveSupplier;
 
     public AbstractGadget(Properties builder, IntSupplier undoLengthSupplier, String undoName, ResourceLocation whiteListTag, ResourceLocation blackListTag) {
         super(builder.setNoRepair());
 
         renderer = DistExecutor.runForDist(this::createRenderFactory, () -> () -> null);
-        this.whiteList = BlockTags.makeWrapperTag(whiteListTag.toString());
-        this.blackList = BlockTags.makeWrapperTag(blackListTag.toString());
+        this.whiteList = BlockTags.createOptional(whiteListTag, new HashSet<>());
+        this.blackList = BlockTags.createOptional(blackListTag, new HashSet<>());
         saveSupplier = SaveManager.INSTANCE.registerUndoSave(w -> SaveManager.getUndoSave(w, undoLengthSupplier, undoName));
     }