diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json
index 4d9184f06..d05bfc446 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json
@@ -1,5 +1,7 @@
 {
+	"credit": "Made with Blockbench",
 	"parent": "block/block",
+	"texture_size": [16, 32],
 	"textures": {
 		"particle": "overdrive_that_matters:block/matter_replicator",
 		"texture": "overdrive_that_matters:block/matter_replicator"
@@ -37,11 +39,9 @@
 			"to": [8, 16, 6],
 			"faces": {
 				"north": {"uv": [4, 13.25, 8, 14.5], "texture": "#texture"},
-				"east": {"uv": [0, 0, 5, 5], "texture": "#missing"},
 				"south": {"uv": [4, 14.5, 8, 15.75], "texture": "#texture"},
 				"west": {"uv": [8.5, 4, 11, 5.25], "texture": "#texture"},
-				"up": {"uv": [4, 12, 8, 13.25], "texture": "#texture"},
-				"down": {"uv": [0, 0, 8, 5], "texture": "#missing"}
+				"up": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}
 			}
 		},
 		{
@@ -53,60 +53,95 @@
 				"east": {"uv": [5, 4, 8, 5.25], "texture": "#texture"},
 				"south": {"uv": [0, 12.25, 4, 13.5], "rotation": 180, "texture": "#texture"},
 				"west": {"uv": [5, 4, 8, 5.25], "texture": "#texture"},
-				"up": {"uv": [0, 12, 4, 13.5], "texture": "#texture"},
-				"down": {"uv": [0, 0, 8, 6], "texture": "#missing"}
+				"up": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "canisterlight",
+			"from": [5, 11, 11],
+			"to": [14, 15, 15],
+			"faces": {
+				"north": {"uv": [11, 12, 15.5, 13], "rotation": 180, "texture": "#texture"},
+				"south": {"uv": [11, 12, 15.5, 13], "texture": "#texture"},
+				"up": {"uv": [11, 12, 15.5, 13], "texture": "#texture"}
+			},
+			"forge_data": { "block_light": 15, "sky_light": 15 }
+		},
+		{
+			"name": "canister",
+			"from": [14, 11, 11],
+			"to": [15, 15, 15],
+			"faces": {
+				"north": {"uv": [15.5, 12, 16, 13], "rotation": 180, "texture": "#texture"},
+				"east": {"uv": [8, 12, 10, 13], "texture": "#texture"},
+				"south": {"uv": [15.5, 12, 16, 13], "texture": "#texture"},
+				"up": {"uv": [15.5, 12, 16, 13], "texture": "#texture"}
 			}
 		},
 		{
 			"name": "canister",
 			"from": [3, 11, 11],
-			"to": [15, 15, 15],
+			"to": [5, 15, 15],
 			"faces": {
-				"north": {"uv": [10, 12, 16, 13], "rotation": 180, "texture": "#texture"},
-				"east": {"uv": [8, 12, 10, 13], "texture": "#texture"},
-				"south": {"uv": [10, 12, 16, 13], "texture": "#texture"},
+				"north": {"uv": [10, 12, 11, 13], "rotation": 180, "texture": "#texture"},
+				"south": {"uv": [10, 12, 11, 13], "texture": "#texture"},
 				"west": {"uv": [8, 12, 10, 13], "texture": "#texture"},
-				"up": {"uv": [10, 12, 16, 13], "texture": "#texture"},
-				"down": {"uv": [0, 0, 6, 1], "texture": "#missing"}
+				"up": {"uv": [10, 12, 11, 13], "texture": "#texture"}
 			}
 		},
 		{
 			"name": "canister",
 			"from": [3, 11, 6],
+			"to": [5, 15, 10],
+			"faces": {
+				"south": {"uv": [10, 12, 11, 13], "texture": "#texture"},
+				"west": {"uv": [8, 12, 10, 13], "texture": "#texture"},
+				"up": {"uv": [10, 12, 11, 13], "texture": "#texture"},
+				"down": {"uv": [0, 0, 6, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "canisterlight",
+			"from": [5, 11, 6],
+			"to": [14, 15, 10],
+			"faces": {
+				"south": {"uv": [11, 12, 15.5, 13], "texture": "#texture"},
+				"up": {"uv": [11, 12, 15.5, 13], "texture": "#texture"},
+				"down": {"uv": [0, 0, 6, 1], "texture": "#missing"}
+			},
+			"forge_data": { "block_light": 15, "sky_light": 15 }
+		},
+		{
+			"name": "canister",
+			"from": [14, 11, 6],
 			"to": [15, 15, 10],
 			"faces": {
-				"north": {"uv": [0, 0, 6, 1], "texture": "#missing"},
 				"east": {"uv": [8, 12, 10, 13], "texture": "#texture"},
-				"south": {"uv": [10, 12, 16, 13], "texture": "#texture"},
-				"west": {"uv": [8, 12, 10, 13], "texture": "#texture"},
-				"up": {"uv": [10, 12, 16, 13], "texture": "#texture"},
+				"south": {"uv": [15.5, 12, 16, 13], "texture": "#texture"},
+				"up": {"uv": [15.5, 12, 16, 13], "texture": "#texture"},
 				"down": {"uv": [0, 0, 6, 1], "texture": "#missing"}
 			}
 		},
 		{
 			"name": "pipe",
-			"from": [1, 11, 7],
+			"from": [0, 11, 7],
 			"to": [3, 14, 9],
 			"faces": {
 				"north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"},
-				"east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"},
 				"south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"},
 				"west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"},
-				"up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"},
-				"down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}
+				"up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}
 			}
 		},
 		{
 			"name": "pipe",
-			"from": [1, 11, 12],
+			"from": [0, 11, 12],
 			"to": [3, 14, 14],
 			"faces": {
-				"north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"},
-				"east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"},
+				"north": {"uv": [1, 14, 0, 14.75], "texture": "#texture"},
 				"south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"},
 				"west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"},
