diff --git a/project/src/demo/puzzle/PuzzleTileSetDemo.tscn b/project/src/demo/puzzle/PuzzleTileSetDemo.tscn
deleted file mode 100644
index 08b64a889..000000000
--- a/project/src/demo/puzzle/PuzzleTileSetDemo.tscn
+++ /dev/null
@@ -1,18 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://b3nv5darfkh68"]
-
-[ext_resource type="TileSet" uid="uid://nmk2el4lfco0" path="res://src/main/puzzle/puzzle-tile-set-g4.tres" id="1_ruled"]
-[ext_resource type="TileSet" uid="uid://dah2oa0jyk7ue" path="res://src/main/puzzle/puzzle-corner-tile-set-g4.tres" id="2_8vcog"]
-
-[node name="Node" type="Node"]
-
-[node name="TileMap" type="TileMap" parent="."]
-z_index = 1
-scale = Vector2(0.5, 0.5)
-tile_set = ExtResource("1_ruled")
-format = 2
-layer_0/tile_data = PackedInt32Array(0, 524288, 0, 1, 393216, 0, 65537, 65536, 0)
-
-[node name="CornerMap" type="TileMap" parent="TileMap"]
-tile_set = ExtResource("2_8vcog")
-format = 2
-layer_0/tile_data = PackedInt32Array(65538, 5, 1)
diff --git a/project/src/main/puzzle/OldPuzzleTileMap.tscn b/project/src/main/puzzle/OldPuzzleTileMap.tscn
new file mode 100644
index 000000000..dad4de94c
--- /dev/null
+++ b/project/src/main/puzzle/OldPuzzleTileMap.tscn
@@ -0,0 +1,133 @@
+[gd_scene load_steps=13 format=2]
+
+[ext_resource path="res://src/main/puzzle/piece/ghost-piece-shadow-map.gd" type="Script" id=1]
+[ext_resource path="res://src/main/puzzle/old-puzzle-tile-set.tres" type="TileSet" id=2]
+[ext_resource path="res://src/main/puzzle/piece/PuzzleCornerMap.tscn" type="PackedScene" id=3]
+[ext_resource path="res://src/main/puzzle/piece/puzzle-shadow-map.gd" type="Script" id=4]
+[ext_resource path="res://src/main/puzzle/puzzle-tile-map.gd" type="Script" id=5]
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-boxes-shadows.png" type="Texture2D" id=6]
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-veggie-cube-shadows.png" type="Texture2D" id=7]
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-shadows.png" type="Texture2D" id=8]
+[ext_resource path="res://src/main/puzzle/flat-mix.gdshader" type="Shader" id=9]
+
+[sub_resource type="ShaderMaterial" id=1]
+resource_local_to_scene = true
+shader = ExtResource( 9 )
+shader_parameter/mix_color = Color( 1, 1, 1, 0 )
+
+[sub_resource type="ShaderMaterial" id=2]
+resource_local_to_scene = true
+shader = ExtResource( 9 )
+shader_parameter/mix_color = Color( 1, 1, 1, 0 )
+
+[sub_resource type="TileSet" id=3]
+0/name = "blocks-shadows.png 0"
+0/texture = ExtResource( 8 )
+0/tex_offset = Vector2( 0, -64 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 2, 2, 2364, 524 )
+0/tile_mode = 2
+0/autotile/icon_coordinate = Vector2( 0, 0 )
+0/autotile/tile_size = Vector2( 144, 128 )
+0/autotile/spacing = 4
+0/autotile/occluder_map = [  ]
+0/autotile/navpoly_map = [  ]
+0/autotile/priority_map = [  ]
+0/autotile/z_index_map = [  ]
+0/occluder_offset = Vector2( 0, 0 )
+0/navigation_offset = Vector2( 0, 0 )
+0/shape_offset = Vector2( 0, 0 )
+0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+0/shape_one_way = false
+0/shape_one_way_margin = 0.0
+0/shapes = [  ]
+0/z_index = 0
+1/name = "blocks-boxes-shadows.png 1"
+1/texture = ExtResource( 6 )
+1/tex_offset = Vector2( 0, -64 )
+1/modulate = Color( 1, 1, 1, 1 )
+1/region = Rect2( 2, 2, 2364, 1580 )
+1/tile_mode = 2
+1/autotile/icon_coordinate = Vector2( 0, 0 )
+1/autotile/tile_size = Vector2( 144, 128 )
+1/autotile/spacing = 4
+1/autotile/occluder_map = [  ]
+1/autotile/navpoly_map = [  ]
+1/autotile/priority_map = [  ]
+1/autotile/z_index_map = [  ]
+1/occluder_offset = Vector2( 0, 0 )
+1/navigation_offset = Vector2( 0, 0 )
+1/shape_offset = Vector2( 0, 0 )
+1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+1/shape_one_way = false
+1/shape_one_way_margin = 0.0
+1/shapes = [  ]
+1/z_index = 0
+2/name = "blocks-veggie-cube-shadows.png 2"
+2/texture = ExtResource( 7 )
+2/tex_offset = Vector2( 0, -64 )
+2/modulate = Color( 1, 1, 1, 1 )
+2/region = Rect2( 2, 2, 2660, 524 )
+2/tile_mode = 2
+2/autotile/icon_coordinate = Vector2( 0, 0 )
+2/autotile/tile_size = Vector2( 144, 128 )
+2/autotile/spacing = 4
+2/autotile/occluder_map = [  ]
+2/autotile/navpoly_map = [  ]
+2/autotile/priority_map = [  ]
+2/autotile/z_index_map = [  ]
+2/occluder_offset = Vector2( 0, 0 )
+2/navigation_offset = Vector2( 0, 0 )
+2/shape_offset = Vector2( 0, 0 )
+2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+2/shape_one_way = false
+2/shape_one_way_margin = 0.0
+2/shapes = [  ]
+2/z_index = 0
+
+[node name="TileMap" type="TileMap"]
+material = SubResource( 1 )
+scale = Vector2( 0.5, 0.5 )
+z_index = 1
+tile_set = ExtResource( 2 )
+cell_size = Vector2( 72, 64 )
+format = 1
+script = ExtResource( 5 )
+
+[node name="CornerMap" parent="." instance=ExtResource( 3 )]
+material = SubResource( 2 )
+tile_set = ExtResource( 2 )
+
+[node name="ShadowViewport" type="SubViewport" parent="."]
+size = Vector2( 324, 544 )
+transparent_bg = true
+usage = 0
+
+[node name="ShadowMap" type="TileMap" parent="ShadowViewport"]
+modulate = Color( 0, 0, 0, 1 )
+show_behind_parent = true
+position = Vector2( 0, -96 )
+scale = Vector2( 0.5, 0.5 )
+tile_set = SubResource( 3 )
+cell_size = Vector2( 72, 64 )
+format = 1
+script = ExtResource( 4 )
+playfield_tile_map_path = NodePath("../..")
+
+[node name="GhostPieceViewport" type="SubViewport" parent="."]
+size = Vector2( 324, 544 )
+transparent_bg = true
+usage = 0
+
+[node name="ShadowMap" type="TileMap" parent="GhostPieceViewport"]
+show_behind_parent = true
+position = Vector2( 0, -96 )
+scale = Vector2( 0.5, 0.5 )
+tile_set = ExtResource( 2 )
+cell_size = Vector2( 72, 64 )
+format = 1
+script = ExtResource( 1 )
+
+[node name="CornerMap" parent="GhostPieceViewport/ShadowMap" instance=ExtResource( 3 )]
+material = SubResource( 2 )
+tile_set = ExtResource( 2 )
diff --git a/project/src/main/puzzle/PuzzleTileMap.tscn b/project/src/main/puzzle/PuzzleTileMap.tscn
index 7fcb34f71..17024c04e 100644
--- a/project/src/main/puzzle/PuzzleTileMap.tscn
+++ b/project/src/main/puzzle/PuzzleTileMap.tscn
@@ -1,133 +1,729 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=14 format=3 uid="uid://cspswgo3grgwy"]
 
-[ext_resource path="res://src/main/puzzle/piece/ghost-piece-shadow-map.gd" type="Script" id=1]
-[ext_resource path="res://src/main/puzzle/puzzle-tile-set.tres" type="TileSet" id=2]
-[ext_resource path="res://src/main/puzzle/piece/PuzzleCornerMap.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/main/puzzle/piece/puzzle-shadow-map.gd" type="Script" id=4]
-[ext_resource path="res://src/main/puzzle/puzzle-tile-map.gd" type="Script" id=5]
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-boxes-shadows.png" type="Texture2D" id=6]
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-veggie-cube-shadows.png" type="Texture2D" id=7]
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-shadows.png" type="Texture2D" id=8]
-[ext_resource path="res://src/main/puzzle/flat-mix.gdshader" type="Shader" id=9]
+[ext_resource type="Shader" path="res://src/main/puzzle/flat-mix.gdshader" id="1_fq7er"]
+[ext_resource type="TileSet" uid="uid://btnp1onq6dy3d" path="res://src/main/puzzle/puzzle-tile-set.tres" id="2_qtcn1"]
+[ext_resource type="Script" path="res://src/main/puzzle/puzzle-tile-map.gd" id="3_80wyk"]
+[ext_resource type="PackedScene" uid="uid://cn06hfyc2tklm" path="res://src/main/puzzle/piece/PuzzleCornerMap.tscn" id="4_acqlk"]
+[ext_resource type="Texture2D" uid="uid://dq4wxfu6y8d0i" path="res://assets/main/puzzle/blocks/blocks-shadows.png" id="5_jja0s"]
+[ext_resource type="Texture2D" uid="uid://c8o006sxkpnll" path="res://assets/main/puzzle/blocks/blocks-boxes-shadows.png" id="6_4y83y"]
+[ext_resource type="Texture2D" uid="uid://bsfguymtgcv8j" path="res://assets/main/puzzle/blocks/blocks-veggie-cube-shadows.png" id="7_ur54j"]
+[ext_resource type="Script" path="res://src/main/puzzle/ghost-piece-shadow-map.gd" id="8_4bv0n"]
 
-[sub_resource type="ShaderMaterial" id=1]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_iahjm"]
 resource_local_to_scene = true
-shader = ExtResource( 9 )
-shader_parameter/mix_color = Color( 1, 1, 1, 0 )
+shader = ExtResource("1_fq7er")
+shader_parameter/mix_color = Color(1, 1, 1, 0)
 
