revised theme loading (#3)