Resolve #3575585 "Convert remaining themes"

Closes #3575585

Merge request reports

Loading