diff --git a/composer.json b/composer.json
index e95c010..db3adb8 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,6 @@
   },
   "scripts": {
     "auto-scripts": {
-      "cache:clear": "symfony-cmd",
       "assets:install %PUBLIC_DIR%": "symfony-cmd"
     },
     "post-install-cmd": [
diff --git a/config/services.yaml b/config/services.yaml
index d1056e7..4e6753d 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -48,8 +48,6 @@ services:
     Kadet\Highlighter\KeyLighter:
         factory: ['@App\Service\KeyLighterVersioner', 'getKeyLighter']
 
-    Kadet\Highlighter\Formatter\HtmlFormatter: ~
-
     League\CommonMark\Environment:
         factory: ['League\CommonMark\Environment', 'createGFMEnvironment']
         calls:
diff --git a/deploy.php b/deploy.php
new file mode 100644
index 0000000..9862691
--- /dev/null
+++ b/deploy.php
@@ -0,0 +1,37 @@
+<?php
+namespace Deployer;
+
+require 'recipe/symfony4.php';
+
+// Project name
+set('application', 'keylighter.kadet.net');
+
+// Project repository
+set('repository', 'git@git.kadet.net:kadet.net/keylighter.git');
+
+// [Optional] Allocate tty for git clone. Default value is false.
+set('git_tty', true); 
+
+// Shared files/dirs between deploys 
+add('shared_files', []);
+add('shared_dirs', ['var/keylighter']);
+
+// Writable dirs by web server 
+add('writable_dirs', []);
+
+// Hosts
+host('kadet.net')
+    ->stage('production')
+    ->set('deploy_path', '~/www/{{application}}');
+    
+// Tasks
+task('build', function () {
+    run('cd {{release_path}} && make');
+});
+
+// [Optional] if deploy fails automatically unlock.
+after('deploy:failed', 'deploy:unlock');
+
+// Migrate database before symlink new release.
+//before('deploy:symlink', 'database:migrate');
+
diff --git a/src/Controller/HighlightAction.php b/src/Controller/HighlightAction.php
index 06e6f49..fa6c902 100755
--- a/src/Controller/HighlightAction.php
+++ b/src/Controller/HighlightAction.php
@@ -2,7 +2,6 @@
 
 namespace App\Controller;
 
-use Kadet\Highlighter\Formatter\HtmlFormatter;
 use Kadet\Highlighter\KeyLighter;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -13,10 +12,10 @@ class HighlightAction
     private $keylighter;
     private $formatter;
 
-    public function __construct(KeyLighter $keylighter, HtmlFormatter $formatter)
+    public function __construct(KeyLighter $keylighter)
     {
         $this->keylighter = $keylighter;
-        $this->formatter  = $formatter;
+        $this->formatter  = $keylighter->getFormatter('html');
     }
 
     /**
diff --git a/src/Twig/KeyLighterExtension.php b/src/Twig/KeyLighterExtension.php
index 6e8cc81..eb294ea 100755
--- a/src/Twig/KeyLighterExtension.php
+++ b/src/Twig/KeyLighterExtension.php
@@ -13,18 +13,23 @@ use function Kadet\Highlighter\highlight;
 
 class KeyLighterExtension extends AbstractExtension
 {
+    private $formatter;
+
     public function getFilters()
     {
-        $formatter = new HtmlFormatter(['prefix' => 'kl-']);
-
         return [
-            new TwigFilter('highlight', function($source, $language) use ($formatter) {
+            new TwigFilter('highlight', function($source, $language) {
                 if (!$language instanceof Language) {
                     $language = KeyLighter::get()->getLanguage($language);
                 }
 
-                return highlight($source, $language, $formatter);
+                return highlight($source, $language, $this->getFormatter());
             }, ['pre_escape' => 'html', 'is_safe' => ['html']])
         ];
     }
+
+    public function getFormatter()
+    {
+        return $this->formatter ?: $this->formatter = new HtmlFormatter();
+    }
 }