diff --git a/src/main/resources/assets/portalcubed/blockstates/conversion_gel.json b/src/main/resources/assets/portalcubed/blockstates/conversion_gel.json
index 506dce1d..1ddedb23 100644
--- a/src/main/resources/assets/portalcubed/blockstates/conversion_gel.json
+++ b/src/main/resources/assets/portalcubed/blockstates/conversion_gel.json
@@ -1,64 +1,149 @@
 {
   "multipart": [
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel"
+      },
       "when": {
         "north": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel"
       },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 270
+        "y": 90
+      },
+      "when": {
+        "east": "true"
       }
     },
     {
-      "when": {
-        "east": "true"
-      },
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 270,
         "y": 90
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "y": 180
+      },
       "when": {
         "south": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 90
+        "y": 180
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "y": 270
+      },
       "when": {
         "west": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 90,
-        "y": 90
+        "y": 270
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "x": 270
+      },
       "when": {
         "up": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
         "uvlock": true,
-        "x": 180
+        "x": 270
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     },
     {
+      "apply": {
+        "model": "portalcubed:block/conversion_gel",
+        "uvlock": true,
+        "x": 90
+      },
       "when": {
         "down": "true"
-      },
+      }
+    },
+    {
       "apply": {
         "model": "portalcubed:block/conversion_gel",
-        "uvlock": true
+        "uvlock": true,
+        "x": 90
+      },
+      "when": {
+        "down": "false",
+        "east": "false",
+        "north": "false",
+        "south": "false",
+        "up": "false",
+        "west": "false"
       }
     }
   ]
diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json
index c81c1143..68277c42 100644
--- a/src/main/resources/assets/portalcubed/lang/en_us.json
+++ b/src/main/resources/assets/portalcubed/lang/en_us.json
@@ -64,18 +64,20 @@
   "item.portalcubed.portal_gun": "Portal Gun",
   "item.portalcubed.portal_gun_primary": "Primary Portal Gun",
   "item.portalcubed.portal_gun_secondary": "Secondary Portal Gun",
-  "item.portalcubed.portal_gun_frame": "Portal Gun Barrel",
+  "item.portalcubed.portal_gun_frame": "Portal Gun Frame",
   "item.portalcubed.portal_gun_casing": "Portal Gun Casing",
   "item.portalcubed.paint_gun": "Paint Gun",
   "item.portalcubed.mini_blackhole": "Miniature Black Hole",
   "item.portalcubed.toxic_goo_bucket": "Toxic Goo Bucket",
 
-  "item.portalcubed.base_gel": "Gel Blob",
-
   "item.portalcubed.turret": "Sentry Turret",
+  "block.portalcubed.rocket_turret": "Rocket Turret",
 
   "block.portalcubed.power_block": "Power Block",
+  "block.portalcubed.velocity_helper": "Velocity Helper",
+  "block.portalcubed.catapult": "Catapult",
 
+  "item.portalcubed.base_gel": "Gel Blob",
   "block.portalcubed.propulsion_gel": "Propulsion Gel Blob",
   "block.portalcubed.repulsion_gel": "Repulsion Gel Blob",
   "block.portalcubed.adhesion_gel": "Adhesion Gel Blob",
@@ -83,10 +85,6 @@
   "block.portalcubed.reflection_gel": "Reflection Gel Blob",
 
   "block.portalcubed.auto_portal": "Auto Portal",
-  "block.portalcubed.velocity_helper": "Velocity Helper",
-  "block.portalcubed.catapult": "Catapult",
-
-  "block.portalcubed.rocket_turret": "Rocket Turret",
 
   "block.portalcubed.sewage": "Sewage",
 