-[sub_resource type="ShaderMaterial" id=2]
-resource_local_to_scene = true
-shader = ExtResource( 9 )
-shader_parameter/mix_color = Color( 1, 1, 1, 0 )
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e1lxe"]
+texture = ExtResource("5_jja0s")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(144, 128)
+0:0/0 = 0
+0:0/0/texture_origin = Vector2i(-64, 0)
+1:0/0 = 0
+1:0/0/texture_origin = Vector2i(-64, 0)
+2:0/0 = 0
+2:0/0/texture_origin = Vector2i(-64, 0)
+3:0/0 = 0
+3:0/0/texture_origin = Vector2i(-64, 0)
+4:0/0 = 0
+4:0/0/texture_origin = Vector2i(-64, 0)
+5:0/0 = 0
+5:0/0/texture_origin = Vector2i(-64, 0)
+6:0/0 = 0
+6:0/0/texture_origin = Vector2i(-64, 0)
+7:0/0 = 0
+7:0/0/texture_origin = Vector2i(-64, 0)
+8:0/0 = 0
+8:0/0/texture_origin = Vector2i(-64, 0)
+9:0/0 = 0
+9:0/0/texture_origin = Vector2i(-64, 0)
+10:0/0 = 0
+10:0/0/texture_origin = Vector2i(-64, 0)
+11:0/0 = 0
+11:0/0/texture_origin = Vector2i(-64, 0)
+12:0/0 = 0
+12:0/0/texture_origin = Vector2i(-64, 0)
+13:0/0 = 0
+13:0/0/texture_origin = Vector2i(-64, 0)
+14:0/0 = 0
+14:0/0/texture_origin = Vector2i(-64, 0)
+15:0/0 = 0
+15:0/0/texture_origin = Vector2i(-64, 0)
+0:1/0 = 0
+0:1/0/texture_origin = Vector2i(-64, 0)
+1:1/0 = 0
+1:1/0/texture_origin = Vector2i(-64, 0)
+2:1/0 = 0
+2:1/0/texture_origin = Vector2i(-64, 0)
+3:1/0 = 0
+3:1/0/texture_origin = Vector2i(-64, 0)
+4:1/0 = 0
+4:1/0/texture_origin = Vector2i(-64, 0)
+5:1/0 = 0
+5:1/0/texture_origin = Vector2i(-64, 0)
+6:1/0 = 0
+6:1/0/texture_origin = Vector2i(-64, 0)
+7:1/0 = 0
+7:1/0/texture_origin = Vector2i(-64, 0)
+8:1/0 = 0
+8:1/0/texture_origin = Vector2i(-64, 0)
+9:1/0 = 0
+9:1/0/texture_origin = Vector2i(-64, 0)
+10:1/0 = 0
+10:1/0/texture_origin = Vector2i(-64, 0)
+11:1/0 = 0
+11:1/0/texture_origin = Vector2i(-64, 0)
+12:1/0 = 0
+12:1/0/texture_origin = Vector2i(-64, 0)
+13:1/0 = 0
+13:1/0/texture_origin = Vector2i(-64, 0)
+14:1/0 = 0
+14:1/0/texture_origin = Vector2i(-64, 0)
+15:1/0 = 0
+15:1/0/texture_origin = Vector2i(-64, 0)
+0:2/0 = 0
+0:2/0/texture_origin = Vector2i(-64, 0)
+1:2/0 = 0
+1:2/0/texture_origin = Vector2i(-64, 0)
+2:2/0 = 0
+2:2/0/texture_origin = Vector2i(-64, 0)
+3:2/0 = 0
+3:2/0/texture_origin = Vector2i(-64, 0)
+4:2/0 = 0
+4:2/0/texture_origin = Vector2i(-64, 0)
+5:2/0 = 0
+5:2/0/texture_origin = Vector2i(-64, 0)
+6:2/0 = 0
+6:2/0/texture_origin = Vector2i(-64, 0)
+7:2/0 = 0
+7:2/0/texture_origin = Vector2i(-64, 0)
+8:2/0 = 0
+8:2/0/texture_origin = Vector2i(-64, 0)
+9:2/0 = 0
+9:2/0/texture_origin = Vector2i(-64, 0)
+10:2/0 = 0
+10:2/0/texture_origin = Vector2i(-64, 0)
+11:2/0 = 0
+11:2/0/texture_origin = Vector2i(-64, 0)
+12:2/0 = 0
+12:2/0/texture_origin = Vector2i(-64, 0)
+13:2/0 = 0
+13:2/0/texture_origin = Vector2i(-64, 0)
+14:2/0 = 0
+14:2/0/texture_origin = Vector2i(-64, 0)
+15:2/0 = 0
+15:2/0/texture_origin = Vector2i(-64, 0)
+0:3/0 = 0
+0:3/0/texture_origin = Vector2i(-64, 0)
+1:3/0 = 0
+1:3/0/texture_origin = Vector2i(-64, 0)
+2:3/0 = 0
+2:3/0/texture_origin = Vector2i(-64, 0)
+3:3/0 = 0
+3:3/0/texture_origin = Vector2i(-64, 0)
+4:3/0 = 0
+4:3/0/texture_origin = Vector2i(-64, 0)
+5:3/0 = 0
+5:3/0/texture_origin = Vector2i(-64, 0)
+6:3/0 = 0
+6:3/0/texture_origin = Vector2i(-64, 0)
+7:3/0 = 0
+7:3/0/texture_origin = Vector2i(-64, 0)
+8:3/0 = 0
+8:3/0/texture_origin = Vector2i(-64, 0)
+9:3/0 = 0
+9:3/0/texture_origin = Vector2i(-64, 0)
+10:3/0 = 0
+10:3/0/texture_origin = Vector2i(-64, 0)
+11:3/0 = 0
+11:3/0/texture_origin = Vector2i(-64, 0)
+12:3/0 = 0
+12:3/0/texture_origin = Vector2i(-64, 0)
+13:3/0 = 0
+13:3/0/texture_origin = Vector2i(-64, 0)
+14:3/0 = 0
+14:3/0/texture_origin = Vector2i(-64, 0)
+15:3/0 = 0
+15:3/0/texture_origin = Vector2i(-64, 0)
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rjd2j"]
+texture = ExtResource("6_4y83y")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(144, 128)
+15:11/0 = 0
+15:11/0/texture_origin = Vector2i(-64, 0)
+14:11/0 = 0
+14:11/0/texture_origin = Vector2i(-64, 0)
+14:10/0 = 0
+14:10/0/texture_origin = Vector2i(-64, 0)
+13:10/0 = 0
+13:10/0/texture_origin = Vector2i(-64, 0)
+12:9/0 = 0
+12:9/0/texture_origin = Vector2i(-64, 0)
+11:9/0 = 0
+11:9/0/texture_origin = Vector2i(-64, 0)
+11:8/0 = 0
+11:8/0/texture_origin = Vector2i(-64, 0)
+10:8/0 = 0
+10:8/0/texture_origin = Vector2i(-64, 0)
+10:7/0 = 0
+10:7/0/texture_origin = Vector2i(-64, 0)
+9:7/0 = 0
+9:7/0/texture_origin = Vector2i(-64, 0)
+9:6/0 = 0
+9:6/0/texture_origin = Vector2i(-64, 0)
+8:6/0 = 0
+8:6/0/texture_origin = Vector2i(-64, 0)
+8:5/0 = 0
+8:5/0/texture_origin = Vector2i(-64, 0)
+7:5/0 = 0
+7:5/0/texture_origin = Vector2i(-64, 0)
+7:4/0 = 0
+7:4/0/texture_origin = Vector2i(-64, 0)
+6:4/0 = 0
+6:4/0/texture_origin = Vector2i(-64, 0)
+5:4/0 = 0
+5:4/0/texture_origin = Vector2i(-64, 0)
+5:3/0 = 0
+5:3/0/texture_origin = Vector2i(-64, 0)
+4:3/0 = 0
+4:3/0/texture_origin = Vector2i(-64, 0)
+4:2/0 = 0
+4:2/0/texture_origin = Vector2i(-64, 0)
+3:2/0 = 0
+3:2/0/texture_origin = Vector2i(-64, 0)
+2:2/0 = 0
+2:2/0/texture_origin = Vector2i(-64, 0)
+1:2/0 = 0
+1:2/0/texture_origin = Vector2i(-64, 0)
+1:1/0 = 0
+1:1/0/texture_origin = Vector2i(-64, 0)
+0:1/0 = 0
+0:1/0/texture_origin = Vector2i(-64, 0)
+0:0/0 = 0
+0:0/0/texture_origin = Vector2i(-64, 0)
+1:0/0 = 0
+1:0/0/texture_origin = Vector2i(-64, 0)
+2:0/0 = 0
+2:0/0/texture_origin = Vector2i(-64, 0)
+3:0/0 = 0
+3:0/0/texture_origin = Vector2i(-64, 0)
+4:0/0 = 0
+4:0/0/texture_origin = Vector2i(-64, 0)
+5:0/0 = 0
+5:0/0/texture_origin = Vector2i(-64, 0)
+6:0/0 = 0
+6:0/0/texture_origin = Vector2i(-64, 0)
+7:0/0 = 0
+7:0/0/texture_origin = Vector2i(-64, 0)
+8:0/0 = 0
+8:0/0/texture_origin = Vector2i(-64, 0)
+9:0/0 = 0
+9:0/0/texture_origin = Vector2i(-64, 0)
+10:0/0 = 0
+10:0/0/texture_origin = Vector2i(-64, 0)
+11:0/0 = 0
+11:0/0/texture_origin = Vector2i(-64, 0)
+12:0/0 = 0
+12:0/0/texture_origin = Vector2i(-64, 0)
+13:0/0 = 0
+13:0/0/texture_origin = Vector2i(-64, 0)
+14:0/0 = 0
+14:0/0/texture_origin = Vector2i(-64, 0)
+15:0/0 = 0
+15:0/0/texture_origin = Vector2i(-64, 0)
+2:1/0 = 0
+2:1/0/texture_origin = Vector2i(-64, 0)
+3:1/0 = 0
+3:1/0/texture_origin = Vector2i(-64, 0)
+4:1/0 = 0
+4:1/0/texture_origin = Vector2i(-64, 0)
+5:1/0 = 0
+5:1/0/texture_origin = Vector2i(-64, 0)
+6:1/0 = 0
+6:1/0/texture_origin = Vector2i(-64, 0)
+7:1/0 = 0
+7:1/0/texture_origin = Vector2i(-64, 0)
+8:1/0 = 0
+8:1/0/texture_origin = Vector2i(-64, 0)
+9:1/0 = 0
+9:1/0/texture_origin = Vector2i(-64, 0)
+10:1/0 = 0
+10:1/0/texture_origin = Vector2i(-64, 0)
+11:1/0 = 0
+11:1/0/texture_origin = Vector2i(-64, 0)
+12:1/0 = 0
+12:1/0/texture_origin = Vector2i(-64, 0)
+13:1/0 = 0
+13:1/0/texture_origin = Vector2i(-64, 0)
+14:1/0 = 0
+14:1/0/texture_origin = Vector2i(-64, 0)
+15:1/0 = 0
+15:1/0/texture_origin = Vector2i(-64, 0)
+0:2/0 = 0
+0:2/0/texture_origin = Vector2i(-64, 0)
+5:2/0 = 0
+5:2/0/texture_origin = Vector2i(-64, 0)
+6:2/0 = 0
+6:2/0/texture_origin = Vector2i(-64, 0)
+7:2/0 = 0
+7:2/0/texture_origin = Vector2i(-64, 0)
+8:2/0 = 0
+8:2/0/texture_origin = Vector2i(-64, 0)
+9:2/0 = 0
+9:2/0/texture_origin = Vector2i(-64, 0)
+10:2/0 = 0
+10:2/0/texture_origin = Vector2i(-64, 0)
+11:2/0 = 0
+11:2/0/texture_origin = Vector2i(-64, 0)
+12:2/0 = 0
+12:2/0/texture_origin = Vector2i(-64, 0)
+13:2/0 = 0
+13:2/0/texture_origin = Vector2i(-64, 0)
+14:2/0 = 0
+14:2/0/texture_origin = Vector2i(-64, 0)
+15:2/0 = 0
+15:2/0/texture_origin = Vector2i(-64, 0)
+0:3/0 = 0
+0:3/0/texture_origin = Vector2i(-64, 0)
+1:3/0 = 0
+1:3/0/texture_origin = Vector2i(-64, 0)
+2:3/0 = 0
+2:3/0/texture_origin = Vector2i(-64, 0)
+3:3/0 = 0
+3:3/0/texture_origin = Vector2i(-64, 0)
+6:3/0 = 0
+6:3/0/texture_origin = Vector2i(-64, 0)
+7:3/0 = 0
+7:3/0/texture_origin = Vector2i(-64, 0)
+8:3/0 = 0
+8:3/0/texture_origin = Vector2i(-64, 0)
+9:3/0 = 0
+9:3/0/texture_origin = Vector2i(-64, 0)
+10:3/0 = 0
+10:3/0/texture_origin = Vector2i(-64, 0)
+11:3/0 = 0
+11:3/0/texture_origin = Vector2i(-64, 0)
+12:3/0 = 0
+12:3/0/texture_origin = Vector2i(-64, 0)
+13:3/0 = 0
+13:3/0/texture_origin = Vector2i(-64, 0)
+14:3/0 = 0
+14:3/0/texture_origin = Vector2i(-64, 0)
+15:3/0 = 0
+15:3/0/texture_origin = Vector2i(-64, 0)
+0:4/0 = 0
+0:4/0/texture_origin = Vector2i(-64, 0)
+1:4/0 = 0
+1:4/0/texture_origin = Vector2i(-64, 0)
+2:4/0 = 0
+2:4/0/texture_origin = Vector2i(-64, 0)
+3:4/0 = 0
+3:4/0/texture_origin = Vector2i(-64, 0)
+4:4/0 = 0
+4:4/0/texture_origin = Vector2i(-64, 0)
+8:4/0 = 0
+8:4/0/texture_origin = Vector2i(-64, 0)
+9:4/0 = 0
+9:4/0/texture_origin = Vector2i(-64, 0)
+10:4/0 = 0
+10:4/0/texture_origin = Vector2i(-64, 0)
+11:4/0 = 0
+11:4/0/texture_origin = Vector2i(-64, 0)
+12:4/0 = 0
+12:4/0/texture_origin = Vector2i(-64, 0)
+13:4/0 = 0
+13:4/0/texture_origin = Vector2i(-64, 0)
+14:4/0 = 0
+14:4/0/texture_origin = Vector2i(-64, 0)
+15:4/0 = 0
+15:4/0/texture_origin = Vector2i(-64, 0)
+0:5/0 = 0
+0:5/0/texture_origin = Vector2i(-64, 0)
+1:5/0 = 0
+1:5/0/texture_origin = Vector2i(-64, 0)
+2:5/0 = 0
+2:5/0/texture_origin = Vector2i(-64, 0)
+3:5/0 = 0
+3:5/0/texture_origin = Vector2i(-64, 0)
+4:5/0 = 0
+4:5/0/texture_origin = Vector2i(-64, 0)
+5:5/0 = 0
+5:5/0/texture_origin = Vector2i(-64, 0)
+6:5/0 = 0
+6:5/0/texture_origin = Vector2i(-64, 0)
+9:5/0 = 0
+9:5/0/texture_origin = Vector2i(-64, 0)
+10:5/0 = 0
+10:5/0/texture_origin = Vector2i(-64, 0)
+11:5/0 = 0
+11:5/0/texture_origin = Vector2i(-64, 0)
+12:5/0 = 0
+12:5/0/texture_origin = Vector2i(-64, 0)
+13:5/0 = 0
+13:5/0/texture_origin = Vector2i(-64, 0)
+14:5/0 = 0
+14:5/0/texture_origin = Vector2i(-64, 0)
+15:5/0 = 0
+15:5/0/texture_origin = Vector2i(-64, 0)
+0:6/0 = 0
+0:6/0/texture_origin = Vector2i(-64, 0)
+1:6/0 = 0
+1:6/0/texture_origin = Vector2i(-64, 0)
+2:6/0 = 0
+2:6/0/texture_origin = Vector2i(-64, 0)
+3:6/0 = 0
+3:6/0/texture_origin = Vector2i(-64, 0)
+4:6/0 = 0
+4:6/0/texture_origin = Vector2i(-64, 0)
+5:6/0 = 0
+5:6/0/texture_origin = Vector2i(-64, 0)
+6:6/0 = 0
+6:6/0/texture_origin = Vector2i(-64, 0)
+7:6/0 = 0
+7:6/0/texture_origin = Vector2i(-64, 0)
+10:6/0 = 0
+10:6/0/texture_origin = Vector2i(-64, 0)
+11:6/0 = 0
+11:6/0/texture_origin = Vector2i(-64, 0)
+12:6/0 = 0
+12:6/0/texture_origin = Vector2i(-64, 0)
+13:6/0 = 0
+13:6/0/texture_origin = Vector2i(-64, 0)
+14:6/0 = 0
+14:6/0/texture_origin = Vector2i(-64, 0)
+15:6/0 = 0
+15:6/0/texture_origin = Vector2i(-64, 0)
+0:7/0 = 0
+0:7/0/texture_origin = Vector2i(-64, 0)
+1:7/0 = 0
+1:7/0/texture_origin = Vector2i(-64, 0)
+2:7/0 = 0
+2:7/0/texture_origin = Vector2i(-64, 0)
+3:7/0 = 0
+3:7/0/texture_origin = Vector2i(-64, 0)
+4:7/0 = 0
+4:7/0/texture_origin = Vector2i(-64, 0)
+5:7/0 = 0
+5:7/0/texture_origin = Vector2i(-64, 0)
+6:7/0 = 0
+6:7/0/texture_origin = Vector2i(-64, 0)
+7:7/0 = 0
+7:7/0/texture_origin = Vector2i(-64, 0)
+8:7/0 = 0
+8:7/0/texture_origin = Vector2i(-64, 0)
+11:7/0 = 0
+11:7/0/texture_origin = Vector2i(-64, 0)
+12:7/0 = 0
+12:7/0/texture_origin = Vector2i(-64, 0)
+13:7/0 = 0
+13:7/0/texture_origin = Vector2i(-64, 0)
+14:7/0 = 0
+14:7/0/texture_origin = Vector2i(-64, 0)
+15:7/0 = 0
+15:7/0/texture_origin = Vector2i(-64, 0)
+0:8/0 = 0
+0:8/0/texture_origin = Vector2i(-64, 0)
+1:8/0 = 0
+1:8/0/texture_origin = Vector2i(-64, 0)
+2:8/0 = 0
+2:8/0/texture_origin = Vector2i(-64, 0)
+3:8/0 = 0
+3:8/0/texture_origin = Vector2i(-64, 0)
+4:8/0 = 0
+4:8/0/texture_origin = Vector2i(-64, 0)
+5:8/0 = 0
+5:8/0/texture_origin = Vector2i(-64, 0)
+6:8/0 = 0
+6:8/0/texture_origin = Vector2i(-64, 0)
+7:8/0 = 0
+7:8/0/texture_origin = Vector2i(-64, 0)
+8:8/0 = 0
+8:8/0/texture_origin = Vector2i(-64, 0)
+9:8/0 = 0
+9:8/0/texture_origin = Vector2i(-64, 0)
+12:8/0 = 0
+12:8/0/texture_origin = Vector2i(-64, 0)
+13:8/0 = 0
+13:8/0/texture_origin = Vector2i(-64, 0)
+14:8/0 = 0
+14:8/0/texture_origin = Vector2i(-64, 0)
+15:8/0 = 0
+15:8/0/texture_origin = Vector2i(-64, 0)
+0:9/0 = 0
+0:9/0/texture_origin = Vector2i(-64, 0)
+1:9/0 = 0
+1:9/0/texture_origin = Vector2i(-64, 0)
+2:9/0 = 0
+2:9/0/texture_origin = Vector2i(-64, 0)
+3:9/0 = 0
+3:9/0/texture_origin = Vector2i(-64, 0)
+4:9/0 = 0
+4:9/0/texture_origin = Vector2i(-64, 0)
+5:9/0 = 0
+5:9/0/texture_origin = Vector2i(-64, 0)
+6:9/0 = 0
+6:9/0/texture_origin = Vector2i(-64, 0)
+7:9/0 = 0
+7:9/0/texture_origin = Vector2i(-64, 0)
+8:9/0 = 0
+8:9/0/texture_origin = Vector2i(-64, 0)
+9:9/0 = 0
+9:9/0/texture_origin = Vector2i(-64, 0)
+10:9/0 = 0
+10:9/0/texture_origin = Vector2i(-64, 0)
+13:9/0 = 0
+13:9/0/texture_origin = Vector2i(-64, 0)
+14:9/0 = 0
+14:9/0/texture_origin = Vector2i(-64, 0)
+15:9/0 = 0
+15:9/0/texture_origin = Vector2i(-64, 0)
+0:10/0 = 0
+0:10/0/texture_origin = Vector2i(-64, 0)
+1:10/0 = 0
+1:10/0/texture_origin = Vector2i(-64, 0)
+2:10/0 = 0
+2:10/0/texture_origin = Vector2i(-64, 0)
+3:10/0 = 0
+3:10/0/texture_origin = Vector2i(-64, 0)
+4:10/0 = 0
+4:10/0/texture_origin = Vector2i(-64, 0)
+5:10/0 = 0
+5:10/0/texture_origin = Vector2i(-64, 0)
+6:10/0 = 0
+6:10/0/texture_origin = Vector2i(-64, 0)
+7:10/0 = 0
+7:10/0/texture_origin = Vector2i(-64, 0)
+8:10/0 = 0
+8:10/0/texture_origin = Vector2i(-64, 0)
+9:10/0 = 0
+9:10/0/texture_origin = Vector2i(-64, 0)
+10:10/0 = 0
+10:10/0/texture_origin = Vector2i(-64, 0)
+11:10/0 = 0
+11:10/0/texture_origin = Vector2i(-64, 0)
+12:10/0 = 0
+12:10/0/texture_origin = Vector2i(-64, 0)
+15:10/0 = 0
+15:10/0/texture_origin = Vector2i(-64, 0)
+0:11/0 = 0
+0:11/0/texture_origin = Vector2i(-64, 0)
+1:11/0 = 0
+1:11/0/texture_origin = Vector2i(-64, 0)
+2:11/0 = 0
+2:11/0/texture_origin = Vector2i(-64, 0)
+3:11/0 = 0
+3:11/0/texture_origin = Vector2i(-64, 0)
+4:11/0 = 0
+4:11/0/texture_origin = Vector2i(-64, 0)
+5:11/0 = 0
+5:11/0/texture_origin = Vector2i(-64, 0)
+6:11/0 = 0
+6:11/0/texture_origin = Vector2i(-64, 0)
+7:11/0 = 0
+7:11/0/texture_origin = Vector2i(-64, 0)
+8:11/0 = 0
+8:11/0/texture_origin = Vector2i(-64, 0)
+9:11/0 = 0
+9:11/0/texture_origin = Vector2i(-64, 0)
+10:11/0 = 0
+10:11/0/texture_origin = Vector2i(-64, 0)
+11:11/0 = 0
+11:11/0/texture_origin = Vector2i(-64, 0)
+12:11/0 = 0
+12:11/0/texture_origin = Vector2i(-64, 0)
+13:11/0 = 0
+13:11/0/texture_origin = Vector2i(-64, 0)
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_aeibt"]
+texture = ExtResource("7_ur54j")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(144, 128)
+0:0/0 = 0
+0:0/0/texture_origin = Vector2i(-64, 0)
+1:0/0 = 0
+1:0/0/texture_origin = Vector2i(-64, 0)
+2:0/0 = 0
+2:0/0/texture_origin = Vector2i(-64, 0)
+3:0/0 = 0
+3:0/0/texture_origin = Vector2i(-64, 0)
+4:0/0 = 0
+4:0/0/texture_origin = Vector2i(-64, 0)
+5:0/0 = 0
+5:0/0/texture_origin = Vector2i(-64, 0)
+6:0/0 = 0
+6:0/0/texture_origin = Vector2i(-64, 0)
+7:0/0 = 0
+7:0/0/texture_origin = Vector2i(-64, 0)
+8:0/0 = 0
+8:0/0/texture_origin = Vector2i(-64, 0)
+9:0/0 = 0
+9:0/0/texture_origin = Vector2i(-64, 0)
+10:0/0 = 0
+10:0/0/texture_origin = Vector2i(-64, 0)
+11:0/0 = 0
+11:0/0/texture_origin = Vector2i(-64, 0)
+12:0/0 = 0
+12:0/0/texture_origin = Vector2i(-64, 0)
+13:0/0 = 0
+13:0/0/texture_origin = Vector2i(-64, 0)
+14:0/0 = 0
+14:0/0/texture_origin = Vector2i(-64, 0)
+15:0/0 = 0
+15:0/0/texture_origin = Vector2i(-64, 0)
+16:0/0 = 0
+16:0/0/texture_origin = Vector2i(-64, 0)
+17:0/0 = 0
+17:0/0/texture_origin = Vector2i(-64, 0)
+0:1/0 = 0
+0:1/0/texture_origin = Vector2i(-64, 0)
+1:1/0 = 0
+1:1/0/texture_origin = Vector2i(-64, 0)
+2:1/0 = 0
+2:1/0/texture_origin = Vector2i(-64, 0)
+3:1/0 = 0
+3:1/0/texture_origin = Vector2i(-64, 0)
+4:1/0 = 0
+4:1/0/texture_origin = Vector2i(-64, 0)
+5:1/0 = 0
+5:1/0/texture_origin = Vector2i(-64, 0)
+6:1/0 = 0
+6:1/0/texture_origin = Vector2i(-64, 0)
+7:1/0 = 0
+7:1/0/texture_origin = Vector2i(-64, 0)
+8:1/0 = 0
+8:1/0/texture_origin = Vector2i(-64, 0)
+9:1/0 = 0
+9:1/0/texture_origin = Vector2i(-64, 0)
+10:1/0 = 0
+10:1/0/texture_origin = Vector2i(-64, 0)
+11:1/0 = 0
+11:1/0/texture_origin = Vector2i(-64, 0)
+12:1/0 = 0
+12:1/0/texture_origin = Vector2i(-64, 0)
+13:1/0 = 0
+13:1/0/texture_origin = Vector2i(-64, 0)
+14:1/0 = 0
+14:1/0/texture_origin = Vector2i(-64, 0)
+15:1/0 = 0
+15:1/0/texture_origin = Vector2i(-64, 0)
+16:1/0 = 0
+16:1/0/texture_origin = Vector2i(-64, 0)
+17:1/0 = 0
+17:1/0/texture_origin = Vector2i(-64, 0)
+0:2/0 = 0
+0:2/0/texture_origin = Vector2i(-64, 0)
+1:2/0 = 0
+1:2/0/texture_origin = Vector2i(-64, 0)
+2:2/0 = 0
+2:2/0/texture_origin = Vector2i(-64, 0)
+3:2/0 = 0
+3:2/0/texture_origin = Vector2i(-64, 0)
+4:2/0 = 0
+4:2/0/texture_origin = Vector2i(-64, 0)
+5:2/0 = 0
+5:2/0/texture_origin = Vector2i(-64, 0)
+6:2/0 = 0
+6:2/0/texture_origin = Vector2i(-64, 0)
+7:2/0 = 0
+7:2/0/texture_origin = Vector2i(-64, 0)
+8:2/0 = 0
+8:2/0/texture_origin = Vector2i(-64, 0)
+9:2/0 = 0
+9:2/0/texture_origin = Vector2i(-64, 0)
+10:2/0 = 0
+10:2/0/texture_origin = Vector2i(-64, 0)
+11:2/0 = 0
+11:2/0/texture_origin = Vector2i(-64, 0)
+12:2/0 = 0
+12:2/0/texture_origin = Vector2i(-64, 0)
+13:2/0 = 0
+13:2/0/texture_origin = Vector2i(-64, 0)
+14:2/0 = 0
+14:2/0/texture_origin = Vector2i(-64, 0)
+15:2/0 = 0
+15:2/0/texture_origin = Vector2i(-64, 0)
+16:2/0 = 0
+16:2/0/texture_origin = Vector2i(-64, 0)
+17:2/0 = 0
+17:2/0/texture_origin = Vector2i(-64, 0)
+0:3/0 = 0
+0:3/0/texture_origin = Vector2i(-64, 0)
+1:3/0 = 0
+1:3/0/texture_origin = Vector2i(-64, 0)
+2:3/0 = 0
+2:3/0/texture_origin = Vector2i(-64, 0)
+3:3/0 = 0
+3:3/0/texture_origin = Vector2i(-64, 0)
+4:3/0 = 0
+4:3/0/texture_origin = Vector2i(-64, 0)
+5:3/0 = 0
+5:3/0/texture_origin = Vector2i(-64, 0)
+6:3/0 = 0
+6:3/0/texture_origin = Vector2i(-64, 0)
+7:3/0 = 0
+7:3/0/texture_origin = Vector2i(-64, 0)
+8:3/0 = 0
+8:3/0/texture_origin = Vector2i(-64, 0)
+9:3/0 = 0
+9:3/0/texture_origin = Vector2i(-64, 0)
+10:3/0 = 0
+10:3/0/texture_origin = Vector2i(-64, 0)
+11:3/0 = 0
+11:3/0/texture_origin = Vector2i(-64, 0)
+12:3/0 = 0
+12:3/0/texture_origin = Vector2i(-64, 0)
+13:3/0 = 0
+13:3/0/texture_origin = Vector2i(-64, 0)
+14:3/0 = 0
+14:3/0/texture_origin = Vector2i(-64, 0)
+15:3/0 = 0
+15:3/0/texture_origin = Vector2i(-64, 0)
+16:3/0 = 0
+16:3/0/texture_origin = Vector2i(-64, 0)
+17:3/0 = 0
+17:3/0/texture_origin = Vector2i(-64, 0)
 
