diff --git a/src/Kunstmaan/AdminBundle/Form/DashboardConfigurationType.php b/src/Kunstmaan/AdminBundle/Form/DashboardConfigurationType.php
index 5d4c0b2bec..a835b366c7 100644
--- a/src/Kunstmaan/AdminBundle/Form/DashboardConfigurationType.php
+++ b/src/Kunstmaan/AdminBundle/Form/DashboardConfigurationType.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\AdminBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -17,7 +18,7 @@ class DashboardConfigurationType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', null, array(
+        $builder->add('title', TextType::class, array(
             'label' => 'kuma_admin.dashboard.configuration.title.label',
         ));
         $builder->add('content', TextareaType::class, array(
diff --git a/src/Kunstmaan/ArticleBundle/Form/AbstractArticlePageAdminType.php b/src/Kunstmaan/ArticleBundle/Form/AbstractArticlePageAdminType.php
index 58512c7087..7dd1c26195 100644
--- a/src/Kunstmaan/ArticleBundle/Form/AbstractArticlePageAdminType.php
+++ b/src/Kunstmaan/ArticleBundle/Form/AbstractArticlePageAdminType.php
@@ -4,6 +4,7 @@
 
 use Kunstmaan\NodeBundle\Form\PageAdminType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -37,8 +38,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'date_format' => 'dd/MM/yyyy'
             )
         );
-        $builder->add('summary', null, array(
-            'label' => 'article.form.summary.label'
+
+        $builder->add('summary', TextType::class, array(
+            'label' => 'article.form.summery.label'
         ));
     }
 
diff --git a/src/Kunstmaan/ArticleBundle/Form/AbstractAuthorAdminType.php b/src/Kunstmaan/ArticleBundle/Form/AbstractAuthorAdminType.php
index 0b93e5ffc2..0dd3390278 100644
--- a/src/Kunstmaan/ArticleBundle/Form/AbstractAuthorAdminType.php
+++ b/src/Kunstmaan/ArticleBundle/Form/AbstractAuthorAdminType.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\ArticleBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AbstractAuthorAdminType extends AbstractType
@@ -10,10 +11,10 @@ class AbstractAuthorAdminType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('name', null, array(
+        $builder->add('name', TextType::class, array(
             'label' => 'article.author.form.name.label',
         ));
-        $builder->add('link', null, array(
+        $builder->add('link', TextType::class, array(
             'label' => 'article.author.form.link.label',
         ));
     }
diff --git a/src/Kunstmaan/FormBundle/Form/AbstractFormPageAdminType.php b/src/Kunstmaan/FormBundle/Form/AbstractFormPageAdminType.php
index b9fd423f66..861e69097c 100644
--- a/src/Kunstmaan/FormBundle/Form/AbstractFormPageAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/AbstractFormPageAdminType.php
@@ -4,7 +4,9 @@
 
 use Kunstmaan\AdminBundle\Form\WysiwygType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -19,20 +21,20 @@ class AbstractFormPageAdminType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', null, array(
+        $builder->add('title', TextType::class, array(
             'label' => 'kuma_form.form.page_admin.title.label',
         ));
         $builder->add('thanks', WysiwygType::class, array(
             'label' => 'kuma_form.form.page_admin.thanks.label',
             'required' => false,
         ));
-        $builder->add('subject', null, array(
+        $builder->add('subject', TextType::class, array(
             'label' => 'kuma_form.form.page_admin.subject.label',
         ));
-        $builder->add('from_email', null, array(
+        $builder->add('from_email', EmailType::class, array(
             'label' => 'kuma_form.form.page_admin.from_email.label',
         ));
-        $builder->add('to_email', null, array(
+        $builder->add('to_email', TextType::class, array(
             'label' => 'kuma_form.form.page_admin.to_email.label',
         ));
     }
diff --git a/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php
index a8ec5a7f2b..43229eec19 100644
--- a/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php
@@ -20,7 +20,7 @@ class CheckboxPagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'label' => 'kuma_form.form.checkbox_page_part.label.label',
                 'required' => false,
             ))
diff --git a/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php
index 795068fa03..68c8d0b93d 100644
--- a/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php
@@ -22,7 +22,7 @@ class ChoicePagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'label' => 'kuma_form.form.choice_page_part.label.label',
                 'required' => false,
             ))
diff --git a/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php
index 980577a538..e496aa4f66 100644
--- a/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php
@@ -20,7 +20,7 @@ class EmailPagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'required' => false,
                 'label' => 'kuma_form.form.email_page_part.label.label',
             ))
diff --git a/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php
index 506f062c49..c5613aecad 100644
--- a/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php
@@ -21,7 +21,7 @@ class FileUploadPagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'required' => true,
                 'label' => 'kuma_form.form.file_upload_page_part.label.label',
             ))
diff --git a/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php
index 488c7cb9c6..38db36642c 100644
--- a/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php
@@ -21,7 +21,7 @@ class MultiLineTextPagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'required' => false,
                 'label' => 'kuma_form.form.multi_line_text_page_part.label.label',
             ))
diff --git a/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php
index 4ebac1329f..3bb0f420a3 100644
--- a/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php
@@ -20,7 +20,7 @@ class SingleLineTextPagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'required' => false,
                 'label' => 'kuma_form.form.single_line_text_page_part.label.label',
             ))
