[#3] More theme tweaks