Fix theme bugs