diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 4f57804..150f299 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -18,8 +18,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('kitpages_data_grid');
+        $treeBuilder = new TreeBuilder('kitpages_data_grid');
+        $rootNode = $treeBuilder->getRootNode();
 
         $this->addGridConfiguration($rootNode);
         $this->addPaginatorConfiguration($rootNode);
@@ -44,7 +44,7 @@ private function addGridConfiguration(ArrayNodeDefinition $node)
                         ->end()
                         ->scalarNode('default_twig')
                             ->cannotBeEmpty()
-                            ->defaultValue('KitpagesDataGridBundle:Grid:grid.html.twig')
+                            ->defaultValue('@KitpagesDataGrid/Grid/grid.html.twig')
                         ->end()
                     ->end()
                 ->end()
@@ -62,7 +62,7 @@ private function addPaginatorConfiguration(ArrayNodeDefinition $node)
                     ->children()
                         ->scalarNode('default_twig')
                             ->cannotBeEmpty()
-                            ->defaultValue('KitpagesDataGridBundle:Paginator:paginator.html.twig')
+                            ->defaultValue('@KitpagesDataGrid/Paginator/paginator.html.twig')
                         ->end()
                         ->scalarNode('item_count_in_page')
                             ->cannotBeEmpty()
diff --git a/Event/AbstractEvent.php b/Event/AbstractEvent.php
index 214efb3..0f532b2 100644
--- a/Event/AbstractEvent.php
+++ b/Event/AbstractEvent.php
@@ -1,7 +1,7 @@
 <?php
 namespace Kitpages\DataGridBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 abstract class AbstractEvent extends Event
 {
@@ -22,12 +22,12 @@ public function isDefaultPrevented()
         return $this->isDefaultPrevented;
     }
 
-    public function stopPropagation()
+    public function stopPropagation(): void
     {
         $this->isPropagationStopped = true;
     }
 
-    public function isPropagationStopped()
+    public function isPropagationStopped(): bool
     {
         return $this->isPropagationStopped;
     }
diff --git a/Event/AfterApplyFilter.php b/Event/AfterApplyFilter.php
new file mode 100644
index 0000000..420f020
--- /dev/null
+++ b/Event/AfterApplyFilter.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class AfterApplyFilter extends DataGridEvent
+{
+
+}
diff --git a/Event/AfterApplySelector.php b/Event/AfterApplySelector.php
new file mode 100644
index 0000000..613204a
--- /dev/null
+++ b/Event/AfterApplySelector.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class AfterApplySelector extends DataGridEvent
+{
+
+}
diff --git a/Event/AfterApplySort.php b/Event/AfterApplySort.php
new file mode 100644
index 0000000..bf925fd
--- /dev/null
+++ b/Event/AfterApplySort.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class AfterApplySort extends DataGridEvent
+{
+
+}
diff --git a/Event/AfterDisplayGridValueConversion.php b/Event/AfterDisplayGridValueConversion.php
new file mode 100644
index 0000000..b23b320
--- /dev/null
+++ b/Event/AfterDisplayGridValueConversion.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class AfterDisplayGridValueConversion extends DataGridEvent
+{
+
+}
diff --git a/Event/AfterGetGridQuery.php b/Event/AfterGetGridQuery.php
new file mode 100644
index 0000000..40fa3f0
--- /dev/null
+++ b/Event/AfterGetGridQuery.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class AfterGetGridQuery extends DataGridEvent
+{
+
+}
diff --git a/Event/AfterGetPaginatorQuery.php b/Event/AfterGetPaginatorQuery.php
new file mode 100644
index 0000000..bed2c77
--- /dev/null
+++ b/Event/AfterGetPaginatorQuery.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class AfterGetPaginatorQuery extends DataGridEvent
+{
+
+}
diff --git a/Event/DataGridEvent.php b/Event/DataGridEvent.php
index 69d4906..525d948 100644
--- a/Event/DataGridEvent.php
+++ b/Event/DataGridEvent.php
@@ -5,4 +5,12 @@
 
 class DataGridEvent extends AbstractEvent
 {
+    public function __construct(DataGridEvent $event = null)
+    {
+        if ($event) {
+            $this->data = $event->data;
+            $this->isDefaultPrevented = $event->isDefaultPrevented;
+            $this->isPropagationStopped = $event->isPropagationStopped;
+        }
+    }
 }
