Theme fixes for CSS-width issues