Pulled in some slight CPU optimizations from CCL
Fixed base style file