Changed main tileset to new, cleaner format