-[sub_resource type="TileSet" id=3]
-0/name = "blocks-shadows.png 0"
-0/texture = ExtResource( 8 )
-0/tex_offset = Vector2( 0, -64 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 2, 2, 2364, 524 )
-0/tile_mode = 2
-0/autotile/icon_coordinate = Vector2( 0, 0 )
-0/autotile/tile_size = Vector2( 144, 128 )
-0/autotile/spacing = 4
-0/autotile/occluder_map = [  ]
-0/autotile/navpoly_map = [  ]
-0/autotile/priority_map = [  ]
-0/autotile/z_index_map = [  ]
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape_one_way = false
-0/shape_one_way_margin = 0.0
-0/shapes = [  ]
-0/z_index = 0
-1/name = "blocks-boxes-shadows.png 1"
-1/texture = ExtResource( 6 )
-1/tex_offset = Vector2( 0, -64 )
-1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 2, 2, 2364, 1580 )
-1/tile_mode = 2
-1/autotile/icon_coordinate = Vector2( 0, 0 )
-1/autotile/tile_size = Vector2( 144, 128 )
-1/autotile/spacing = 4
-1/autotile/occluder_map = [  ]
-1/autotile/navpoly_map = [  ]
-1/autotile/priority_map = [  ]
-1/autotile/z_index_map = [  ]
-1/occluder_offset = Vector2( 0, 0 )
-1/navigation_offset = Vector2( 0, 0 )
-1/shape_offset = Vector2( 0, 0 )
-1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-1/shape_one_way = false
-1/shape_one_way_margin = 0.0
-1/shapes = [  ]
-1/z_index = 0
-2/name = "blocks-veggie-cube-shadows.png 2"
-2/texture = ExtResource( 7 )
-2/tex_offset = Vector2( 0, -64 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 2, 2, 2660, 524 )
-2/tile_mode = 2
-2/autotile/icon_coordinate = Vector2( 0, 0 )
-2/autotile/tile_size = Vector2( 144, 128 )
-2/autotile/spacing = 4
-2/autotile/occluder_map = [  ]
-2/autotile/navpoly_map = [  ]
-2/autotile/priority_map = [  ]
-2/autotile/z_index_map = [  ]
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
-2/shape_offset = Vector2( 0, 0 )
-2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-2/shape_one_way = false
-2/shape_one_way_margin = 0.0
-2/shapes = [  ]
-2/z_index = 0
+[sub_resource type="TileSet" id="TileSet_j45e5"]
+tile_size = Vector2i(72, 64)
+sources/0 = SubResource("TileSetAtlasSource_e1lxe")
+sources/1 = SubResource("TileSetAtlasSource_rjd2j")
+sources/2 = SubResource("TileSetAtlasSource_aeibt")
 
 [node name="TileMap" type="TileMap"]
