diff --git a/.editorconfig b/.editorconfig
index 0e28e9d..e553a37 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,5 +12,5 @@ indent_style = tab
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml,php}]
+[*.{yml,yaml,php,twig,js}]
 indent_style = space
diff --git a/.gitignore b/.gitignore
index 88e27f9..f5f0a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 .php-cs-fixer.cache
 .DS_Store
 composer.lock
+.twig-cs-fixer.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index febdba9..0f9fd04 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -11,12 +11,12 @@
 return $config->setRules([
         '@PhpCsFixer' => true,
         '@Symfony' => true,
-        '@PER' => true,
+        '@PER-CS' => true,
         '@DoctrineAnnotation' => true,
         'php_unit_test_class_requires_covers' => false,
         'php_unit_internal_class' => false,
         'heredoc_to_nowdoc' => false,
-        'escape_implicit_backslashes' => false,
+        'string_implicit_backslashes' => false,
         'explicit_indirect_variable' => false,
         'explicit_string_variable' => false,
         'combine_consecutive_issets' => false,
@@ -27,5 +27,6 @@
         'concat_space' => false,
         'single_quote' => false,
         'method_argument_space' => ['on_multiline' => 'ignore'],
+        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
     ])
     ->setFinder($finder);
diff --git a/.twig-cs-fixer.dist.php b/.twig-cs-fixer.dist.php
new file mode 100644
index 0000000..79a4200
--- /dev/null
+++ b/.twig-cs-fixer.dist.php
@@ -0,0 +1,11 @@
+<?php
+
+$ruleset = new TwigCsFixer\Ruleset\Ruleset();
+$ruleset->addStandard(new TwigCsFixer\Standard\TwigCsFixer());
+$ruleset->removeRule(TwigCsFixer\Rules\Whitespace\BlankEOFRule::class);
+
+$config = new TwigCsFixer\Config\Config();
+$config->allowNonFixableRules();
+$config->setRuleset($ruleset);
+
+return $config;
diff --git a/DEV/cs/twigcs.sh b/DEV/cs/twigcs.sh
index c865119..c51f3af 100755
--- a/DEV/cs/twigcs.sh
+++ b/DEV/cs/twigcs.sh
@@ -6,5 +6,5 @@ if [ -d "${BASEDIR}/templates" ]; then
 		bin/console lint:twig templates
 	fi
 
-	vendor/friendsoftwig/twigcs/bin/twigcs templates
+	vendor/bin/twig-cs-fixer lint templates
 fi
diff --git a/composer.json b/composer.json
index c3abf65..53820c6 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "twig/twig": "^3.8"
     },
     "require-dev": {
-        "eckinox/eckinox-cs": "^2.0"
+        "eckinox/eckinox-cs": "^3.0"
     },
     "repositories": [
     ],
diff --git a/templates/form/address_autocomplete.html.twig b/templates/form/address_autocomplete.html.twig
index 6bdea66..55dd1ee 100644
--- a/templates/form/address_autocomplete.html.twig
+++ b/templates/form/address_autocomplete.html.twig
@@ -1,14 +1,14 @@
 {%- block eckinox_address_autocomplete_widget -%}
-	<address-autocomplete class="{{ form.vars.errors|length ? 'is-invalid' : '' }}" data-api="{{ api }}" data-parent="{{ parent }}">
-		<input type="text" class="form-control {{ form.vars.errors|length ? 'is-invalid' : '' }}" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
-		<div class="autocomplete-choices-wrapper">
-			<div class="autocomplete-choices list-group"></div>
-			<div class="loading-overlay" style="display: none;">
-				<div class="spinner-border">
-					<span class="sr-only">Loading...</span>
-				</div>
-			</div>
-		</div>
-	</address-autocomplete>
-	<script type="module" src="{{ asset("bundles/eckinoxaddress/js/widgets/address-autocomplete.js") }}"></script>
+    <address-autocomplete class="{{ form.vars.errors|length ? 'is-invalid' : '' }}" data-api="{{ api }}" data-parent="{{ parent }}">
+        <input type="text" class="form-control {{ form.vars.errors|length ? 'is-invalid' : '' }}" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
+        <div class="autocomplete-choices-wrapper">
+            <div class="autocomplete-choices list-group"></div>
+            <div class="loading-overlay" style="display: none;">
+                <div class="spinner-border">
+                    <span class="sr-only">Loading...</span>
+                </div>
+            </div>
+        </div>
+    </address-autocomplete>
+    <script type="module" src="{{ asset("bundles/eckinoxaddress/js/widgets/address-autocomplete.js") }}"></script>
 {%- endblock eckinox_address_autocomplete_widget -%}