Improvements

Template expansion/improvement, widespread unit addition, bugfix for broken colors, etc