Fixing the new theme (slowly).