use new namespace of theme+ models if available
make single accordion element collapsable as proposed in #35