fixed color property persistence
Merge branch 'master' into single_mode