Upgraded theme manager