Issue #45 and fix problems with new default classes (template default)