remove some old cruft, fix themes