-				"up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"},
-				"down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}
+				"up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}
 			}
 		},
 		{
@@ -162,102 +197,90 @@
 			}
 		},
 		{
+			"name": "body",
 			"from": [1, 0, 0],
 			"to": [15, 1, 16],
 			"faces": {
 				"north": {"uv": [0.5, 3.75, 7.5, 4], "texture": "#texture"},
-				"east": {"uv": [0, 0, 8, 0.25], "texture": "#missing"},
 				"south": {"uv": [8.5, 3.75, 15.5, 4], "texture": "#texture"},
-				"west": {"uv": [0, 0, 8, 0.25], "texture": "#missing"},
 				"up": {"uv": [0.5, 8, 7.5, 12], "rotation": 180, "texture": "#texture"},
 				"down": {"uv": [8.5, 8, 15.5, 12], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [8, 7, 0],
 			"to": [15, 11, 1],
 			"faces": {
 				"north": {"uv": [0.5, 1.25, 4, 2.25], "texture": "#texture"},
-				"east": {"uv": [0, 0, 0.5, 0.75], "texture": "#missing"},
 				"south": {"uv": [0, 0, 3.5, 1], "texture": "#texture"},
 				"west": {"uv": [3.5, 1.25, 4, 2], "texture": "#texture"},
-				"up": {"uv": [0, 0, 3.5, 0.25], "texture": "#missing"},
 				"down": {"uv": [0.5, 2, 4, 2.25], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [1, 9, 0],
 			"to": [8, 11, 1],
 			"faces": {
 				"north": {"uv": [4, 1.25, 7.5, 1.75], "texture": "#texture"},
 				"east": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
 				"south": {"uv": [4, 1.25, 7, 1.75], "texture": "#texture"},
-				"west": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
 				"up": {"uv": [4, 11.75, 7.5, 12], "texture": "#texture"},
 				"down": {"uv": [1.5, 3.5, 5, 3.75], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [1, 1, 0],
 			"to": [2, 9, 1],
 			"faces": {
 				"north": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"},
 				"east": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"},
-				"south": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"},
-				"west": {"uv": [0, 0, 0.5, 2], "texture": "#missing"},
-				"up": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+				"south": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [14, 1, 0],
 			"to": [15, 7, 1],
 			"faces": {
 				"north": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"},
-				"east": {"uv": [0, 0, 0.5, 1.75], "texture": "#missing"},
 				"south": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"},
-				"west": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"},
-				"up": {"uv": [0.5, 3.25, 1, 3.5], "texture": "#texture"},
-				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
+				"west": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [2, 1, 0],
 			"to": [14, 2, 1],
 			"faces": {
 				"north": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"},
-				"east": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
 				"south": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"},
-				"west": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
-				"up": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"},
-				"down": {"uv": [0, 0, 6, 0.25], "texture": "#missing"}
+				"up": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [1, 10, 1],
 			"to": [15, 11, 15],
 			"faces": {
-				"north": {"uv": [0, 0, 7, 0.25], "texture": "#missing"},
-				"east": {"uv": [0, 0, 7, 0.25], "texture": "#missing"},
-				"south": {"uv": [0, 0, 7, 0.25], "texture": "#missing"},
-				"west": {"uv": [0, 0, 7, 0.25], "texture": "#missing"},
 				"up": {"uv": [0.5, 8.25, 7.5, 11.75], "rotation": 180, "texture": "#texture"},
 				"down": {"uv": [8.5, 8.25, 15.5, 11.75], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [1, 1, 15],
 			"to": [15, 11, 16],
 			"faces": {
 				"north": {"uv": [8.5, 9, 15.5, 11.5], "texture": "#texture"},
-				"east": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"},
 				"south": {"uv": [8.5, 1.25, 15.5, 3.75], "texture": "#texture"},
-				"west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"},
-				"up": {"uv": [0.5, 8, 7.5, 8.25], "texture": "#texture"},
-				"down": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}
+				"up": {"uv": [0.5, 8, 7.5, 8.25], "texture": "#texture"}
 			}
 		},
 		{
+			"name": "body",
 			"from": [3, 1, 3],
 			"to": [13, 2, 13],
 			"faces": {
@@ -268,6 +291,30 @@
 				"up": {"uv": [10.5, 13, 16, 15.75], "texture": "#texture"},
 				"down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}
 			}
+		},
+		{
+			"from": [-2, 10, 7.1],
+			"to": [0, 14, 8.9],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 8]},
+			"faces": {
+				"north": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"},
+				"south": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"},
+				"west": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"},
+				"up": {"uv": [8.5, 13.25, 9.5, 13.75], "texture": "#texture"},
+				"down": {"uv": [8.5, 14.75, 9.5, 15.25], "texture": "#texture"}
+			}
+		},
+		{
+			"from": [-2, 10, 12.1],
+			"to": [0, 14, 13.9],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 8]},
+			"faces": {
+				"north": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"},
+				"south": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"},
+				"west": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"},
+				"up": {"uv": [8.5, 13.25, 9.5, 13.75], "texture": "#texture"},
+				"down": {"uv": [8.5, 14.75, 9.5, 15.25], "texture": "#texture"}
+			}
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg b/src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg
index 82f78ecdf..7e73c1313 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg and b/src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png
index bb8aec884..b40212a31 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png
index 2804aa7a1..ea2c4f689 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png
index 5044a04ce..c53cc03d3 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png differ