start working on ct styles
fix merge conflicts