theme work, comments
cleanup