Merge "Fix colors and themes in QS" into sc-dev