diff --git a/Assets/Sprites/Tilesets/Terrain/Castle.png b/Assets/Sprites/Tilesets/Terrain/Castle.png
index 173da1f..b45962a 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/Castle.png and b/Assets/Sprites/Tilesets/Terrain/Castle.png differ
diff --git a/Assets/Sprites/Tilesets/Terrain/CastleANN.png b/Assets/Sprites/Tilesets/Terrain/CastleANN.png
index 57cef13..03cd85d 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/CastleANN.png and b/Assets/Sprites/Tilesets/Terrain/CastleANN.png differ
diff --git a/Assets/Sprites/Tilesets/Terrain/CastleLL.png b/Assets/Sprites/Tilesets/Terrain/CastleLL.png
index 2642eb6..b7a0dba 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/CastleLL.png and b/Assets/Sprites/Tilesets/Terrain/CastleLL.png differ
diff --git a/Assets/Sprites/Tilesets/Terrain/CastleWater.png b/Assets/Sprites/Tilesets/Terrain/CastleWater.png
index a9bbb04..818b825 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/CastleWater.png and b/Assets/Sprites/Tilesets/Terrain/CastleWater.png differ
diff --git a/Assets/Sprites/Tilesets/Terrain/CastleWaterLL.png b/Assets/Sprites/Tilesets/Terrain/CastleWaterLL.png
index 0279f82..9a24b72 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/CastleWaterLL.png and b/Assets/Sprites/Tilesets/Terrain/CastleWaterLL.png differ
diff --git a/Assets/Sprites/Tilesets/Terrain/CastleWaterSP.png b/Assets/Sprites/Tilesets/Terrain/CastleWaterSP.png
index 363898a..d8fb931 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/CastleWaterSP.png and b/Assets/Sprites/Tilesets/Terrain/CastleWaterSP.png differ
diff --git a/Assets/Sprites/Tilesets/Terrain/SkyLL.png b/Assets/Sprites/Tilesets/Terrain/SkyLL.png
index 1313a36..07466a9 100644
Binary files a/Assets/Sprites/Tilesets/Terrain/SkyLL.png and b/Assets/Sprites/Tilesets/Terrain/SkyLL.png differ
diff --git a/Scripts/Classes/Editor/LevelEditor.gd b/Scripts/Classes/Editor/LevelEditor.gd
index 5ce4400..effe5a7 100644
--- a/Scripts/Classes/Editor/LevelEditor.gd
+++ b/Scripts/Classes/Editor/LevelEditor.gd
@@ -351,6 +351,7 @@ func save_level() -> void:
 	$LevelSaver.write_file(level_file, file_name)
 	%SaveDialog.text = str("'") +  file_name + "'" + " Saved." 
 	%SaveAnimation.play("Show")
+	current_state = EditorState.TILE_MENU
 	level_saved.emit()
 
 func close_save_menu() -> void:
diff --git a/Scripts/Parts/LevelLoader.gd b/Scripts/Parts/LevelLoader.gd
index 6e0c424..e18c7fb 100644
--- a/Scripts/Parts/LevelLoader.gd
+++ b/Scripts/Parts/LevelLoader.gd
@@ -15,6 +15,7 @@ func _ready() -> void:
 
 func load_level(level_idx := 0) -> void:
 	clear_level()
+	editor.sub_level_id = level_idx
 	sub_level_file = editor.level_file["Levels"][level_idx]
 	build_level()