diff --git a/addons/zylann.hterrain/tools/icons/white.png.import b/addons/zylann.hterrain/tools/icons/white.png.import
index a0d73bf..df777c3 100644
--- a/addons/zylann.hterrain/tools/icons/white.png.import
+++ b/addons/zylann.hterrain/tools/icons/white.png.import
@@ -3,16 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dnee27oabcvy2"
-path.s3tc="res://.godot/imported/white.png-06b7d7f95e74cd7f8357ec25a73870fb.s3tc.ctex"
+path.etc2="res://.godot/imported/white.png-06b7d7f95e74cd7f8357ec25a73870fb.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/zylann.hterrain/tools/icons/white.png"
-dest_files=["res://.godot/imported/white.png-06b7d7f95e74cd7f8357ec25a73870fb.s3tc.ctex"]
+dest_files=["res://.godot/imported/white.png-06b7d7f95e74cd7f8357ec25a73870fb.etc2.ctex"]
 
 [params]
 
diff --git a/characters/Mr. Brown/0_SFusion_0.jpg.import b/characters/Mr. Brown/0_SFusion_0.jpg.import
index 0933d5c..ae71492 100644
--- a/characters/Mr. Brown/0_SFusion_0.jpg.import	
+++ b/characters/Mr. Brown/0_SFusion_0.jpg.import	
@@ -3,16 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bh7elgf3urcff"
-path.s3tc="res://.godot/imported/0_SFusion_0.jpg-dea7b49322b34f2960ac6c6b2d52709e.s3tc.ctex"
+path.etc2="res://.godot/imported/0_SFusion_0.jpg-dea7b49322b34f2960ac6c6b2d52709e.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://characters/Mr. Brown/0_SFusion_0.jpg"
-dest_files=["res://.godot/imported/0_SFusion_0.jpg-dea7b49322b34f2960ac6c6b2d52709e.s3tc.ctex"]
+dest_files=["res://.godot/imported/0_SFusion_0.jpg-dea7b49322b34f2960ac6c6b2d52709e.etc2.ctex"]
 
 [params]
 
diff --git a/characters/teddy/model_glb/teddy_BrownFabric.png.import b/characters/teddy/model_glb/teddy_BrownFabric.png.import
index fad6ae5..7256841 100644
--- a/characters/teddy/model_glb/teddy_BrownFabric.png.import
+++ b/characters/teddy/model_glb/teddy_BrownFabric.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bcx8hi3wfgmjm"
-path.s3tc="res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.s3tc.ctex"
+path.etc2="res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://characters/teddy/model_glb/teddy_BrownFabric.png"
-dest_files=["res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.s3tc.ctex"]
+dest_files=["res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.etc2.ctex"]
 
 [params]
 
diff --git a/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import b/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import
index 6b7cc08..b2e1542 100644
--- a/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import
+++ b/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b25on3sg58fj0"
-path.s3tc="res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.s3tc.ctex"
+path.etc2="res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://characters/teddy/model_glb/teddy_BrownFabricBelly.png"
-dest_files=["res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.s3tc.ctex"]
+dest_files=["res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.etc2.ctex"]
 
 [params]
 
diff --git a/characters/teddy/model_glb/teddy_FabricNose.png.import b/characters/teddy/model_glb/teddy_FabricNose.png.import
index 06f583b..d8bb62d 100644
--- a/characters/teddy/model_glb/teddy_FabricNose.png.import
+++ b/characters/teddy/model_glb/teddy_FabricNose.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://r61f275fmhx0"
-path.s3tc="res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.s3tc.ctex"
+path.etc2="res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://characters/teddy/model_glb/teddy_FabricNose.png"
-dest_files=["res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.s3tc.ctex"]
+dest_files=["res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.etc2.ctex"]
 
 [params]
 
diff --git a/characters/teddy/teddy_model.tscn b/characters/teddy/teddy_model.tscn
new file mode 100644
index 0000000..1945eef
--- /dev/null
+++ b/characters/teddy/teddy_model.tscn
@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=3 uid="uid://b4eo3c2ux18r1"]
+
+[ext_resource type="PackedScene" uid="uid://b3l10agcjfgdx" path="res://characters/teddy/model_glb/teddy.glb" id="1_wnq7c"]
+
+[node name="teddy" instance=ExtResource("1_wnq7c")]
diff --git a/map_data/forest_data/height.png b/map_data/forest_data/height.png
index 07b72e4..5a568d1 100644
Binary files a/map_data/forest_data/height.png and b/map_data/forest_data/height.png differ
diff --git a/map_data/forest_data/normal.png b/map_data/forest_data/normal.png
index 8f7b572..199dd9b 100644
Binary files a/map_data/forest_data/normal.png and b/map_data/forest_data/normal.png differ
diff --git a/map_data/forest_textures/aerial_grass_rock_diff_4k.jpg.import b/map_data/forest_textures/aerial_grass_rock_diff_4k.jpg.import
index 4ba8f3c..fcdb81a 100644
--- a/map_data/forest_textures/aerial_grass_rock_diff_4k.jpg.import
+++ b/map_data/forest_textures/aerial_grass_rock_diff_4k.jpg.import
@@ -3,16 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://crwts8kd00o7t"
-path.s3tc="res://.godot/imported/aerial_grass_rock_diff_4k.jpg-4be09580ce43d147c78042ddd65da7ee.s3tc.ctex"
+path.etc2="res://.godot/imported/aerial_grass_rock_diff_4k.jpg-4be09580ce43d147c78042ddd65da7ee.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://map_data/forest_textures/aerial_grass_rock_diff_4k.jpg"
-dest_files=["res://.godot/imported/aerial_grass_rock_diff_4k.jpg-4be09580ce43d147c78042ddd65da7ee.s3tc.ctex"]
+dest_files=["res://.godot/imported/aerial_grass_rock_diff_4k.jpg-4be09580ce43d147c78042ddd65da7ee.etc2.ctex"]
 
 [params]
 