diff --git a/src/main/resources/assets/portalcubed/models/block/conversion_gel.json b/src/main/resources/assets/portalcubed/models/block/conversion_gel.json
index 6cf94bdf..dddb47c3 100644
--- a/src/main/resources/assets/portalcubed/models/block/conversion_gel.json
+++ b/src/main/resources/assets/portalcubed/models/block/conversion_gel.json
@@ -1,20 +1,16 @@
 {
-	"credit": "Made with Blockbench",
+	"ambientocclusion": false,
 	"textures": {
-		"0": "portalcubed:block/conversion_gel",
-		"particle": "portalcubed:block/conversion_gel"
+		"particle": "portalcubed:block/conversion_gel",
+		"conversion_gel": "portalcubed:block/conversion_gel"
 	},
 	"elements": [
-		{
-			"from": [0, 0, 0],
-			"to": [16, 0.01, 16],
+		{   "from": [ 0, 0, 0.1 ],
+			"to": [ 16, 16, 0.1 ],
 			"faces": {
-				"north": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"east": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"south": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"west": {"uv": [0, 0, 16, 1], "texture": "#0"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#0"}
+				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#conversion_gel" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#conversion_gel" }
 			}
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json b/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json
index b4f98b19..206a96a7 100644
--- a/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json
+++ b/src/main/resources/assets/portalcubed/models/block/laser_relay_active.json
@@ -3,7 +3,6 @@
 	"texture_size": [64, 64],
 	"textures": {
 		"0": "portalcubed:block/laser_emitter",
-		"1": "portalcubed:block/laser_emitter_e",
 		"3": "portalcubed:block/laser_relay_active",
 		"particle": "portalcubed:block/padded_gray_panel"
 	},
@@ -63,25 +62,6 @@
 				"west": {"uv": [10.758, 13.258, 11.008, 13.508], "rotation": 270, "texture": "#0"}
 			}
 		},
-		{
-			"from": [4.65, 7.75, 3.5],
-			"to": [11.4, 8.25, 8.5],
-			"rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]},
-			"faces": {
-				"west": {"uv": [8.258, 0.008, 9.508, 0.008], "texture": "#1"},
-				"up": {"uv": [8.008, 0.008, 9.258, 1.758], "rotation": 270, "texture": "#1"},
-				"down": {"uv": [9.258, 0.008, 8.008, 1.758], "rotation": 270, "texture": "#1"}
-			}
-		},
-		{
-			"from": [4.625, 7.75, 3.5],
-			"to": [11.375, 8.25, 8.5],
-			"rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 5]},
-			"faces": {
-				"up": {"uv": [8.008, 0.008, 9.258, 1.758], "rotation": 270, "texture": "#1"},
-				"down": {"uv": [9.258, 0.008, 8.008, 1.758], "rotation": 270, "texture": "#1"}
-			}
-		},
 		{
 			"name": "cube inverted",
 			"from": [11, 11, 10.75],
diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun.json b/src/main/resources/assets/portalcubed/models/item/portal_gun.json
index bb3d3a00..78c94e16 100644
--- a/src/main/resources/assets/portalcubed/models/item/portal_gun.json
+++ b/src/main/resources/assets/portalcubed/models/item/portal_gun.json
@@ -1,6 +1,6 @@
 {
 	"credit": "Made with Blockbench by Cart3r.  ",
-	"texture_size": [64, 64],
+	"texture_size": [32, 32],
 	"textures": {
 		"0": "portalcubed:item/portal_gun",
 		"1": "portalcubed:item/portal_gun_dyeable",
@@ -8,148 +8,253 @@
 	},
 	"elements": [
 		{
-			"from": [4.5, 0, 8.5],
-			"to": [11.5, 6, 18.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6, 1, 1],
+			"to": [10, 3, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -2]},
 			"faces": {
-				"north": {"uv": [1.265, 4.015, 2.985, 5.485], "texture": "#0"},
-				"east": {"uv": [0.015, 2.515, 2.485, 3.985], "texture": "#0"},
-				"south": {"uv": [3.015, 4.015, 4.735, 5.485], "texture": "#0"},
-				"west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"},
-				"up": {"uv": [1.735, 2.485, 0.015, 0.015], "texture": "#0"},
-				"down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"}
+				"north": {"uv": [7.516, 11.516, 9.484, 12.484], "texture": "#0"},
+				"east": {"uv": [14.484, 7.516, 10.516, 8.484], "texture": "#0"},
+				"west": {"uv": [10.516, 7.516, 14.484, 8.484], "texture": "#0"},
+				"up": {"uv": [7.484, 12.484, 5.516, 8.516], "texture": "#0"},
+				"down": {"uv": [10.484, 5.516, 8.516, 8.984], "texture": "#0"}
 			}
 		},
 		{
-			"from": [7.5, 6.025, 10.5],
-			"to": [8.5, 6.025, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.49, 0.49, -0.01],
+			"to": [10.51, 4.51, 7.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"east": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"south": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"west": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"up": {"uv": [5.235, 3.735, 5.015, 3.515], "texture": "#1", "tintindex": 0},
-				"down": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0}
+				"north": {"uv": [2.484, 10.516, 0.016, 12.484], "texture": "#0"},
+				"east": {"uv": [13.984, 5.516, 10.516, 7.484], "texture": "#0"},
+				"south": {"uv": [4.984, 11.016, 2.516, 12.984], "texture": "#0"},
+				"west": {"uv": [13.484, 9.016, 10.016, 10.984], "texture": "#0"},
+				"down": {"uv": [15.984, 0.016, 13.532, 3.468], "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.5, 0, -0.5],
-			"to": [11.5, 3, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [4.98, 0.98, 8.48],
+			"to": [11.02, 6.02, 17.52],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [7.765, 3.265, 9.485, 3.985], "texture": "#0"},
-				"east": {"uv": [7.765, 4.765, 9.235, 5.485], "texture": "#0"},
-				"south": {"uv": [7.765, 4.015, 9.485, 4.735], "texture": "#0"},
-				"west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"},
-				"up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"},
-				"down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"}
+				"north": {"uv": [2.516, 8.516, 5.484, 10.984], "texture": "#0"},
+				"east": {"uv": [4.468, 13.016, 0.016, 15.484], "texture": "#0"},
+				"south": {"uv": [11.484, 3.016, 8.516, 5.484], "texture": "#0"},
+				"west": {"uv": [0.016, 13.016, 4.468, 15.484], "texture": "#0"},
+				"up": {"uv": [0.016, 0.016, 2.984, 4.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [5.5, 0.75, 4.5],
-			"to": [10.5, 3.75, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.98, 5.955, 10.78],
+			"to": [9.02, 5.995, 13.82],
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 5.975, 11.8]},
 			"faces": {
-				"east": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"},
-				"down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"}
+				"up": {"uv": [14.516, 14.516, 15.984, 15.984], "texture": "#1"}
 			}
 		},
 		{
-			"from": [7, 3.75, 3.5],
-			"to": [9, 4.75, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6, 3, 1],
+			"to": [10, 5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"east": {"uv": [9.758, 1.758, 10.992, 1.992], "texture": "#1", "tintindex": 0},
-				"south": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"west": {"uv": [9.758, 1.758, 10.992, 1.992], "texture": "#1", "tintindex": 0},
-				"up": {"uv": [10.242, 1.242, 9.758, 0.008], "texture": "#1", "tintindex": 0},
-				"down": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0}
+				"north": {"uv": [11.516, 2.516, 13.484, 3.484], "texture": "#0"},
+				"east": {"uv": [13.484, 4.516, 11.516, 5.484], "texture": "#0"},
+				"south": {"uv": [11.516, 3.516, 13.484, 4.484], "texture": "#0"},
+				"west": {"uv": [11.516, 4.516, 13.484, 5.484], "texture": "#0"},
+				"up": {"uv": [11.984, 12.984, 10.016, 11.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.5, 3.25, 4.5],
-			"to": [9.5, 5.25, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6.49, 2.365, -1.01],
+			"to": [8.51, 4.385, 1.06],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.45]},
 			"faces": {
-				"east": {"uv": [11.008, 0.008, 11.492, 1.125], "rotation": 90, "texture": "#0", "tintindex": 0},
-				"west": {"uv": [11.008, 0.008, 11.492, 1.125], "rotation": 90, "texture": "#0", "tintindex": 0},
-				"up": {"uv": [11.008, 0.008, 11.742, 1.125], "texture": "#0", "tintindex": 0}
+				"east": {"uv": [6.484, 12.016, 5.516, 12.984], "texture": "#0"},
+				"west": {"uv": [5.516, 12.016, 6.484, 12.984], "texture": "#0"},
+				"up": {"uv": [5.516, 12.016, 6.484, 12.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [6.484, 12.016, 5.516, 12.984], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, 1, 0.5],
-			"to": [11, 6, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.5, 0.5, 9],
+			"to": [10.5, 5.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [6.515, 0.015, 8.015, 1.265], "texture": "#0"},
-				"east": {"uv": [0.765, 7.765, 1.735, 8.985], "texture": "#0"},
-				"south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"},
-				"west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"},
-				"up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"}
+				"north": {"uv": [7.516, 9.016, 9.984, 11.484], "texture": "#0"},
+				"east": {"uv": [3.484, 5.016, 0.016, 7.484], "texture": "#0"},
+				"south": {"uv": [11.016, 0.016, 13.484, 2.484], "texture": "#0"},
+				"west": {"uv": [0.016, 5.016, 3.484, 7.484], "texture": "#0"},
+				"up": {"uv": [3.516, 8.484, 5.984, 5.016], "texture": "#0"},
+				"down": {"uv": [6.016, 5.016, 8.484, 8.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6, 1.075, -2.25],
-			"to": [10, 5.075, 1.75],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [7.49, 0.49, 15.99],
+			"to": [8.51, 4.51, 18.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"north": {"uv": [8.015, 5.515, 8.985, 6.485], "texture": "#0"},
-				"east": {"uv": [1.765, 8.265, 2.735, 9.235], "texture": "#0"},
-				"west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"},
-				"up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"},
-				"down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"}
+				"south": {"uv": [5.016, 11.016, 5.484, 12.984], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [10.375, -0.4, -5.5],
-			"to": [14.375, -0.4, 1.5],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [15.5, 0, -0.75]},
+			"name": "cube inverted",
+			"from": [11.01, 6.01, 17.51],
+			"to": [4.99, 0.99, 8.49],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"},
-				"down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"}
+				"north": {"uv": [8.516, 5.484, 11.484, 3.016], "texture": "#0"},
+				"east": {"uv": [0.016, 15.484, 4.468, 13.016], "texture": "#0"},
+				"south": {"uv": [2.516, 10.984, 5.484, 8.516], "texture": "#0"},
+				"west": {"uv": [4.468, 15.484, 0.016, 13.016], "texture": "#0"},
+				"down": {"uv": [0.016, 4.484, 2.984, 0.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.425, -0.4, -5.5],
-			"to": [5.425, -0.4, 1.5],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [0.3, 0, -0.75]},
+			"name": "cube inverted",
+			"from": [8.5, 4.5, 18],
+			"to": [7.5, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"},
-				"down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"}
+				"north": {"uv": [5.016, 13.016, 4.984, 12.984], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.484, 11.484], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.484, 11.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [8, 4.875, -5.5],
-			"to": [8, 8.875, 1.5],
-			"rotation": {"angle": 0, "axis": "z", "origin": [15.5, -5, -0.75]},
+			"name": "cube inverted",
+			"from": [10.5, 4.5, 7],
+			"to": [5.5, 0.5, 0],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"},
-				"west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"}
+				"north": {"uv": [4.984, 12.984, 2.516, 11.016], "texture": "#0"},
+				"east": {"uv": [10.516, 7.484, 13.984, 5.516], "texture": "#0"},
+				"south": {"uv": [2.484, 12.484, 0.016, 10.516], "texture": "#0"},
+				"west": {"uv": [13.984, 7.484, 10.516, 5.516], "texture": "#0"},
+				"up": {"uv": [15.984, 0.016, 13.532, 3.468], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [8.5, 4.375, 0.975],
+			"to": [6.5, 2.375, -1.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.525]},
+			"faces": {
+				"north": {"uv": [5.516, 13.984, 6.484, 13.016], "texture": "#0"},
+				"east": {"uv": [5.516, 12.984, 6.484, 12.016], "texture": "#0"},
+				"west": {"uv": [6.484, 12.984, 5.516, 12.016], "texture": "#0"},
+				"up": {"uv": [6.484, 12.984, 5.516, 12.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [9.04, 4.4, 8.975],
+			"to": [7.04, 2.4, 5.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]},
+			"faces": {
+				"north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"},
+				"down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted inverted",
+			"from": [7.715, 3.4, 5.025],
+			"to": [8.715, 4.4, 8.975],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.7, 3.35, 7]},
+			"faces": {
+				"east": {"uv": [14.484, 15.984, 14.016, 14.025], "rotation": 90, "texture": "#1"},
+				"west": {"uv": [14.484, 15.984, 14.016, 14.025], "rotation": 90, "texture": "#1"},
+				"up": {"uv": [14.484, 15.984, 14.016, 14.025], "texture": "#1"},
+				"down": {"uv": [14.484, 15.984, 14.016, 14.025], "texture": "#1"}
+			}
+		},
+		{
+			"from": [1.5, 2.575, -4],
+			"to": [7.5, 2.575, 12],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]},
+			"faces": {
+				"up": {"uv": [3.016, 0.016, 10.984, 2.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 0.016, 3.016, 2.984], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.96492, 3.81711, 2.99],
+			"to": [14.96492, 3.81711, 11.99],
+			"rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]},
+			"faces": {
+				"up": {"uv": [6.532, 13.032, 10.984, 15.484], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 13.032, 6.532, 14.984], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 2.075, -4],
+			"to": [5, 3.075, -4],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 5.516, 6.984, 6.984], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6.516, 5.516, 6.984, 6.984], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.5, 2.575, -4],
+			"to": [14.5, 2.575, 12],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"up": {"uv": [3.016, 2.984, 10.984, 0.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 2.984, 3.016, 0.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.999, 3.02125, -4.01],
+			"to": [7.999, 9.02125, 2.99],
+			"rotation": {"angle": 0, "axis": "z", "origin": [7.999, 5.52125, 8.49]},
+			"faces": {
+				"east": {"uv": [6.484, 2.984, 3.016, 0.016], "texture": "#0"},
+				"west": {"uv": [3.016, 2.984, 6.484, 0.016], "texture": "#0"}
+			}
+		},
+		{
+			"from": [11, 2.075, -4],
+			"to": [14, 3.075, -4],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.5, 5.575, -4],
+			"to": [8.5, 8.575, -4],
+			"rotation": {"angle": 0, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 6.984, 6.984, 5.516], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [6.516, 6.984, 6.984, 5.516], "texture": "#0"}
 			}
 		}
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"thirdperson_lefthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"firstperson_righthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"firstperson_lefthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"ground": {
 			"translation": [0, 4, 0],
