Style fixup2

This is a start at template and style cleanup.   

+ deleted many unused styles
+ abstracted inline styles to styles.xml