Refactor color-primary
Change color and headings