First pass  on general styles
Merge remote