theme updated, configuration zone fixed
Merge remote-tracking branch 'origin/master'