Style major type elements
Style images using variables and mixins.
Fix merge conflicts in type styles