diff --git a/Event/OnApplyFilter.php b/Event/OnApplyFilter.php
new file mode 100644
index 0000000..09171ee
--- /dev/null
+++ b/Event/OnApplyFilter.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class OnApplyFilter extends DataGridEvent
+{
+
+}
diff --git a/Event/OnApplySelector.php b/Event/OnApplySelector.php
new file mode 100644
index 0000000..89e79da
--- /dev/null
+++ b/Event/OnApplySelector.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class OnApplySelector extends DataGridEvent
+{
+
+}
diff --git a/Event/OnApplySort.php b/Event/OnApplySort.php
new file mode 100644
index 0000000..4437671
--- /dev/null
+++ b/Event/OnApplySort.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class OnApplySort extends DataGridEvent
+{
+
+}
diff --git a/Event/OnDisplayGridValueConversion.php b/Event/OnDisplayGridValueConversion.php
new file mode 100644
index 0000000..eafdff8
--- /dev/null
+++ b/Event/OnDisplayGridValueConversion.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class OnDisplayGridValueConversion extends DataGridEvent
+{
+
+}
diff --git a/Event/OnGetGridQuery.php b/Event/OnGetGridQuery.php
new file mode 100644
index 0000000..f26813e
--- /dev/null
+++ b/Event/OnGetGridQuery.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class OnGetGridQuery extends DataGridEvent
+{
+
+}
diff --git a/Event/OnGetPaginatorQuery.php b/Event/OnGetPaginatorQuery.php
new file mode 100644
index 0000000..b8f5066
--- /dev/null
+++ b/Event/OnGetPaginatorQuery.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kitpages\DataGridBundle\Event;
+
+class OnGetPaginatorQuery extends DataGridEvent
+{
+
+}
diff --git a/Grid/Grid.php b/Grid/Grid.php
index 6a866a3..3e0725a 100644
--- a/Grid/Grid.php
+++ b/Grid/Grid.php
@@ -2,6 +2,9 @@
 
 namespace Kitpages\DataGridBundle\Grid;
 
+use Kitpages\DataGridBundle\Event\AfterDisplayGridValueConversion;
+use Kitpages\DataGridBundle\Event\OnDisplayGridValueConversion;
+use Kitpages\DataGridBundle\Paginator\Paginator;
 use Kitpages\DataGridBundle\Tool\UrlTool;
 use Kitpages\DataGridBundle\Grid\Field;
 use Kitpages\DataGridBundle\DataGridException;
@@ -123,7 +126,7 @@ public function displayGridValue($row, Field $field)
         $event->set('value', $value);
         $event->set('row', $row);
         $event->set('field', $field);
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::ON_DISPLAY_GRID_VALUE_CONVERSION, $event);
+        $this->dispatcher->dispatch(new OnDisplayGridValueConversion($event));
 
         if (!$event->isDefaultPrevented()) {
             $value = $event->get('value');
@@ -135,7 +138,7 @@ public function displayGridValue($row, Field $field)
             $event->set('returnValue', $returnValue);
         }
 
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::AFTER_DISPLAY_GRID_VALUE_CONVERSION, $event);
+        $this->dispatcher->dispatch(new AfterDisplayGridValueConversion($event));
         $returnValue = $event->get('returnValue');
 
         // auto escape ? (if null, return null, without autoescape...)
