Try fix theme issue