Style fixes
Merge branch 'develop' into feature-optimize-palette