all the styles
Merge remote-tracking branch 'origin/manfred' into dillon
dillon updates to some styles and stuff