diff --git a/Grid/GridConfig.php b/Grid/GridConfig.php
index 225d8ec..334afb1 100644
--- a/Grid/GridConfig.php
+++ b/Grid/GridConfig.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Kitpages\DataGridBundle\Paginator\PaginatorConfig;
+use SebastianBergmann\CodeCoverage\Driver\Selector;
 
 class GridConfig
 {
diff --git a/Grid/GridManager.php b/Grid/GridManager.php
index c62c37c..488a78b 100644
--- a/Grid/GridManager.php
+++ b/Grid/GridManager.php
@@ -1,6 +1,14 @@
 <?php
 namespace Kitpages\DataGridBundle\Grid;
 
+use Kitpages\DataGridBundle\Event\AfterApplyFilter;
+use Kitpages\DataGridBundle\Event\AfterApplySelector;
+use Kitpages\DataGridBundle\Event\AfterApplySort;
+use Kitpages\DataGridBundle\Event\AfterGetGridQuery;
+use Kitpages\DataGridBundle\Event\OnApplyFilter;
+use Kitpages\DataGridBundle\Event\OnApplySelector;
+use Kitpages\DataGridBundle\Event\OnApplySort;
+use Kitpages\DataGridBundle\Event\OnGetGridQuery;
 use Kitpages\DataGridBundle\Grid\ItemListNormalizer\NormalizerInterface;
 use Kitpages\DataGridBundle\Paginator\PaginatorManager;
 use Symfony\Component\HttpFoundation\Request;
@@ -123,7 +131,7 @@ public function getGrid(
         $event->set("grid", $grid);
         $event->set("gridQueryBuilder", $gridQueryBuilder);
         $event->set("request", $request);
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::ON_GET_GRID_QUERY, $event);
+        $this->dispatcher->dispatch(new OnGetGridQuery($event));
 
         if (!$event->isDefaultPrevented()) {
             // execute request
@@ -131,7 +139,7 @@ public function getGrid(
             $event->set("query", $query);
         }
 
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::AFTER_GET_GRID_QUERY, $event);
+        $this->dispatcher->dispatch(new AfterGetGridQuery($event));
 
         // hack : recover query from the event so the developper can build a new grid
         // from the gridQueryBuilder in the listener and reinject it in the event.
@@ -156,7 +164,7 @@ protected function applyFilter(QueryBuilder $queryBuilder, Grid $grid, $filter)
         $event->set("grid", $grid);
         $event->set("gridQueryBuilder", $queryBuilder);
         $event->set("filter", $filter);
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::ON_APPLY_FILTER, $event);
+        $this->dispatcher->dispatch(new OnApplyFilter($event));
 
         if (!$event->isDefaultPrevented()) {
             $fieldList = $grid->getGridConfig()->getFieldList();
@@ -173,7 +181,7 @@ protected function applyFilter(QueryBuilder $queryBuilder, Grid $grid, $filter)
             }
             $grid->setFilterValue($filter);
         }
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::AFTER_APPLY_FILTER, $event);
+        $this->dispatcher->dispatch(new AfterApplyFilter($event));
     }
 
     protected function applySelector(QueryBuilder $queryBuilder, Grid $grid, $selectorField, $selectorValue)
@@ -186,7 +194,7 @@ protected function applySelector(QueryBuilder $queryBuilder, Grid $grid, $select
         $event->set("gridQueryBuilder", $queryBuilder);
         $event->set("selectorField", $selectorField);
         $event->set("selectorValue", $selectorValue);
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::ON_APPLY_SELECTOR, $event);
+        $this->dispatcher->dispatch(new OnApplySelector($event));
 
         if (!$event->isDefaultPrevented()) {
             $queryBuilder->andWhere($selectorField." = :selectorValue");
@@ -195,7 +203,7 @@ protected function applySelector(QueryBuilder $queryBuilder, Grid $grid, $select
             $grid->setSelectorField($selectorField);
             $grid->setSelectorValue($selectorValue);
         }
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::AFTER_APPLY_SELECTOR, $event);
+        $this->dispatcher->dispatch(new AfterApplySelector($event));
     }
 
     protected function applySort(QueryBuilder $gridQueryBuilder, Grid $grid, $sortField, $sortOrder)
@@ -208,7 +216,7 @@ protected function applySort(QueryBuilder $gridQueryBuilder, Grid $grid, $sortFi
         $event->set("gridQueryBuilder", $gridQueryBuilder);
         $event->set("sortField", $sortField);
         $event->set("sortOrder", $sortOrder);
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::ON_APPLY_SORT, $event);
+        $this->dispatcher->dispatch(new OnApplySort($event));
 
         if (!$event->isDefaultPrevented()) {
             $sortFieldObject = null;
@@ -232,7 +240,7 @@ protected function applySort(QueryBuilder $gridQueryBuilder, Grid $grid, $sortFi
             $grid->setSortOrder($sortOrder);
         }
 
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::AFTER_APPLY_SORT, $event);
+        $this->dispatcher->dispatch(new AfterApplySort($event));
     }
 
 }
