Updated colors, editor work-in-progress