Tweaks to theme calculation for tags and stories