REF Changed 'layout' to 'theme' in project and module names