a host of fixes and theme changes