-material = SubResource( 1 )
-scale = Vector2( 0.5, 0.5 )
 z_index = 1
-tile_set = ExtResource( 2 )
-cell_size = Vector2( 72, 64 )
-format = 1
-script = ExtResource( 5 )
+material = SubResource("ShaderMaterial_iahjm")
+scale = Vector2(0.5, 0.5)
+tile_set = ExtResource("2_qtcn1")
+format = 2
+script = ExtResource("3_80wyk")
 
-[node name="CornerMap" parent="." instance=ExtResource( 3 )]
-material = SubResource( 2 )
-tile_set = ExtResource( 2 )
+[node name="CornerMap" parent="." instance=ExtResource("4_acqlk")]
 
 [node name="ShadowViewport" type="SubViewport" parent="."]
-size = Vector2( 324, 544 )
 transparent_bg = true
-usage = 0
+size = Vector2i(324, 544)
 
 [node name="ShadowMap" type="TileMap" parent="ShadowViewport"]
-modulate = Color( 0, 0, 0, 1 )
-show_behind_parent = true
-position = Vector2( 0, -96 )
-scale = Vector2( 0.5, 0.5 )
-tile_set = SubResource( 3 )
-cell_size = Vector2( 72, 64 )
-format = 1
-script = ExtResource( 4 )
-playfield_tile_map_path = NodePath("../..")
+position = Vector2(0, -96)
+scale = Vector2(0.5, 0.5)
+tile_set = SubResource("TileSet_j45e5")
+format = 2
+script = ExtResource("3_80wyk")
 
 [node name="GhostPieceViewport" type="SubViewport" parent="."]
