Tweak theme preview
Fix theme preview of tree header & badges