diff --git a/KitpagesDataGridEvents.php b/KitpagesDataGridEvents.php
index 3517fbe..da45c0b 100644
--- a/KitpagesDataGridEvents.php
+++ b/KitpagesDataGridEvents.php
@@ -1,23 +1,37 @@
 <?php
+
 namespace Kitpages\DataGridBundle;
 
+use Kitpages\DataGridBundle\Event\AfterApplyFilter;
+use Kitpages\DataGridBundle\Event\AfterApplySelector;
+use Kitpages\DataGridBundle\Event\AfterApplySort;
+use Kitpages\DataGridBundle\Event\AfterDisplayGridValueConversion;
+use Kitpages\DataGridBundle\Event\AfterGetGridQuery;
+use Kitpages\DataGridBundle\Event\AfterGetPaginatorQuery;
+use Kitpages\DataGridBundle\Event\OnApplyFilter;
+use Kitpages\DataGridBundle\Event\OnApplySelector;
+use Kitpages\DataGridBundle\Event\OnApplySort;
+use Kitpages\DataGridBundle\Event\OnDisplayGridValueConversion;
+use Kitpages\DataGridBundle\Event\OnGetGridQuery;
+use Kitpages\DataGridBundle\Event\OnGetPaginatorQuery;
+
 final class KitpagesDataGridEvents
 {
-    const ON_GET_GRID_QUERY = "kitpages_data_grid.on_get_grid_query";
-    const AFTER_GET_GRID_QUERY = "kitpages_data_grid.after_get_grid_query";
+    const ON_GET_GRID_QUERY = OnGetGridQuery::class;
+    const AFTER_GET_GRID_QUERY = AfterGetGridQuery::class;
 
-    const ON_GET_PAGINATOR_QUERY = "kitpages_data_grid.on_get_paginator_query";
-    const AFTER_GET_PAGINATOR_QUERY = "kitpages_data_grid.after_get_paginator_query";
+    const ON_GET_PAGINATOR_QUERY = OnGetPaginatorQuery::class;
+    const AFTER_GET_PAGINATOR_QUERY = AfterGetPaginatorQuery::class;
 
-    const ON_APPLY_FILTER = "kitpages_data_grid.on_apply_filter";
-    const AFTER_APPLY_FILTER = "kitpages_data_grid.after_apply_filter";
+    const ON_APPLY_FILTER = OnApplyFilter::class;
+    const AFTER_APPLY_FILTER = AfterApplyFilter::class;
 
-    const ON_APPLY_SELECTOR = "kitpages_data_grid.on_apply_selector";
-    const AFTER_APPLY_SELECTOR = "kitpages_data_grid.after_apply_selector";
+    const ON_APPLY_SELECTOR = OnApplySelector::class;
+    const AFTER_APPLY_SELECTOR = AfterApplySelector::class;
 
-    const ON_APPLY_SORT = "kitpages_data_grid.on_apply_sort";
-    const AFTER_APPLY_SORT = "kitpages_data_grid.after_apply_sort";
+    const ON_APPLY_SORT = OnApplySort::class;
+    const AFTER_APPLY_SORT = AfterApplySort::class;
 
-    const ON_DISPLAY_GRID_VALUE_CONVERSION = "kitpages_data_grid.on_display_grid_value_conversion";
-    const AFTER_DISPLAY_GRID_VALUE_CONVERSION = "kitpages_data_grid.after_display_grid_value_conversion";
+    const ON_DISPLAY_GRID_VALUE_CONVERSION = OnDisplayGridValueConversion::class;
+    const AFTER_DISPLAY_GRID_VALUE_CONVERSION = AfterDisplayGridValueConversion::class;
 }
diff --git a/Paginator/PaginatorManager.php b/Paginator/PaginatorManager.php
index 91ef166..7c83917 100644
--- a/Paginator/PaginatorManager.php
+++ b/Paginator/PaginatorManager.php
@@ -1,6 +1,8 @@
 <?php
 namespace Kitpages\DataGridBundle\Paginator;
 
