Mixed fixes for the new theme