buttons changes, themes are correct now