Theme loading fix