Filled in some documentation about theme color definition
Merge branch 'master' into develop
Filled in some documentation about theme color definition