Put solid color generator overloads back, improve performance