More theme manager work