update logo and brand
merged and resolved conflicts with head