+use Kitpages\DataGridBundle\Event\AfterGetPaginatorQuery;
+use Kitpages\DataGridBundle\Event\OnGetPaginatorQuery;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -73,13 +75,13 @@ public function getPaginator(PaginatorConfig $paginatorConfig, Request $request)
         $event->set("paginator", $paginator);
         $event->set("paginatorQueryBuilder", $countQueryBuilder);
         $event->set("request", $request);
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::ON_GET_PAGINATOR_QUERY, $event);
+        $this->dispatcher->dispatch(new OnGetPaginatorQuery($event));
 
         if (!$event->isDefaultPrevented()) {
             $query = $countQueryBuilder->getQuery();
             $event->set("query", $query);
         }
-        $this->dispatcher->dispatch(KitpagesDataGridEvents::AFTER_GET_PAGINATOR_QUERY, $event);
+        $this->dispatcher->dispatch(new AfterGetPaginatorQuery($event));
 
         // hack : recover query from the event so the developper can build a new query
         // from the paginatorQueryBuilder in the listener and reinject it in the event.
diff --git a/README.md b/README.md
index 237760c..0574563 100644
--- a/README.md
+++ b/README.md
@@ -98,9 +98,9 @@ These values are default values. You can skip the configuration if it is ok for
 ```yaml
 kitpages_data_grid:
     grid:
-        default_twig: KitpagesDataGridBundle:Grid:grid.html.twig
+        default_twig: @KitpagesDataGrid/Grid/grid.html.twig
     paginator:
-        default_twig: KitpagesDataGridBundle:Paginator:paginator.html.twig
+        default_twig: @KitpagesDataGrid/Paginator/paginator.html.twig
         item_count_in_page: 50
         visible_page_count_in_paginator: 5
 ```
@@ -110,9 +110,9 @@ Note you can use the followin configuration in order to user Bootstrap 3 :
 ```yaml
 kitpages_data_grid:
     grid:
-        default_twig: KitpagesDataGridBundle:Grid:bootstrap3-grid.html.twig
+        default_twig: @KitpagesDataGrid/Grid/bootstrap3-grid.html.twig
     paginator:
-        default_twig: KitpagesDataGridBundle:Paginator:bootstrap3-paginator.html.twig
+        default_twig: @KitpagesDataGrid/Paginator/bootstrap3-paginator.html.twig
 ```
 
 
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 6933796..3d1173b 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -4,31 +4,23 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="kitpages_data_grid.grid_manager.class">Kitpages\DataGridBundle\Grid\GridManager</parameter>
-        <parameter key="kitpages_data_grid.paginator_manager.class">Kitpages\DataGridBundle\Paginator\PaginatorManager</parameter>
-        <parameter key="kitpages_data_grid.item_list_normalizer.legacy.class">Kitpages\DataGridBundle\Grid\ItemListNormalizer\LegacyNormalizer</parameter>
-        <parameter key="kitpages_data_grid.item_list_normalizer.standard.class">Kitpages\DataGridBundle\Grid\ItemListNormalizer\StandardNormalizer</parameter>
-        <parameter key="kitpages_data_grid.globals_twig_extension.class">Kitpages\DataGridBundle\Twig\GlobalsTwigExtension</parameter>
-    </parameters>
-
     <services>
-        <service id="kitpages_data_grid.grid_manager" class="%kitpages_data_grid.grid_manager.class%">
+        <service id="Kitpages\DataGridBundle\Grid\GridManager">
             <argument type="service" id="event_dispatcher"/>
-            <argument type="service" id="kitpages_data_grid.paginator_manager"/>
-            <argument type="service" id="kitpages_data_grid.item_list_normalizer.standard"/>
+            <argument type="service" id="Kitpages\DataGridBundle\Paginator\PaginatorManager"/>
+            <argument type="service" id="Kitpages\DataGridBundle\Grid\ItemListNormalizer\StandardNormalizer"/>
             <argument>%kitpages_data_grid.grid.hydrator_class%</argument>
         </service>
-        <service id="kitpages_data_grid.paginator_manager" class="%kitpages_data_grid.paginator_manager.class%">
+        <service id="Kitpages\DataGridBundle\Paginator\PaginatorManager">
             <argument type="service" id="event_dispatcher"/>
             <argument>%kitpages_data_grid.paginator%</argument>
         </service>
