Regressions fixes and theme tweaks #2