Merge branch 'release/0.2.35' into develop
Restore display of color choice in configuration
Version bump to 0.2.36
Merge branch 'release/0.2.36'