Contribute dark theme fixes