style updates
merge
styles
rebuild
merge thin branch