added theme loading/unloading