WIP criteria selection
Merge remote-tracking branch 'remotes/origin/feature/selectedCriteria' into develop
styling, use thema colors
(cherry picked from commit a1025fe)
styling, use thema colors
(cherry picked from commit a1025fe)