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