better handling of paint schemes, added testing.