Fix theme customizer colors bug
Merge remote-tracking branch 'origin/dev'