Update to less generic theme