theme switch, wait, 'if' fix