add missing theme stuff
cleanup