Tweaks to increase Theme Check validation