-        <service id="kitpages_data_grid.item_list_normalizer.legacy" class="%kitpages_data_grid.item_list_normalizer.legacy.class%">
+        <service id="Kitpages\DataGridBundle\Grid\ItemListNormalizer\LegacyNormalizer">
         </service>
-        <service id="kitpages_data_grid.item_list_normalizer.standard" class="%kitpages_data_grid.item_list_normalizer.standard.class%">
+        <service id="Kitpages\DataGridBundle\Grid\ItemListNormalizer\StandardNormalizer">
         </service>
 
-        <service id="kitpages_data_grid.globals_twig_extension" class="%kitpages_data_grid.globals_twig_extension.class%">
+        <service id="Kitpages\DataGridBundle\Twig\GlobalsTwigExtension">
             <argument>%kitpages_data_grid.grid%</argument>
             <argument>%kitpages_data_grid.paginator%</argument>
             <tag name="twig.extension"/>
diff --git a/Resources/doc/40-CookBook.md b/Resources/doc/40-CookBook.md
index caf49a0..dac6bae 100644
--- a/Resources/doc/40-CookBook.md
+++ b/Resources/doc/40-CookBook.md
@@ -6,7 +6,7 @@ The CookBook
 You just have to use the twig embed bootstrap-grid.html.twig instead of grid.html.twig :
 
 ```twig
-    {% embed 'KitpagesDataGridBundle:Grid:bootstrap-grid.html.twig' with {'grid': grid} %}
+    {% embed '@KitpagesDataGrid/Grid/bootstrap-grid.html.twig' with {'grid': grid} %}
     {% endembed %}
 ```
 
diff --git a/Resources/views/Grid/bootstrap-grid.html.twig b/Resources/views/Grid/bootstrap-grid.html.twig
index 012d39f..68ef6e6 100644
--- a/Resources/views/Grid/bootstrap-grid.html.twig
+++ b/Resources/views/Grid/bootstrap-grid.html.twig
@@ -81,6 +81,6 @@
 </div>
 
 {% block kit_grid_javascript %}
-    {% include "KitpagesDataGridBundle:Grid:javascript.html.twig" %}
+    {% include "@KitpagesDataGrid/Grid/javascript.html.twig" %}
 {% endblock kit_grid_javascript %}
 {% endblock kit_grid_main %}
diff --git a/Resources/views/Grid/bootstrap3-grid.html.twig b/Resources/views/Grid/bootstrap3-grid.html.twig
index 92ced1e..a125fbc 100644
--- a/Resources/views/Grid/bootstrap3-grid.html.twig
+++ b/Resources/views/Grid/bootstrap3-grid.html.twig
@@ -127,6 +127,6 @@
         {% block kit_grid_after_paginator %}{% endblock %}
     </div>
     {% block kit_grid_javascript %}
-        {% include "KitpagesDataGridBundle:Grid:javascript.html.twig" %}
+        {% include "@KitpagesDataGrid/Grid/javascript.html.twig" %}
     {% endblock kit_grid_javascript %}
 {% endblock kit_grid_main %}
diff --git a/Resources/views/Grid/grid.html.twig b/Resources/views/Grid/grid.html.twig
index b538342..4a17d94 100644
--- a/Resources/views/Grid/grid.html.twig
+++ b/Resources/views/Grid/grid.html.twig
@@ -81,6 +81,6 @@
     {{ block(' kit_grid_after_paginator') }}
 </div>
 {% block kit_grid_javascript %}
-    {% include "KitpagesDataGridBundle:Grid:javascript.html.twig" %}
+    {% include "@KitpagesDataGrid/Grid/javascript.html.twig" %}
 {% endblock kit_grid_javascript %}
 {% endblock kit_grid_main %}
diff --git a/Resources/views/Grid/javascript.html.twig b/Resources/views/Grid/javascript.html.twig
index edd444a..ac8d3fb 100644
--- a/Resources/views/Grid/javascript.html.twig
+++ b/Resources/views/Grid/javascript.html.twig
@@ -1,3 +1,3 @@
 <script type="text/javascript">
