Add new styles from refactoring branch
Add clasters, add form-type-2