fixed inversion with original colors

also added color to the border for the fill style buttons. need to add
for the original color buttons / color pickers