-    {% include "KitpagesDataGridBundle:Grid:javascript_content.html.twig" %}
+    {% include "@KitpagesDataGrid/Grid/javascript_content.html.twig" %}
 </script>
diff --git a/Tests/AppKernel.php b/Tests/AppKernel.php
index 7091294..e459fd6 100644
--- a/Tests/AppKernel.php
+++ b/Tests/AppKernel.php
@@ -24,6 +24,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function getCacheDir()
     {
-        return $this->rootDir.'/app/cache/'.$this->environment;
+        return $this->getProjectDir().'/app/cache/'.$this->environment;
     }
 }
diff --git a/Tests/Fonctionnal/ConfigTest.php b/Tests/Fonctionnal/ConfigTest.php
index 1c7ed15..5bd9cf5 100644
--- a/Tests/Fonctionnal/ConfigTest.php
+++ b/Tests/Fonctionnal/ConfigTest.php
@@ -11,7 +11,7 @@ public function testConfigParsing()
     {
         $client = self::createClient();
         $gridParameters = $client->getContainer()->getParameter('kitpages_data_grid.grid');
-        $this->assertEquals("KitpagesDataGridBundle:Grid:grid-standard.html.twig", $gridParameters["default_twig"]);
+        $this->assertEquals("@KitpagesDataGrid/Grid/grid-standard.html.twig", $gridParameters["default_twig"]);
         $this->assertEquals('\Kitpages\DataGridBundle\Hydrators\DataGridHydrator', $gridParameters["hydrator_class"]);
     }
 
diff --git a/Tests/Fonctionnal/TwigExtensionTest.php b/Tests/Fonctionnal/TwigExtensionTest.php
index c993ec7..0d4969d 100644
--- a/Tests/Fonctionnal/TwigExtensionTest.php
+++ b/Tests/Fonctionnal/TwigExtensionTest.php
@@ -18,7 +18,7 @@ public function testConfigParsing()
          */
         $templating = $client->getContainer()->get('templating');
         $this->assertEquals(
-            "KitpagesDataGridBundle:Grid:grid-standard.html.twig",
+            "@KitpagesDataGrid/Grid/grid-standard.html.twig",
             $templating->render("globals.html.twig")
         );
     }
diff --git a/Tests/Grid/GridConfigTest.php b/Tests/Grid/GridConfigTest.php
index 9251952..2d7931d 100644
--- a/Tests/Grid/GridConfigTest.php
+++ b/Tests/Grid/GridConfigTest.php
@@ -13,7 +13,7 @@ class GridConfigTest extends TestCase
      */
     protected $gridConfig;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->gridConfig = new GridConfig();
 
diff --git a/Tests/Grid/GridManagerTest.php b/Tests/Grid/GridManagerTest.php
index a6dae5c..c7a3b55 100644
--- a/Tests/Grid/GridManagerTest.php
+++ b/Tests/Grid/GridManagerTest.php
@@ -17,12 +17,12 @@
  */
 class GridManagerTest extends BundleOrmTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
     }
diff --git a/Tests/Grid/GridTest.php b/Tests/Grid/GridTest.php
index d8d0e1e..4b3d94d 100644
--- a/Tests/Grid/GridTest.php
+++ b/Tests/Grid/GridTest.php
@@ -13,7 +13,7 @@ class GridTest extends TestCase
     private $grid;
     private $now;
     private $row;
-    public function setUp()
+    public function setUp(): void
     {
         $dispatcher = new EventDispatcher();
 
diff --git a/Tests/Paginator/PaginatorManagerTest.php b/Tests/Paginator/PaginatorManagerTest.php
index 204b8cb..fff0627 100644
--- a/Tests/Paginator/PaginatorManagerTest.php
+++ b/Tests/Paginator/PaginatorManagerTest.php
@@ -10,12 +10,12 @@
 
 class PaginatorManagerTest extends BundleOrmTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
     }
diff --git a/Tests/app/config/config_test.yml b/Tests/app/config/config_test.yml
index bb5d791..a1a52a2 100644
--- a/Tests/app/config/config_test.yml
+++ b/Tests/app/config/config_test.yml
@@ -1,20 +1,20 @@
 kitpages_data_grid:
     grid:
