Fixed override path and reviewed all theme overrides, closes #805.
Merge pull request #872 from cmfcmf/override-fix

Fixed override path and reviewed all theme overrides, closes #805.