diff --git a/DependencyInjection/ChillCustomFieldsExtension.php b/DependencyInjection/ChillCustomFieldsExtension.php
index 3f5a1342c..3aaab5933 100644
--- a/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/DependencyInjection/ChillCustomFieldsExtension.php
@@ -41,7 +41,7 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
     public function prepend(ContainerBuilder $container) 
     {
         // add form layout to twig resources
-        $twigConfig['form']['resources'][] = 'ChillCustomFieldsBundle:Form:fields.html.twig';
+        $twigConfig['form_themes'][] = 'ChillCustomFieldsBundle:Form:fields.html.twig';
         $container->prependExtensionConfig('twig', $twigConfig);
         
         //add routes for custom bundle
diff --git a/Form/CustomFieldType.php b/Form/CustomFieldType.php
index 861b6c662..9636049f1 100644
--- a/Form/CustomFieldType.php
+++ b/Form/CustomFieldType.php
@@ -4,7 +4,7 @@ namespace Chill\CustomFieldsBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Symfony\Component\Form\FormEvent;
@@ -75,7 +75,7 @@ class CustomFieldType extends AbstractType
     /**
      * @param OptionsResolverInterface $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomField'
diff --git a/Form/CustomFieldsGroupType.php b/Form/CustomFieldsGroupType.php
index 4ab4379ff..5efc61653 100644
--- a/Form/CustomFieldsGroupType.php
+++ b/Form/CustomFieldsGroupType.php
@@ -4,7 +4,7 @@ namespace Chill\CustomFieldsBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
@@ -88,7 +88,7 @@ class CustomFieldsGroupType extends AbstractType
     /**
      * @param OptionsResolverInterface $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup'
diff --git a/Form/Type/ChoiceWithOtherType.php b/Form/Type/ChoiceWithOtherType.php
index f2c061125..f6e295706 100644
--- a/Form/Type/ChoiceWithOtherType.php
+++ b/Form/Type/ChoiceWithOtherType.php
@@ -3,7 +3,7 @@ namespace Chill\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Return a choice widget with an "other" option
@@ -38,9 +38,9 @@ class ChoiceWithOtherType extends AbstractType
     }
 
     /* (non-PHPdoc)
-     * @see \Symfony\Component\Form\AbstractType::setDefaultOptions()
+     * @see \Symfony\Component\Form\AbstractType::configureOptions()
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver) 
+    public function configureOptions(OptionsResolver $resolver) 
     {
         $resolver
             ->setRequired(array('choices'))
diff --git a/Form/Type/ChoicesListType.php b/Form/Type/ChoicesListType.php
index e45e7942d..26ad33bf5 100644
--- a/Form/Type/ChoicesListType.php
+++ b/Form/Type/ChoicesListType.php
@@ -63,4 +63,4 @@ class ChoicesListType extends AbstractType
         return 'cf_choices_list';
     }
 
-}
\ No newline at end of file
+}
diff --git a/Form/Type/CustomFieldType.php b/Form/Type/CustomFieldType.php
index 7b18d1f76..ed710ec59 100644
--- a/Form/Type/CustomFieldType.php
+++ b/Form/Type/CustomFieldType.php
@@ -19,6 +19,7 @@ use Chill\CustomFieldsBundle\Form\AdressType;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CustomFieldType extends AbstractType
 {
@@ -52,7 +53,7 @@ class CustomFieldType extends AbstractType
         }
     }
     
-    public function setDefaultOptions(\Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver)
+    public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
     {
         $resolver
               ->setRequired(array('group'))
diff --git a/composer.json b/composer.json
index 8f33c8621..d5b776375 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "~5.5",
-        "symfony/symfony": "2.5.*",
+        "symfony/symfony": "~2.7",
         "doctrine/orm": "~2.4",
         "doctrine/dbal" : "~2.5",
         "doctrine/common": "~2.4",
@@ -28,7 +28,7 @@
         "symfony/monolog-bundle": "~2.4",
         "sensio/distribution-bundle": "~3.0",
         "sensio/framework-extra-bundle": "~3.0",
-        "chill-project/main": "*@dev",
+        "chill-project/main": "dev-add_acl@dev",
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "dev-master@dev",
         "doctrine/migrations": "~1.0@dev"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 86c84517a..309d251a0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -19,5 +19,6 @@
     </filter>
     <php>
         <server name="KERNEL_DIR" value="/Tests/Fixtures/App/app/" />
+        <ini name="error_reporting" value="-16385"/>
     </php>  
 </phpunit>
\ No newline at end of file