Added support for Dark Themes