@@ -158,7 +263,7 @@
 		"gui": {
 			"rotation": [26.75, -139, 0],
 			"translation": [-1.25, 3, 0],
-			"scale": [0.67383, 0.67383, 0.67383]
+			"scale": [0.73633, 0.73633, 0.73633]
 		},
 		"head": {
 			"translation": [0, 13.75, -1]
diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_casing.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_casing.json
index 0ff0a699..b47a3c31 100644
--- a/src/main/resources/assets/portalcubed/models/item/portal_gun_casing.json
+++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_casing.json
@@ -1,60 +1,86 @@
 {
 	"credit": "Made with Blockbench by Cart3r.  ",
-	"texture_size": [64, 64],
+	"texture_size": [32, 32],
 	"textures": {
 		"0": "portalcubed:item/portal_gun",
 		"particle": "portalcubed:item/portal_gun"
 	},
 	"elements": [
 		{
-			"from": [4.5, 0, 8.5],
-			"to": [11.5, 6, 18.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [4.98, 0.98, 8.48],
+			"to": [11.02, 6.02, 17.52],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [1.265, 4.015, 2.985, 5.485], "texture": "#0"},
-				"east": {"uv": [0.015, 2.515, 2.485, 3.985], "texture": "#0"},
-				"south": {"uv": [3.015, 4.015, 4.735, 5.485], "texture": "#0"},
-				"west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"},
-				"up": {"uv": [1.735, 2.485, 0.015, 0.015], "texture": "#0"},
-				"down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"}
+				"north": {"uv": [2.516, 8.516, 5.484, 10.984], "texture": "#0"},
+				"east": {"uv": [4.468, 13.016, 0, 15.484], "texture": "#0"},
+				"south": {"uv": [11.484, 3.016, 8.516, 5.484], "texture": "#0"},
+				"west": {"uv": [0, 13.016, 4.468, 15.484], "texture": "#0"},
+				"up": {"uv": [0.016, 0.016, 2.984, 4.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.5, 0, -0.5],
-			"to": [11.5, 3, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.49, 0.49, -0.01],
+			"to": [10.51, 4.51, 7.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [7.765, 3.265, 9.485, 3.985], "texture": "#0"},
-				"east": {"uv": [7.765, 4.765, 9.235, 5.485], "texture": "#0"},
-				"south": {"uv": [7.765, 3.265, 9.485, 3.985], "texture": "#0"},
-				"west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"},
-				"up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"},
-				"down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"}
+				"north": {"uv": [2.484, 10.516, 0.016, 12.484], "texture": "#0"},
+				"east": {"uv": [13.984, 5.516, 10.516, 7.484], "texture": "#0"},
+				"south": {"uv": [4.984, 11.016, 2.516, 12.984], "texture": "#0"},
+				"west": {"uv": [13.484, 9.016, 10.016, 10.984], "texture": "#0"},
+				"down": {"uv": [15.984, 0.016, 13.532, 3.468], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [11.01, 6.01, 17.51],
+			"to": [4.99, 0.99, 8.49],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
+			"faces": {
+				"north": {"uv": [8.516, 5.484, 11.484, 3.016], "texture": "#0"},
+				"east": {"uv": [0, 15.484, 4.468, 13.016], "texture": "#0"},
+				"south": {"uv": [2.516, 10.984, 5.484, 8.516], "texture": "#0"},
+				"west": {"uv": [4.468, 15.484, 0, 13.016], "texture": "#0"},
+				"down": {"uv": [0.016, 4.484, 2.984, 0.016], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [10.5, 4.5, 7],
+			"to": [5.5, 0.5, 0],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
+			"faces": {
+				"north": {"uv": [4.984, 12.984, 2.516, 11.016], "texture": "#0"},
+				"east": {"uv": [10.516, 7.484, 13.984, 5.516], "texture": "#0"},
+				"south": {"uv": [2.484, 12.484, 0.016, 10.516], "texture": "#0"},
+				"west": {"uv": [13.984, 7.484, 10.516, 5.516], "texture": "#0"},
+				"up": {"uv": [16, 0, 13.532, 3.468], "texture": "#0"}
 			}
 		}
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation": [0, 3.25, -2.75],
-			"scale": [0.80273, 0.80273, 0.80273]
+			"rotation": [0, 47, 0],
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
 		},
 		"thirdperson_lefthand": {
-			"translation": [0, 3.25, -2.75],
-			"scale": [0.80273, 0.80273, 0.80273]
+			"rotation": [0, 47, 0],
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
 		},
 		"firstperson_righthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [180, 61.25, -180],
+			"translation": [1.38, 5.95, 1.13],
+			"scale": [0.46711, 0.46711, 0.46711]
 		},
 		"firstperson_lefthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [180, 61.25, -180],
