Color edits + rearranging