clean up messness from merge
remove logo alignment
update body colour setting names
add brand primary