CustomThemes collection
Merge branch 'develop' into 2.0dev
add CustomThemes to module