diff --git a/map_data/forest_textures/forrest_slot0_albedo_bump.png.import b/map_data/forest_textures/forrest_slot0_albedo_bump.png.import
index b5b19b3..0ab7fa7 100644
--- a/map_data/forest_textures/forrest_slot0_albedo_bump.png.import
+++ b/map_data/forest_textures/forrest_slot0_albedo_bump.png.import
@@ -3,16 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dylo328agoxw8"
-path.s3tc="res://.godot/imported/forrest_slot0_albedo_bump.png-a6472caed68cad20e151b066a80a704e.s3tc.ctex"
+path.etc2="res://.godot/imported/forrest_slot0_albedo_bump.png-a6472caed68cad20e151b066a80a704e.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://map_data/forest_textures/forrest_slot0_albedo_bump.png"
-dest_files=["res://.godot/imported/forrest_slot0_albedo_bump.png-a6472caed68cad20e151b066a80a704e.s3tc.ctex"]
+dest_files=["res://.godot/imported/forrest_slot0_albedo_bump.png-a6472caed68cad20e151b066a80a704e.etc2.ctex"]
 
 [params]
 
diff --git a/map_data/forest_textures/forrest_slot0_normal_roughness.png.import b/map_data/forest_textures/forrest_slot0_normal_roughness.png.import
index 8e680a2..9869b67 100644
--- a/map_data/forest_textures/forrest_slot0_normal_roughness.png.import
+++ b/map_data/forest_textures/forrest_slot0_normal_roughness.png.import
@@ -3,16 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c7b11tux6uufa"
-path.s3tc="res://.godot/imported/forrest_slot0_normal_roughness.png-65623c769850c69a1853a195f9ab9c9a.s3tc.ctex"
+path.etc2="res://.godot/imported/forrest_slot0_normal_roughness.png-65623c769850c69a1853a195f9ab9c9a.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://map_data/forest_textures/forrest_slot0_normal_roughness.png"
-dest_files=["res://.godot/imported/forrest_slot0_normal_roughness.png-65623c769850c69a1853a195f9ab9c9a.s3tc.ctex"]
+dest_files=["res://.godot/imported/forrest_slot0_normal_roughness.png-65623c769850c69a1853a195f9ab9c9a.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_Grass.png.import b/objects/farmland/Farmland_Grass.png.import
index e80e6d1..ac4285a 100644
--- a/objects/farmland/Farmland_Grass.png.import
+++ b/objects/farmland/Farmland_Grass.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dc114yqktvs3h"
-path.s3tc="res://.godot/imported/Farmland_Grass.png-709c2679c394e38f46347a5551ebab8b.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_Grass.png-709c2679c394e38f46347a5551ebab8b.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_Grass.png"
-dest_files=["res://.godot/imported/Farmland_Grass.png-709c2679c394e38f46347a5551ebab8b.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_Grass.png-709c2679c394e38f46347a5551ebab8b.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_PavingStones070_2K_Color.png.import b/objects/farmland/Farmland_PavingStones070_2K_Color.png.import
index f16a235..f164a2f 100644
--- a/objects/farmland/Farmland_PavingStones070_2K_Color.png.import
+++ b/objects/farmland/Farmland_PavingStones070_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://vgpu5ge7l6dg"
-path.s3tc="res://.godot/imported/Farmland_PavingStones070_2K_Color.png-069aa40f670dc2c435a3d7e7a442ee01.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_PavingStones070_2K_Color.png-069aa40f670dc2c435a3d7e7a442ee01.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_PavingStones070_2K_Color.png"
-dest_files=["res://.godot/imported/Farmland_PavingStones070_2K_Color.png-069aa40f670dc2c435a3d7e7a442ee01.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_PavingStones070_2K_Color.png-069aa40f670dc2c435a3d7e7a442ee01.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_Planks.png.import b/objects/farmland/Farmland_Planks.png.import
index 3cc1cd5..e7f00c1 100644
--- a/objects/farmland/Farmland_Planks.png.import
+++ b/objects/farmland/Farmland_Planks.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c6u7b0qa4in58"
-path.s3tc="res://.godot/imported/Farmland_Planks.png-e57c9f38aa129a42f5dd0eb87c4d5f32.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_Planks.png-e57c9f38aa129a42f5dd0eb87c4d5f32.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_Planks.png"
-dest_files=["res://.godot/imported/Farmland_Planks.png-e57c9f38aa129a42f5dd0eb87c4d5f32.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_Planks.png-e57c9f38aa129a42f5dd0eb87c4d5f32.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_PlanksDark.png.import b/objects/farmland/Farmland_PlanksDark.png.import
index e3e682b..d3d44e0 100644
--- a/objects/farmland/Farmland_PlanksDark.png.import
+++ b/objects/farmland/Farmland_PlanksDark.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://clwc77pxfnakt"
-path.s3tc="res://.godot/imported/Farmland_PlanksDark.png-966f8016452b2c9c4294b878865c3cd1.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_PlanksDark.png-966f8016452b2c9c4294b878865c3cd1.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_PlanksDark.png"
-dest_files=["res://.godot/imported/Farmland_PlanksDark.png-966f8016452b2c9c4294b878865c3cd1.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_PlanksDark.png-966f8016452b2c9c4294b878865c3cd1.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_PlanksDark_8.png.import b/objects/farmland/Farmland_PlanksDark_8.png.import
index 300016c..dfb0abe 100644
--- a/objects/farmland/Farmland_PlanksDark_8.png.import
+++ b/objects/farmland/Farmland_PlanksDark_8.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cfi71iips71un"
-path.s3tc="res://.godot/imported/Farmland_PlanksDark_8.png-f57e71d16a98aa9c0644e54e7d47ad2d.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_PlanksDark_8.png-f57e71d16a98aa9c0644e54e7d47ad2d.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_PlanksDark_8.png"
-dest_files=["res://.godot/imported/Farmland_PlanksDark_8.png-f57e71d16a98aa9c0644e54e7d47ad2d.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_PlanksDark_8.png-f57e71d16a98aa9c0644e54e7d47ad2d.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_Rock.png.import b/objects/farmland/Farmland_Rock.png.import
index c8d5232..9cf8445 100644
--- a/objects/farmland/Farmland_Rock.png.import
+++ b/objects/farmland/Farmland_Rock.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cp5aynm7fok2t"
-path.s3tc="res://.godot/imported/Farmland_Rock.png-c84f6bacff54402d498a282051c6c7a6.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_Rock.png-c84f6bacff54402d498a282051c6c7a6.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_Rock.png"
-dest_files=["res://.godot/imported/Farmland_Rock.png-c84f6bacff54402d498a282051c6c7a6.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_Rock.png-c84f6bacff54402d498a282051c6c7a6.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_Rock_9.png.import b/objects/farmland/Farmland_Rock_9.png.import
index e873e34..ca712ed 100644
--- a/objects/farmland/Farmland_Rock_9.png.import
+++ b/objects/farmland/Farmland_Rock_9.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bvgjhycfi8ixy"
-path.s3tc="res://.godot/imported/Farmland_Rock_9.png-29177af88c796ba2dc14d3fb3f158514.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_Rock_9.png-29177af88c796ba2dc14d3fb3f158514.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_Rock_9.png"
-dest_files=["res://.godot/imported/Farmland_Rock_9.png-29177af88c796ba2dc14d3fb3f158514.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_Rock_9.png-29177af88c796ba2dc14d3fb3f158514.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_Shingles.png.import b/objects/farmland/Farmland_Shingles.png.import
index 198a96a..160f0da 100644
--- a/objects/farmland/Farmland_Shingles.png.import
+++ b/objects/farmland/Farmland_Shingles.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ceeqwdkr0qh10"
-path.s3tc="res://.godot/imported/Farmland_Shingles.png-fa8f362b619e83f73014e4452cf19fe2.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_Shingles.png-fa8f362b619e83f73014e4452cf19fe2.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_Shingles.png"
-dest_files=["res://.godot/imported/Farmland_Shingles.png-fa8f362b619e83f73014e4452cf19fe2.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_Shingles.png-fa8f362b619e83f73014e4452cf19fe2.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_Shingles_2.png.import b/objects/farmland/Farmland_Shingles_2.png.import
index 3ac0fad..c3f6606 100644
--- a/objects/farmland/Farmland_Shingles_2.png.import
+++ b/objects/farmland/Farmland_Shingles_2.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c8arp7wkootg1"
-path.s3tc="res://.godot/imported/Farmland_Shingles_2.png-e82f151d8e19b2ce869fc630acd319dc.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_Shingles_2.png-e82f151d8e19b2ce869fc630acd319dc.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_Shingles_2.png"
-dest_files=["res://.godot/imported/Farmland_Shingles_2.png-e82f151d8e19b2ce869fc630acd319dc.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_Shingles_2.png-e82f151d8e19b2ce869fc630acd319dc.etc2.ctex"]
 
 [params]
 
diff --git a/objects/farmland/Farmland_water.png.import b/objects/farmland/Farmland_water.png.import
index 0479337..e6342f7 100644
--- a/objects/farmland/Farmland_water.png.import
+++ b/objects/farmland/Farmland_water.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b8nxk38tya654"
-path.s3tc="res://.godot/imported/Farmland_water.png-3425e7c3ed361d902ee6cae186c3c2b6.s3tc.ctex"
+path.etc2="res://.godot/imported/Farmland_water.png-3425e7c3ed361d902ee6cae186c3c2b6.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/farmland/Farmland_water.png"
-dest_files=["res://.godot/imported/Farmland_water.png-3425e7c3ed361d902ee6cae186c3c2b6.s3tc.ctex"]
+dest_files=["res://.godot/imported/Farmland_water.png-3425e7c3ed361d902ee6cae186c3c2b6.etc2.ctex"]
 
 [params]
 
diff --git a/objects/gun/Gun_Plastic008_2K_Color.png.import b/objects/gun/Gun_Plastic008_2K_Color.png.import
index 8f5181e..ed225d9 100644
--- a/objects/gun/Gun_Plastic008_2K_Color.png.import
+++ b/objects/gun/Gun_Plastic008_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dgka4ydbssadl"
-path.s3tc="res://.godot/imported/Gun_Plastic008_2K_Color.png-bac889a853997f0060f4f61a5a6c9b9d.s3tc.ctex"
+path.etc2="res://.godot/imported/Gun_Plastic008_2K_Color.png-bac889a853997f0060f4f61a5a6c9b9d.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/gun/Gun_Plastic008_2K_Color.png"
-dest_files=["res://.godot/imported/Gun_Plastic008_2K_Color.png-bac889a853997f0060f4f61a5a6c9b9d.s3tc.ctex"]
+dest_files=["res://.godot/imported/Gun_Plastic008_2K_Color.png-bac889a853997f0060f4f61a5a6c9b9d.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_Grass.png.import b/objects/islands/islands_Grass.png.import
index 2c0d9b6..63f6638 100644
--- a/objects/islands/islands_Grass.png.import
+++ b/objects/islands/islands_Grass.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cdk6chiam3anc"
-path.s3tc="res://.godot/imported/islands_Grass.png-db6f4072658f0438a023a0bf18662123.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_Grass.png-db6f4072658f0438a023a0bf18662123.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_Grass.png"
-dest_files=["res://.godot/imported/islands_Grass.png-db6f4072658f0438a023a0bf18662123.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_Grass.png-db6f4072658f0438a023a0bf18662123.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_PavingStones070_2K_Color.png.import b/objects/islands/islands_PavingStones070_2K_Color.png.import
index e12ed72..aa5a5c7 100644
--- a/objects/islands/islands_PavingStones070_2K_Color.png.import
+++ b/objects/islands/islands_PavingStones070_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dv7q31i30hxan"
-path.s3tc="res://.godot/imported/islands_PavingStones070_2K_Color.png-ad49b61aeded0d139e67a956816543d3.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_PavingStones070_2K_Color.png-ad49b61aeded0d139e67a956816543d3.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_PavingStones070_2K_Color.png"
-dest_files=["res://.godot/imported/islands_PavingStones070_2K_Color.png-ad49b61aeded0d139e67a956816543d3.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_PavingStones070_2K_Color.png-ad49b61aeded0d139e67a956816543d3.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_Planks.png.import b/objects/islands/islands_Planks.png.import
index 7df6e50..a839494 100644
--- a/objects/islands/islands_Planks.png.import
+++ b/objects/islands/islands_Planks.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ewpl8ki53v7m"
-path.s3tc="res://.godot/imported/islands_Planks.png-32f78ff052ecc8bbb0a32748f8f39661.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_Planks.png-32f78ff052ecc8bbb0a32748f8f39661.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_Planks.png"
-dest_files=["res://.godot/imported/islands_Planks.png-32f78ff052ecc8bbb0a32748f8f39661.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_Planks.png-32f78ff052ecc8bbb0a32748f8f39661.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_PlanksDark.png.import b/objects/islands/islands_PlanksDark.png.import
index c9478fc..638b414 100644
--- a/objects/islands/islands_PlanksDark.png.import
+++ b/objects/islands/islands_PlanksDark.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://d4ltk0q7135vv"
-path.s3tc="res://.godot/imported/islands_PlanksDark.png-4bbcc494d8ff043314b8491d94b9cf28.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_PlanksDark.png-4bbcc494d8ff043314b8491d94b9cf28.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_PlanksDark.png"
-dest_files=["res://.godot/imported/islands_PlanksDark.png-4bbcc494d8ff043314b8491d94b9cf28.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_PlanksDark.png-4bbcc494d8ff043314b8491d94b9cf28.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_Rock.png.import b/objects/islands/islands_Rock.png.import
index ab497c2..f650fb2 100644
--- a/objects/islands/islands_Rock.png.import
+++ b/objects/islands/islands_Rock.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://baxt6ri4c4s8m"
-path.s3tc="res://.godot/imported/islands_Rock.png-66e20c088cc9e46970c83974bb366335.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_Rock.png-66e20c088cc9e46970c83974bb366335.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_Rock.png"
-dest_files=["res://.godot/imported/islands_Rock.png-66e20c088cc9e46970c83974bb366335.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_Rock.png-66e20c088cc9e46970c83974bb366335.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_Shingles.png.import b/objects/islands/islands_Shingles.png.import
index 2fa4678..11a1f0d 100644
--- a/objects/islands/islands_Shingles.png.import
+++ b/objects/islands/islands_Shingles.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cb6hib2ju24bg"
-path.s3tc="res://.godot/imported/islands_Shingles.png-7d1af920a1239661ac5ef5f756e6716f.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_Shingles.png-7d1af920a1239661ac5ef5f756e6716f.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_Shingles.png"
-dest_files=["res://.godot/imported/islands_Shingles.png-7d1af920a1239661ac5ef5f756e6716f.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_Shingles.png-7d1af920a1239661ac5ef5f756e6716f.etc2.ctex"]
 
 [params]
 
diff --git a/objects/islands/islands_water.png.import b/objects/islands/islands_water.png.import
index a58f6a0..82f59c1 100644
--- a/objects/islands/islands_water.png.import
+++ b/objects/islands/islands_water.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://lo01vpm4ublg"
-path.s3tc="res://.godot/imported/islands_water.png-5e446ee74a7aa3f7815f2f0e2299f0c1.s3tc.ctex"
+path.etc2="res://.godot/imported/islands_water.png-5e446ee74a7aa3f7815f2f0e2299f0c1.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/islands/islands_water.png"
-dest_files=["res://.godot/imported/islands_water.png-5e446ee74a7aa3f7815f2f0e2299f0c1.s3tc.ctex"]
+dest_files=["res://.godot/imported/islands_water.png-5e446ee74a7aa3f7815f2f0e2299f0c1.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockBlue.png.import b/objects/toyland/toyland_BlockBlue.png.import
index 9521c72..5a3ce22 100644
--- a/objects/toyland/toyland_BlockBlue.png.import
+++ b/objects/toyland/toyland_BlockBlue.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dkqoijeo10tux"
-path.s3tc="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockBlue.png"
-dest_files=["res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockGreen.png.import b/objects/toyland/toyland_BlockGreen.png.import
index 535ab10..bc18c6b 100644
--- a/objects/toyland/toyland_BlockGreen.png.import
+++ b/objects/toyland/toyland_BlockGreen.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dw6p7eei1sfo0"
-path.s3tc="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockGreen.png"
-dest_files=["res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockOrange.png.import b/objects/toyland/toyland_BlockOrange.png.import
index 8585601..6c33beb 100644
--- a/objects/toyland/toyland_BlockOrange.png.import
+++ b/objects/toyland/toyland_BlockOrange.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cv87hmivqj8lb"
-path.s3tc="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockOrange.png"
-dest_files=["res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockPurple.png.import b/objects/toyland/toyland_BlockPurple.png.import
index 26d9540..e9a6009 100644
--- a/objects/toyland/toyland_BlockPurple.png.import
+++ b/objects/toyland/toyland_BlockPurple.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bghd624myuydg"
-path.s3tc="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockPurple.png"
-dest_files=["res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockRed.png.import b/objects/toyland/toyland_BlockRed.png.import
index eb66c33..550840a 100644
--- a/objects/toyland/toyland_BlockRed.png.import
+++ b/objects/toyland/toyland_BlockRed.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dt6jxmiv5ip6"
-path.s3tc="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockRed.png"
-dest_files=["res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockRed_18.png.import b/objects/toyland/toyland_BlockRed_18.png.import
index 0c98ed5..9e0dd20 100644
--- a/objects/toyland/toyland_BlockRed_18.png.import
+++ b/objects/toyland/toyland_BlockRed_18.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c4u5qjxkujrek"
-path.s3tc="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockRed_18.png"
-dest_files=["res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockTan.png.import b/objects/toyland/toyland_BlockTan.png.import
index a51a69d..e2d0fc6 100644
--- a/objects/toyland/toyland_BlockTan.png.import
+++ b/objects/toyland/toyland_BlockTan.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ddrsmcusndkm0"
-path.s3tc="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockTan.png"
-dest_files=["res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BlockYellow.png.import b/objects/toyland/toyland_BlockYellow.png.import
index a67742b..c7ea390 100644
--- a/objects/toyland/toyland_BlockYellow.png.import
+++ b/objects/toyland/toyland_BlockYellow.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cnxhkpv2lacp5"
-path.s3tc="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BlockYellow.png"
-dest_files=["res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_BookTEMP.png.import b/objects/toyland/toyland_BookTEMP.png.import
index 0149a94..643e0b5 100644
--- a/objects/toyland/toyland_BookTEMP.png.import
+++ b/objects/toyland/toyland_BookTEMP.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://rlfqf8gplxj8"
-path.s3tc="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_BookTEMP.png"
-dest_files=["res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_Carpet012_4K_Color.png.import b/objects/toyland/toyland_Carpet012_4K_Color.png.import
index 5f7029b..8e4e5f1 100644
--- a/objects/toyland/toyland_Carpet012_4K_Color.png.import
+++ b/objects/toyland/toyland_Carpet012_4K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ncqq3yy6e3n8"
-path.s3tc="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_Carpet012_4K_Color.png"
-dest_files=["res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_Fabric001_2K_Color.png.import b/objects/toyland/toyland_Fabric001_2K_Color.png.import
index 85f915e..5c9bf64 100644
--- a/objects/toyland/toyland_Fabric001_2K_Color.png.import
+++ b/objects/toyland/toyland_Fabric001_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bfixfprjiax48"
-path.s3tc="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_Fabric001_2K_Color.png"
-dest_files=["res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_Fabric056_2K_Color.png.import b/objects/toyland/toyland_Fabric056_2K_Color.png.import
index 343c824..3e472c9 100644
--- a/objects/toyland/toyland_Fabric056_2K_Color.png.import
+++ b/objects/toyland/toyland_Fabric056_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://de42xsa41plh3"
-path.s3tc="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_Fabric056_2K_Color.png"
-dest_files=["res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_Metal.png.import b/objects/toyland/toyland_Metal.png.import
index d28aeda..542c4f5 100644
--- a/objects/toyland/toyland_Metal.png.import
+++ b/objects/toyland/toyland_Metal.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dxa8jtk4kyjaa"
-path.s3tc="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_Metal.png"
-dest_files=["res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_Toy Blocks Box.png.import b/objects/toyland/toyland_Toy Blocks Box.png.import
index e597f34..f95c02c 100644
--- a/objects/toyland/toyland_Toy Blocks Box.png.import	
+++ b/objects/toyland/toyland_Toy Blocks Box.png.import	
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://up3fknjlqc6u"
-path.s3tc="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_Toy Blocks Box.png"
-dest_files=["res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_Wood067_2K_Color.png.import b/objects/toyland/toyland_Wood067_2K_Color.png.import
index f2cc22f..bea5a9e 100644
--- a/objects/toyland/toyland_Wood067_2K_Color.png.import
+++ b/objects/toyland/toyland_Wood067_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dntcxe4ruoo7f"
-path.s3tc="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_Wood067_2K_Color.png"
-dest_files=["res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_newplaster.png.import b/objects/toyland/toyland_newplaster.png.import
index 8783b75..6b63e1f 100644
--- a/objects/toyland/toyland_newplaster.png.import
+++ b/objects/toyland/toyland_newplaster.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bg104um3mu3wl"
-path.s3tc="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_newplaster.png"
-dest_files=["res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_outlet.png.import b/objects/toyland/toyland_outlet.png.import
index 0cb78b7..e49a3df 100644
--- a/objects/toyland/toyland_outlet.png.import
+++ b/objects/toyland/toyland_outlet.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c2q3ly4tn11tl"
-path.s3tc="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_outlet.png"
-dest_files=["res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_white door.png.import b/objects/toyland/toyland_white door.png.import
index 91607a7..92ace31 100644
--- a/objects/toyland/toyland_white door.png.import	
+++ b/objects/toyland/toyland_white door.png.import	
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://4gr8ak7xkbg"
-path.s3tc="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_white door.png"
-dest_files=["res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_windows_xp_bliss-wide.png.import b/objects/toyland/toyland_windows_xp_bliss-wide.png.import
index 9e43cec..c77818d 100644
--- a/objects/toyland/toyland_windows_xp_bliss-wide.png.import
+++ b/objects/toyland/toyland_windows_xp_bliss-wide.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b7f2eoxabtom3"
-path.s3tc="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_windows_xp_bliss-wide.png"
-dest_files=["res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.etc2.ctex"]
 
 [params]
 
diff --git a/objects/toyland/toyland_woodfloor4k.png.import b/objects/toyland/toyland_woodfloor4k.png.import
index 9d5dd9d..fdf0560 100644
--- a/objects/toyland/toyland_woodfloor4k.png.import
+++ b/objects/toyland/toyland_woodfloor4k.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cd5soqj1rr2jc"
-path.s3tc="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex"
+path.etc2="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/toyland/toyland_woodfloor4k.png"
-dest_files=["res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex"]
+dest_files=["res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.etc2.ctex"]
 
 [params]
 
diff --git a/objects/tree/tree_Bark012_2K_Color.png.import b/objects/tree/tree_Bark012_2K_Color.png.import
index e7df33f..3cdab47 100644
--- a/objects/tree/tree_Bark012_2K_Color.png.import
+++ b/objects/tree/tree_Bark012_2K_Color.png.import
@@ -3,9 +3,9 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b7kia5o1kio8h"
-path.s3tc="res://.godot/imported/tree_Bark012_2K_Color.png-3c0e33a02f769f86ba18613c291a0f57.s3tc.ctex"
+path.etc2="res://.godot/imported/tree_Bark012_2K_Color.png-3c0e33a02f769f86ba18613c291a0f57.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={}
@@ -13,7 +13,7 @@ generator_parameters={}
 [deps]
 
 source_file="res://objects/tree/tree_Bark012_2K_Color.png"
-dest_files=["res://.godot/imported/tree_Bark012_2K_Color.png-3c0e33a02f769f86ba18613c291a0f57.s3tc.ctex"]
+dest_files=["res://.godot/imported/tree_Bark012_2K_Color.png-3c0e33a02f769f86ba18613c291a0f57.etc2.ctex"]
 
 [params]
 
diff --git a/project.godot b/project.godot
index b6119ca..fb50085 100644
--- a/project.godot
+++ b/project.godot
@@ -37,24 +37,28 @@ player_left={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 player_right={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 player_forward={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 player_backward={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 sprint={
diff --git a/scenes/Teddy.tscn b/scenes/Teddy.tscn
index 600eeb0..499ece2 100644
--- a/scenes/Teddy.tscn
+++ b/scenes/Teddy.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://characters/teddy/Teddy.gd" id="1_ywxo5"]
 [ext_resource type="Script" path="res://scripts/nameLabel.gd" id="3_1v4js"]
-[ext_resource type="PackedScene" uid="uid://b3l10agcjfgdx" path="res://characters/teddy/model_glb/teddy.glb" id="4_h6g7o"]
+[ext_resource type="PackedScene" uid="uid://b4eo3c2ux18r1" path="res://characters/teddy/teddy_model.tscn" id="4_q0pxc"]
 [ext_resource type="ArrayMesh" uid="uid://b26a54y2fd5n8" path="res://characters/teddy/cotton/cotton.obj" id="4_qbair"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_rpt2n"]
@@ -30,8 +30,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.859224, 0)
 [node name="BulletGenerator" type="Marker3D" parent="CollisionShape3D/Neck/Camera3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.104801, -0.858231)
 
-[node name="Teddy" parent="CollisionShape3D/Neck" instance=ExtResource("4_h6g7o")]
-transform = Transform3D(-0.32125, 1.12048e-16, -2.80845e-08, 1.12048e-16, 0.32125, -1.12048e-16, 2.80845e-08, -1.12048e-16, -0.32125, 2.08165e-12, -1.85907, 2.08165e-12)
+[node name="teddy" parent="CollisionShape3D/Neck" instance=ExtResource("4_q0pxc")]
+transform = Transform3D(-0.328533, 1.14588e-16, -2.87213e-08, 1.14588e-16, 0.328533, -1.14588e-16, 2.87213e-08, -1.14588e-16, -0.328533, 2.08165e-12, -1.87888, 2.08165e-12)
 
 [node name="sound" type="AudioStreamPlayer3D" parent="."]
 
diff --git a/scenes/death_collider.tscn b/scenes/death_collider.tscn
new file mode 100644
index 0000000..a9f3b5d
--- /dev/null
+++ b/scenes/death_collider.tscn
@@ -0,0 +1,17 @@
+[gd_scene load_steps=4 format=3 uid="uid://dytp1teb22c8o"]
+
+[ext_resource type="Script" path="res://scripts/death_collider.gd" id="1_67ww0"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_jjdi3"]
+
+[sub_resource type="BoxMesh" id="BoxMesh_d1jim"]
+
+[node name="death_collider" type="Area3D"]
+script = ExtResource("1_67ww0")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_jjdi3")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="CollisionShape3D"]
+visible = false
+mesh = SubResource("BoxMesh_d1jim")
diff --git a/scenes/forrest.tscn b/scenes/forrest.tscn
index 2aed71c..a40341a 100644
--- a/scenes/forrest.tscn
+++ b/scenes/forrest.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://cnmdiewpk1mau"]
+[gd_scene load_steps=17 format=3 uid="uid://cnmdiewpk1mau"]
 
 [ext_resource type="Script" path="res://scripts/maps/forrest.gd" id="1_dns8p"]
 [ext_resource type="PackedScene" uid="uid://ytbacsuahxie" path="res://scenes/HUD.tscn" id="2_e77cs"]
@@ -8,7 +8,9 @@
 [ext_resource type="Texture2D" uid="uid://dylo328agoxw8" path="res://map_data/forest_textures/forrest_slot0_albedo_bump.png" id="6_6rfna"]
 [ext_resource type="Texture2D" uid="uid://crwts8kd00o7t" path="res://map_data/forest_textures/aerial_grass_rock_diff_4k.jpg" id="7_a6nha"]
 [ext_resource type="Texture2D" uid="uid://bihd1ii7cmju5" path="res://map_data/forest_textures/aerial_grass_rock_disp_4k.png" id="8_klmdr"]
+[ext_resource type="PackedScene" uid="uid://c2f2to78vgbix" path="res://scenes/waterplane.tscn" id="10_dc7ae"]
 [ext_resource type="PackedScene" uid="uid://on7ofumfw2j1" path="res://objects/tree/tree.tscn" id="10_v8vtj"]
+[ext_resource type="PackedScene" uid="uid://dytp1teb22c8o" path="res://scenes/death_collider.tscn" id="11_8iuo5"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ell6n"]
 sky_top_color = Color(0.870588, 0.894118, 0.92549, 1)
@@ -29,6 +31,11 @@ script = ExtResource("5_04yy2")
 mode = 0
 textures = [[ExtResource("6_6rfna"), ExtResource("7_a6nha")], [null, ExtResource("8_klmdr")]]
 
+[sub_resource type="PlaneMesh" id="PlaneMesh_vtffu"]
+size = Vector2(1000, 1000)
+subdivide_width = 200
+subdivide_depth = 200
+
 [node name="Forrest" type="Node3D"]
 script = ExtResource("1_dns8p")
 
@@ -121,3 +128,100 @@ transform = Transform3D(2.28438, 0, -3.04295, 0, 3.80499, 0, 3.04295, 0, 2.28438
 
 [node name="tree19" parent="Trees" instance=ExtResource("10_v8vtj")]
 transform = Transform3D(0.320247, 0, -3.79149, 0, 3.80499, 0, 3.79149, 0, 0.320247, -83.1482, 0.000484467, -70.4413)
+
+[node name="River_planes" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.75534, 0)
+
+[node name="WaterPlane" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, 2.08165e-12)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane2" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, 19.7932)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane3" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, 39.5304)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane4" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, 59.0568)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane5" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, 78.4324)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane6" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, 98.193)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane7" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, -19.3472)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane8" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, -38.8894)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane9" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, -58.5276)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane10" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, -77.8236)
+skeleton = NodePath("../..")
+
+[node name="WaterPlane11" parent="River_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 2.08165e-12, -4.40623, -96.2718)
+skeleton = NodePath("../..")
+
+[node name="Ocean_planes" type="Node3D" parent="."]
+
+[node name="Background_water" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.08165e-12, -9.344, 2.08165e-12)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water2" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -985.924, -9.344, 2.08165e-12)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water3" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -985.924, -9.344, 988.503)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water4" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.335999, -9.344, 988.503)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water5" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 993.343, -9.344, 988.503)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water6" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 993.343, -9.344, -2.49261)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water7" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 993.343, -9.344, -994.718)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water8" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.308716, -9.344, -994.718)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="Background_water9" parent="Ocean_planes" instance=ExtResource("10_dc7ae")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -985.232, -9.344, -994.718)
+mesh = SubResource("PlaneMesh_vtffu")
+skeleton = NodePath("../..")
+
+[node name="death_collider" parent="." instance=ExtResource("11_8iuo5")]
+transform = Transform3D(20.2687, 0, 0, 0, 6.21204, 0, 0, 0, 210.389, 2.08165e-12, -5.68668, 2.08165e-12)
diff --git a/scenes/hostmenu.tscn b/scenes/hostmenu.tscn
index adcd811..cecbf22 100644
--- a/scenes/hostmenu.tscn
+++ b/scenes/hostmenu.tscn
@@ -172,6 +172,7 @@ offset_left = 594.0
 offset_top = 407.0
 offset_right = 664.0
 offset_bottom = 438.0
+button_pressed = true
 text = "Short"
 
 [node name="normalRespawn" type="CheckBox" parent="."]
@@ -180,7 +181,6 @@ offset_left = 673.0
 offset_top = 406.0
 offset_right = 760.0
 offset_bottom = 437.0
-button_pressed = true
 text = "Normal"
 
 [node name="longRespawn" type="CheckBox" parent="."]
diff --git a/scenes/waterplane.tscn b/scenes/waterplane.tscn
new file mode 100644
index 0000000..d596082
--- /dev/null
+++ b/scenes/waterplane.tscn
@@ -0,0 +1,12 @@
+[gd_scene load_steps=3 format=3 uid="uid://c2f2to78vgbix"]
+
+[ext_resource type="Material" uid="uid://deer6l7sk1h2v" path="res://shaders/water.tres" id="1_jww1o"]
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_e2m35"]
+size = Vector2(1, 1)
+subdivide_width = 200
+subdivide_depth = 200
+
+[node name="WaterPlane" type="MeshInstance3D"]
+mesh = SubResource("PlaneMesh_e2m35")
+surface_material_override/0 = ExtResource("1_jww1o")
diff --git a/scripts/death_collider.gd b/scripts/death_collider.gd
new file mode 100644
index 0000000..c83a426
--- /dev/null
+++ b/scripts/death_collider.gd
@@ -0,0 +1,14 @@
+extends Area3D
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	for body in get_overlapping_bodies():
+			if body.is_in_group("human"):
+				print("Player collided with a death zone!")
+				Global.player_dead()
diff --git a/scripts/global.gd b/scripts/global.gd
index f00efc3..abef5b1 100644
--- a/scripts/global.gd
+++ b/scripts/global.gd
@@ -161,10 +161,19 @@ func spawn_locations():
 		spawnCoords_y[2] = 30
 		spawnCoords_z[2] = -81.81
 	elif mapName == "Forrest":
-		spawnCoords_x.resize(1)
-		spawnCoords_y.resize(1)
-		spawnCoords_z.resize(1)
+		spawnCoords_x.resize(4)
+		spawnCoords_y.resize(4)
+		spawnCoords_z.resize(4)
 		spawnCoords_x[0] = -83.39
 		spawnCoords_y[0] = -4.93
 		spawnCoords_z[0] = 5.77
+		spawnCoords_x[1] = -31.92
+		spawnCoords_y[1] = 5.71
+		spawnCoords_z[1] = -52.45
+		spawnCoords_x[2] = 79.92
+		spawnCoords_y[2] = -4.36
+		spawnCoords_z[2] = -72.71
+		spawnCoords_x[3] = 78.49
+		spawnCoords_y[3] = -7.78
+		spawnCoords_z[3] = -7.87
 
diff --git a/shaders/water.gdshader b/shaders/water.gdshader
new file mode 100644
index 0000000..84b7cb2
--- /dev/null
+++ b/shaders/water.gdshader
@@ -0,0 +1,22 @@
+shader_type spatial;
+
+uniform vec3 albedo : source_color;
+uniform float metallic  : hint_range(0.0, 1.0) = 0;
+uniform float roughness : hint_range(0.0, 1.0) = 0.02;
+uniform sampler2D texture_normal;
+uniform sampler2D texture_normal2;
+uniform vec2 wave_direction = vec2(2.0,0.0);
+uniform vec2 wave_direction2 = vec2(0.0,1.0);
+uniform float time_scale : hint_range(0.0, 0.2, 0.005) = 0.025;
+
+void fragment() {
+	vec2 time = (TIME * wave_direction) * time_scale;
+	vec2 time2 = (TIME * wave_direction2) * time_scale;
+	
+	vec3 normal_blend = mix(texture(texture_normal,UV + time).rgb, texture(texture_normal2,UV + time2).rgb, 0.5);
+	
+	ALBEDO = albedo;
+	METALLIC = metallic;
+	ROUGHNESS = roughness;
+	NORMAL_MAP = normal_blend;
+}
diff --git a/shaders/water.tres b/shaders/water.tres
new file mode 100644
index 0000000..ca10ec8
--- /dev/null
+++ b/shaders/water.tres
@@ -0,0 +1,37 @@
+[gd_resource type="ShaderMaterial" load_steps=6 format=3 uid="uid://deer6l7sk1h2v"]
+
+[ext_resource type="Shader" path="res://shaders/water.gdshader" id="1_qlspc"]
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_a8wtt"]
+noise_type = 3
+offset = Vector3(-125.94, 2.08167e-08, 2.08167e-08)
+fractal_type = 2
+
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_h6tte"]
+seamless = true
+as_normal_map = true
+bump_strength = 5.0
+noise = SubResource("FastNoiseLite_a8wtt")
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_16343"]
+noise_type = 3
+seed = 10
+fractal_type = 2
+
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_uh35s"]
+seamless = true
+as_normal_map = true
+bump_strength = 5.7
+noise = SubResource("FastNoiseLite_16343")
+
+[resource]
+render_priority = 0
+shader = ExtResource("1_qlspc")
+shader_parameter/albedo = Color(0, 0.321569, 0.431373, 1)
+shader_parameter/metallic = 0.0
+shader_parameter/roughness = 0.02
+shader_parameter/wave_direction = Vector2(2, 0)
+shader_parameter/wave_direction2 = Vector2(0, 1)
+shader_parameter/time_scale = 0.025
+shader_parameter/texture_normal = SubResource("NoiseTexture2D_h6tte")
+shader_parameter/texture_normal2 = SubResource("NoiseTexture2D_uh35s")