Improve Resource Parameterization
Resource Improvments (Ok for colors, fonts and images)
Merge remote-tracking branch 'upstream/master'