fixed basic theme loading

further restructuring required for a clean setup