Branding update, finishes up #19