Theme + button fix