fixed some missed styles
consolidated the getcolor parameters out of the functions