Promote draft to post: "Paint By Types"

Final fixes