G26715 fix theme validation