Regressions fixes and theme tweaks