Unify the different tilesets into one tileset, with the various types of terrain loaded on demand based on what is present within each area. This will remove the current duplication of many tiles across the tilesets and allow all props (features) to be used in all areas.
Unified tileset is done as of r1851. It may still need some tweaking; which will become apparent as it is used.