Fixed comments plus switched theme