-size = Vector2( 324, 544 )
 transparent_bg = true
-usage = 0
+size = Vector2i(324, 544)
 
 [node name="ShadowMap" type="TileMap" parent="GhostPieceViewport"]
-show_behind_parent = true
-position = Vector2( 0, -96 )
-scale = Vector2( 0.5, 0.5 )
-tile_set = ExtResource( 2 )
-cell_size = Vector2( 72, 64 )
-format = 1
-script = ExtResource( 1 )
+position = Vector2(0, -96)
+scale = Vector2(0.5, 0.5)
+tile_set = ExtResource("2_qtcn1")
+format = 2
+script = ExtResource("8_4bv0n")
 
-[node name="CornerMap" parent="GhostPieceViewport/ShadowMap" instance=ExtResource( 3 )]
-material = SubResource( 2 )
-tile_set = ExtResource( 2 )
+[node name="CornerMap" parent="GhostPieceViewport/ShadowMap" instance=ExtResource("4_acqlk")]
diff --git a/project/src/main/puzzle/ghost-piece-shadow-map.gd b/project/src/main/puzzle/ghost-piece-shadow-map.gd
new file mode 100644
index 000000000..7edbaf4de
--- /dev/null
+++ b/project/src/main/puzzle/ghost-piece-shadow-map.gd
@@ -0,0 +1,11 @@
+extends TileMap
+
+
+# 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):
+	pass
diff --git a/project/src/main/puzzle/old-puzzle-tile-set.tres b/project/src/main/puzzle/old-puzzle-tile-set.tres
new file mode 100644
index 000000000..18e6d147b
--- /dev/null
+++ b/project/src/main/puzzle/old-puzzle-tile-set.tres
@@ -0,0 +1,92 @@
+[gd_resource type="TileSet" load_steps=5 format=2]
+
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-boxes.png" type="Texture2D" id=1]
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-veggie-cubes.png" type="Texture2D" id=2]
+[ext_resource path="res://assets/main/puzzle/blocks/blocks.png" type="Texture2D" id=3]
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-corners.png" type="Texture2D" id=4]
+
+[resource]
+0/name = "blocks.png"
+0/texture = ExtResource( 3 )
+0/tex_offset = Vector2( 0, 0 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 2, 2, 1212, 268 )
+0/tile_mode = 2
+0/autotile/icon_coordinate = Vector2( 0, 0 )
+0/autotile/tile_size = Vector2( 72, 64 )
+0/autotile/spacing = 4
+0/autotile/occluder_map = [  ]
+0/autotile/navpoly_map = [  ]
+0/autotile/priority_map = [  ]
+0/autotile/z_index_map = [  ]
+0/occluder_offset = Vector2( 0, 0 )
+0/navigation_offset = Vector2( 0, 0 )
+0/shape_offset = Vector2( 0, 0 )
+0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+0/shape_one_way = false
+0/shape_one_way_margin = 0.0
+0/shapes = [  ]
+0/z_index = 0
+1/name = "blocks-boxes.png"
+1/texture = ExtResource( 1 )
+1/tex_offset = Vector2( 0, 0 )
+1/modulate = Color( 1, 1, 1, 1 )
+1/region = Rect2( 2, 2, 1212, 812 )
+1/tile_mode = 2
+1/autotile/icon_coordinate = Vector2( 0, 0 )
+1/autotile/tile_size = Vector2( 72, 64 )
+1/autotile/spacing = 4
+1/autotile/occluder_map = [  ]
+1/autotile/navpoly_map = [  ]
+1/autotile/priority_map = [  ]
+1/autotile/z_index_map = [  ]
+1/occluder_offset = Vector2( 0, 0 )
+1/navigation_offset = Vector2( 0, 0 )
+1/shape_offset = Vector2( 0, 0 )
+1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+1/shape_one_way = false
+1/shape_one_way_margin = 0.0
+1/shapes = [  ]
+1/z_index = 0
+2/name = "blocks-veggie-cubes.png"
+2/texture = ExtResource( 2 )
+2/tex_offset = Vector2( 0, 0 )
+2/modulate = Color( 1, 1, 1, 1 )
+2/region = Rect2( 2, 2, 1368, 268 )
+2/tile_mode = 2
+2/autotile/icon_coordinate = Vector2( 0, 0 )
+2/autotile/tile_size = Vector2( 72, 64 )
+2/autotile/spacing = 4
+2/autotile/occluder_map = [  ]
+2/autotile/navpoly_map = [  ]
+2/autotile/priority_map = [  ]
+2/autotile/z_index_map = [  ]
+2/occluder_offset = Vector2( 0, 0 )
+2/navigation_offset = Vector2( 0, 0 )
+2/shape_offset = Vector2( 0, 0 )
+2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+2/shape_one_way = false
+2/shape_one_way_margin = 0.0
+2/shapes = [  ]
+2/z_index = 0
+3/name = "blocks-corners.png 2"
+3/texture = ExtResource( 4 )
+3/tex_offset = Vector2( 0, 0 )
+3/modulate = Color( 1, 1, 1, 1 )
+3/region = Rect2( 2, 2, 76, 284 )
+3/tile_mode = 2
+3/autotile/icon_coordinate = Vector2( 0, 0 )
+3/autotile/tile_size = Vector2( 36, 32 )
+3/autotile/spacing = 4
+3/autotile/occluder_map = [  ]
+3/autotile/navpoly_map = [  ]
+3/autotile/priority_map = [  ]
+3/autotile/z_index_map = [  ]
+3/occluder_offset = Vector2( 0, 0 )
+3/navigation_offset = Vector2( 0, 0 )
+3/shape_offset = Vector2( 0, 0 )
+3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+3/shape_one_way = false
+3/shape_one_way_margin = 0.0
+3/shapes = [  ]
+3/z_index = 0
diff --git a/project/src/main/puzzle/piece/OldPuzzleCornerMap.tscn b/project/src/main/puzzle/piece/OldPuzzleCornerMap.tscn
new file mode 100644
index 000000000..6dec0f51d
--- /dev/null
+++ b/project/src/main/puzzle/piece/OldPuzzleCornerMap.tscn
@@ -0,0 +1,33 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://assets/main/puzzle/blocks/blocks-corners.png" type="Texture2D" id=1]
+[ext_resource path="res://src/main/puzzle/piece/puzzle-corner-map.gd" type="Script" id=2]
+
+[sub_resource type="TileSet" id=1]
+0/name = "blocks-corners.png 2"
+0/texture = ExtResource( 1 )
+0/tex_offset = Vector2( 0, 0 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 2, 2, 76, 284 )
+0/tile_mode = 2
+0/autotile/icon_coordinate = Vector2( 0, 0 )
+0/autotile/tile_size = Vector2( 36, 32 )
+0/autotile/spacing = 4
+0/autotile/occluder_map = [  ]
+0/autotile/navpoly_map = [  ]
+0/autotile/priority_map = [  ]
+0/autotile/z_index_map = [  ]
+0/occluder_offset = Vector2( 0, 0 )
+0/navigation_offset = Vector2( 0, 0 )
+0/shape_offset = Vector2( 0, 0 )
+0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+0/shape_one_way = false
+0/shape_one_way_margin = 0.0
+0/shapes = [  ]
+0/z_index = 0
+
+[node name="CornerMap" type="TileMap"]
+tile_set = SubResource( 1 )
+cell_size = Vector2( 36, 32 )
+format = 1
+script = ExtResource( 2 )
diff --git a/project/src/main/puzzle/piece/PuzzleCornerMap.tscn b/project/src/main/puzzle/piece/PuzzleCornerMap.tscn
index 6dec0f51d..9758fe28b 100644
--- a/project/src/main/puzzle/piece/PuzzleCornerMap.tscn
+++ b/project/src/main/puzzle/piece/PuzzleCornerMap.tscn
@@ -1,33 +1,35 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=3 uid="uid://cn06hfyc2tklm"]
 
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-corners.png" type="Texture2D" id=1]
-[ext_resource path="res://src/main/puzzle/piece/puzzle-corner-map.gd" type="Script" id=2]
+[ext_resource type="Texture2D" uid="uid://bvadnf5wmdmwd" path="res://assets/main/puzzle/blocks/blocks-corners.png" id="1_6rdno"]
+[ext_resource type="Script" path="res://src/main/puzzle/piece/puzzle-corner-map.gd" id="2_gwd0p"]
 
