Pulled in some slight CPU optimizations from CCL
Fixed base style file
Fixed text wrap issues. Pulled in fixes from CCL.
Merge branch 'master' into gh-pages