More Dark mode fixes

Merge request reports