Adding support for dark themes