-        default_twig: KitpagesDataGridBundle:Grid:grid-standard.html.twig
+        default_twig: @KitpagesDataGrid/Grid/grid-standard.html.twig
 
 framework:
     trusted_hosts: ~
     secret: "test"
     translator:      { fallback: "fr" }
     test: ~
-    templating:
-        engines: ['twig']
+    #templating:
+    #    engines: ['twig']
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/config/routing.yml"
 
 twig:
     paths:
-        "%kernel.root_dir%/app/Resources/views/": __main__
+        "%kernel.project_dir%/app/Resources/views/": __main__
 doctrine:
     dbal:
         driver:   'pdo_sqlite'
@@ -25,5 +25,5 @@ doctrine:
                 mappings:
                     Kitpages\DataGridBundle\Tests\TestEntities\Node:
                         type: xml
-                        dir: "%kernel.root_dir%/app/Resources/config/doctrine"
+                        dir: "%kernel.project_dir%/app/Resources/config/doctrine"
                         prefix: Kitpages\DataGridBundle\Tests\TestEntities
diff --git a/Twig/GlobalsTwigExtension.php b/Twig/GlobalsTwigExtension.php
index ee9ffa3..0e3afb4 100644
--- a/Twig/GlobalsTwigExtension.php
+++ b/Twig/GlobalsTwigExtension.php
@@ -1,10 +1,11 @@
 <?php
+
 namespace Kitpages\DataGridBundle\Twig;
 
+use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
 
-class GlobalsTwigExtension
-    extends \Twig_Extension
-    implements \Twig_Extension_GlobalsInterface
+class GlobalsTwigExtension extends AbstractExtension implements GlobalsInterface
 {
     protected $gridParameterList;
     protected $paginatorParameterList;
@@ -12,21 +13,21 @@ class GlobalsTwigExtension
     public function __construct(
         $gridParameterList,
         $paginatorParameterList
-    )
-    {
+    ) {
         $this->gridParameterList = $gridParameterList;
         $this->paginatorParameterList = $paginatorParameterList;
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
-        return array(
-            "kitpages_data_grid" => array(
+        return [
+            "kitpages_data_grid" => [
                 'grid' => $this->gridParameterList,
-                'paginator' => $this->paginatorParameterList
-            )
-        );
+                'paginator' => $this->paginatorParameterList,
+            ],
+        ];
     }
+
     /**
      * Returns the name of the extension.
      *
@@ -36,5 +37,4 @@ public function getName()
     {
         return "kitpages_data_grid_globals_extension";
     }
-
-} 
+}
diff --git a/composer.json b/composer.json
index 05a84b3..cd7761a 100644
--- a/composer.json
+++ b/composer.json
@@ -13,23 +13,21 @@
     ],
     "require": {
         "php": ">=7.1",
-        "symfony/framework-bundle": "~3.3|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
-        "symfony/translation": "~3.3|~4.0",
-        "symfony/templating": "~3.3|~4.0",
+        "symfony/framework-bundle": "~5.0",
+        "symfony/dependency-injection": "~5.0",
+        "symfony/translation": "~5.0",
+        "symfony/templating": "~5.0",
         "doctrine/orm": "~2.5",
-        "doctrine/doctrine-bundle": "~1.8|~2.0",
-        "twig/twig": "~1.23|~2.0",
-        "symfony/twig-bundle": "~3.3|~4.0"
+        "doctrine/doctrine-bundle": "~2.0",
+        "twig/twig": "~3.0",
+        "symfony/twig-bundle": "~5.0"
     },
     "require-dev": {
-        "symfony/class-loader": "~3.3|~4.0",
-        "symfony/yaml": "~3.3|~4.0",
-        "symfony/finder": "~3.3|~4.0",
-        "symfony/browser-kit": "~3.3|~4.0",
+        "symfony/yaml": "~5.0",
+        "symfony/finder": "~5.0",
+        "symfony/browser-kit": "~5.0",
 
-        "phpunit/phpunit": "~6.1",
-        "phpunit/dbunit": "~3.0"
+        "phpunit/phpunit": "~9.5"
     },
     "autoload": {
         "psr-0": { "Kitpages\\DataGridBundle": "" }