More fixing for theme manager