Merge "Fix color in workspace. Where theme badge is applied when it shouldn't" into main