+			"translation": [1.38, 5.95, 1.13],
+			"scale": [0.46711, 0.46711, 0.46711]
 		},
 		"ground": {
-			"translation": [0, 3.5, 0],
-			"scale": [0.58984, 0.58984, 0.58984]
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
 		},
 		"gui": {
 			"rotation": [26.75, -139, 0],
@@ -62,11 +88,11 @@
 			"scale": [0.78711, 0.78711, 0.78711]
 		},
 		"head": {
-			"translation": [0, 13.75, -1]
+			"rotation": [0, -1, 0],
+			"translation": [0, 13, 0.75]
 		},
 		"fixed": {
-			"rotation": [0, -87.75, 0],
-			"translation": [0, 4.75, -1.25]
+			"rotation": [0, -89.75, 0]
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json
index 209c0658..23921b3b 100644
--- a/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json
+++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json
@@ -1,103 +1,135 @@
 {
 	"credit": "Made with Blockbench by Cart3r.  ",
-	"texture_size": [64, 64],
+	"texture_size": [32, 32],
 	"textures": {
 		"0": "portalcubed:item/portal_gun",
 		"particle": "portalcubed:item/portal_gun"
 	},
 	"elements": [
 		{
-			"from": [5.5, 0.75, 9.5],
-			"to": [10.5, 3.75, 13.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 5]},
+			"from": [6, 1, 1],
+			"to": [10, 3, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -2]},
 			"faces": {
-				"east": {"uv": [7.25, 1.5, 8.5, 2.25], "texture": "#0"},
-				"south": {"uv": [7.25, 1.5, 8.5, 2.25], "texture": "#0"},
-				"west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"},
-				"down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"}
+				"north": {"uv": [7.516, 11.516, 9.484, 12.484], "texture": "#0"},
+				"east": {"uv": [14.484, 7.516, 10.516, 8.484], "texture": "#0"},
+				"west": {"uv": [10.516, 7.516, 14.484, 8.484], "texture": "#0"},
+				"up": {"uv": [7.484, 12.484, 5.516, 8.516], "texture": "#0"},
+				"down": {"uv": [10.484, 5.516, 8.516, 8.984], "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, 1, 5.5],
-			"to": [11, 6, 9.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 5]},
+			"from": [6, 3, 1],
+			"to": [10, 5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [6.515, 0.015, 8.015, 1.265], "texture": "#0"},
-				"east": {"uv": [0.765, 7.765, 1.735, 8.985], "texture": "#0"},
-				"south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"},
-				"west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"},
-				"up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"},
-				"down": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"}
+				"north": {"uv": [11.516, 2.516, 13.484, 3.484], "texture": "#0"},
+				"east": {"uv": [13.484, 4.516, 11.516, 5.484], "texture": "#0"},
+				"south": {"uv": [11.516, 3.516, 13.484, 4.484], "texture": "#0"},
+				"west": {"uv": [11.516, 4.516, 13.484, 5.484], "texture": "#0"},
+				"up": {"uv": [11.984, 12.984, 10.016, 11.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6, 1.075, 2.75],
-			"to": [10, 5.075, 6.75],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 5]},
+			"from": [6.49, 2.365, -1.01],
+			"to": [8.51, 4.385, 1.06],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.45]},
 			"faces": {
-				"north": {"uv": [8.015, 5.515, 8.985, 6.485], "texture": "#0"},
-				"east": {"uv": [1.765, 8.265, 2.735, 9.235], "texture": "#0"},
-				"west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"},
-				"up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"},
-				"down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"}
+				"east": {"uv": [6.484, 12.016, 5.516, 12.984], "texture": "#0"},
+				"west": {"uv": [5.516, 12.016, 6.484, 12.984], "texture": "#0"},
+				"up": {"uv": [5.516, 12.016, 6.484, 12.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [6.484, 12.016, 5.516, 12.984], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [10.375, -0.4, -0.5],
-			"to": [14.375, -0.4, 6.5],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [15.5, 0, 4.25]},
+			"from": [5.5, 0.5, 9],
+			"to": [10.5, 5.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"},
-				"down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"}
+				"north": {"uv": [7.516, 9.016, 9.984, 11.484], "texture": "#0"},
+				"east": {"uv": [3.484, 5.016, 0.016, 7.484], "texture": "#0"},
+				"south": {"uv": [11.016, 0.016, 13.484, 2.484], "texture": "#0"},
+				"west": {"uv": [0.016, 5.016, 3.484, 7.484], "texture": "#0"},
+				"up": {"uv": [3.516, 8.484, 5.984, 5.016], "texture": "#0"},
+				"down": {"uv": [6.016, 5.016, 8.484, 8.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.425, -0.4, -0.5],
-			"to": [5.425, -0.4, 6.5],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [0.3, 0, 4.25]},
+			"from": [7.49, 0.49, 15.99],
+			"to": [8.51, 4.51, 18.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"},
-				"down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"}
+				"south": {"uv": [5.016, 11.016, 5.484, 12.984], "texture": "#0"},
+				"up": {"uv": [8.516, 12.484, 8.984, 11.516], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [8, 4.875, -0.5],
-			"to": [8, 8.875, 6.5],
-			"rotation": {"angle": 0, "axis": "z", "origin": [15.5, -5, 4.25]},
+			"name": "cube inverted",
+			"from": [8.5, 4.5, 18],
+			"to": [7.5, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"},
-				"west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"}
+				"north": {"uv": [5.016, 13.016, 5.016, 13.016], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.516, 11.516], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.516, 11.516], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [8.5, 4.375, 0.975],
+			"to": [6.5, 2.375, -1.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.525]},
+			"faces": {
+				"north": {"uv": [5.516, 13.984, 6.484, 13.016], "texture": "#0"},
+				"east": {"uv": [5.516, 12.984, 6.484, 12.016], "texture": "#0"},
+				"west": {"uv": [6.484, 12.984, 5.516, 12.016], "texture": "#0"},
+				"up": {"uv": [6.484, 12.984, 5.516, 12.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [9.04, 4.4, 8.975],
+			"to": [7.04, 2.4, 5.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]},
+			"faces": {
+				"north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"},
+				"down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}
 			}
 		}
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"thirdperson_lefthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"firstperson_righthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"firstperson_lefthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"ground": {
-			"translation": [0, 3.5, 0],
+			"translation": [0, 4, 0],
 			"scale": [0.58984, 0.58984, 0.58984]
 		},
 		"gui": {
 			"rotation": [26.75, -139, 0],
-			"translation": [-1, 3.75, 0],
-			"scale": [0.86133, 0.86133, 0.86133]
+			"translation": [-1.25, 3, 0],
+			"scale": [0.73633, 0.73633, 0.73633]
 		},
 		"head": {
 			"translation": [0, 13.75, -1]
diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json
index bb3d3a00..03891dfd 100644
--- a/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json
+++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_primary.json
@@ -1,6 +1,6 @@
 {
 	"credit": "Made with Blockbench by Cart3r.  ",
-	"texture_size": [64, 64],
+	"texture_size": [32, 32],
 	"textures": {
 		"0": "portalcubed:item/portal_gun",
 		"1": "portalcubed:item/portal_gun_dyeable",
@@ -8,148 +8,253 @@
 	},
 	"elements": [
 		{
-			"from": [4.5, 0, 8.5],
-			"to": [11.5, 6, 18.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6, 1, 1],
+			"to": [10, 3, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -2]},
 			"faces": {
-				"north": {"uv": [1.265, 4.015, 2.985, 5.485], "texture": "#0"},
-				"east": {"uv": [0.015, 2.515, 2.485, 3.985], "texture": "#0"},
-				"south": {"uv": [3.015, 4.015, 4.735, 5.485], "texture": "#0"},
-				"west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"},
-				"up": {"uv": [1.735, 2.485, 0.015, 0.015], "texture": "#0"},
-				"down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"}
+				"north": {"uv": [7.516, 11.516, 9.484, 12.484], "texture": "#0"},
+				"east": {"uv": [14.484, 7.516, 10.516, 8.484], "texture": "#0"},
+				"west": {"uv": [10.516, 7.516, 14.484, 8.484], "texture": "#0"},
+				"up": {"uv": [7.484, 12.484, 5.516, 8.516], "texture": "#0"},
+				"down": {"uv": [10.484, 5.516, 8.516, 8.984], "texture": "#0"}
 			}
 		},
 		{
-			"from": [7.5, 6.025, 10.5],
-			"to": [8.5, 6.025, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.49, 0.49, -0.01],
+			"to": [10.51, 4.51, 7.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"east": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"south": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"west": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"up": {"uv": [5.235, 3.735, 5.015, 3.515], "texture": "#1", "tintindex": 0},
-				"down": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0}
+				"north": {"uv": [2.484, 10.516, 0.016, 12.484], "texture": "#0"},
+				"east": {"uv": [13.984, 5.516, 10.516, 7.484], "texture": "#0"},
+				"south": {"uv": [4.984, 11.016, 2.516, 12.984], "texture": "#0"},
+				"west": {"uv": [13.484, 9.016, 10.016, 10.984], "texture": "#0"},
+				"down": {"uv": [15.984, 0.016, 13.532, 3.468], "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.5, 0, -0.5],
-			"to": [11.5, 3, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [4.98, 0.98, 8.48],
+			"to": [11.02, 6.02, 17.52],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [7.765, 3.265, 9.485, 3.985], "texture": "#0"},
-				"east": {"uv": [7.765, 4.765, 9.235, 5.485], "texture": "#0"},
-				"south": {"uv": [7.765, 4.015, 9.485, 4.735], "texture": "#0"},
-				"west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"},
-				"up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"},
-				"down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"}
+				"north": {"uv": [2.516, 8.516, 5.484, 10.984], "texture": "#0"},
+				"east": {"uv": [4.468, 13.016, 0, 15.484], "texture": "#0"},
+				"south": {"uv": [11.484, 3.016, 8.516, 5.484], "texture": "#0"},
+				"west": {"uv": [0, 13.016, 4.468, 15.484], "texture": "#0"},
+				"up": {"uv": [0.016, 0.016, 2.984, 4.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [5.5, 0.75, 4.5],
-			"to": [10.5, 3.75, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.98, 5.975, 10.78],
+			"to": [9.02, 6.015, 13.82],
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 5.925, 11.8]},
 			"faces": {
-				"east": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"},
-				"down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"}
+				"up": {"uv": [14.48, 14.48, 16, 16], "texture": "#1"}
 			}
 		},
 		{
-			"from": [7, 3.75, 3.5],
-			"to": [9, 4.75, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6, 3, 1],
+			"to": [10, 5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"east": {"uv": [9.758, 1.758, 10.992, 1.992], "texture": "#1", "tintindex": 0},
-				"south": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"west": {"uv": [9.758, 1.758, 10.992, 1.992], "texture": "#1", "tintindex": 0},
-				"up": {"uv": [10.242, 1.242, 9.758, 0.008], "texture": "#1", "tintindex": 0},
-				"down": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0}
+				"north": {"uv": [11.516, 2.516, 13.484, 3.484], "texture": "#0"},
+				"east": {"uv": [13.484, 4.516, 11.516, 5.484], "texture": "#0"},
+				"south": {"uv": [11.516, 3.516, 13.484, 4.484], "texture": "#0"},
+				"west": {"uv": [11.516, 4.516, 13.484, 5.484], "texture": "#0"},
+				"up": {"uv": [11.984, 12.984, 10.016, 11.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.5, 3.25, 4.5],
-			"to": [9.5, 5.25, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6.49, 2.365, -1.01],
+			"to": [8.51, 4.385, 1.06],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.45]},
 			"faces": {
-				"east": {"uv": [11.008, 0.008, 11.492, 1.125], "rotation": 90, "texture": "#0", "tintindex": 0},
-				"west": {"uv": [11.008, 0.008, 11.492, 1.125], "rotation": 90, "texture": "#0", "tintindex": 0},
-				"up": {"uv": [11.008, 0.008, 11.742, 1.125], "texture": "#0", "tintindex": 0}
+				"east": {"uv": [6.484, 12.016, 5.516, 12.984], "texture": "#0"},
+				"west": {"uv": [5.516, 12.016, 6.484, 12.984], "texture": "#0"},
+				"up": {"uv": [5.516, 12.016, 6.484, 12.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [6.484, 12.016, 5.516, 12.984], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, 1, 0.5],
-			"to": [11, 6, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.5, 0.5, 9],
+			"to": [10.5, 5.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [6.515, 0.015, 8.015, 1.265], "texture": "#0"},
-				"east": {"uv": [0.765, 7.765, 1.735, 8.985], "texture": "#0"},
-				"south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"},
-				"west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"},
-				"up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"}
+				"north": {"uv": [7.516, 9.016, 9.984, 11.484], "texture": "#0"},
+				"east": {"uv": [3.484, 5.016, 0.016, 7.484], "texture": "#0"},
+				"south": {"uv": [11.016, 0.016, 13.484, 2.484], "texture": "#0"},
+				"west": {"uv": [0.016, 5.016, 3.484, 7.484], "texture": "#0"},
+				"up": {"uv": [3.516, 8.484, 5.984, 5.016], "texture": "#0"},
+				"down": {"uv": [6.016, 5.016, 8.484, 8.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6, 1.075, -2.25],
-			"to": [10, 5.075, 1.75],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [7.49, 0.49, 15.99],
+			"to": [8.51, 4.51, 18.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"north": {"uv": [8.015, 5.515, 8.985, 6.485], "texture": "#0"},
-				"east": {"uv": [1.765, 8.265, 2.735, 9.235], "texture": "#0"},
-				"west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"},
-				"up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"},
-				"down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"}
+				"south": {"uv": [5.016, 11.016, 5.484, 12.984], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [10.375, -0.4, -5.5],
-			"to": [14.375, -0.4, 1.5],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [15.5, 0, -0.75]},
+			"name": "cube inverted",
+			"from": [11.01, 6.01, 17.51],
+			"to": [4.99, 0.99, 8.49],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"},
-				"down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"}
+				"north": {"uv": [8.516, 5.484, 11.484, 3.016], "texture": "#0"},
+				"east": {"uv": [0, 15.484, 4.468, 13.016], "texture": "#0"},
+				"south": {"uv": [2.516, 10.984, 5.484, 8.516], "texture": "#0"},
+				"west": {"uv": [4.468, 15.484, 0, 13.016], "texture": "#0"},
+				"down": {"uv": [0.016, 4.484, 2.984, 0.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.425, -0.4, -5.5],
-			"to": [5.425, -0.4, 1.5],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [0.3, 0, -0.75]},
+			"name": "cube inverted",
+			"from": [8.5, 4.5, 18],
+			"to": [7.5, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"},
-				"down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"}
+				"north": {"uv": [5.016, 13.016, 5.016, 13.016], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.516, 11.516], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.516, 11.516], "texture": "#0"}
 			}
 		},
 		{
-			"from": [8, 4.875, -5.5],
-			"to": [8, 8.875, 1.5],
-			"rotation": {"angle": 0, "axis": "z", "origin": [15.5, -5, -0.75]},
+			"name": "cube inverted",
+			"from": [10.5, 4.5, 7],
+			"to": [5.5, 0.5, 0],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"},
-				"west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"}
+				"north": {"uv": [4.984, 12.984, 2.516, 11.016], "texture": "#0"},
+				"east": {"uv": [10.516, 7.484, 13.984, 5.516], "texture": "#0"},
+				"south": {"uv": [2.484, 12.484, 0.016, 10.516], "texture": "#0"},
+				"west": {"uv": [13.984, 7.484, 10.516, 5.516], "texture": "#0"},
+				"up": {"uv": [16, 0, 13.532, 3.468], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [8.5, 4.375, 0.975],
+			"to": [6.5, 2.375, -1.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.525]},
+			"faces": {
+				"north": {"uv": [5.516, 13.984, 6.484, 13.016], "texture": "#0"},
+				"east": {"uv": [5.516, 12.984, 6.484, 12.016], "texture": "#0"},
+				"west": {"uv": [6.484, 12.984, 5.516, 12.016], "texture": "#0"},
+				"up": {"uv": [6.484, 12.984, 5.516, 12.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [9.04, 4.4, 8.975],
+			"to": [7.04, 2.4, 5.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]},
+			"faces": {
+				"north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"},
+				"down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted inverted",
+			"from": [7.715, 3.4, 5.025],
+			"to": [8.715, 4.4, 8.975],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.7, 3.35, 7]},
+			"faces": {
+				"east": {"uv": [14.516, 15.991, 14.016, 14.016], "rotation": 90, "texture": "#1"},
+				"west": {"uv": [14.516, 15.991, 14.016, 14.016], "rotation": 90, "texture": "#1"},
+				"up": {"uv": [14.516, 15.991, 14.016, 14.016], "texture": "#1"},
+				"down": {"uv": [14.516, 15.991, 14.016, 14.016], "texture": "#1"}
+			}
+		},
+		{
+			"from": [1.5, 2.575, -4],
+			"to": [7.5, 2.575, 12],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]},
+			"faces": {
+				"up": {"uv": [3.016, 0.016, 10.984, 2.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 0.016, 3.016, 2.984], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.96492, 3.81711, 2.99],
+			"to": [14.96492, 3.81711, 11.99],
+			"rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]},
+			"faces": {
+				"up": {"uv": [6.532, 13.032, 11, 15.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [11, 13.032, 6.532, 15], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 2.075, -4],
+			"to": [5, 3.075, -4],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 5.516, 7.016, 7.016], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6.516, 5.516, 7.016, 7.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.5, 2.575, -4],
+			"to": [14.5, 2.575, 12],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"up": {"uv": [3.016, 2.984, 10.984, 0.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 2.984, 3.016, 0.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.999, 3.02125, -4.01],
+			"to": [7.999, 9.02125, 2.99],
+			"rotation": {"angle": 0, "axis": "z", "origin": [7.999, 5.52125, 8.49]},
+			"faces": {
+				"east": {"uv": [6.484, 2.984, 3.016, 0.016], "texture": "#0"},
+				"west": {"uv": [3.016, 2.984, 6.484, 0.016], "texture": "#0"}
+			}
+		},
+		{
+			"from": [11, 2.075, -4],
+			"to": [14, 3.075, -4],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 7.016, 7.016, 5.516], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6.516, 7.016, 7.016, 5.516], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.5, 5.575, -4],
+			"to": [8.5, 8.575, -4],
+			"rotation": {"angle": 0, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 7.016, 7.016, 5.516], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [6.516, 7.016, 7.016, 5.516], "texture": "#0"}
 			}
 		}
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"thirdperson_lefthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"firstperson_righthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"firstperson_lefthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"ground": {
 			"translation": [0, 4, 0],
