Rearrange
Change color scheme to detailed, minor changes