minor fixes and theme stuff