diff --git a/packages/valve/clean_style/resources/instances/clean/items/observation_room_256.vmf b/packages/valve/clean_style/resources/instances/clean/items/observation_room_256.vmf
index 99430a3b35..486195c1f7 100644
--- a/packages/valve/clean_style/resources/instances/clean/items/observation_room_256.vmf
+++ b/packages/valve/clean_style/resources/instances/clean/items/observation_room_256.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "8973"
-	"mapversion" "227"
+	"mapversion" "228"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -32,7 +32,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "227"
+	"mapversion" "228"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -1105,7 +1105,7 @@ entity
 		{
 			"id" "2087"
 			"plane" "(128 192 -192) (128 -64 -192) (128 -64 -80)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1116,7 +1116,7 @@ entity
 		{
 			"id" "2086"
 			"plane" "(64 -64 -192) (64 192 -192) (64 192 -80)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1127,7 +1127,7 @@ entity
 		{
 			"id" "2085"
 			"plane" "(64 192 -192) (64 -64 -192) (128 -64 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[-1 0 0 0] 0.25"
 			"rotation" "0"
@@ -1138,7 +1138,7 @@ entity
 		{
 			"id" "2084"
 			"plane" "(64 -64 -80) (64 192 -80) (128 192 -80)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[-1 0 0 0] 0.25"
 			"rotation" "0"
@@ -1149,7 +1149,7 @@ entity
 		{
 			"id" "2083"
 			"plane" "(128 -64 -80) (128 -64 -192) (64 -64 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1160,7 +1160,7 @@ entity
 		{
 			"id" "2082"
 			"plane" "(64 192 -80) (64 192 -192) (128 192 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1212,98 +1212,6 @@ entity
 	}
 }
 entity
-{
-	"id" "5470"
-	"classname" "func_noportal_volume"
-	"origin" "0 64 -64"
-	"solid" "6"
-	"spawnflags" "0"
-	solid
-	{
-		"id" "5462"
-		side
-		{
-			"id" "1919"
-			"plane" "(64 192 -68) (64 -64 -68) (64 -64 -60)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 -1 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1918"
-			"plane" "(-64 -64 -68) (-64 192 -68) (-64 192 -60)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 -1 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1917"
-			"plane" "(-64 192 -68) (-64 -64 -68) (64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 -1 0 0] 0.25"
-			"vaxis" "[-1 0 0 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1916"
-			"plane" "(-64 -64 -60) (-64 192 -60) (64 192 -60)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 -1 0 0] 0.25"
-			"vaxis" "[-1 0 0 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1915"
-			"plane" "(64 -64 -60) (64 -64 -68) (-64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1914"
-			"plane" "(-64 192 -60) (-64 192 -68) (64 192 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		editor
-		{
-			"color" "220 30 220"
-			"visgroupshown" "1"
-			"visgroupautoshown" "1"
-		}
-	}
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupid" "14"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 500]"
-	}
-}
-entity
 {
 	"id" "3385"
 	"classname" "func_detail"
@@ -1314,7 +1222,7 @@ entity
 		{
 			"id" "1320"
 			"plane" "(64 192 -192) (64 -64 -192) (64 -64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1325,7 +1233,7 @@ entity
 		{
 			"id" "1319"
 			"plane" "(-64 -64 -192) (-64 192 -192) (-64 192 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1336,7 +1244,7 @@ entity
 		{
 			"id" "1318"
 			"plane" "(-64 192 -192) (-64 -64 -192) (64 -64 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[-1 0 0 0] 0.25"
 			"rotation" "0"
@@ -1347,7 +1255,7 @@ entity
 		{
 			"id" "1317"
 			"plane" "(-64 -64 -64) (-64 192 -64) (64 192 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[-1 0 0 0] 0.25"
 			"rotation" "0"
@@ -1358,7 +1266,7 @@ entity
 		{
 			"id" "1316"
 			"plane" "(64 -64 -64) (64 -64 -192) (-64 -64 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1369,7 +1277,7 @@ entity
 		{
 			"id" "1315"
 			"plane" "(-64 192 -64) (-64 192 -192) (64 192 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1735,8 +1643,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[-7.49007 20.0537 6.07635]"
-		"look" "[119.215 164.8 -172.057]"
+		"position" "[-23.0017 -76.874 75.5701]"
+		"look" "[98.7875 -50.0914 -155.053]"
 	}
 	camera
 	{
diff --git a/packages/valve/geometry/resources/instances/clean/items/observation_room_128_ceil.vmf b/packages/valve/geometry/resources/instances/clean/items/observation_room_128_ceil.vmf
index 7ed75d1619..c7ef3fedc5 100644
--- a/packages/valve/geometry/resources/instances/clean/items/observation_room_128_ceil.vmf
+++ b/packages/valve/geometry/resources/instances/clean/items/observation_room_128_ceil.vmf
@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "134"
+	"editorbuild" "8973"
+	"mapversion" "138"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,13 +20,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "8"
+	"nGridSpacing" "2"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "134"
+	"mapversion" "138"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -3952,12 +3952,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "32 -96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -3973,12 +3974,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-32 -96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -3994,12 +3996,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-96 -96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4015,12 +4018,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "96 -32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4036,12 +4040,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "32 -32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4057,12 +4062,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-32 -32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4078,12 +4084,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-96 -32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4099,12 +4106,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "96 32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4120,12 +4128,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "32 32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4141,12 +4150,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-32 32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4162,12 +4172,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-96 32 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4183,12 +4194,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "96 96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4204,12 +4216,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "32 96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4225,12 +4238,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-32 96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4246,12 +4260,13 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "-96 96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -4466,7 +4481,7 @@ entity
 		{
 			"id" "2397"
 			"plane" "(-160 -160 -82) (-160 160 -82) (160 160 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
@@ -4477,7 +4492,7 @@ entity
 		{
 			"id" "2396"
 			"plane" "(-160 160 -274) (-160 -160 -274) (160 -160 -274)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[-1 0 0 0] 0.25"
 			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
@@ -4488,7 +4503,7 @@ entity
 		{
 			"id" "2395"
 			"plane" "(-160 -160 -274) (-160 160 -274) (-160 160 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 -8] 0.25"
 			"rotation" "0"
@@ -4499,7 +4514,7 @@ entity
 		{
 			"id" "2394"
 			"plane" "(160 160 -274) (160 -160 -274) (160 -160 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 1 0 0] 0.25"
 			"vaxis" "[0 0 -1 -8] 0.25"
 			"rotation" "0"
@@ -4510,7 +4525,7 @@ entity
 		{
 			"id" "2393"
 			"plane" "(-160 160 -274) (160 160 -274) (160 160 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[-1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 -8] 0.25"
 			"rotation" "0"
@@ -4521,7 +4536,7 @@ entity
 		{
 			"id" "2392"
 			"plane" "(160 -160 -274) (-160 -160 -274) (-160 -160 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 -8] 0.25"
 			"rotation" "0"
@@ -4542,7 +4557,7 @@ entity
 		{
 			"id" "2398"
 			"plane" "(-64 -64 -64) (64 -64 -64) (64 -64 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 -32] 0.25"
 			"rotation" "0"
@@ -4553,7 +4568,7 @@ entity
 		{
 			"id" "2399"
 			"plane" "(-64 64 -82) (64 64 -82) (64 64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 -32] 0.25"
 			"rotation" "0"
@@ -4564,7 +4579,7 @@ entity
 		{
 			"id" "2400"
 			"plane" "(-64 -64 -64) (-64 -64 -82) (-64 64 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 0 1 32] 0.25"
 			"vaxis" "[0 1 0 32] 0.25"
 			"rotation" "0"
@@ -4575,7 +4590,7 @@ entity
 		{
 			"id" "2401"
 			"plane" "(64 64 -64) (64 64 -82) (64 -64 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 0 1 32] 0.25"
 			"vaxis" "[0 1 0 32] 0.25"
 			"rotation" "0"
@@ -4586,7 +4601,7 @@ entity
 		{
 			"id" "2402"
 			"plane" "(64 -64 -64) (-64 -64 -64) (-64 64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 1 0 32] 0.25"
 			"rotation" "0"
@@ -4597,7 +4612,7 @@ entity
 		{
 			"id" "2403"
 			"plane" "(64 64 -82) (-64 64 -82) (-64 -64 -82)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 1 0 32] 0.25"
 			"rotation" "0"
@@ -5019,108 +5034,19 @@ entity
 	"_lightscaleHDR" "1"
 	"_linear_attn" "0"
 	"_quadratic_attn" "1"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"style" "0"
 	"origin" "96 -96 -116"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
 	}
 }
 entity
-{
-	"id" "1992"
-	"classname" "func_noportal_volume"
-	"origin" "0 0 -65"
-	"spawnflags" "0"
-	solid
-	{
-		"id" "1988"
-		side
-		{
-			"id" "1503"
-			"plane" "(64 -64 -62) (64 -64 -68) (-64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 8] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1502"
-			"plane" "(-64 64 -62) (-64 64 -68) (64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 8] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1501"
-			"plane" "(-64 -64 -62) (-64 -64 -68) (-64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 -1 8] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1500"
-			"plane" "(64 64 -62) (64 64 -68) (64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 -1 8] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1499"
-			"plane" "(64 -64 -62) (-64 -64 -62) (-64 64 -62)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 1 0 16] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1498"
-			"plane" "(64 64 -68) (-64 64 -68) (-64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 -1 0 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		editor
-		{
-			"color" "220 30 220"
-			"visgroupshown" "1"
-			"visgroupautoshown" "1"
-		}
-	}
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 11000]"
-	}
-}
-entity
 {
 	"id" "2958"
 	"classname" "light_spot"
@@ -5143,7 +5069,7 @@ entity
 	"origin" "0 0 -104"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "255 255 0"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -5205,8 +5131,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[-25.6348 39.8191 -129.609]"
-		"look" "[150.205 -87.9384 -276.215]"
+		"position" "[106.938 -70.9079 30.4041]"
+		"look" "[-84.7663 39.7708 -110.075]"
 	}
 }
 cordons
diff --git a/packages/valve/geometry/resources/instances/clean/items/observation_room_128_floor.vmf b/packages/valve/geometry/resources/instances/clean/items/observation_room_128_floor.vmf
index 9e15e18541..bc3a41a0e9 100644
--- a/packages/valve/geometry/resources/instances/clean/items/observation_room_128_floor.vmf
+++ b/packages/valve/geometry/resources/instances/clean/items/observation_room_128_floor.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "8973"
-	"mapversion" "113"
+	"mapversion" "116"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "113"
+	"mapversion" "116"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -973,97 +973,6 @@ world
 	}
 }
 entity
-{
-	"id" "2197"
-	"classname" "func_noportal_volume"
-	"origin" "0 0 -65"
-	"solid" "6"
-	"spawnflags" "0"
-	solid
-	{
-		"id" "2198"
-		side
-		{
-			"id" "1545"
-			"plane" "(64 -64 -62) (64 -64 -68) (-64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 4] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1544"
-			"plane" "(-64 64 -62) (-64 64 -68) (64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 0 -1 4] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1543"
-			"plane" "(-64 -64 -62) (-64 -64 -68) (-64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 -1 4] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1542"
-			"plane" "(64 64 -62) (64 64 -68) (64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 -1 4] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1541"
-			"plane" "(64 -64 -62) (-64 -64 -62) (-64 64 -62)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 1 0 16] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1540"
-			"plane" "(64 64 -68) (-64 64 -68) (-64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[1 0 0 0] 0.25"
-			"vaxis" "[0 -1 0 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		editor
-		{
-			"color" "220 30 220"
-			"visgroupshown" "1"
-			"visgroupautoshown" "1"
-		}
-	}
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 11000]"
-	}
-}
-entity
 {
 	"id" "1578"
 	"classname" "prop_static"
@@ -1200,7 +1109,7 @@ entity
 	"drawinfastreflection" "0"
 	"InputFilter" "0"
 	"invert_exclusion" "0"
-	"origin" "-0 -0 -68"
+	"origin" "0 0 -68"
 	"renderamt" "255"
 	"rendercolor" "255 255 255"
 	"renderfx" "0"
@@ -1332,8 +1241,8 @@ entity
 		side
 		{
 			"id" "1193"
-			"plane" "(-64 -64 -68) (-64 64 -68) (64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"plane" "(-64 -64 -64) (-64 64 -64) (64 64 -64)"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
@@ -1344,8 +1253,8 @@ entity
 		{
 			"id" "1192"
 			"plane" "(-64 64 -208) (-64 -64 -208) (64 -64 -208)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[-1 0 0 0] 0.25"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
+			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
@@ -1354,8 +1263,8 @@ entity
 		side
 		{
 			"id" "1191"
-			"plane" "(-64 -64 -208) (-64 64 -208) (-64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"plane" "(-64 -64 -208) (-64 64 -208) (-64 64 -64)"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1365,8 +1274,8 @@ entity
 		side
 		{
 			"id" "1190"
-			"plane" "(64 64 -208) (64 -64 -208) (64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"plane" "(64 64 -208) (64 -64 -208) (64 -64 -64)"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1376,8 +1285,8 @@ entity
 		side
 		{
 			"id" "1189"
-			"plane" "(-64 64 -208) (64 64 -208) (64 64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"plane" "(-64 64 -208) (64 64 -208) (64 64 -64)"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[-1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1387,8 +1296,8 @@ entity
 		side
 		{
 			"id" "1188"
-			"plane" "(64 -64 -208) (-64 -64 -208) (-64 -64 -68)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"plane" "(64 -64 -208) (-64 -64 -208) (-64 -64 -64)"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -1465,8 +1374,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[-11.4878 5.97179 -70.8484]"
-		"look" "[158.472 -15.4959 -269.314]"
+		"position" "[-15.7417 90.5372 41.7525]"
+		"look" "[-78.1413 44.5295 -208.698]"
 	}
 }
 cordons
diff --git a/packages/valve/geometry/resources/instances/clean/items/observation_room_128_wall.vmf b/packages/valve/geometry/resources/instances/clean/items/observation_room_128_wall.vmf
index b3a62e48dd..1548d7dbca 100644
--- a/packages/valve/geometry/resources/instances/clean/items/observation_room_128_wall.vmf
+++ b/packages/valve/geometry/resources/instances/clean/items/observation_room_128_wall.vmf
@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "8973"
-	"mapversion" "94"
+	"mapversion" "96"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -14,13 +14,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "8"
+	"nGridSpacing" "4"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "94"
+	"mapversion" "96"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -429,7 +429,7 @@ entity
 		{
 			"id" "1193"
 			"plane" "(-64 -64 -64) (-64 64 -64) (64 64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
@@ -440,8 +440,8 @@ entity
 		{
 			"id" "1192"
 			"plane" "(-64 64 -192) (-64 -64 -192) (64 -64 -192)"
-			"material" "TOOLS/TOOLSINVISIBLE"
-			"uaxis" "[-1 0 0 0] 0.25"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
+			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
@@ -451,7 +451,7 @@ entity
 		{
 			"id" "1191"
 			"plane" "(-64 -64 -192) (-64 64 -192) (-64 64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 -1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -462,7 +462,7 @@ entity
 		{
 			"id" "1190"
 			"plane" "(64 64 -192) (64 -64 -192) (64 -64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[0 1 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -473,7 +473,7 @@ entity
 		{
 			"id" "1189"
 			"plane" "(-64 64 -192) (64 64 -192) (64 64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[-1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -484,7 +484,7 @@ entity
 		{
 			"id" "1188"
 			"plane" "(64 -64 -192) (-64 -64 -192) (-64 -64 -64)"
-			"material" "TOOLS/TOOLSINVISIBLE"
+			"material" "BEE2/INVISIBLE_NOPORTAL"
 			"uaxis" "[1 0 0 0] 0.25"
 			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
@@ -587,8 +587,8 @@ cameras
 	"activecamera" "0"
 	camera
 	{
-		"position" "[-54.2088 92.9442 4.96124]"
-		"look" "[11.8668 -80.9556 -179.774]"
+		"position" "[65.9936 19.6035 -74.2218]"
+		"look" "[27.2378 -230.89 -141.192]"
 	}
 }
 cordons