diff --git a/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java b/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java
index 27c7c083e..b979ae724 100644
--- a/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java
+++ b/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java
@@ -7,16 +7,16 @@ import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType;
 import com.refinedmods.refinedstorage.block.*;
 import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem;
 import com.refinedmods.refinedstorage.util.ColorMap;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public final class RSBlocks {
     public static final RegistryObject<ImporterBlock> IMPORTER;
@@ -28,6 +28,7 @@ public final class RSBlocks {
     public static final RegistryObject<ExternalStorageBlock> EXTERNAL_STORAGE;
     public static final Map<ItemStorageType, RegistryObject<StorageBlock>> STORAGE_BLOCKS = new EnumMap<>(ItemStorageType.class);
     public static final Map<FluidStorageType, RegistryObject<FluidStorageBlock>> FLUID_STORAGE_BLOCKS = new EnumMap<>(FluidStorageType.class);
+    public static final Map<TagKey<Block>, ColorMap<? extends Block>> COLORED_BLOCK_TAGS = new HashMap<>();
     public static final RegistryObject<InterfaceBlock> INTERFACE;
     public static final RegistryObject<FluidInterfaceBlock> FLUID_INTERFACE;
     public static final RegistryObject<StorageMonitorBlock> STORAGE_MONITOR;
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java
index edba36433..dc856066f 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java
@@ -10,6 +10,7 @@ import com.refinedmods.refinedstorage.item.blockitem.ColoredBlockItem;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -77,6 +78,7 @@ public class ColorMap<T extends IForgeRegistryEntry<? super T>> {
             map.put(color, (RegistryObject<T>) block);
             RSBlocks.COLORED_BLOCKS.add(block);
         }
+        RSBlocks.COLORED_BLOCK_TAGS.put(BlockTags.create(new ResourceLocation(RS.ID, get(DEFAULT_COLOR).getId().getPath())), (ColorMap<S>) this);
     }
 
     public <S extends BaseBlock> void registerItemsFromBlocks(ColorMap<S> blockMap) {