camera dialog updated colors and picture still need to do spacing
Merge remote-tracking branch 'origin/master'