Updated the doc concerning themes and made proper inclusions from the project theme files.
Merge branch 'dev'