Update styles (almost refactoring)