support latest dark theme changes in core