clean up, working on theme init