Some tweaks to test theme