@@ -158,7 +263,7 @@
 		"gui": {
 			"rotation": [26.75, -139, 0],
 			"translation": [-1.25, 3, 0],
-			"scale": [0.67383, 0.67383, 0.67383]
+			"scale": [0.73633, 0.73633, 0.73633]
 		},
 		"head": {
 			"translation": [0, 13.75, -1]
diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json
index 7d2a0fe0..03891dfd 100644
--- a/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json
+++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_secondary.json
@@ -1,6 +1,6 @@
 {
 	"credit": "Made with Blockbench by Cart3r.  ",
-	"texture_size": [64, 64],
+	"texture_size": [32, 32],
 	"textures": {
 		"0": "portalcubed:item/portal_gun",
 		"1": "portalcubed:item/portal_gun_dyeable",
@@ -8,143 +8,253 @@
 	},
 	"elements": [
 		{
-			"from": [4.5, 0, 8.5],
-			"to": [11.5, 6, 18.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6, 1, 1],
+			"to": [10, 3, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -2]},
 			"faces": {
-				"north": {"uv": [1.265, 4.015, 2.985, 5.485], "texture": "#0"},
-				"east": {"uv": [0.015, 2.515, 2.485, 3.985], "texture": "#0"},
-				"south": {"uv": [3.015, 4.015, 4.735, 5.485], "texture": "#0"},
-				"west": {"uv": [2.515, 2.515, 4.985, 3.985], "texture": "#0"},
-				"up": {"uv": [1.735, 2.485, 0.015, 0.015], "texture": "#0"},
-				"down": {"uv": [3.485, 0.015, 1.765, 2.485], "texture": "#0"}
+				"north": {"uv": [7.516, 11.516, 9.484, 12.484], "texture": "#0"},
+				"east": {"uv": [14.484, 7.516, 10.516, 8.484], "texture": "#0"},
+				"west": {"uv": [10.516, 7.516, 14.484, 8.484], "texture": "#0"},
+				"up": {"uv": [7.484, 12.484, 5.516, 8.516], "texture": "#0"},
+				"down": {"uv": [10.484, 5.516, 8.516, 8.984], "texture": "#0"}
 			}
 		},
 		{
-			"from": [7.5, 6.025, 10.5],
-			"to": [8.5, 6.025, 11.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.49, 0.49, -0.01],
+			"to": [10.51, 4.51, 7.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"up": {"uv": [5.235, 3.735, 5.015, 3.515], "texture": "#1", "tintindex": 0}
+				"north": {"uv": [2.484, 10.516, 0.016, 12.484], "texture": "#0"},
+				"east": {"uv": [13.984, 5.516, 10.516, 7.484], "texture": "#0"},
+				"south": {"uv": [4.984, 11.016, 2.516, 12.984], "texture": "#0"},
+				"west": {"uv": [13.484, 9.016, 10.016, 10.984], "texture": "#0"},
+				"down": {"uv": [15.984, 0.016, 13.532, 3.468], "texture": "#0"}
 			}
 		},
 		{
-			"from": [4.5, 0, -0.5],
-			"to": [11.5, 3, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [4.98, 0.98, 8.48],
+			"to": [11.02, 6.02, 17.52],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"north": {"uv": [7.765, 3.265, 9.485, 3.985], "texture": "#0"},
-				"east": {"uv": [7.765, 4.765, 9.235, 5.485], "texture": "#0"},
-				"south": {"uv": [7.765, 4.015, 9.485, 4.735], "texture": "#0"},
-				"west": {"uv": [5.515, 8.015, 6.985, 8.735], "texture": "#0"},
-				"up": {"uv": [6.485, 1.485, 4.765, 0.015], "texture": "#0"},
-				"down": {"uv": [6.485, 4.015, 4.765, 5.485], "texture": "#0"}
+				"north": {"uv": [2.516, 8.516, 5.484, 10.984], "texture": "#0"},
+				"east": {"uv": [4.468, 13.016, 0, 15.484], "texture": "#0"},
+				"south": {"uv": [11.484, 3.016, 8.516, 5.484], "texture": "#0"},
+				"west": {"uv": [0, 13.016, 4.468, 15.484], "texture": "#0"},
+				"up": {"uv": [0.016, 0.016, 2.984, 4.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [5.5, 0.75, 4.5],
-			"to": [10.5, 3.75, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.98, 5.975, 10.78],
+			"to": [9.02, 6.015, 13.82],
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 5.925, 11.8]},
 			"faces": {
-				"east": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"west": {"uv": [7.265, 1.515, 8.242, 2.242], "texture": "#0"},
-				"up": {"uv": [4.742, 1.992, 3.515, 1.015], "texture": "#0"},
-				"down": {"uv": [1.242, 4.015, 0.008, 4.992], "texture": "#0"}
+				"up": {"uv": [14.48, 14.48, 16, 16], "texture": "#1"}
 			}
 		},
 		{
-			"from": [7, 3.75, 3.5],
-			"to": [9, 4.75, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6, 3, 1],
+			"to": [10, 5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"east": {"uv": [9.758, 1.758, 10.992, 1.992], "texture": "#1", "tintindex": 0},
-				"south": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0},
-				"west": {"uv": [9.758, 1.758, 10.992, 1.992], "texture": "#1", "tintindex": 0},
-				"up": {"uv": [10.242, 1.242, 9.758, 0.008], "texture": "#1", "tintindex": 0},
-				"down": {"uv": [0.008, 0.008, 0.008, 0.008], "texture": "#1", "tintindex": 0}
+				"north": {"uv": [11.516, 2.516, 13.484, 3.484], "texture": "#0"},
+				"east": {"uv": [13.484, 4.516, 11.516, 5.484], "texture": "#0"},
+				"south": {"uv": [11.516, 3.516, 13.484, 4.484], "texture": "#0"},
+				"west": {"uv": [11.516, 4.516, 13.484, 5.484], "texture": "#0"},
+				"up": {"uv": [11.984, 12.984, 10.016, 11.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6.5, 3.25, 4.5],
-			"to": [9.5, 5.25, 8.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [6.49, 2.365, -1.01],
+			"to": [8.51, 4.385, 1.06],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.45]},
 			"faces": {
-				"east": {"uv": [11.008, 0.008, 11.492, 1.125], "rotation": 90, "texture": "#0", "tintindex": 0},
-				"west": {"uv": [11.008, 0.008, 11.492, 1.125], "rotation": 90, "texture": "#0", "tintindex": 0},
-				"up": {"uv": [11.008, 0.008, 11.742, 1.125], "texture": "#0", "tintindex": 0}
+				"east": {"uv": [6.484, 12.016, 5.516, 12.984], "texture": "#0"},
+				"west": {"uv": [5.516, 12.016, 6.484, 12.984], "texture": "#0"},
+				"up": {"uv": [5.516, 12.016, 6.484, 12.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [6.484, 12.016, 5.516, 12.984], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
-			"from": [5, 1, 0.5],
-			"to": [11, 6, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [5.5, 0.5, 9],
+			"to": [10.5, 5.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1]},
 			"faces": {
-				"north": {"uv": [6.515, 0.015, 8.015, 1.265], "texture": "#0"},
-				"east": {"uv": [0.765, 7.765, 1.735, 8.985], "texture": "#0"},
-				"south": {"uv": [5.515, 6.765, 6.985, 7.985], "texture": "#0"},
-				"west": {"uv": [8.015, 0.015, 8.985, 1.235], "texture": "#0"},
-				"up": {"uv": [8.735, 2.235, 7.265, 1.265], "texture": "#0"}
+				"north": {"uv": [7.516, 9.016, 9.984, 11.484], "texture": "#0"},
+				"east": {"uv": [3.484, 5.016, 0.016, 7.484], "texture": "#0"},
+				"south": {"uv": [11.016, 0.016, 13.484, 2.484], "texture": "#0"},
+				"west": {"uv": [0.016, 5.016, 3.484, 7.484], "texture": "#0"},
+				"up": {"uv": [3.516, 8.484, 5.984, 5.016], "texture": "#0"},
+				"down": {"uv": [6.016, 5.016, 8.484, 8.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [6, 1.075, -2.25],
-			"to": [10, 5.075, 1.75],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-0.5, 0, 0]},
+			"from": [7.49, 0.49, 15.99],
+			"to": [8.51, 4.51, 18.01],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"north": {"uv": [8.015, 5.515, 8.985, 6.485], "texture": "#0"},
-				"east": {"uv": [1.765, 8.265, 2.735, 9.235], "texture": "#0"},
-				"west": {"uv": [3.765, 8.265, 4.735, 9.235], "texture": "#0"},
-				"up": {"uv": [9.735, 2.235, 8.765, 1.265], "texture": "#0"},
-				"down": {"uv": [5.735, 8.765, 4.765, 9.735], "texture": "#0"}
+				"south": {"uv": [5.016, 11.016, 5.484, 12.984], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.984, 12.484], "texture": "#0"}
 			}
 		},
 		{
-			"from": [10.375, -0.4, -5.5],
-			"to": [14.375, -0.4, 1.5],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [15.5, 0, -0.75]},
+			"name": "cube inverted",
+			"from": [11.01, 6.01, 17.51],
+			"to": [4.99, 0.99, 8.49],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, -1.5]},
 			"faces": {
-				"up": {"uv": [7.492, 5.242, 6.508, 3.508], "texture": "#0"},
-				"down": {"uv": [7.492, 3.508, 6.508, 5.242], "texture": "#0"}
+				"north": {"uv": [8.516, 5.484, 11.484, 3.016], "texture": "#0"},
+				"east": {"uv": [0, 15.484, 4.468, 13.016], "texture": "#0"},
+				"south": {"uv": [2.516, 10.984, 5.484, 8.516], "texture": "#0"},
+				"west": {"uv": [4.468, 15.484, 0, 13.016], "texture": "#0"},
+				"down": {"uv": [0.016, 4.484, 2.984, 0.016], "texture": "#0"}
 			}
 		},
 		{
-			"from": [1.425, -0.4, -5.5],
-			"to": [5.425, -0.4, 1.5],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [0.3, 0, -0.75]},
+			"name": "cube inverted",
+			"from": [8.5, 4.5, 18],
+			"to": [7.5, 0.5, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 1, 6]},
 			"faces": {
-				"up": {"uv": [6.508, 5.242, 7.492, 3.508], "texture": "#0"},
-				"down": {"uv": [6.508, 3.508, 7.492, 5.242], "texture": "#0"}
+				"north": {"uv": [5.016, 13.016, 5.016, 13.016], "texture": "#0"},
+				"up": {"uv": [8.516, 11.516, 8.516, 11.516], "texture": "#0"},
+				"down": {"uv": [8.516, 11.516, 8.516, 11.516], "texture": "#0"}
 			}
 		},
 		{
-			"from": [8, 4.875, -5.5],
-			"to": [8, 8.875, 1.5],
-			"rotation": {"angle": 0, "axis": "z", "origin": [15.5, -5, -0.75]},
+			"name": "cube inverted",
+			"from": [10.5, 4.5, 7],
+			"to": [5.5, 0.5, 0],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 1, -1.5]},
 			"faces": {
-				"east": {"uv": [6.508, 5.225, 7.492, 3.508], "rotation": 90, "texture": "#0"},
-				"west": {"uv": [6.508, 3.508, 7.492, 5.242], "rotation": 90, "texture": "#0"}
+				"north": {"uv": [4.984, 12.984, 2.516, 11.016], "texture": "#0"},
+				"east": {"uv": [10.516, 7.484, 13.984, 5.516], "texture": "#0"},
+				"south": {"uv": [2.484, 12.484, 0.016, 10.516], "texture": "#0"},
+				"west": {"uv": [13.984, 7.484, 10.516, 5.516], "texture": "#0"},
+				"up": {"uv": [16, 0, 13.532, 3.468], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [8.5, 4.375, 0.975],
+			"to": [6.5, 2.375, -1.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.875, -0.525]},
+			"faces": {
+				"north": {"uv": [5.516, 13.984, 6.484, 13.016], "texture": "#0"},
+				"east": {"uv": [5.516, 12.984, 6.484, 12.016], "texture": "#0"},
+				"west": {"uv": [6.484, 12.984, 5.516, 12.016], "texture": "#0"},
+				"up": {"uv": [6.484, 12.984, 5.516, 12.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [5.516, 12.984, 6.484, 12.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted",
+			"from": [9.04, 4.4, 8.975],
+			"to": [7.04, 2.4, 5.025],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]},
+			"faces": {
+				"north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
+				"west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"},
+				"down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}
+			}
+		},
+		{
+			"name": "cube inverted inverted",
+			"from": [7.715, 3.4, 5.025],
+			"to": [8.715, 4.4, 8.975],
+			"rotation": {"angle": 45, "axis": "z", "origin": [8.7, 3.35, 7]},
+			"faces": {
+				"east": {"uv": [14.516, 15.991, 14.016, 14.016], "rotation": 90, "texture": "#1"},
+				"west": {"uv": [14.516, 15.991, 14.016, 14.016], "rotation": 90, "texture": "#1"},
+				"up": {"uv": [14.516, 15.991, 14.016, 14.016], "texture": "#1"},
+				"down": {"uv": [14.516, 15.991, 14.016, 14.016], "texture": "#1"}
+			}
+		},
+		{
+			"from": [1.5, 2.575, -4],
+			"to": [7.5, 2.575, 12],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]},
+			"faces": {
+				"up": {"uv": [3.016, 0.016, 10.984, 2.984], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 0.016, 3.016, 2.984], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [9.96492, 3.81711, 2.99],
+			"to": [14.96492, 3.81711, 11.99],
+			"rotation": {"angle": 45, "axis": "z", "origin": [7.96492, 0.81711, 5.49]},
+			"faces": {
+				"up": {"uv": [6.532, 13.032, 11, 15.5], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [11, 13.032, 6.532, 15], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 2.075, -4],
+			"to": [5, 3.075, -4],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [6.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 5.516, 7.016, 7.016], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6.516, 5.516, 7.016, 7.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [8.5, 2.575, -4],
+			"to": [14.5, 2.575, 12],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"up": {"uv": [3.016, 2.984, 10.984, 0.016], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [10.984, 2.984, 3.016, 0.016], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.999, 3.02125, -4.01],
+			"to": [7.999, 9.02125, 2.99],
+			"rotation": {"angle": 0, "axis": "z", "origin": [7.999, 5.52125, 8.49]},
+			"faces": {
+				"east": {"uv": [6.484, 2.984, 3.016, 0.016], "texture": "#0"},
+				"west": {"uv": [3.016, 2.984, 6.484, 0.016], "texture": "#0"}
+			}
+		},
+		{
+			"from": [11, 2.075, -4],
+			"to": [14, 3.075, -4],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 7.016, 7.016, 5.516], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [6.516, 7.016, 7.016, 5.516], "rotation": 90, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.5, 5.575, -4],
+			"to": [8.5, 8.575, -4],
+			"rotation": {"angle": 0, "axis": "z", "origin": [9.5, 2.575, 5.5]},
+			"faces": {
+				"north": {"uv": [6.516, 7.016, 7.016, 5.516], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [6.516, 7.016, 7.016, 5.516], "texture": "#0"}
 			}
 		}
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"thirdperson_lefthand": {
-			"translation": [0, 3.25, -2.75],
+			"translation": [0, 2.75, -6.75],
 			"scale": [0.80273, 0.80273, 0.80273]
 		},
 		"firstperson_righthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"firstperson_lefthand": {
