improve form to allow validation at theme level
Merge branch 'master' into dev-impexp-attrs