Fix theme manager