fix bug in theme from the last theme change