Fixes for new theme