diff --git a/build.gradle b/build.gradle
index b0e1812..0046156 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
 	id "me.shedaniel.unified-publishing" version "0.1.+" apply false
 	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
diff --git a/common/src/main/java/eu/midnightdust/betterbeds/mixin/MixinBedBlock.java b/common/src/main/java/eu/midnightdust/betterbeds/mixin/MixinBedBlock.java
index 8102241..bc1f1e3 100644
--- a/common/src/main/java/eu/midnightdust/betterbeds/mixin/MixinBedBlock.java
+++ b/common/src/main/java/eu/midnightdust/betterbeds/mixin/MixinBedBlock.java
@@ -1,11 +1,10 @@
 package eu.midnightdust.betterbeds.mixin;
 
-import net.minecraft.block.*;
+import net.minecraft.block.BedBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.HorizontalFacingBlock;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(value = BedBlock.class, priority = 2000)
 public abstract class MixinBedBlock extends HorizontalFacingBlock {
@@ -14,13 +13,7 @@ public abstract class MixinBedBlock extends HorizontalFacingBlock {
         super(settings);
     }
 
-    @Inject(at = @At("RETURN"), method = "getRenderType", cancellable = true)
-    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
-        cir.setReturnValue(BlockRenderType.MODEL);
-    }
-
     @Override
-    @SuppressWarnings("deprecation")
     public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
         return neighborState.getBlock() instanceof BedBlock;
     }
diff --git a/common/src/main/resources/assets/minecraft/items/black_bed.json b/common/src/main/resources/assets/minecraft/items/black_bed.json
new file mode 100644
index 0000000..400f705
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/black_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/black_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/blue_bed.json b/common/src/main/resources/assets/minecraft/items/blue_bed.json
new file mode 100644
index 0000000..0c09634
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/blue_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/blue_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/brown_bed.json b/common/src/main/resources/assets/minecraft/items/brown_bed.json
new file mode 100644
index 0000000..23e51ea
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/brown_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/brown_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/cyan_bed.json b/common/src/main/resources/assets/minecraft/items/cyan_bed.json
new file mode 100644
index 0000000..ce2b9a6
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/cyan_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/cyan_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/gray_bed.json b/common/src/main/resources/assets/minecraft/items/gray_bed.json
new file mode 100644
index 0000000..48ef011
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/gray_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/gray_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/green_bed.json b/common/src/main/resources/assets/minecraft/items/green_bed.json
new file mode 100644
index 0000000..3eb557d
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/green_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/green_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/light_blue_bed.json b/common/src/main/resources/assets/minecraft/items/light_blue_bed.json
new file mode 100644
index 0000000..48cbb84
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/light_blue_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/light_blue_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/light_gray_bed.json b/common/src/main/resources/assets/minecraft/items/light_gray_bed.json
new file mode 100644
index 0000000..15109a4
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/light_gray_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/light_gray_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/lime_bed.json b/common/src/main/resources/assets/minecraft/items/lime_bed.json
new file mode 100644
index 0000000..b499ed8
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/lime_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/lime_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/magenta_bed.json b/common/src/main/resources/assets/minecraft/items/magenta_bed.json
new file mode 100644
index 0000000..3247346
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/magenta_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/magenta_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/orange_bed.json b/common/src/main/resources/assets/minecraft/items/orange_bed.json
new file mode 100644
index 0000000..72752b4
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/orange_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/orange_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/pink_bed.json b/common/src/main/resources/assets/minecraft/items/pink_bed.json
new file mode 100644
index 0000000..b47f597
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/pink_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/pink_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/purple_bed.json b/common/src/main/resources/assets/minecraft/items/purple_bed.json
new file mode 100644
index 0000000..e0046eb
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/purple_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/purple_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/red_bed.json b/common/src/main/resources/assets/minecraft/items/red_bed.json
new file mode 100644
index 0000000..53f8b75
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/red_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/red_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/white_bed.json b/common/src/main/resources/assets/minecraft/items/white_bed.json
new file mode 100644
index 0000000..e6503ce
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/white_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/white_bed"
+  }
+}
\ No newline at end of file
diff --git a/common/src/main/resources/assets/minecraft/items/yellow_bed.json b/common/src/main/resources/assets/minecraft/items/yellow_bed.json
new file mode 100644
index 0000000..0f8e9d4
--- /dev/null
+++ b/common/src/main/resources/assets/minecraft/items/yellow_bed.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/yellow_bed"
+  }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 2e3b21b..ea9d7f4 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=betterbeds
-mod_version=1.4.0
+mod_version=1.4.1
 maven_group=eu.midnightdust
 release_type=release
 curseforge_id=443782
 modrinth_id=kKwy3HU9
 
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_loader_version=0.16.9
+fabric_api_version=0.111.0+1.21.4
 
-neoforge_version=21.0.14-beta
+neoforge_version=21.4.10-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 quilt_loader_version=0.19.0-beta.18