diff --git a/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php
index f650a31855..d08a2b69ed 100644
--- a/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php
+++ b/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\FormBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -18,7 +19,7 @@ class SubmitButtonPagePartAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('label', null, array(
+            ->add('label', TextType::class, array(
                 'required' => false,
                 'label' => 'kuma_form.form.submit_button_page_part.label.label'
             ));
diff --git a/src/Kunstmaan/MediaBundle/Form/FolderType.php b/src/Kunstmaan/MediaBundle/Form/FolderType.php
index ba73699336..6dd7d20118 100644
--- a/src/Kunstmaan/MediaBundle/Form/FolderType.php
+++ b/src/Kunstmaan/MediaBundle/Form/FolderType.php
@@ -31,7 +31,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add(
                 'name',
-                null,
+                TextType::class,
                 array(
                     'label' => 'media.folder.addsub.form.name'
                 )
diff --git a/src/Kunstmaan/MediaPagePartBundle/Form/ImagePagePartAdminType.php b/src/Kunstmaan/MediaPagePartBundle/Form/ImagePagePartAdminType.php
index 0a825063c5..b1a9aebe08 100644
--- a/src/Kunstmaan/MediaPagePartBundle/Form/ImagePagePartAdminType.php
+++ b/src/Kunstmaan/MediaPagePartBundle/Form/ImagePagePartAdminType.php
@@ -6,9 +6,8 @@
 use Kunstmaan\NodeBundle\Form\Type\URLChooserType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -32,7 +31,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('media', MediaType::class, array(
             'label' => 'mediapagepart.image.choosefile',
         ));
-        $builder->add('alttext', null, array(
+        $builder->add('alttext', TextType::class, array(
             'required' => false,
             'label' => 'mediapagepart.image.alttext',
         ));
diff --git a/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php b/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php
index 3a75ddb6d1..e5a1ecf636 100644
--- a/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php
+++ b/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -20,7 +21,7 @@ class ControllerActionAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('id', HiddenType::class);
-        $builder->add('title', null, array(
+        $builder->add('title', TextType::class, array(
             'label' => 'kuma_node.form.controller_action.title.label',
         ));
     }
diff --git a/src/Kunstmaan/NodeBundle/Form/PageAdminType.php b/src/Kunstmaan/NodeBundle/Form/PageAdminType.php
index b054c407b4..9a4904f538 100644
--- a/src/Kunstmaan/NodeBundle/Form/PageAdminType.php
+++ b/src/Kunstmaan/NodeBundle/Form/PageAdminType.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -19,10 +20,10 @@ class PageAdminType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('id', HiddenType::class);
-        $builder->add('title', null, array(
+        $builder->add('title', TextType::class, array(
             'label' => 'kuma_node.form.page.title.label',
         ));
-        $builder->add('pageTitle', null, array(
+        $builder->add('pageTitle', TextType::class, array(
             'label' => 'kuma_node.form.page.page_title.label',
             'attr' => array(
                 'info_text' => 'kuma_node.form.page.page_title.info_text',
diff --git a/src/Kunstmaan/NodeSearchBundle/Form/NodeSearchAdminType.php b/src/Kunstmaan/NodeSearchBundle/Form/NodeSearchAdminType.php
index c6036feff5..23ea40f93b 100644
--- a/src/Kunstmaan/NodeSearchBundle/Form/NodeSearchAdminType.php
+++ b/src/Kunstmaan/NodeSearchBundle/Form/NodeSearchAdminType.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\NodeSearchBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -14,7 +15,7 @@ class NodeSearchAdminType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('boost', null, array(
+        $builder->add('boost', TextType::class, array(
             'label' => 'node_search.form.search.boost.label',
         ));
     }
diff --git a/src/Kunstmaan/PagePartBundle/Form/HeaderPagePartAdminType.php b/src/Kunstmaan/PagePartBundle/Form/HeaderPagePartAdminType.php
index 0616fee512..9ea682c2b8 100644
--- a/src/Kunstmaan/PagePartBundle/Form/HeaderPagePartAdminType.php
+++ b/src/Kunstmaan/PagePartBundle/Form/HeaderPagePartAdminType.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -27,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'required' => true
           )
         );
-        $builder->add('title', null, array(
+        $builder->add('title', TextType::class, array(
             'label' => 'pagepart.header.title',
             'required' => true,
         ));
diff --git a/src/Kunstmaan/PagePartBundle/Form/LinkPagePartAdminType.php b/src/Kunstmaan/PagePartBundle/Form/LinkPagePartAdminType.php
index 7c114c4572..3614c98678 100644
--- a/src/Kunstmaan/PagePartBundle/Form/LinkPagePartAdminType.php
+++ b/src/Kunstmaan/PagePartBundle/Form/LinkPagePartAdminType.php
@@ -5,6 +5,7 @@
 use Kunstmaan\NodeBundle\Form\Type\URLChooserType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -28,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'pagepart.link.openinnewwindow',
                 'required' => false,
             ))
-            ->add('text', null, array(
+            ->add('text', TextType::class, array(
                 'label' => 'pagepart.link.text',
                 'required' => false,
             ));
diff --git a/src/Kunstmaan/TaggingBundle/Form/TagAdminType.php b/src/Kunstmaan/TaggingBundle/Form/TagAdminType.php
index d7cdc06e3c..7d279bb9c7 100644
--- a/src/Kunstmaan/TaggingBundle/Form/TagAdminType.php
+++ b/src/Kunstmaan/TaggingBundle/Form/TagAdminType.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\TaggingBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class TagAdminType extends AbstractType
@@ -10,7 +11,7 @@ class TagAdminType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('name', null, array(
+        $builder->add('name', TextType::class, array(
             'label' => 'kuma_tagging.form.tag.name.label',
         ));
     }