added some new ALLCOLORS attributes in coloredamounts.h, did some more general work on converting.