Update with new way to load theme