finish editing the new style

(pending approval from team to change official files)