cherry-vanilla: restyle (again)