-			"rotation": [10.25, 0, 0],
-			"translation": [0.5, 5, -0.25],
-			"scale": [0.88867, 0.88867, 0.88867]
+			"rotation": [10.24, 0.74, -0.13],
+			"translation": [-3, 6.5, 2.75],
+			"scale": [0.70312, 0.68359, 0.65429]
 		},
 		"ground": {
 			"translation": [0, 4, 0],
@@ -153,7 +263,7 @@
 		"gui": {
 			"rotation": [26.75, -139, 0],
 			"translation": [-1.25, 3, 0],
-			"scale": [0.67383, 0.67383, 0.67383]
+			"scale": [0.73633, 0.73633, 0.73633]
 		},
 		"head": {
 			"translation": [0, 13.75, -1]
diff --git a/src/main/resources/assets/portalcubed/textures/block/insulation.png b/src/main/resources/assets/portalcubed/textures/block/insulation.png
index aaa6ef4d..6b63929f 100644
Binary files a/src/main/resources/assets/portalcubed/textures/block/insulation.png and b/src/main/resources/assets/portalcubed/textures/block/insulation.png differ
diff --git a/src/main/resources/assets/portalcubed/textures/block/old_aperture_metal_grating.png b/src/main/resources/assets/portalcubed/textures/block/old_aperture_metal_grating.png
index 11fdb57d..5985d54b 100644
Binary files a/src/main/resources/assets/portalcubed/textures/block/old_aperture_metal_grating.png and b/src/main/resources/assets/portalcubed/textures/block/old_aperture_metal_grating.png differ
diff --git a/src/main/resources/assets/portalcubed/textures/block/portal_2_metal_grating.png b/src/main/resources/assets/portalcubed/textures/block/portal_2_metal_grating.png
index 530fd5b8..24286d40 100644
Binary files a/src/main/resources/assets/portalcubed/textures/block/portal_2_metal_grating.png and b/src/main/resources/assets/portalcubed/textures/block/portal_2_metal_grating.png differ
diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_gun.png b/src/main/resources/assets/portalcubed/textures/item/portal_gun.png
index 4c1fe3eb..59c27d77 100644
Binary files a/src/main/resources/assets/portalcubed/textures/item/portal_gun.png and b/src/main/resources/assets/portalcubed/textures/item/portal_gun.png differ
diff --git a/src/main/resources/assets/portalcubed/textures/item/portal_gun_dyeable.png b/src/main/resources/assets/portalcubed/textures/item/portal_gun_dyeable.png
index d92ba17c..f59e3b58 100644
Binary files a/src/main/resources/assets/portalcubed/textures/item/portal_gun_dyeable.png and b/src/main/resources/assets/portalcubed/textures/item/portal_gun_dyeable.png differ