Update styles to latest from Gabriel