-[sub_resource type="TileSet" id=1]
-0/name = "blocks-corners.png 2"
-0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 2, 2, 76, 284 )
-0/tile_mode = 2
-0/autotile/icon_coordinate = Vector2( 0, 0 )
-0/autotile/tile_size = Vector2( 36, 32 )
-0/autotile/spacing = 4
-0/autotile/occluder_map = [  ]
-0/autotile/navpoly_map = [  ]
-0/autotile/priority_map = [  ]
-0/autotile/z_index_map = [  ]
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape_one_way = false
-0/shape_one_way_margin = 0.0
-0/shapes = [  ]
-0/z_index = 0
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_eoo1k"]
+texture = ExtResource("1_6rdno")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(36, 32)
+0:3/0 = 0
+1:3/0 = 0
+0:0/0 = 0
+1:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+0:4/0 = 0
+1:4/0 = 0
+0:5/0 = 0
+1:5/0 = 0
+0:6/0 = 0
+1:6/0 = 0
+0:7/0 = 0
+1:7/0 = 0
+
+[sub_resource type="TileSet" id="TileSet_y4hur"]
+tile_size = Vector2i(36, 32)
+sources/0 = SubResource("TileSetAtlasSource_eoo1k")
 
 [node name="CornerMap" type="TileMap"]
-tile_set = SubResource( 1 )
-cell_size = Vector2( 36, 32 )
-format = 1
-script = ExtResource( 2 )
+tile_set = SubResource("TileSet_y4hur")
+format = 2
+script = ExtResource("2_gwd0p")
diff --git a/project/src/main/puzzle/puzzle-tile-map.gd b/project/src/main/puzzle/puzzle-tile-map.gd
index 5dd926aa8..e0b68a2cc 100644
--- a/project/src/main/puzzle/puzzle-tile-map.gd
+++ b/project/src/main/puzzle/puzzle-tile-map.gd
@@ -40,7 +40,7 @@ var _saved_autotile_coords := []
 @onready var _ghost_piece_corner_map: TileMap = $GhostPieceViewport/ShadowMap/CornerMap
 
 var _puzzle_tile_sets_by_enum := {
-	TileSetType.DEFAULT: preload("res://src/main/puzzle/puzzle-tile-set.tres"),
+	TileSetType.DEFAULT: preload("res://src/main/puzzle/old-puzzle-tile-set.tres"),
 	TileSetType.VEGGIE: preload("res://src/main/puzzle/puzzle-tile-set-veggies.tres"),
 	TileSetType.DIAGRAM: preload("res://src/main/puzzle/puzzle-tile-set-diagram.tres"),
 }
