Improve language key
Fix bug with colorScheme and width in iframe
Merge branch 'master' into pacl