Improve styles and update colors