misc. improvements and bug fixes for maps 

Template expansion/improvement, widespread unit addition, bugfix for broken colors, etc. Fixes redmine #1796