Added internal support for dark theme