Re-add TileTypes and WallTypes