angieskazka v3.14.1: Merge branch 'fix/colors' into develop