added module "dark theming"
fix merge conflicts