Patches to add support for dark themes