diff --git a/godot/project.godot b/godot/project.godot
index cb866e5..b7c5284 100644
--- a/godot/project.godot
+++ b/godot/project.godot
@@ -150,6 +150,15 @@ prev_spectator={
 ]
 }
 
+[layer_names]
+
+3d_physics/layer_1="Local Player"
+3d_physics/layer_2="Remote Player"
+3d_physics/layer_3="Walls"
+3d_physics/layer_4="Ball and Goals"
+3d_physics/layer_5="I forget"
+3d_physics/layer_6="Grate Walls"
+
 [physics]
 
 common/physics_ticks_per_second=240
diff --git a/godot/scenes/misc/teleport_grenade.tscn b/godot/scenes/misc/teleport_grenade.tscn
index 781e7bb..86b1c1e 100644
--- a/godot/scenes/misc/teleport_grenade.tscn
+++ b/godot/scenes/misc/teleport_grenade.tscn
@@ -37,7 +37,7 @@ curve = SubResource("Curve_bbjda")
 
 [node name="teleport_grenade" type="Telegrenade" unique_id=1670808846]
 collision_layer = 0
-collision_mask = 4
+collision_mask = 36
 contact_monitor = true
 max_contacts_reported = 1
 
diff --git a/godot/scenes/player/local_player.tscn b/godot/scenes/player/local_player.tscn
index 15fb442..d627e46 100644
--- a/godot/scenes/player/local_player.tscn
+++ b/godot/scenes/player/local_player.tscn
@@ -45,7 +45,7 @@ punch_cooldown = 1.0
 telegrenade_cooldown = NodePath("cooldown_icon")
 telefrag_area_prefab = ExtResource("1_0yoer")
 telegrenade_cd = 10.0
-collision_mask = 4
+collision_mask = 36
 slide_on_ceiling = false
 floor_constant_speed = true
 
diff --git a/godot/scenes/player/remote_player.tscn b/godot/scenes/player/remote_player.tscn
index d9e090f..12e9d8a 100644
--- a/godot/scenes/player/remote_player.tscn
+++ b/godot/scenes/player/remote_player.tscn
@@ -60,7 +60,7 @@ arrow = NodePath("arrow")
 telefrag_area_prefab = ExtResource("1_8dfyr")
 telegrenade_cd = 10.0
 collision_layer = 2
-collision_mask = 4
+collision_mask = 36
 slide_on_ceiling = false
 floor_constant_speed = true
 
diff --git a/godot/scenes/player/replay_player.tscn b/godot/scenes/player/replay_player.tscn
index 28d0945..7a85f33 100644
--- a/godot/scenes/player/replay_player.tscn
+++ b/godot/scenes/player/replay_player.tscn
@@ -57,7 +57,7 @@ ball_pickup_sfx = NodePath("ball_pickup_sfx")
 ball_throw_sfx = NodePath("ball_throw_sfx")
 arrow = NodePath("arrow")
 collision_layer = 16
-collision_mask = 4
+collision_mask = 36
 
 [node name="soldier_m" parent="." unique_id=281995630 instance=ExtResource("1_bfcd3")]
 transform = Transform3D(-0.5, 0, -4.371139e-08, 0, 0.5, 0, 4.371139e-08, 0, -0.5, 0, 0, 0)