case-2022: Structural changes to the facets/grouping
case-2022: code style
case 2022 Merge conflict
Merge branch 'develop' of github.com:eMusik/emusik_theme into develop