diff --git a/project/src/main/puzzle/puzzle-tile-set-g4.tres b/project/src/main/puzzle/puzzle-tile-set-g4.tres
deleted file mode 100644
index 41c62844d..000000000
--- a/project/src/main/puzzle/puzzle-tile-set-g4.tres
+++ /dev/null
@@ -1,360 +0,0 @@
-[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://nmk2el4lfco0"]
-
-[ext_resource type="Texture2D" uid="uid://cx1rfhllap0tl" path="res://assets/main/puzzle/blocks/blocks-boxes.png" id="1"]
-[ext_resource type="Texture2D" uid="uid://b6fof5cvs8at2" path="res://assets/main/puzzle/blocks/blocks-veggie-cubes.png" id="2"]
-[ext_resource type="Texture2D" uid="uid://bw8wt53dofqmh" path="res://assets/main/puzzle/blocks/blocks.png" id="3"]
-
-[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_1paby"]
-resource_name = "blocks.png"
-texture = ExtResource("3")
-margins = Vector2i(2, 2)
-separation = Vector2i(4, 4)
-texture_region_size = Vector2i(72, 64)
-0:0/0 = 0
-2:0/0 = 0
-3:0/0 = 0
-4:0/0 = 0
-5:0/0 = 0
-6:0/0 = 0
-7:0/0 = 0
-8:0/0 = 0
-9:0/0 = 0
-10:0/0 = 0
-11:0/0 = 0
-12:0/0 = 0
-13:0/0 = 0
-14:0/0 = 0
-15:0/0 = 0
-15:1/0 = 0
-15:2/0 = 0
-15:3/0 = 0
-14:3/0 = 0
-13:3/0 = 0
-12:3/0 = 0
-11:3/0 = 0
-10:3/0 = 0
-9:3/0 = 0
-8:3/0 = 0
-7:3/0 = 0
-6:3/0 = 0
-5:3/0 = 0
-4:3/0 = 0
-3:3/0 = 0
-2:3/0 = 0
-1:3/0 = 0
-0:3/0 = 0
-0:2/0 = 0
-0:1/0 = 0
-1:1/0 = 0
-2:1/0 = 0
-3:1/0 = 0
-4:1/0 = 0
-5:1/0 = 0
-6:1/0 = 0
-7:1/0 = 0
-8:1/0 = 0
-9:1/0 = 0
-10:1/0 = 0
-11:1/0 = 0
-12:1/0 = 0
-13:1/0 = 0
-14:1/0 = 0
-14:2/0 = 0
-13:2/0 = 0
-12:2/0 = 0
-11:2/0 = 0
-10:2/0 = 0
-9:2/0 = 0
-8:2/0 = 0
-7:2/0 = 0
-6:2/0 = 0
-5:2/0 = 0
-4:2/0 = 0
-3:2/0 = 0
-2:2/0 = 0
-1:2/0 = 0
-1:0/0 = 0
-
-[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_wwp1r"]
-resource_name = "blocks-boxes.png"
-texture = ExtResource("1")
-margins = Vector2i(2, 2)
-separation = Vector2i(4, 4)
-texture_region_size = Vector2i(72, 64)
-5:2/0 = 0
-13:3/0 = 0
-14:3/0 = 0
-5:4/0 = 0
-6:4/0 = 0
-7:4/0 = 0
-8:4/0 = 0
-9:4/0 = 0
-10:4/0 = 0
-11:4/0 = 0
-12:4/0 = 0
-13:4/0 = 0
-14:4/0 = 0
-4:5/0 = 0
-7:5/0 = 0
-8:5/0 = 0
-9:5/0 = 0
-10:5/0 = 0
-11:5/0 = 0
-12:5/0 = 0
-13:5/0 = 0
-14:5/0 = 0
-4:6/0 = 0
-5:6/0 = 0
-8:6/0 = 0
-9:6/0 = 0
-10:6/0 = 0
-11:6/0 = 0
-12:6/0 = 0
-13:6/0 = 0
-14:6/0 = 0
-5:7/0 = 0
-6:7/0 = 0
-9:7/0 = 0
-10:7/0 = 0
-11:7/0 = 0
-12:7/0 = 0
-13:7/0 = 0
-14:7/0 = 0
-5:8/0 = 0
-6:8/0 = 0
-7:8/0 = 0
-10:8/0 = 0
-11:8/0 = 0
-12:8/0 = 0
-13:8/0 = 0
-14:8/0 = 0
-5:9/0 = 0
-6:9/0 = 0
-7:9/0 = 0
-8:9/0 = 0
-11:9/0 = 0
-12:9/0 = 0
-13:9/0 = 0
-14:9/0 = 0
-0:10/0 = 0
-4:10/0 = 0
-5:10/0 = 0
-6:10/0 = 0
-7:10/0 = 0
-8:10/0 = 0
-9:10/0 = 0
-12:10/0 = 0
-13:10/0 = 0
-14:10/0 = 0
-0:11/0 = 0
-4:11/0 = 0
-5:11/0 = 0
-6:11/0 = 0
-7:11/0 = 0
-8:11/0 = 0
-9:11/0 = 0
-10:11/0 = 0
-11:11/0 = 0
-0:0/0 = 0
-1:0/0 = 0
-2:0/0 = 0
-3:0/0 = 0
-4:0/0 = 0
-5:0/0 = 0
-6:0/0 = 0
-7:0/0 = 0
-8:0/0 = 0
-9:0/0 = 0
-10:0/0 = 0
-11:0/0 = 0
-12:0/0 = 0
-13:0/0 = 0
-14:0/0 = 0
-15:0/0 = 0
-0:1/0 = 0
-1:1/0 = 0
-2:1/0 = 0
-3:1/0 = 0
-4:1/0 = 0
-5:1/0 = 0
-6:1/0 = 0
-7:1/0 = 0
-8:1/0 = 0
-9:1/0 = 0
-10:1/0 = 0
-11:1/0 = 0
-12:1/0 = 0
-13:1/0 = 0
-14:1/0 = 0
-15:1/0 = 0
-0:2/0 = 0
-1:2/0 = 0
-2:2/0 = 0
-3:2/0 = 0
-4:2/0 = 0
-6:2/0 = 0
-7:2/0 = 0
-8:2/0 = 0
-9:2/0 = 0
-10:2/0 = 0
-11:2/0 = 0
-12:2/0 = 0
-13:2/0 = 0
-14:2/0 = 0
-15:2/0 = 0
-0:3/0 = 0
-1:3/0 = 0
-2:3/0 = 0
-3:3/0 = 0
-4:3/0 = 0
-5:3/0 = 0
-6:3/0 = 0
-7:3/0 = 0
-8:3/0 = 0
-9:3/0 = 0
-10:3/0 = 0
-11:3/0 = 0
-12:3/0 = 0
-15:3/0 = 0
-0:4/0 = 0
-1:4/0 = 0
-2:4/0 = 0
-3:4/0 = 0
-4:4/0 = 0
-15:4/0 = 0
-0:5/0 = 0
-1:5/0 = 0
-2:5/0 = 0
-3:5/0 = 0
-5:5/0 = 0
-6:5/0 = 0
-15:5/0 = 0
-0:6/0 = 0
-1:6/0 = 0
-2:6/0 = 0
-3:6/0 = 0
-6:6/0 = 0
-7:6/0 = 0
-15:6/0 = 0
-0:7/0 = 0
-1:7/0 = 0
-2:7/0 = 0
-3:7/0 = 0
-4:7/0 = 0
-7:7/0 = 0
-8:7/0 = 0
-15:7/0 = 0
-0:8/0 = 0
-1:8/0 = 0
-2:8/0 = 0
-3:8/0 = 0
-4:8/0 = 0
-8:8/0 = 0
-9:8/0 = 0
-15:8/0 = 0
-0:9/0 = 0
-1:9/0 = 0
-2:9/0 = 0
-3:9/0 = 0
-4:9/0 = 0
-9:9/0 = 0
-10:9/0 = 0
-15:9/0 = 0
-1:10/0 = 0
-2:10/0 = 0
-3:10/0 = 0
-10:10/0 = 0
-11:10/0 = 0
-15:10/0 = 0
-1:11/0 = 0
-2:11/0 = 0
-3:11/0 = 0
-12:11/0 = 0
-13:11/0 = 0
-14:11/0 = 0
-15:11/0 = 0
-
-[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nunh4"]
-resource_name = "blocks-veggie-cubes.png"
-texture = ExtResource("2")
-margins = Vector2i(2, 2)
-separation = Vector2i(4, 4)
-texture_region_size = Vector2i(72, 64)
-0:0/0 = 0
-1:0/0 = 0
-2:0/0 = 0
-3:0/0 = 0
-4:0/0 = 0
-5:0/0 = 0
-6:0/0 = 0
-7:0/0 = 0
-8:0/0 = 0
-9:0/0 = 0
-10:0/0 = 0
-11:0/0 = 0
-12:0/0 = 0
-13:0/0 = 0
-14:0/0 = 0
-15:0/0 = 0
-16:0/0 = 0
-17:0/0 = 0
-0:1/0 = 0
-1:1/0 = 0
-2:1/0 = 0
-3:1/0 = 0
-4:1/0 = 0
-5:1/0 = 0
-6:1/0 = 0
-7:1/0 = 0
-8:1/0 = 0
-9:1/0 = 0
-10:1/0 = 0
-11:1/0 = 0
-12:1/0 = 0
-13:1/0 = 0
-14:1/0 = 0
-15:1/0 = 0
-16:1/0 = 0
-17:1/0 = 0
-0:2/0 = 0
-1:2/0 = 0
-2:2/0 = 0
-3:2/0 = 0
-4:2/0 = 0
-5:2/0 = 0
-6:2/0 = 0
-7:2/0 = 0
-8:2/0 = 0
-9:2/0 = 0
-10:2/0 = 0
-11:2/0 = 0
-12:2/0 = 0
-13:2/0 = 0
-14:2/0 = 0
-15:2/0 = 0
-16:2/0 = 0
-17:2/0 = 0
-0:3/0 = 0
-1:3/0 = 0
-2:3/0 = 0
-3:3/0 = 0
-4:3/0 = 0
-5:3/0 = 0
-6:3/0 = 0
-7:3/0 = 0
-8:3/0 = 0
-9:3/0 = 0
-10:3/0 = 0
-11:3/0 = 0
-12:3/0 = 0
-13:3/0 = 0
-14:3/0 = 0
-15:3/0 = 0
-16:3/0 = 0
-17:3/0 = 0
-
-[resource]
-tile_size = Vector2i(72, 64)
-sources/0 = SubResource("TileSetAtlasSource_1paby")
-sources/2 = SubResource("TileSetAtlasSource_wwp1r")
-sources/3 = SubResource("TileSetAtlasSource_nunh4")
diff --git a/project/src/main/puzzle/puzzle-tile-set.tres b/project/src/main/puzzle/puzzle-tile-set.tres
index 18e6d147b..08b5e9cfd 100644
--- a/project/src/main/puzzle/puzzle-tile-set.tres
+++ b/project/src/main/puzzle/puzzle-tile-set.tres
@@ -1,92 +1,381 @@
-[gd_resource type="TileSet" load_steps=5 format=2]
+[gd_resource type="TileSet" load_steps=9 format=3 uid="uid://btnp1onq6dy3d"]
 
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-boxes.png" type="Texture2D" id=1]
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-veggie-cubes.png" type="Texture2D" id=2]
-[ext_resource path="res://assets/main/puzzle/blocks/blocks.png" type="Texture2D" id=3]
-[ext_resource path="res://assets/main/puzzle/blocks/blocks-corners.png" type="Texture2D" id=4]
+[ext_resource type="Texture2D" uid="uid://bw8wt53dofqmh" path="res://assets/main/puzzle/blocks/blocks.png" id="1_vpo2j"]
+[ext_resource type="Texture2D" uid="uid://cx1rfhllap0tl" path="res://assets/main/puzzle/blocks/blocks-boxes.png" id="2_vgfte"]
+[ext_resource type="Texture2D" uid="uid://b6fof5cvs8at2" path="res://assets/main/puzzle/blocks/blocks-veggie-cubes.png" id="3_4hhlr"]
+[ext_resource type="Texture2D" uid="uid://bvadnf5wmdmwd" path="res://assets/main/puzzle/blocks/blocks-corners.png" id="4_a3mj6"]
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_axod0"]
+texture = ExtResource("1_vpo2j")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(72, 64)
+0:0/0 = 0
+1:0/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+4:0/0 = 0
+5:0/0 = 0
+6:0/0 = 0
+7:0/0 = 0
+8:0/0 = 0
+9:0/0 = 0
+10:0/0 = 0
+11:0/0 = 0
+12:0/0 = 0
+13:0/0 = 0
+14:0/0 = 0
+15:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+2:1/0 = 0
+3:1/0 = 0
+4:1/0 = 0
+5:1/0 = 0
+6:1/0 = 0
+7:1/0 = 0
+8:1/0 = 0
+9:1/0 = 0
+10:1/0 = 0
+11:1/0 = 0
+12:1/0 = 0
+13:1/0 = 0
+14:1/0 = 0
+15:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+2:2/0 = 0
+3:2/0 = 0
+4:2/0 = 0
+5:2/0 = 0
+6:2/0 = 0
+7:2/0 = 0
+8:2/0 = 0
+9:2/0 = 0
+10:2/0 = 0
+11:2/0 = 0
+12:2/0 = 0
+13:2/0 = 0
+14:2/0 = 0
+15:2/0 = 0
+0:3/0 = 0
+1:3/0 = 0
+2:3/0 = 0
+3:3/0 = 0
+4:3/0 = 0
+5:3/0 = 0
+6:3/0 = 0
+7:3/0 = 0
+8:3/0 = 0
+9:3/0 = 0
+10:3/0 = 0
+11:3/0 = 0
+12:3/0 = 0
+13:3/0 = 0
+14:3/0 = 0
+15:3/0 = 0
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_jk7j7"]
+texture = ExtResource("2_vgfte")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(72, 64)
+0:0/0 = 0
+1:0/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+4:0/0 = 0
+5:0/0 = 0
+6:0/0 = 0
+7:0/0 = 0
+8:0/0 = 0
+9:0/0 = 0
+10:0/0 = 0
+11:0/0 = 0
+12:0/0 = 0
+13:0/0 = 0
+14:0/0 = 0
+15:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+2:1/0 = 0
+3:1/0 = 0
+4:1/0 = 0
+5:1/0 = 0
+6:1/0 = 0
+7:1/0 = 0
+8:1/0 = 0
+9:1/0 = 0
+10:1/0 = 0
+11:1/0 = 0
+12:1/0 = 0
+13:1/0 = 0
+14:1/0 = 0
+15:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+2:2/0 = 0
+3:2/0 = 0
+4:2/0 = 0
+5:2/0 = 0
+6:2/0 = 0
+7:2/0 = 0
+8:2/0 = 0
+9:2/0 = 0
+10:2/0 = 0
+11:2/0 = 0
+12:2/0 = 0
+13:2/0 = 0
+14:2/0 = 0
+15:2/0 = 0
+0:3/0 = 0
+1:3/0 = 0
+2:3/0 = 0
+3:3/0 = 0
+4:3/0 = 0
+5:3/0 = 0
+6:3/0 = 0
+7:3/0 = 0
+8:3/0 = 0
+9:3/0 = 0
+10:3/0 = 0
+11:3/0 = 0
+12:3/0 = 0
+13:3/0 = 0
+14:3/0 = 0
+15:3/0 = 0
+0:4/0 = 0
+1:4/0 = 0
+2:4/0 = 0
+3:4/0 = 0
+4:4/0 = 0
+5:4/0 = 0
+6:4/0 = 0
+7:4/0 = 0
+8:4/0 = 0
+9:4/0 = 0
+10:4/0 = 0
+11:4/0 = 0
+12:4/0 = 0
+13:4/0 = 0
+14:4/0 = 0
+15:4/0 = 0
+0:5/0 = 0
+1:5/0 = 0
+2:5/0 = 0
+3:5/0 = 0
+4:5/0 = 0
+5:5/0 = 0
+6:5/0 = 0
+7:5/0 = 0
+8:5/0 = 0
+9:5/0 = 0
+10:5/0 = 0
+11:5/0 = 0
+12:5/0 = 0
+13:5/0 = 0
+14:5/0 = 0
+15:5/0 = 0
+0:6/0 = 0
+1:6/0 = 0
+2:6/0 = 0
+3:6/0 = 0
+4:6/0 = 0
+5:6/0 = 0
+6:6/0 = 0
+7:6/0 = 0
+8:6/0 = 0
+9:6/0 = 0
+10:6/0 = 0
+11:6/0 = 0
+12:6/0 = 0
+13:6/0 = 0
+14:6/0 = 0
+15:6/0 = 0
+0:7/0 = 0
+1:7/0 = 0
+2:7/0 = 0
+3:7/0 = 0
+4:7/0 = 0
+5:7/0 = 0
+6:7/0 = 0
+7:7/0 = 0
+8:7/0 = 0
+9:7/0 = 0
+10:7/0 = 0
+11:7/0 = 0
+12:7/0 = 0
+13:7/0 = 0
+14:7/0 = 0
+15:7/0 = 0
+0:8/0 = 0
+1:8/0 = 0
+2:8/0 = 0
+3:8/0 = 0
+4:8/0 = 0
+5:8/0 = 0
+6:8/0 = 0
+7:8/0 = 0
+8:8/0 = 0
+9:8/0 = 0
+10:8/0 = 0
+11:8/0 = 0
+12:8/0 = 0
+13:8/0 = 0
+14:8/0 = 0
+15:8/0 = 0
+0:9/0 = 0
+1:9/0 = 0
+2:9/0 = 0
+3:9/0 = 0
+4:9/0 = 0
+5:9/0 = 0
+6:9/0 = 0
+7:9/0 = 0
+8:9/0 = 0
+9:9/0 = 0
+10:9/0 = 0
+11:9/0 = 0
+12:9/0 = 0
+13:9/0 = 0
+14:9/0 = 0
+15:9/0 = 0
+0:10/0 = 0
+1:10/0 = 0
+2:10/0 = 0
+3:10/0 = 0
+4:10/0 = 0
+5:10/0 = 0
+6:10/0 = 0
+7:10/0 = 0
+8:10/0 = 0
+9:10/0 = 0
+10:10/0 = 0
+11:10/0 = 0
+12:10/0 = 0
+13:10/0 = 0
+14:10/0 = 0
+15:10/0 = 0
+0:11/0 = 0
+1:11/0 = 0
+2:11/0 = 0
+3:11/0 = 0
+4:11/0 = 0
+5:11/0 = 0
+6:11/0 = 0
+7:11/0 = 0
+8:11/0 = 0
+9:11/0 = 0
+10:11/0 = 0
+11:11/0 = 0
+12:11/0 = 0
+13:11/0 = 0
+14:11/0 = 0
+15:11/0 = 0
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_g8pn6"]
+texture = ExtResource("3_4hhlr")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(72, 64)
+0:0/0 = 0
+1:0/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+4:0/0 = 0
+5:0/0 = 0
+6:0/0 = 0
+7:0/0 = 0
+8:0/0 = 0
+9:0/0 = 0
+10:0/0 = 0
+11:0/0 = 0
+12:0/0 = 0
+13:0/0 = 0
+14:0/0 = 0
+15:0/0 = 0
+16:0/0 = 0
+17:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+2:1/0 = 0
+3:1/0 = 0
+4:1/0 = 0
+5:1/0 = 0
+6:1/0 = 0
+7:1/0 = 0
+8:1/0 = 0
+9:1/0 = 0
+10:1/0 = 0
+11:1/0 = 0
+12:1/0 = 0
+13:1/0 = 0
+14:1/0 = 0
+15:1/0 = 0
+16:1/0 = 0
+17:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+2:2/0 = 0
+3:2/0 = 0
+4:2/0 = 0
+5:2/0 = 0
+6:2/0 = 0
+7:2/0 = 0
+8:2/0 = 0
+9:2/0 = 0
+10:2/0 = 0
+11:2/0 = 0
+12:2/0 = 0
+13:2/0 = 0
+14:2/0 = 0
+15:2/0 = 0
+16:2/0 = 0
+17:2/0 = 0
+0:3/0 = 0
+1:3/0 = 0
+2:3/0 = 0
+3:3/0 = 0
+4:3/0 = 0
+5:3/0 = 0
+6:3/0 = 0
+7:3/0 = 0
+8:3/0 = 0
+9:3/0 = 0
+10:3/0 = 0
+11:3/0 = 0
+12:3/0 = 0
+13:3/0 = 0
+14:3/0 = 0
+15:3/0 = 0
+16:3/0 = 0
+17:3/0 = 0
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_8qhmg"]
+texture = ExtResource("4_a3mj6")
+margins = Vector2i(2, 2)
+separation = Vector2i(4, 4)
+texture_region_size = Vector2i(36, 32)
+0:0/0 = 0
+1:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+0:3/0 = 0
+1:3/0 = 0
+0:4/0 = 0
+1:4/0 = 0
+0:5/0 = 0
+1:5/0 = 0
+0:6/0 = 0
+1:6/0 = 0
+0:7/0 = 0
+1:7/0 = 0
 
 [resource]
-0/name = "blocks.png"
-0/texture = ExtResource( 3 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 2, 2, 1212, 268 )
-0/tile_mode = 2
-0/autotile/icon_coordinate = Vector2( 0, 0 )
-0/autotile/tile_size = Vector2( 72, 64 )
-0/autotile/spacing = 4
-0/autotile/occluder_map = [  ]
-0/autotile/navpoly_map = [  ]
-0/autotile/priority_map = [  ]
-0/autotile/z_index_map = [  ]
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape_one_way = false
-0/shape_one_way_margin = 0.0
-0/shapes = [  ]
-0/z_index = 0
-1/name = "blocks-boxes.png"
-1/texture = ExtResource( 1 )
-1/tex_offset = Vector2( 0, 0 )
-1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 2, 2, 1212, 812 )
-1/tile_mode = 2
-1/autotile/icon_coordinate = Vector2( 0, 0 )
-1/autotile/tile_size = Vector2( 72, 64 )
-1/autotile/spacing = 4
-1/autotile/occluder_map = [  ]
-1/autotile/navpoly_map = [  ]
-1/autotile/priority_map = [  ]
-1/autotile/z_index_map = [  ]
-1/occluder_offset = Vector2( 0, 0 )
-1/navigation_offset = Vector2( 0, 0 )
-1/shape_offset = Vector2( 0, 0 )
-1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-1/shape_one_way = false
-1/shape_one_way_margin = 0.0
-1/shapes = [  ]
-1/z_index = 0
-2/name = "blocks-veggie-cubes.png"
-2/texture = ExtResource( 2 )
-2/tex_offset = Vector2( 0, 0 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 2, 2, 1368, 268 )
-2/tile_mode = 2
-2/autotile/icon_coordinate = Vector2( 0, 0 )
-2/autotile/tile_size = Vector2( 72, 64 )
-2/autotile/spacing = 4
-2/autotile/occluder_map = [  ]
-2/autotile/navpoly_map = [  ]
-2/autotile/priority_map = [  ]
-2/autotile/z_index_map = [  ]
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
-2/shape_offset = Vector2( 0, 0 )
-2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-2/shape_one_way = false
-2/shape_one_way_margin = 0.0
-2/shapes = [  ]
-2/z_index = 0
-3/name = "blocks-corners.png 2"
-3/texture = ExtResource( 4 )
-3/tex_offset = Vector2( 0, 0 )
-3/modulate = Color( 1, 1, 1, 1 )
-3/region = Rect2( 2, 2, 76, 284 )
-3/tile_mode = 2
-3/autotile/icon_coordinate = Vector2( 0, 0 )
-3/autotile/tile_size = Vector2( 36, 32 )
-3/autotile/spacing = 4
-3/autotile/occluder_map = [  ]
-3/autotile/navpoly_map = [  ]
-3/autotile/priority_map = [  ]
-3/autotile/z_index_map = [  ]
-3/occluder_offset = Vector2( 0, 0 )
-3/navigation_offset = Vector2( 0, 0 )
-3/shape_offset = Vector2( 0, 0 )
-3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-3/shape_one_way = false
-3/shape_one_way_margin = 0.0
-3/shapes = [  ]
-3/z_index = 0
+tile_size = Vector2i(72, 64)
+sources/0 = SubResource("TileSetAtlasSource_axod0")
+sources/1 = SubResource("TileSetAtlasSource_jk7j7")
+sources/2 = SubResource("TileSetAtlasSource_g8pn6")
+sources/3 = SubResource("TileSetAtlasSource_8qhmg")
diff --git a/todo.txt b/todo.txt
index ec6f544c2..db0d98574 100644
--- a/todo.txt
+++ b/todo.txt
@@ -160,6 +160,7 @@ Demos
   *replace 'tile_set.get_tiles_ids()' calls
  -looks vaguely ok on startup
  -'QWERT'
+  -PuzzleTileMap tiles appear OK
  -'ASDFG'
  -'ZXCVB'
  -'.'
@@ -209,22 +210,3 @@ update tile_map.set_cell calls to include 'Vector2.ZERO'
 replace 'tile_set.tile_get_texture(tile_id)' with tile_set.get_source(tile_id).texture
 replace 'tile_set.tile_get_material(tile_id)' with tile_set.get_source(tile_id).get_tile_data(Vector2i.ZERO, 0).texture
 
-removed unnecessary tile alternatives
-shaders no longer apply modulate property
-
-
-Godot demos take about 10-15 seconds to start?
-update Wacom driver (no effect)
-install Corsair iCue (no effect)
-upgrade to iCue 5, update harpoon RGB pro firmware, reboot (no effect)
-decrease polling rate from 1000 to 125 (no effect, 13 s)
-enable editor -> update continuously (no effect)
-unplug corsair mouse, reboot (18s, 17s)
-uninstalled Corsair iCUE, reboot (18s)
-update black mamba to newest version, reboot (no effect)
-reinstall NVidia driver 535.98
-ReleaseToolkit: 6s 6s
-PlayfieldDemo: 10s 10s
-Plugged in corsair mouse; no effect
-Frog Finder: 3s
-PlayfieldDemo in Godot 3: 2.5s