backported theme tweaks from supplevault