Multiple themeing tweaks