From deaf86ab2db4f30a7b4a200e38f1565a9333eaa5 Mon Sep 17 00:00:00 2001
From: KHOUBZA Younes <younes.khoubza@smile-maroc.com>
Date: Fri, 16 Apr 2021 20:08:36 +0200
Subject: [PATCH] clean up code

---
 .gitignore                                    |   4 +-
 src/Laravel/.gitignore                        |   4 +-
 src/Laravel/Resources/config/config.php       |  64 ++++----
 .../Resources/public/flasher-template.js      | 142 ------------------
 src/Laravel/Resources/public/flasher.js       | 114 --------------
 .../Resources/views/bootstrap.blade.php       |   4 +-
 .../ServiceProvider/Providers/Laravel.php     |  40 ++++-
 .../ServiceProvider/Providers/Laravel4.php    |   2 +-
 .../ServiceProvider/Providers/Laravel50.php   |   2 +-
 .../ServiceProvider/ResourceManagerHelper.php |  54 +++++++
 .../Tests/FlasherServiceProviderTest.php      |  10 +-
 src/Laravel/composer.json                     |   2 +-
 src/Noty/Laravel/.gitignore                   |   4 +-
 src/Noty/Laravel/Resources/config/config.php  |  25 +--
 .../Laravel/Resources/public/flasher-noty.js  |  22 ---
 .../ServiceProvider/Providers/Laravel.php     |   9 +-
 .../Tests/FlasherNotyServiceProviderTest.php  |  27 +---
 src/Noty/Laravel/composer.json                |   4 +-
 src/Noty/Prime/.gitignore                     |   4 +-
 src/Noty/Prime/composer.json                  |   2 +-
 src/Noty/Symfony/.gitignore                   |   4 +-
 .../DependencyInjection/Configuration.php     |  11 +-
 .../Symfony/Resources/public/flasher-noty.js  |  22 ---
 .../DependencyInjection/ConfigurationTest.php |  27 +---
 .../FlasherNotyExtensionTest.php              |  19 +--
 src/Noty/Symfony/composer.json                |   4 +-
 src/Noty/Symfony/composer.json.local          |  75 +++++++++
 src/Notyf/Laravel/.gitignore                  |   4 +-
 src/Notyf/Laravel/Resources/config/config.php |  31 +---
 .../Laravel/Resources/public/flasher-notyf.js |  17 ---
 .../ServiceProvider/Providers/Laravel.php     |   9 +-
 .../Tests/FlasherNotyfServiceProviderTest.php |  37 +----
 src/Notyf/Laravel/composer.json               |   4 +-
 src/Notyf/Prime/.gitignore                    |   4 +-
 src/Notyf/Prime/composer.json                 |   2 +-
 src/Notyf/Symfony/.gitignore                  |   4 +-
 .../DependencyInjection/Configuration.php     |  31 +---
 .../Symfony/Resources/public/flasher-notyf.js |  17 ---
 .../DependencyInjection/ConfigurationTest.php |  37 +----
 .../FlasherNotyfExtensionTest.php             |  19 +--
 src/Notyf/Symfony/composer.json               |   4 +-
 src/Pnotify/Laravel/.gitignore                |   4 +-
 .../Laravel/Resources/config/config.php       |  44 +-----
 .../Resources/public/flasher-pnotify.js       |  22 ---
 .../ServiceProvider/Providers/Laravel.php     |   9 +-
 .../FlasherPnotifyServiceProviderTest.php     |  44 +-----
 src/Pnotify/Laravel/composer.json             |   4 +-
 src/Pnotify/Prime/.gitignore                  |   4 +-
 src/Pnotify/Prime/composer.json               |   2 +-
 src/Pnotify/Symfony/.gitignore                |   4 +-
 .../DependencyInjection/Configuration.php     |  44 +-----
 .../Resources/public/flasher-pnotify.js       |  22 ---
 .../DependencyInjection/ConfigurationTest.php |  44 +-----
 .../FlasherPnotifyExtensionTest.php           |  17 +--
 src/Pnotify/Symfony/composer.json             |   4 +-
 src/Prime/.gitignore                          |   4 +-
 .../EventListener/TemplateListener.php        |  78 ----------
 .../Renderer/Presenter/AbstractPresenter.php  | 116 --------------
 .../Renderer/Presenter/ArrayPresenter.php     |  14 --
 .../Renderer/Presenter/HtmlPresenter.php      |  49 ------
 .../Renderer/Presenter/PresenterInterface.php |  16 --
 .../Renderer/Presenter/PresenterManager.php   |  39 -----
 .../Presenter/PresenterManagerInterface.php   |  19 ---
 src/Prime/Renderer/Renderer.php               |  85 -----------
 src/Prime/Renderer/RendererInterface.php      |  14 --
 src/Prime/Resources/views/tailwindcss.php     |   0
 .../Response/Presenter/ArrayPresenter.php     |   2 +-
 .../Response/Presenter/HtmlPresenter.php      |   7 +-
 .../Response/Resource/ResourceManager.php     |  45 +++++-
 src/Prime/Stamp/TemplateStamp.php             |  32 +---
 src/Prime/Template/Engine.php                 |   3 +-
 src/SweetAlert/Laravel/.gitignore             |   4 +-
 .../Laravel/Resources/config/config.php       |  31 +---
 .../Resources/public/flasher-sweet-alert.js   |  19 ---
 .../ServiceProvider/Providers/Laravel.php     |   9 +-
 .../FlasherSweetAlertServiceProviderTest.php  |  31 +---
 src/SweetAlert/Laravel/composer.json          |   4 +-
 src/SweetAlert/Prime/.gitignore               |   4 +-
 src/SweetAlert/Prime/composer.json            |   2 +-
 src/SweetAlert/Symfony/.gitignore             |   4 +-
 .../DependencyInjection/Configuration.php     |  12 +-
 .../Resources/public/flasher-sweet-alert.js   |  19 ---
 .../DependencyInjection/ConfigurationTest.php |  29 +---
 .../FlasherSweetAlertExtensionTest.php        |  19 +--
 src/SweetAlert/Symfony/composer.json          |   4 +-
 src/Symfony/.gitignore                        |   4 +-
 .../DependencyInjection/Configuration.php     |  10 +-
 src/Symfony/DependencyInjection/Extension.php |   1 +
 .../DependencyInjection/FlasherExtension.php  |  24 +--
 src/Symfony/EventListener/SessionListener.php |  10 +-
 src/Symfony/Resources/assets/package.json     |  14 --
 src/Symfony/Resources/config/config.yaml      |  10 +-
 .../Resources/public/flasher-template.js      | 142 ------------------
 src/Symfony/Resources/public/flasher.js       | 114 --------------
 .../EventSubscriberCompilerPassTest.php       |   2 +-
 .../DependencyInjection/ConfigurationTest.php | 110 ++++++--------
 .../Tests/Twig/FlasherTwigExtensionTest.php   |   6 +-
 src/Symfony/Twig/FlasherTwigExtension.php     |  10 +-
 src/Symfony/composer.json                     |   5 +-
 src/Symfony/composer.json.local               |  73 +++++++++
 src/Toastr/Laravel/.gitignore                 |   4 +-
 .../Laravel/Resources/config/config.php       |  49 +-----
 .../Resources/public/flasher-toastr.js        |  16 --
 .../ServiceProvider/Providers/Laravel.php     |   9 +-
 .../FlasherToastrServiceProviderTest.php      |  49 +-----
 src/Toastr/Laravel/composer.json              |   4 +-
 src/Toastr/Laravel/composer.json.local        |  82 ++++++++++
 src/Toastr/Prime/.gitignore                   |   4 +-
 src/Toastr/Prime/composer.json                |   2 +-
 src/Toastr/Symfony/.gitignore                 |   4 +-
 .../DependencyInjection/Configuration.php     |  15 +-
 .../Resources/public/flasher-toastr.js        |  16 --
 .../DependencyInjection/ConfigurationTest.php |  55 +------
 .../FlasherToastrExtensionTest.php            |   9 +-
 src/Toastr/Symfony/composer.json              |   4 +-
 src/Toastr/Symfony/composer.json.local        |  75 +++++++++
 116 files changed, 764 insertions(+), 2071 deletions(-)
 delete mode 100644 src/Laravel/Resources/public/flasher-template.js
 delete mode 100644 src/Laravel/Resources/public/flasher.js
 create mode 100644 src/Laravel/ServiceProvider/ResourceManagerHelper.php
 delete mode 100644 src/Noty/Laravel/Resources/public/flasher-noty.js
 delete mode 100644 src/Noty/Symfony/Resources/public/flasher-noty.js
 create mode 100644 src/Noty/Symfony/composer.json.local
 delete mode 100644 src/Notyf/Laravel/Resources/public/flasher-notyf.js
 delete mode 100644 src/Notyf/Symfony/Resources/public/flasher-notyf.js
 delete mode 100644 src/Pnotify/Laravel/Resources/public/flasher-pnotify.js
 delete mode 100644 src/Pnotify/Symfony/Resources/public/flasher-pnotify.js
 delete mode 100644 src/Prime/EventDispatcher/EventListener/TemplateListener.php
 delete mode 100644 src/Prime/Renderer/Presenter/AbstractPresenter.php
 delete mode 100644 src/Prime/Renderer/Presenter/ArrayPresenter.php
 delete mode 100644 src/Prime/Renderer/Presenter/HtmlPresenter.php
 delete mode 100644 src/Prime/Renderer/Presenter/PresenterInterface.php
 delete mode 100644 src/Prime/Renderer/Presenter/PresenterManager.php
 delete mode 100644 src/Prime/Renderer/Presenter/PresenterManagerInterface.php
 delete mode 100644 src/Prime/Renderer/Renderer.php
 delete mode 100644 src/Prime/Renderer/RendererInterface.php
 delete mode 100644 src/Prime/Resources/views/tailwindcss.php
 delete mode 100644 src/SweetAlert/Laravel/Resources/public/flasher-sweet-alert.js
 delete mode 100644 src/SweetAlert/Symfony/Resources/public/flasher-sweet-alert.js
 delete mode 100644 src/Symfony/Resources/assets/package.json
 delete mode 100644 src/Symfony/Resources/public/flasher-template.js
 delete mode 100644 src/Symfony/Resources/public/flasher.js
 create mode 100644 src/Symfony/composer.json.local
 delete mode 100644 src/Toastr/Laravel/Resources/public/flasher-toastr.js
 create mode 100644 src/Toastr/Laravel/composer.json.local
 delete mode 100644 src/Toastr/Symfony/Resources/public/flasher-toastr.js
 create mode 100644 src/Toastr/Symfony/composer.json.local

diff --git a/.gitignore b/.gitignore
index 409f0e32..89d72688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Laravel/.gitignore b/src/Laravel/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Laravel/.gitignore
+++ b/src/Laravel/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Laravel/Resources/config/config.php b/src/Laravel/Resources/config/config.php
index 0dbadb90..0ed02bea 100644
--- a/src/Laravel/Resources/config/config.php
+++ b/src/Laravel/Resources/config/config.php
@@ -3,8 +3,34 @@
 return array(
     'default' => 'template',
 
-    'scripts' => array(
-        '/vendor/flasher/flasher.js',
+    'root_scripts' => array(
+        'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.3/dist/flasher.min.js'
+    ),
+
+    'template_factory' => array(
+        'default' => 'tailwindcss',
+        'templates' => array(
+            'tailwindcss' => array(
+                'view' => 'flasher::tailwindcss',
+                'styles' => array(
+                    'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
+                    'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css'
+                ),
+            ),
+            'tailwindcss_bg' => array(
+                'view' => 'flasher::tailwindcss_bg',
+                "styles" => array(
+                    'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
+                    'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
+                ),
+            ),
+            'bootstrap' => array(
+                'view' => 'flasher::bootstrap',
+                'styles' => array(
+                    "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/css/bootstrap.min.css",
+                ),
+            ),
+        ),
     ),
 
     'auto_create_from_session' => true,
@@ -22,38 +48,4 @@ return array(
             'restored',
         ),
     ),
-
-    'adapters' => array(
-        'template' => array(
-            'default'   => 'tailwindcss',
-            'templates' => array(
-                'tailwindcss'    => array(
-                    'view'   => 'flasher::tailwindcss',
-                    'styles' => array(
-                        'https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css',
-                    ),
-                ),
-                'tailwindcss_bg' => array(
-                    'view'   => 'flasher::tailwindcss_bg',
-                    'styles' => array(
-                        'https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css',
-                    ),
-                ),
-                'bootstrap'      => array(
-                    'view'   => 'flasher::bootstrap',
-                    'styles' => array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/css/bootstrap.min.css',
-                    ),
-                ),
-            ),
-            'scripts'   => array(
-                '/vendor/flasher/flasher-template.js',
-            ),
-            'styles'    => array(),
-            'options'   => array(
-                'timeout'  => 5000,
-                'position' => 'top-right',
-            ),
-        ),
-    ),
 );
diff --git a/src/Laravel/Resources/public/flasher-template.js b/src/Laravel/Resources/public/flasher-template.js
deleted file mode 100644
index 383bbf36..00000000
--- a/src/Laravel/Resources/public/flasher-template.js
+++ /dev/null
@@ -1,142 +0,0 @@
-PHPFlasher.addFactory('template', (function () {
-    'use strict';
-
-    var exports = {};
-    var options = {
-        timeout: 5000,
-        fps: 30,
-        position: 'top-right',
-        direction: 'top'
-    };
-
-    exports.render = function (envelope) {
-        renderEnvelope(envelope);
-    };
-
-    exports.renderOptions = function (_setting) {
-        options = extend({}, options, _setting);
-    };
-
-    var renderEnvelope = function (envelope) {
-        var position = options.position;
-
-        if (undefined !== envelope.options && undefined !== envelope.options.position) {
-            position = envelope.options.position;
-        }
-
-        var container = document.getElementById('flasher-container-' + position);
-        if (null === container) {
-            container = document.createElement('div');
-            container.id = "flasher-container-" + options.position;
-            container.style.position = "fixed";
-            container.style.maxWidth = "304px";
-            container.style.width = "100%";
-
-            switch (options.position) {
-                case "top-left":
-                    container.style.top = 0;
-                    container.style.left = "0.5em";
-                    break;
-                case "top-right":
-                    container.style.top = 0;
-                    container.style.right = "0.5em";
-                    break;
-                case "bottom-left":
-                    container.style.bottom = 0;
-                    container.style.left = "0.5em";
-                    break;
-                case "bottom-right":
-                default:
-                    container.style.bottom = 0;
-                    container.style.right = "0.5em";
-                    break;
-            }
-            document.getElementsByTagName('body')[0].appendChild(container);
-        }
-
-        var template = stringToHTML(envelope.template);
-        template.style.transition = '0.8s';
-
-        switch (options.direction) {
-            case "top":
-                container.insertBefore(template, container.firstChild);
-                break;
-            case "bottom":
-            default:
-                container.appendChild(template);
-                break;
-        }
-
-        var progressBar = template.querySelector('.flasher-progress');
-        if (null !== progressBar) {
-            var width = 0;
-            var lapse = 1000 / options.fps;
-
-            var showProgress = function () {
-                width++;
-                var percent = (1 - lapse * width / options.timeout) * 100;
-                progressBar.style.width = percent + '%';
-
-                if (percent <= 0) {
-                    template.style.opacity = 0;
-                    clearInterval(progress);
-
-                    setTimeout(function () {
-                        template.remove();
-                    }, 900);
-                }
-            }
-
-            var progress = setInterval(showProgress, lapse);
-
-            template.addEventListener('mouseover', function () {
-                clearInterval(progress);
-            });
-
-            template.addEventListener("mouseout", function () {
-                progress = setInterval(showProgress, lapse);
-            });
-        }
-    }
-
-    var stringToHTML = function (str) {
-        var support = (function () {
-            if (!window.DOMParser) return false;
-            var parser = new DOMParser();
-            try {
-                parser.parseFromString('x', 'text/html');
-            } catch (err) {
-                return false;
-            }
-            return true;
-        })();
-
-        if (support) {
-            var parser = new DOMParser();
-            var doc = parser.parseFromString(str, 'text/html');
-            return doc.body.firstChild;
-        }
-
-        var dom = document.createElement('div');
-        dom.innerHTML = str;
-        return dom.firstElementChild;
-    };
-
-    var extend = function (out) {
-        out = out || {};
-
-        for (var i = 1; i < arguments.length; i++) {
-            if (!arguments[i])
-                continue;
-
-            for (var key in arguments[i]) {
-                if (arguments[i].hasOwnProperty(key))
-                    out[key] = arguments[i][key];
-            }
-        }
-
-        return out;
-    };
-
-    return exports;
-})());
diff --git a/src/Laravel/Resources/public/flasher.js b/src/Laravel/Resources/public/flasher.js
deleted file mode 100644
index ad3db142..00000000
--- a/src/Laravel/Resources/public/flasher.js
+++ /dev/null
@@ -1,114 +0,0 @@
-var PHPFlasher = (function () {
-    'use strict';
-
-    var exports = {};
-    var factories = {};
-
-    exports.render = function (_options) {
-        exports.addStyles(getStyles(_options), function () {
-            exports.addScripts(getScripts(_options), function () {
-                exports.renderOptions(_options.options);
-                exports.renderEnvelopes(_options.envelopes);
-            });
-        });
-    };
-
-    exports.addFactory = function (alias, factory) {
-        factories[alias] = factory;
-    };
-
-    exports.addStyles = function (urls, callback) {
-        if (0 === urls.length) {
-            if ("function" === typeof callback) {
-                callback();
-            }
-
-            return this;
-        }
-
-        if (null !== document.querySelector('link[href="' + urls[0] + '"]')) {
-            return exports.addStyles(urls.slice(1), callback);
-        }
-
-        var tag = document.createElement('link');
-
-        tag.href = urls[0];
-        tag.type = 'text/css';
-        tag.rel = 'stylesheet';
-        tag.onload = function () {
-            exports.addStyles(urls.slice(1), callback);
-        };
-
-        document.head.appendChild(tag);
-
-        return this;
-    };
-
-    exports.addScripts = function (urls, callback) {
-        if (0 === urls.length) {
-            if ("function" === typeof callback) {
-                callback();
-            }
-
-            return this;
-        }
-
-        if (null !== document.querySelector('script[src="' + urls[0] + '"]')) {
-            return exports.addScripts(urls.slice(1), callback);
-        }
-
-        var tag = document.createElement('script');
-
-        tag.src = urls[0];
-        tag.type = 'text/javascript';
-        tag.onload = function () {
-            exports.addScripts(urls.slice(1), callback);
-        };
-
-        document.body.appendChild(tag);
-
-        return this;
-    };
-
-    exports.renderOptions = function (options) {
-        Object.keys(options).forEach(function (library) {
-            factories[library].renderOptions(options[library]);
-        });
-    };
-
-    exports.renderEnvelopes = function (envelopes) {
-        envelopes.forEach(function (envelope) {
-            factories[envelope.handler].render(envelope);
-        })
-    };
-
-    var getStyles = function (_options) {
-        var styles = _options.styles;
-
-        _options.envelopes.forEach(function (envelope) {
-            if (undefined !== envelope.context && undefined !== envelope.context.styles) {
-                styles = styles.concat(envelope.context.styles);
-            }
-        });
-
-        return styles.filter(function (item, pos) {
-            return styles.indexOf(item) === pos;
-        });
-    }
-
-    var getScripts = function (_options) {
-        var scripts = _options.scripts;
-
-        _options.envelopes.forEach(function (envelope) {
-            if (undefined !== envelope.context && undefined !== envelope.context.scripts) {
-                scripts = scripts.concat(envelope.context.scripts);
-            }
-        });
-
-        return scripts.filter(function (item, pos) {
-            return scripts.indexOf(item) === pos;
-        });
-    }
-
-    return exports;
-})();
diff --git a/src/Laravel/Resources/views/bootstrap.blade.php b/src/Laravel/Resources/views/bootstrap.blade.php
index 68cdc05e..fef4310a 100644
--- a/src/Laravel/Resources/views/bootstrap.blade.php
+++ b/src/Laravel/Resources/views/bootstrap.blade.php
@@ -25,8 +25,8 @@
 ?>
 
 <div style="margin-top: 0.5rem;cursor: pointer;">
-    <div class="alert {{ $alertClass }} alert-dismissible fade in show" role="alert" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border: unset;border-left: 6px solid {{ progress_bg_color }}">
-{#        <strong>{{ $title }} !</strong> #}
+    <div class="alert {{ $alertClass }} alert-dismissible fade in show" role="alert" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border: unset;border-left: 6px solid {{ $progressBackgroundColor }}">
+        <strong>{{ $title }} !</strong>
         {{ $envelope->getMessage() }}
         <button type="button" class="close" data-dismiss="alert" aria-label="Close" onclick="this.parentElement.remove()">
             <span aria-hidden="true">&times;</span>
diff --git a/src/Laravel/ServiceProvider/Providers/Laravel.php b/src/Laravel/ServiceProvider/Providers/Laravel.php
index 00f946dd..fe0b7c78 100755
--- a/src/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/Laravel/ServiceProvider/Providers/Laravel.php
@@ -10,10 +10,12 @@ use Flasher\Prime\EventDispatcher\EventDispatcher;
 use Flasher\Prime\EventDispatcher\EventListener\FilterListener;
 use Flasher\Prime\EventDispatcher\EventListener\RemoveListener;
 use Flasher\Prime\EventDispatcher\EventListener\StampsListener;
-use Flasher\Prime\EventDispatcher\EventListener\TemplateListener;
 use Flasher\Prime\Factory\NotificationFactory;
 use Flasher\Prime\Filter\Filter;
 use Flasher\Prime\Flasher;
+use Flasher\Prime\Response\Presenter\ArrayPresenter;
+use Flasher\Prime\Response\Presenter\HtmlPresenter;
+use Flasher\Prime\Response\Resource\ResourceManager;
 use Flasher\Prime\Response\ResponseManager;
 use Flasher\Prime\Storage\StorageManager;
 use Illuminate\Container\Container;
@@ -52,7 +54,6 @@ class Laravel implements ServiceProviderInterface
         $provider->loadViewsFrom(flasher_path(__DIR__.'/../../Resources/views'), 'flasher');
 
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/config/config.php') => config_path('flasher.php')), 'flasher-config');
-        $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/flasher'))), 'flasher-public');
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/lang') => resource_path(flasher_path('lang/vendor/flasher'))), 'flasher-lang');
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/views') => resource_path(flasher_path('views/vendor/flasher'))), 'flasher-views');
 
@@ -82,8 +83,32 @@ class Laravel implements ServiceProviderInterface
             return $flasher;
         });
 
-        $this->app->singleton('flasher.renderer', function (Application $app) {
-            return new ResponseManager($app['flasher.storage_manager'], $app['flasher.event_dispatcher'], $app['flasher.config']);
+        $this->app->singleton('flasher.resource_manager', function (Application $app) {
+            $resourceManager = new ResourceManager($app['flasher.config'], $app['flasher.template_engine']);
+
+            $templates = $app['flasher.config']->get('template_factory.templates');
+            foreach ($templates as $template => $factory) {
+                if (isset($factory['scripts'])) {
+                    $resourceManager->addScripts('template_'.$template, $factory['scripts']);
+                }
+                if (isset($factory['styles'])) {
+                    $resourceManager->addStyles('template_'.$template, $factory['styles']);
+                }
+                if (isset($factory['options'])) {
+                    $resourceManager->addOptions('template_'.$template, $factory['options']);
+                }
+            }
+
+            return $resourceManager;
+        });
+
+        $this->app->singleton('flasher.response_manager', function (Application $app) {
+            $responseManager = new ResponseManager($app['flasher.storage_manager'], $app['flasher.event_dispatcher'], $app['flasher.resource_manager']);
+
+            $responseManager->addPresenter('html', new HtmlPresenter());
+            $responseManager->addPresenter('array', new ArrayPresenter());
+
+            return $responseManager;
         });
 
         $this->app->singleton('flasher.storage', function (Application $app) {
@@ -108,7 +133,6 @@ class Laravel implements ServiceProviderInterface
             $eventDispatcher->addSubscriber(new FilterListener($app['flasher.filter']));
             $eventDispatcher->addSubscriber(new RemoveListener());
             $eventDispatcher->addSubscriber(new StampsListener());
-            $eventDispatcher->addSubscriber(new TemplateListener($app['flasher.config'], $app['flasher.template_engine']));
 
             return $eventDispatcher;
         });
@@ -119,7 +143,7 @@ class Laravel implements ServiceProviderInterface
 
         $this->app->alias('flasher.config', 'Flasher\Laravel\Config\Config');
         $this->app->alias('flasher', 'Flasher\Prime\Flasher');
-        $this->app->alias('flasher.renderer', 'Flasher\Prime\Renderer\Renderer');
+        $this->app->alias('flasher.response_manager', 'Flasher\Prime\Response\ResponseManager');
         $this->app->alias('flasher.event_dispatcher', 'Flasher\Prime\EventDispatcher\EventDispatcher');
         $this->app->alias('flasher.storage', 'Flasher\Laravel\Storage\Storage');
         $this->app->alias('flasher.storage_manager', 'Flasher\Laravel\Storage\StorageManager');
@@ -132,7 +156,7 @@ class Laravel implements ServiceProviderInterface
         $this->app->bind('Flasher\Prime\Config\ConfigInterface', 'flasher.config');
         $this->app->bind('Flasher\Prime\FlasherInterface', 'flasher');
         $this->app->bind('Flasher\Prime\Storage\StorageManagerInterface', 'flasher.storage_manager');
-        $this->app->bind('Flasher\Prime\Renderer\RendererInterface', 'flasher.renderer');
+        $this->app->bind('Flasher\Prime\Response\ResponseManagerInterface', 'flasher.response_manager');
         $this->app->bind('Flasher\Prime\Filter\FilterInterface', 'flasher.filter');
         $this->app->bind('Flasher\Prime\EventDispatcher\EventDispatcherInterface', 'flasher.event_dispatcher');
         $this->app->bind('Flasher\Prime\Storage\StorageInterface', 'flasher.storage');
@@ -159,7 +183,7 @@ class Laravel implements ServiceProviderInterface
                 $criteria = "array()";
             }
 
-            return "<?php echo app('flasher.renderer')->render($criteria, array('format' => 'html')); ?>";
+            return "<?php echo app('flasher.response_manager')->render($criteria, 'html'); ?>";
         });
     }
 }
diff --git a/src/Laravel/ServiceProvider/Providers/Laravel4.php b/src/Laravel/ServiceProvider/Providers/Laravel4.php
index abaf9d35..ec9983ce 100644
--- a/src/Laravel/ServiceProvider/Providers/Laravel4.php
+++ b/src/Laravel/ServiceProvider/Providers/Laravel4.php
@@ -66,7 +66,7 @@ final class Laravel4 extends Laravel
                 $value = "array()";
             }
 
-            return str_replace("%criteria%", $value, $matches[1] . "<?php echo app('flasher.renderer')->render(%criteria%, array('format' => 'html')); ?>");
+            return str_replace("%criteria%", $value, $matches[1] . "<?php echo app('flasher.response_manager')->render(%criteria%, 'html'); ?>");
         });
     }
 }
diff --git a/src/Laravel/ServiceProvider/Providers/Laravel50.php b/src/Laravel/ServiceProvider/Providers/Laravel50.php
index 80650d5f..ff209777 100644
--- a/src/Laravel/ServiceProvider/Providers/Laravel50.php
+++ b/src/Laravel/ServiceProvider/Providers/Laravel50.php
@@ -53,7 +53,7 @@ final class Laravel50 extends Laravel
                 $value = "array()";
             }
 
-            return str_replace("%criteria%", $value, $matches[1] . "<?php echo app('flasher.renderer')->render(%criteria%, array('format' => 'html')); ?>");
+            return str_replace("%criteria%", $value, $matches[1] . "<?php echo app('flasher.response_manager')->render(%criteria%, 'html'); ?>");
         });
     }
 }
diff --git a/src/Laravel/ServiceProvider/ResourceManagerHelper.php b/src/Laravel/ServiceProvider/ResourceManagerHelper.php
new file mode 100644
index 00000000..62f5212a
--- /dev/null
+++ b/src/Laravel/ServiceProvider/ResourceManagerHelper.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Flasher\Laravel\ServiceProvider;
+
+use Flasher\Prime\Response\Resource\ResourceManager;
+
+final class ResourceManagerHelper
+{
+    /**
+     * @param string $alias
+     * @param array $config
+     * @param ResourceManager $responseManager
+     */
+    public static function process(ResourceManager $responseManager, $alias, $config = null)
+    {
+        if (null === $config) {
+            $config = $responseManager->getConfig()->get('adapters.' . $alias);
+        }
+
+        $responseManager->addScripts($alias, self::getScripts($config));
+        $responseManager->addStyles($alias, self::getStyles($config));
+        $responseManager->addOptions($alias, self::getOptions($config));
+    }
+
+    /**
+     * @param array $config
+     *
+     * @return array
+     */
+    private static function getScripts($config)
+    {
+        return isset($config['scripts']) ? $config['scripts'] : array();
+    }
+
+    /**
+     * @param array $config
+     *
+     * @return array
+     */
+    private static function getStyles($config)
+    {
+        return isset($config['styles']) ? $config['styles'] : array();
+    }
+
+    /**
+     * @param array $config
+     *
+     * @return array
+     */
+    private static function getOptions($config)
+    {
+        return isset($config['options']) ? $config['options'] : array();
+    }
+}
\ No newline at end of file
diff --git a/src/Laravel/Tests/FlasherServiceProviderTest.php b/src/Laravel/Tests/FlasherServiceProviderTest.php
index 530f5c9a..9f956226 100644
--- a/src/Laravel/Tests/FlasherServiceProviderTest.php
+++ b/src/Laravel/Tests/FlasherServiceProviderTest.php
@@ -10,7 +10,7 @@ final class FlasherServiceProviderTest extends TestCase
     {
         $this->assertInstanceOf('Flasher\Laravel\Config\Config', $this->app->make('flasher.config'));
         $this->assertInstanceOf('Flasher\Prime\Flasher', $this->app->make('flasher'));
-        $this->assertInstanceOf('Flasher\Prime\Renderer\Renderer', $this->app->make('flasher.renderer'));
+        $this->assertInstanceOf('Flasher\Prime\Renderer\Renderer', $this->app->make('flasher.response_manager'));
         $this->assertInstanceOf('Flasher\Laravel\Storage\Storage', $this->app->make('flasher.storage'));
         $this->assertInstanceOf('Flasher\Prime\Storage\StorageManager', $this->app->make('flasher.storage_manager'));
         $this->assertInstanceOf('Flasher\Prime\EventDispatcher\EventDispatcher', $this->app->make('flasher.event_dispatcher'));
@@ -22,9 +22,9 @@ final class FlasherServiceProviderTest extends TestCase
         /** @var BladeCompiler $blade */
         $blade = $this->app->make('view')->getEngineResolver()->resolve('blade')->getCompiler();
 
-        $this->assertEquals("<?php echo app('flasher.renderer')->render(array(), array('format' => 'html')); ?>", $blade->compileString('@flasher_render'));
-        $this->assertEquals("<?php echo app('flasher.renderer')->render(array(), array('format' => 'html')); ?>", $blade->compileString('@flasher_render()'));
-        $this->assertEquals("<?php echo app('flasher.renderer')->render(array(), array('format' => 'html')); ?>", $blade->compileString('@flasher_render(array())'));
-        $this->assertEquals("<?php echo app('flasher.renderer')->render(array(\"priority\" => array(\"min\" => 4, \"max\" => 5)), array('format' => 'html')); ?>", $blade->compileString('@flasher_render(array("priority" => array("min" => 4, "max" => 5)))'));
+        $this->assertEquals("<?php echo app('flasher.response_manager')->render(array(), array('format' => 'html')); ?>", $blade->compileString('@flasher_render'));
+        $this->assertEquals("<?php echo app('flasher.response_manager')->render(array(), array('format' => 'html')); ?>", $blade->compileString('@flasher_render()'));
+        $this->assertEquals("<?php echo app('flasher.response_manager')->render(array(), array('format' => 'html')); ?>", $blade->compileString('@flasher_render(array())'));
+        $this->assertEquals("<?php echo app('flasher.response_manager')->render(array(\"priority\" => array(\"min\" => 4, \"max\" => 5)), array('format' => 'html')); ?>", $blade->compileString('@flasher_render(array("priority" => array("min" => 4, "max" => 5)))'));
     }
 }
diff --git a/src/Laravel/composer.json b/src/Laravel/composer.json
index 2b20339c..66ff0ac8 100644
--- a/src/Laravel/composer.json
+++ b/src/Laravel/composer.json
@@ -30,7 +30,7 @@
     "require": {
         "php": ">=5.3",
         "illuminate/support": "^4.0|^5.0|^6.0|^7.0|^8.0",
-        "php-flasher/flasher": "^0.1"
+        "php-flasher/flasher": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0",
diff --git a/src/Noty/Laravel/.gitignore b/src/Noty/Laravel/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Noty/Laravel/.gitignore
+++ b/src/Noty/Laravel/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Noty/Laravel/Resources/config/config.php b/src/Noty/Laravel/Resources/config/config.php
index 4116cea8..9eb97bf4 100644
--- a/src/Noty/Laravel/Resources/config/config.php
+++ b/src/Noty/Laravel/Resources/config/config.php
@@ -2,31 +2,10 @@
 
 return array(
     'scripts' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js',
-        '/vendor/flasher/flasher-noty.js',
-    ),
-    'styles' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css',
+        'https://cdn.jsdelivr.net/npm/@flasher/flasher-noty@0.1.3/dist/flasher-noty.min.js',
     ),
+    'styles'  => array(),
     'options' => array(
-        'layout' => 'topRight',
-        'theme' => 'mint',
         'timeout' => 5000,
-        'progressBar' => true,
-        'animation.open' => 'noty_effects_open',
-        'animation.close' => 'noty_effects_close',
-        'sounds.sources' => array(),
-        'closeWith' => array('click'),
-        'sounds.volume' => 1,
-        'sounds.conditions' => array(),
-        'docTitle.conditions' => array(),
-        'modal' => false,
-        'id' => false,
-        'force' => false,
-        'queue' => 'global',
-        'killer' => false,
-        'container' => false,
-        'buttons' => array(),
-        'visibilityControl' => false,
     ),
 );
diff --git a/src/Noty/Laravel/Resources/public/flasher-noty.js b/src/Noty/Laravel/Resources/public/flasher-noty.js
deleted file mode 100644
index d6b20820..00000000
--- a/src/Noty/Laravel/Resources/public/flasher-noty.js
+++ /dev/null
@@ -1,22 +0,0 @@
-PHPFlasher.addFactory('noty', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        var options = {
-            text: notification.message,
-            type: notification.type,
-            ...notification.options
-        }
-
-        new Noty(options).show();
-    };
-
-    exports.renderOptions = function (options) {
-        Noty.overrideDefaults(options);
-    };
-
-    return exports;
-})());
diff --git a/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php b/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php
index 481b2a68..8e7a252c 100644
--- a/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php
@@ -2,9 +2,11 @@
 
 namespace Flasher\Noty\Laravel\ServiceProvider\Providers;
 
+use Flasher\Laravel\ServiceProvider\ResourceManagerHelper;
 use Flasher\Prime\Flasher;
 use Flasher\Noty\Laravel\FlasherNotyServiceProvider;
 use Flasher\Noty\Prime\NotyFactory;
+use Flasher\Prime\Response\Resource\ResourceManager;
 use Illuminate\Container\Container;
 use Illuminate\Foundation\Application;
 
@@ -37,7 +39,6 @@ class Laravel implements ServiceProviderInterface
     public function boot(FlasherNotyServiceProvider $provider)
     {
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/config/config.php') => config_path('flasher_noty.php')), 'flasher-config');
-        $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/flasher'))), 'flasher-public');
     }
 
     /**
@@ -64,6 +65,12 @@ class Laravel implements ServiceProviderInterface
 
             return $flasher;
         });
+
+        $this->app->extend('flasher.resource_manager', function (ResourceManager $resourceManager) {
+            ResourceManagerHelper::process($resourceManager, 'noty');
+
+            return $resourceManager;
+        });
     }
 
     protected function appendToFlasherConfig()
diff --git a/src/Noty/Laravel/Tests/FlasherNotyServiceProviderTest.php b/src/Noty/Laravel/Tests/FlasherNotyServiceProviderTest.php
index 3007c091..c8339223 100644
--- a/src/Noty/Laravel/Tests/FlasherNotyServiceProviderTest.php
+++ b/src/Noty/Laravel/Tests/FlasherNotyServiceProviderTest.php
@@ -24,32 +24,11 @@ class FlasherNotyServiceProviderTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js',
-                '/vendor/flasher/flasher-noty.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-noty@0.1.3/dist/flasher-noty.min.js',
             ),
+            'styles'  => array(),
             'options' => array(
-                'layout'              => 'topRight',
-                'theme'               => 'mint',
-                'timeout'             => 5000,
-                'progressBar'         => true,
-                'animation.open'      => 'noty_effects_open',
-                'animation.close'     => 'noty_effects_close',
-                'sounds.sources'      => array(),
-                'closeWith'           => array('click'),
-                'sounds.volume'       => 1,
-                'sounds.conditions'   => array(),
-                'docTitle.conditions' => array(),
-                'modal'               => false,
-                'id'                  => false,
-                'force'               => false,
-                'queue'               => 'global',
-                'killer'              => false,
-                'container'           => false,
-                'buttons'             => array(),
-                'visibilityControl'   => false,
+                'timeout' => 5000,
             ),
         );
 
diff --git a/src/Noty/Laravel/composer.json b/src/Noty/Laravel/composer.json
index 5a7e3d88..def0de56 100644
--- a/src/Noty/Laravel/composer.json
+++ b/src/Noty/Laravel/composer.json
@@ -28,8 +28,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-laravel": "^0.1",
-        "php-flasher/flasher-noty": "^0.1"
+        "php-flasher/flasher-laravel": "@dev",
+        "php-flasher/flasher-noty": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0",
diff --git a/src/Noty/Prime/.gitignore b/src/Noty/Prime/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Noty/Prime/.gitignore
+++ b/src/Noty/Prime/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Noty/Prime/composer.json b/src/Noty/Prime/composer.json
index 10aaf48e..e7c86701 100644
--- a/src/Noty/Prime/composer.json
+++ b/src/Noty/Prime/composer.json
@@ -25,7 +25,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^0.1"
+        "php-flasher/flasher": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Noty/Symfony/.gitignore b/src/Noty/Symfony/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Noty/Symfony/.gitignore
+++ b/src/Noty/Symfony/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Noty/Symfony/DependencyInjection/Configuration.php b/src/Noty/Symfony/DependencyInjection/Configuration.php
index 2249125d..69b0088c 100755
--- a/src/Noty/Symfony/DependencyInjection/Configuration.php
+++ b/src/Noty/Symfony/DependencyInjection/Configuration.php
@@ -26,20 +26,19 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                          'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js',
-                          '/bundles/flashernoty/flasher-noty.js',
+                          'https://cdn.jsdelivr.net/npm/@flasher/flasher-noty@0.1.3/dist/flasher-noty.min.js',
                     ))
                 ->end()
                 ->arrayNode('styles')
                     ->prototype('scalar')->end()
-                    ->defaultValue(array(
-                          'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css',
-                    ))
+                    ->defaultValue(array())
                 ->end()
                 ->arrayNode('options')
                     ->prototype('variable')->end()
                     ->ignoreExtraKeys(false)
-                    ->defaultValue(array())
+                    ->defaultValue(array(
+                       'timeout' => 5000,
+                    ))
                 ->end()
             ->end()
         ;
diff --git a/src/Noty/Symfony/Resources/public/flasher-noty.js b/src/Noty/Symfony/Resources/public/flasher-noty.js
deleted file mode 100644
index d6b20820..00000000
--- a/src/Noty/Symfony/Resources/public/flasher-noty.js
+++ /dev/null
@@ -1,22 +0,0 @@
-PHPFlasher.addFactory('noty', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        var options = {
-            text: notification.message,
-            type: notification.type,
-            ...notification.options
-        }
-
-        new Noty(options).show();
-    };
-
-    exports.renderOptions = function (options) {
-        Noty.overrideDefaults(options);
-    };
-
-    return exports;
-})());
diff --git a/src/Noty/Symfony/Tests/DependencyInjection/ConfigurationTest.php b/src/Noty/Symfony/Tests/DependencyInjection/ConfigurationTest.php
index 3f01181f..e06e53a6 100644
--- a/src/Noty/Symfony/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Noty/Symfony/Tests/DependencyInjection/ConfigurationTest.php
@@ -14,32 +14,11 @@ class ConfigurationTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js',
-                '/bundles/flashernoty/flasher-noty.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-noty@0.1.3/dist/flasher-noty.min.js',
             ),
+            'styles'  => array(),
             'options' => array(
-                'layout'              => 'topRight',
-                'theme'               => 'mint',
-                'timeout'             => false,
-                'progressBar'         => true,
-                'animation.open'      => 'noty_effects_open',
-                'animation.close'     => 'noty_effects_close',
-                'sounds.sources'      => array(),
-                'closeWith'           => array('click'),
-                'sounds.volume'       => 1,
-                'sounds.conditions'   => array(),
-                'docTitle.conditions' => array(),
-                'modal'               => false,
-                'id'                  => false,
-                'force'               => false,
-                'queue'               => 'global',
-                'killer'              => false,
-                'container'           => false,
-                'buttons'             => array(),
-                'visibilityControl'   => false,
+                'timeout' => 5000,
             ),
         );
 
diff --git a/src/Noty/Symfony/Tests/DependencyInjection/FlasherNotyExtensionTest.php b/src/Noty/Symfony/Tests/DependencyInjection/FlasherNotyExtensionTest.php
index 3c2f9539..42d84b98 100644
--- a/src/Noty/Symfony/Tests/DependencyInjection/FlasherNotyExtensionTest.php
+++ b/src/Noty/Symfony/Tests/DependencyInjection/FlasherNotyExtensionTest.php
@@ -13,20 +13,14 @@ class FlasherNotyExtensionTest extends TestCase
 {
     public function testContainerContainFlasherServices()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher', array());
-        $container->loadFromExtension('flasher_noty', array());
-        $container->compile();
+        $container = $this->getContainer();
 
         $this->assertTrue($container->has('flasher.noty'));
     }
 
     public function testCreateInstanceOfNotyAdapter()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher');
-        $container->loadFromExtension('flasher_noty');
-        $container->compile();
+        $container = $this->getContainer();
 
         $flasher = $container->getDefinition('flasher');
         $calls = $flasher->getMethodCalls();
@@ -42,13 +36,6 @@ class FlasherNotyExtensionTest extends TestCase
         $this->assertSame('flasher.noty', (string) $calls[1][1][1]);
     }
 
-    public function testConfigurationInjectedIntoFlasherConfig()
-    {
-        $container = $this->getContainer();
-        $config = $container->get('flasher.config');
-        $this->assertNotEmpty($config->get('adapters.noty'));
-    }
-
     private function getRawContainer()
     {
         $container = new ContainerBuilder();
@@ -71,6 +58,8 @@ class FlasherNotyExtensionTest extends TestCase
     private function getContainer()
     {
         $container = $this->getRawContainer();
+        $container->loadFromExtension('flasher', array());
+        $container->loadFromExtension('flasher_noty', array());
         $container->compile();
 
         return $container;
diff --git a/src/Noty/Symfony/composer.json b/src/Noty/Symfony/composer.json
index c1fc141b..ad206c3b 100644
--- a/src/Noty/Symfony/composer.json
+++ b/src/Noty/Symfony/composer.json
@@ -29,8 +29,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-symfony": "^0.1",
-        "php-flasher/flasher-noty": "^0.1"
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-noty": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Noty/Symfony/composer.json.local b/src/Noty/Symfony/composer.json.local
new file mode 100644
index 00000000..87152876
--- /dev/null
+++ b/src/Noty/Symfony/composer.json.local
@@ -0,0 +1,75 @@
+{
+    "name": "php-flasher/flasher-noty-symfony",
+    "type": "symfony-bundle",
+    "description": "PHP Flasher Symfony adapter for Noty",
+    "keywords": [
+        "yoeunes",
+        "notify",
+        "php",
+        "laravel",
+        "symfony",
+        "Lumen",
+        "notifications",
+        "messages",
+        "alerts",
+        "pnotify",
+        "noty ",
+        "bundle",
+        "flex"
+    ],
+    "homepage": "https://php-flasher.github.io/",
+    "authors": [
+        {
+            "name": "Younes Khoubza",
+            "email": "younes.khoubza@gmail.com",
+            "homepage": "https://github.com/yoeunes",
+            "role": "Developer"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../Symfony",
+            "options": {
+                "symlink": true
+            }
+        },
+        {
+            "type": "path",
+            "url": "../Prime",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
+    "license": "MIT",
+    "require": {
+        "php": ">=5.3",
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-noty": "@dev"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flasher\\Noty\\Symfony\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Flasher\\Noty\\Symfony\\Tests\\": "Tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "platform": {
+            "php": "5.3.10"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}
diff --git a/src/Notyf/Laravel/.gitignore b/src/Notyf/Laravel/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Notyf/Laravel/.gitignore
+++ b/src/Notyf/Laravel/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Notyf/Laravel/Resources/config/config.php b/src/Notyf/Laravel/Resources/config/config.php
index 88840614..1d1bd982 100644
--- a/src/Notyf/Laravel/Resources/config/config.php
+++ b/src/Notyf/Laravel/Resources/config/config.php
@@ -2,39 +2,12 @@
 
 return array(
     'scripts' => array(
-        'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.js',
-        '/vendor/flasher/flasher-notyf.js',
-    ),
-    'styles' => array(
-        'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css',
+        'https://cdn.jsdelivr.net/npm/@flasher/flasher-notyf@0.1.5/dist/flasher-notyf.min.js',
     ),
+    'styles' => array(),
     'options' => array(
         'duration' => 5000,
-        'ripple' => true,
-        'position' => array(
-            'x' => 'right',
-            'y' => 'top',
-        ),
-        'dismissible' => false,
         'types' => array(
-            array(
-                'type'            => 'success',
-                'className'       => 'notyf__toast--success',
-                'backgroundColor' => '#3dc763',
-                'icon'            => array(
-                    'className' => 'notyf__icon--success',
-                    'tagName'   => 'i',
-                ),
-            ),
-            array(
-                'type'            => 'error',
-                'className'       => 'notyf__toast--error',
-                'backgroundColor' => '#ed3d3d',
-                'icon'            => array(
-                    'className' => 'notyf__icon--error',
-                    'tagName'   => 'i',
-                ),
-            ),
             array(
                 'type'            => 'info',
                 'className'       => 'notyf__toast--info',
diff --git a/src/Notyf/Laravel/Resources/public/flasher-notyf.js b/src/Notyf/Laravel/Resources/public/flasher-notyf.js
deleted file mode 100644
index 5876c77f..00000000
--- a/src/Notyf/Laravel/Resources/public/flasher-notyf.js
+++ /dev/null
@@ -1,17 +0,0 @@
-PHPFlasher.addFactory('notyf', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        window.notyf.open(data.notification);
-    };
-
-    exports.renderOptions = function (options) {
-        if ("undefined" === typeof window.notyf) {
-            window.notyf = new Notyf(options);
-        }
-    };
-
-    return exports;
-})());
diff --git a/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php b/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php
index 475435f3..a5f5a8b3 100644
--- a/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php
@@ -2,9 +2,11 @@
 
 namespace Flasher\Notyf\Laravel\ServiceProvider\Providers;
 
+use Flasher\Laravel\ServiceProvider\ResourceManagerHelper;
 use Flasher\Notyf\Laravel\FlasherNotyfServiceProvider;
 use Flasher\Notyf\Prime\NotyfFactory;
 use Flasher\Prime\Flasher;
+use Flasher\Prime\Response\Resource\ResourceManager;
 use Illuminate\Container\Container;
 use Illuminate\Foundation\Application;
 
@@ -37,7 +39,6 @@ class Laravel implements ServiceProviderInterface
     public function boot(FlasherNotyfServiceProvider $provider)
     {
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/config/config.php') => config_path('flasher_notyf.php')), 'flasher-config');
-        $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/flasher'))), 'flasher-public');
     }
 
     /**
@@ -64,6 +65,12 @@ class Laravel implements ServiceProviderInterface
 
             return $manager;
         });
+
+        $this->app->extend('flasher.resource_manager', function (ResourceManager $resourceManager) {
+            ResourceManagerHelper::process($resourceManager, 'notyf');
+
+            return $resourceManager;
+        });
     }
 
     protected function appendToFlasherConfig()
diff --git a/src/Notyf/Laravel/Tests/FlasherNotyfServiceProviderTest.php b/src/Notyf/Laravel/Tests/FlasherNotyfServiceProviderTest.php
index ece6ada1..77c47c0b 100644
--- a/src/Notyf/Laravel/Tests/FlasherNotyfServiceProviderTest.php
+++ b/src/Notyf/Laravel/Tests/FlasherNotyfServiceProviderTest.php
@@ -24,39 +24,12 @@ class FlasherNotyfServiceProviderTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.js',
-                '/vendor/flasher/flasher-notyf.js',
-            ),
-            'styles'  => array(
-                'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-notyf@0.1.5/dist/flasher-notyf.min.js',
             ),
+            'styles' => array(),
             'options' => array(
-                'duration'    => 5000,
-                'ripple'      => true,
-                'position'    => array(
-                    'x' => 'right',
-                    'y' => 'top',
-                ),
-                'dismissible' => false,
-                'types'       => array(
-                    array(
-                        'type'            => 'success',
-                        'className'       => 'notyf__toast--success',
-                        'backgroundColor' => '#3dc763',
-                        'icon'            => array(
-                            'className' => 'notyf__icon--success',
-                            'tagName'   => 'i',
-                        ),
-                    ),
-                    array(
-                        'type'            => 'error',
-                        'className'       => 'notyf__toast--error',
-                        'backgroundColor' => '#ed3d3d',
-                        'icon'            => array(
-                            'className' => 'notyf__icon--error',
-                            'tagName'   => 'i',
-                        ),
-                    ),
+                'duration' => 5000,
+                'types' => array(
                     array(
                         'type'            => 'info',
                         'className'       => 'notyf__toast--info',
@@ -68,7 +41,7 @@ class FlasherNotyfServiceProviderTest extends TestCase
                         'className'       => 'notyf__toast--warning',
                         'backgroundColor' => '#E3A008',
                         'icon'            => false,
-                    ),
+                    )
                 ),
             ),
         );
diff --git a/src/Notyf/Laravel/composer.json b/src/Notyf/Laravel/composer.json
index 67902dc9..62e33b41 100644
--- a/src/Notyf/Laravel/composer.json
+++ b/src/Notyf/Laravel/composer.json
@@ -29,8 +29,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-laravel": "^0.1",
-        "php-flasher/flasher-notyf": "^0.1"
+        "php-flasher/flasher-laravel": "@dev",
+        "php-flasher/flasher-notyf": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0",
diff --git a/src/Notyf/Prime/.gitignore b/src/Notyf/Prime/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Notyf/Prime/.gitignore
+++ b/src/Notyf/Prime/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Notyf/Prime/composer.json b/src/Notyf/Prime/composer.json
index 6d698cd1..b9c54e36 100644
--- a/src/Notyf/Prime/composer.json
+++ b/src/Notyf/Prime/composer.json
@@ -26,7 +26,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^0.1"
+        "php-flasher/flasher": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Notyf/Symfony/.gitignore b/src/Notyf/Symfony/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Notyf/Symfony/.gitignore
+++ b/src/Notyf/Symfony/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Notyf/Symfony/DependencyInjection/Configuration.php b/src/Notyf/Symfony/DependencyInjection/Configuration.php
index 547f80ba..c566a950 100644
--- a/src/Notyf/Symfony/DependencyInjection/Configuration.php
+++ b/src/Notyf/Symfony/DependencyInjection/Configuration.php
@@ -26,46 +26,19 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                        'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.js',
-                        '/bundles/flashernotyf/flasher-notyf.js',
+                        'https://cdn.jsdelivr.net/npm/@flasher/flasher-notyf@0.1.5/dist/flasher-notyf.min.js',
                     ))
                 ->end()
                 ->arrayNode('styles')
                     ->prototype('scalar')->end()
-                    ->defaultValue(array(
-                        'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css',
-                    ))
+                    ->defaultValue(array())
                 ->end()
                 ->arrayNode('options')
                     ->ignoreExtraKeys(false)
                     ->prototype('variable')->end()
                     ->defaultValue(array(
                         'duration' => 5000,
-                        'ripple' => true,
-                        'position' => array(
-                            'x' => 'right',
-                            'y' => 'top',
-                        ),
-                        'dismissible' => false,
                         'types' => array(
-                            array(
-                                'type'            => 'success',
-                                'className'       => 'notyf__toast--success',
-                                'backgroundColor' => '#3dc763',
-                                'icon'            => array(
-                                    'className' => 'notyf__icon--success',
-                                    'tagName'   => 'i',
-                                ),
-                            ),
-                            array(
-                                'type'            => 'error',
-                                'className'       => 'notyf__toast--error',
-                                'backgroundColor' => '#ed3d3d',
-                                'icon'            => array(
-                                    'className' => 'notyf__icon--error',
-                                    'tagName'   => 'i',
-                                ),
-                            ),
                             array(
                                 'type'            => 'info',
                                 'className'       => 'notyf__toast--info',
diff --git a/src/Notyf/Symfony/Resources/public/flasher-notyf.js b/src/Notyf/Symfony/Resources/public/flasher-notyf.js
deleted file mode 100644
index 5876c77f..00000000
--- a/src/Notyf/Symfony/Resources/public/flasher-notyf.js
+++ /dev/null
@@ -1,17 +0,0 @@
-PHPFlasher.addFactory('notyf', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        window.notyf.open(data.notification);
-    };
-
-    exports.renderOptions = function (options) {
-        if ("undefined" === typeof window.notyf) {
-            window.notyf = new Notyf(options);
-        }
-    };
-
-    return exports;
-})());
diff --git a/src/Notyf/Symfony/Tests/DependencyInjection/ConfigurationTest.php b/src/Notyf/Symfony/Tests/DependencyInjection/ConfigurationTest.php
index 362e7182..18711e69 100644
--- a/src/Notyf/Symfony/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Notyf/Symfony/Tests/DependencyInjection/ConfigurationTest.php
@@ -14,39 +14,12 @@ class ConfigurationTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.js',
-                '/bundles/flashernotyf/flasher-notyf.js',
-            ),
-            'styles'  => array(
-                'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-notyf@0.1.5/dist/flasher-notyf.min.js',
             ),
+            'styles' => array(),
             'options' => array(
-                'duration'    => 5000,
-                'ripple'      => true,
-                'position'    => array(
-                    'x' => 'right',
-                    'y' => 'top',
-                ),
-                'dismissible' => false,
-                'types'       => array(
-                    array(
-                        'type'            => 'success',
-                        'className'       => 'notyf__toast--success',
-                        'backgroundColor' => '#3dc763',
-                        'icon'            => array(
-                            'className' => 'notyf__icon--success',
-                            'tagName'   => 'i',
-                        ),
-                    ),
-                    array(
-                        'type'            => 'error',
-                        'className'       => 'notyf__toast--error',
-                        'backgroundColor' => '#ed3d3d',
-                        'icon'            => array(
-                            'className' => 'notyf__icon--error',
-                            'tagName'   => 'i',
-                        ),
-                    ),
+                'duration' => 5000,
+                'types' => array(
                     array(
                         'type'            => 'info',
                         'className'       => 'notyf__toast--info',
@@ -58,7 +31,7 @@ class ConfigurationTest extends TestCase
                         'className'       => 'notyf__toast--warning',
                         'backgroundColor' => '#E3A008',
                         'icon'            => false,
-                    ),
+                    )
                 ),
             ),
         );
diff --git a/src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php b/src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php
index 8c5be1ed..2b1f07cb 100644
--- a/src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php
+++ b/src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php
@@ -13,20 +13,14 @@ class FlasherNotyfExtensionTest extends TestCase
 {
     public function testContainerContainFlasherServices()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher', array());
-        $container->loadFromExtension('flasher_notyf', array());
-        $container->compile();
+        $container = $this->getContainer();
 
         $this->assertTrue($container->has('flasher.notyf'));
     }
 
     public function testCreateInstanceOfNotyfAdapter()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher');
-        $container->loadFromExtension('flasher_notyf');
-        $container->compile();
+        $container = $this->getContainer();
 
         $flasher = $container->getDefinition('flasher');
         $calls = $flasher->getMethodCalls();
@@ -42,13 +36,6 @@ class FlasherNotyfExtensionTest extends TestCase
         $this->assertSame('flasher.notyf', (string) $calls[1][1][1]);
     }
 
-    public function testConfigurationInjectedIntoFlasherConfig()
-    {
-        $container = $this->getContainer();
-        $config = $container->get('flasher.config');
-        $this->assertNotEmpty($config->get('adapters.notyf'));
-    }
-
     private function getRawContainer()
     {
         $container = new ContainerBuilder();
@@ -71,6 +58,8 @@ class FlasherNotyfExtensionTest extends TestCase
     private function getContainer()
     {
         $container = $this->getRawContainer();
+        $container->loadFromExtension('flasher', array());
+        $container->loadFromExtension('flasher_notyf', array());
         $container->compile();
 
         return $container;
diff --git a/src/Notyf/Symfony/composer.json b/src/Notyf/Symfony/composer.json
index 2edce396..97393c1a 100644
--- a/src/Notyf/Symfony/composer.json
+++ b/src/Notyf/Symfony/composer.json
@@ -31,8 +31,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-symfony": "^0.1",
-        "php-flasher/flasher-notyf": "^0.1"
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-notyf": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Pnotify/Laravel/.gitignore b/src/Pnotify/Laravel/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Pnotify/Laravel/.gitignore
+++ b/src/Pnotify/Laravel/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Pnotify/Laravel/Resources/config/config.php b/src/Pnotify/Laravel/Resources/config/config.php
index 720ff1d3..1114f60d 100644
--- a/src/Pnotify/Laravel/Resources/config/config.php
+++ b/src/Pnotify/Laravel/Resources/config/config.php
@@ -2,47 +2,11 @@
 
 return array(
     'scripts' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-        'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.js',
-        '/vendor/flasher/flasher-pnotify.js',
-    ),
-    'styles' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.css',
-        'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.brighttheme.css',
+        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+        'https://cdn.jsdelivr.net/npm/@flasher/flasher-pnotify@0.1.1/dist/flasher-pnotify.min.js',
     ),
+    'styles'  => array(),
     'options' => array(
-        'type'             => 'notice',
-        'title'            => false,
-        'titleTrusted'     => false,
-        'text'             => false,
-        'textTrusted'      => false,
-        'styling'          => 'brighttheme',
-        'icons'            => 'brighttheme',
-        'mode'             => 'no-preference',
-        'addClass'         => '',
-        'addModalClass'    => '',
-        'addModelessClass' => '',
-        'autoOpen'         => true,
-        'width'            => '360px',
-        'minHeight'        => '16px',
-        'maxTextHeight'    => '200px',
-        'icon'             => true,
-        'animation'        => 'fade',
-        'animateSpeed'     => 'normal',
-        'shadow'           => true,
-        'hide'             => true,
-        'delay'            => 5000,
-        'mouseReset'       => true,
-        'closer'           => true,
-        'closerHover'      => true,
-        'sticker'          => true,
-        'stickerHover'     => true,
-        'labels'           => array(
-            'close'   => 'Close',
-            'stick'   => 'Pin',
-            'unstick' => 'Unpin'
-        ),
-        'remove'           => true,
-        'destroy'          => true,
+        'delay' => 1000,
     ),
 );
diff --git a/src/Pnotify/Laravel/Resources/public/flasher-pnotify.js b/src/Pnotify/Laravel/Resources/public/flasher-pnotify.js
deleted file mode 100644
index a03d66a4..00000000
--- a/src/Pnotify/Laravel/Resources/public/flasher-pnotify.js
+++ /dev/null
@@ -1,22 +0,0 @@
-PHPFlasher.addFactory('pnotify', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        var options = {
-            text: notification.message,
-            type: notification.type,
-            ...notification.options
-        }
-
-        new PNotify(options);
-    };
-
-    exports.renderOptions = function (options) {
-        PNotify.defaults = options;
-    };
-
-    return exports;
-})());
diff --git a/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php b/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php
index b88dc143..d4976cf5 100644
--- a/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php
@@ -2,9 +2,11 @@
 
 namespace Flasher\Pnotify\Laravel\ServiceProvider\Providers;
 
+use Flasher\Laravel\ServiceProvider\ResourceManagerHelper;
 use Flasher\Pnotify\Laravel\FlasherPnotifyServiceProvider;
 use Flasher\Pnotify\Prime\PnotifyFactory;
 use Flasher\Prime\Flasher;
+use Flasher\Prime\Response\Resource\ResourceManager;
 use Illuminate\Container\Container;
 use Illuminate\Foundation\Application;
 
@@ -37,7 +39,6 @@ class Laravel implements ServiceProviderInterface
     public function boot(FlasherPnotifyServiceProvider $provider)
     {
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/config/config.php') => config_path('flasher_pnotify.php')), 'flasher-config');
-        $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/flasher'))), 'flasher-public');
     }
 
     /**
@@ -64,6 +65,12 @@ class Laravel implements ServiceProviderInterface
 
             return $manager;
         });
+
+        $this->app->extend('flasher.resource_manager', function (ResourceManager $resourceManager) {
+            ResourceManagerHelper::process($resourceManager, 'pnotify');
+
+            return $resourceManager;
+        });
     }
 
     protected function appendToFlasherConfig()
diff --git a/src/Pnotify/Laravel/Tests/FlasherPnotifyServiceProviderTest.php b/src/Pnotify/Laravel/Tests/FlasherPnotifyServiceProviderTest.php
index b3bee7aa..c32853ab 100644
--- a/src/Pnotify/Laravel/Tests/FlasherPnotifyServiceProviderTest.php
+++ b/src/Pnotify/Laravel/Tests/FlasherPnotifyServiceProviderTest.php
@@ -24,48 +24,12 @@ class FlasherPnotifyServiceProviderTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.js',
-                '/vendor/flasher/flasher-pnotify.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.css',
-                'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.brighttheme.css',
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-pnotify@0.1.1/dist/flasher-pnotify.min.js',
             ),
+            'styles'  => array(),
             'options' => array(
-                'type'             => 'notice',
-                'title'            => false,
-                'titleTrusted'     => false,
-                'text'             => false,
-                'textTrusted'      => false,
-                'styling'          => 'brighttheme',
-                'icons'            => 'brighttheme',
-                'mode'             => 'no-preference',
-                'addClass'         => '',
-                'addModalClass'    => '',
-                'addModelessClass' => '',
-                'autoOpen'         => true,
-                'width'            => '360px',
-                'minHeight'        => '16px',
-                'maxTextHeight'    => '200px',
-                'icon'             => true,
-                'animation'        => 'fade',
-                'animateSpeed'     => 'normal',
-                'shadow'           => true,
-                'hide'             => true,
-                'delay'            => 5000,
-                'mouseReset'       => true,
-                'closer'           => true,
-                'closerHover'      => true,
-                'sticker'          => true,
-                'stickerHover'     => true,
-                'labels'           => array(
-                    'close'   => 'Close',
-                    'stick'   => 'Pin',
-                    'unstick' => 'Unpin',
-                ),
-                'remove'           => true,
-                'destroy'          => true,
+                'delay' => 1000,
             ),
         );
 
diff --git a/src/Pnotify/Laravel/composer.json b/src/Pnotify/Laravel/composer.json
index eeb87dfc..06d23d38 100644
--- a/src/Pnotify/Laravel/composer.json
+++ b/src/Pnotify/Laravel/composer.json
@@ -28,8 +28,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-laravel": "^0.1",
-        "php-flasher/flasher-pnotify": "^0.1"
+        "php-flasher/flasher-laravel": "@dev",
+        "php-flasher/flasher-pnotify": "@dev"
     },
     "require-dev": {
         "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0",
diff --git a/src/Pnotify/Prime/.gitignore b/src/Pnotify/Prime/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Pnotify/Prime/.gitignore
+++ b/src/Pnotify/Prime/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Pnotify/Prime/composer.json b/src/Pnotify/Prime/composer.json
index 24c8d88d..1cb2ff71 100644
--- a/src/Pnotify/Prime/composer.json
+++ b/src/Pnotify/Prime/composer.json
@@ -26,7 +26,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^0.1"
+        "php-flasher/flasher": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Pnotify/Symfony/.gitignore b/src/Pnotify/Symfony/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Pnotify/Symfony/.gitignore
+++ b/src/Pnotify/Symfony/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Pnotify/Symfony/DependencyInjection/Configuration.php b/src/Pnotify/Symfony/DependencyInjection/Configuration.php
index f0362275..beaad7df 100644
--- a/src/Pnotify/Symfony/DependencyInjection/Configuration.php
+++ b/src/Pnotify/Symfony/DependencyInjection/Configuration.php
@@ -26,55 +26,19 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                        'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.js',
-                        '/bundles/flasherpnotify/flasher-pnotify.js',
+                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                        'https://cdn.jsdelivr.net/npm/@flasher/flasher-pnotify@0.1.1/dist/flasher-pnotify.min.js',
                     ))
                 ->end()
                 ->arrayNode('styles')
                     ->prototype('scalar')->end()
-                    ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.css',
-                        'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.brighttheme.css',
-                    ))
+                    ->defaultValue(array())
                 ->end()
                 ->arrayNode('options')
                     ->prototype('variable')->end()
                     ->ignoreExtraKeys(false)
                     ->defaultValue(array(
-                        'type'             => 'notice',
-                        'title'            => false,
-                        'titleTrusted'     => false,
-                        'text'             => false,
-                        'textTrusted'      => false,
-                        'styling'          => 'brighttheme',
-                        'icons'            => 'brighttheme',
-                        'mode'             => 'no-preference',
-                        'addClass'         => '',
-                        'addModalClass'    => '',
-                        'addModelessClass' => '',
-                        'autoOpen'         => true,
-                        'width'            => '360px',
-                        'minHeight'        => '16px',
-                        'maxTextHeight'    => '200px',
-                        'icon'             => true,
-                        'animation'        => 'fade',
-                        'animateSpeed'     => 'normal',
-                        'shadow'           => true,
-                        'hide'             => true,
-                        'delay'            => 5000,
-                        'mouseReset'       => true,
-                        'closer'           => true,
-                        'closerHover'      => true,
-                        'sticker'          => true,
-                        'stickerHover'     => true,
-                        'labels'           => array(
-                            'close'   => 'Close',
-                            'stick'   => 'Pin',
-                            'unstick' => 'Unpin'
-                        ),
-                        'remove'           => true,
-                        'destroy'          => true,
+                        'delay' => 1000,
                     ))
                 ->end()
             ->end()
diff --git a/src/Pnotify/Symfony/Resources/public/flasher-pnotify.js b/src/Pnotify/Symfony/Resources/public/flasher-pnotify.js
deleted file mode 100644
index a03d66a4..00000000
--- a/src/Pnotify/Symfony/Resources/public/flasher-pnotify.js
+++ /dev/null
@@ -1,22 +0,0 @@
-PHPFlasher.addFactory('pnotify', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        var options = {
-            text: notification.message,
-            type: notification.type,
-            ...notification.options
-        }
-
-        new PNotify(options);
-    };
-
-    exports.renderOptions = function (options) {
-        PNotify.defaults = options;
-    };
-
-    return exports;
-})());
diff --git a/src/Pnotify/Symfony/Tests/DependencyInjection/ConfigurationTest.php b/src/Pnotify/Symfony/Tests/DependencyInjection/ConfigurationTest.php
index e939584a..52f6ba03 100644
--- a/src/Pnotify/Symfony/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Pnotify/Symfony/Tests/DependencyInjection/ConfigurationTest.php
@@ -14,48 +14,12 @@ class ConfigurationTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.js',
-                '/bundles/flasherpnotify/flasher-pnotify.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.css',
-                'https://cdnjs.cloudflare.com/ajax/libs/pnotify/3.2.1/pnotify.brighttheme.css',
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-pnotify@0.1.1/dist/flasher-pnotify.min.js',
             ),
+            'styles'  => array(),
             'options' => array(
-                'type'             => 'notice',
-                'title'            => false,
-                'titleTrusted'     => false,
-                'text'             => false,
-                'textTrusted'      => false,
-                'styling'          => 'brighttheme',
-                'icons'            => 'brighttheme',
-                'mode'             => 'no-preference',
-                'addClass'         => '',
-                'addModalClass'    => '',
-                'addModelessClass' => '',
-                'autoOpen'         => true,
-                'width'            => '360px',
-                'minHeight'        => '16px',
-                'maxTextHeight'    => '200px',
-                'icon'             => true,
-                'animation'        => 'fade',
-                'animateSpeed'     => 'normal',
-                'shadow'           => true,
-                'hide'             => true,
-                'delay'            => 5000,
-                'mouseReset'       => true,
-                'closer'           => true,
-                'closerHover'      => true,
-                'sticker'          => true,
-                'stickerHover'     => true,
-                'labels'           => array(
-                    'close'   => 'Close',
-                    'stick'   => 'Pin',
-                    'unstick' => 'Unpin',
-                ),
-                'remove'           => true,
-                'destroy'          => true,
+                'delay' => 1000,
             ),
         );
 
diff --git a/src/Pnotify/Symfony/Tests/DependencyInjection/FlasherPnotifyExtensionTest.php b/src/Pnotify/Symfony/Tests/DependencyInjection/FlasherPnotifyExtensionTest.php
index 16d9825f..7c5c302a 100644
--- a/src/Pnotify/Symfony/Tests/DependencyInjection/FlasherPnotifyExtensionTest.php
+++ b/src/Pnotify/Symfony/Tests/DependencyInjection/FlasherPnotifyExtensionTest.php
@@ -13,20 +13,14 @@ class FlasherPnotifyExtensionTest extends TestCase
 {
     public function testContainerContainFlasherServices()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher', array());
-        $container->loadFromExtension('flasher_pnotify', array());
-        $container->compile();
+        $container = $this->getContainer();
 
         $this->assertTrue($container->has('flasher.pnotify'));
     }
 
     public function testCreateInstanceOfPnotifyAdapter()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher');
-        $container->loadFromExtension('flasher_pnotify');
-        $container->compile();
+        $container = $this->getContainer();
 
         $flasher = $container->getDefinition('flasher');
         $calls = $flasher->getMethodCalls();
@@ -42,13 +36,6 @@ class FlasherPnotifyExtensionTest extends TestCase
         $this->assertSame('flasher.pnotify', (string) $calls[1][1][1]);
     }
 
-    public function testConfigurationInjectedIntoFlasherConfig()
-    {
-        $container = $this->getContainer();
-        $config = $container->get('flasher.config');
-        $this->assertNotEmpty($config->get('adapters.pnotify'));
-    }
-
     private function getRawContainer()
     {
         $container = new ContainerBuilder();
diff --git a/src/Pnotify/Symfony/composer.json b/src/Pnotify/Symfony/composer.json
index 283d1aed..c57e38fc 100644
--- a/src/Pnotify/Symfony/composer.json
+++ b/src/Pnotify/Symfony/composer.json
@@ -29,8 +29,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-symfony": "^0.1",
-        "php-flasher/flasher-pnotify": "^0.1"
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-pnotify": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Prime/.gitignore b/src/Prime/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Prime/.gitignore
+++ b/src/Prime/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Prime/EventDispatcher/EventListener/TemplateListener.php b/src/Prime/EventDispatcher/EventListener/TemplateListener.php
deleted file mode 100644
index 850cab25..00000000
--- a/src/Prime/EventDispatcher/EventListener/TemplateListener.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Flasher\Prime\EventDispatcher\EventListener;
-
-use Flasher\Prime\Config\ConfigInterface;
-use Flasher\Prime\EventDispatcher\Event\ResponseEvent;
-use Flasher\Prime\Stamp\TemplateStamp;
-use Flasher\Prime\Template\EngineInterface;
-
-final class TemplateListener implements EventSubscriberInterface
-{
-    /**
-     * @var EngineInterface
-     */
-    private $templateEngine;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @param ConfigInterface $config
-     * @param EngineInterface $templateEngine
-     */
-    public function __construct(ConfigInterface $config, EngineInterface $templateEngine)
-    {
-        $this->config = $config;
-        $this->templateEngine = $templateEngine;
-    }
-
-    public function __invoke(ResponseEvent $event)
-    {
-        $envelopes = array();
-
-        foreach ($event->getEnvelopes() as $envelope) {
-            $handler = $envelope->get('Flasher\Prime\Stamp\HandlerStamp')->getHandler();
-
-            if ('template' !== $handler) {
-                $envelopes[] = $envelope;
-                continue;
-            }
-
-            $view = null;
-            $template = null;
-            $viewStamp = $envelope->get('Flasher\Prime\Stamp\TemplateStamp');
-
-            if (null !== $viewStamp) {
-                $view = $viewStamp->getView();
-                $template = $this->config->get('adapters.template.templates.'.$view.'.view');
-            }
-
-            if (null === $template) {
-                $view = $this->config->get('adapters.template.default');
-                $template = $this->config->get('adapters.template.templates.'.$view.'.view');
-            }
-
-            $compiled = $this->templateEngine->render($template, array(
-                'envelope' => $envelope,
-            ));
-
-            $envelope->withStamp(new TemplateStamp($view, $compiled, array(
-                'styles'  => $this->config->get('adapters.template.templates.'.$view.'.styles', array()),
-                'scripts' => $this->config->get('adapters.template.templates.'.$view.'.scripts', array()),
-                'options' => $this->config->get('adapters.template.templates.'.$view.'.options', array()),
-            )));
-
-            $envelopes[] = $envelope;
-        }
-
-        $event->setEnvelopes($envelopes);
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return 'Flasher\Prime\EventDispatcher\Event\ResponseEvent';
-    }
-}
diff --git a/src/Prime/Renderer/Presenter/AbstractPresenter.php b/src/Prime/Renderer/Presenter/AbstractPresenter.php
deleted file mode 100644
index 89f5c429..00000000
--- a/src/Prime/Renderer/Presenter/AbstractPresenter.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer\Presenter;
-
-use Flasher\Prime\Config\ConfigInterface;
-use Flasher\Prime\Envelope;
-
-abstract class AbstractPresenter implements PresenterInterface
-{
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @param ConfigInterface $config
-     */
-    public function __construct(ConfigInterface $config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * @param Envelope[] $envelopes
-     *
-     * @return array[]
-     */
-    protected function getEnvelopes(array $envelopes)
-    {
-        return array_map(function (Envelope $envelope) {
-            return $envelope->toArray();
-        }, $envelopes);
-    }
-
-    /**
-     * @param Envelope[] $envelopes
-     *
-     * @return string[]
-     */
-    protected function getStyles(array $envelopes)
-    {
-        return $this->getAssets('styles', $envelopes);
-    }
-
-    /**
-     * @param Envelope[] $envelopes
-     *
-     * @return string[]
-     */
-    protected function getScripts(array $envelopes)
-    {
-        return $this->getAssets('scripts', $envelopes);
-    }
-
-    /**
-     * @param Envelope[] $envelopes
-     *
-     * @return string[]
-     */
-    protected function getOptions(array $envelopes)
-    {
-        $options = array();
-        $handlers = array();
-
-        foreach ($envelopes as $envelope) {
-            $handler = $envelope->get('Flasher\Prime\Stamp\HandlerStamp')->getHandler();
-            if (in_array($handler, $handlers)) {
-                continue;
-            }
-
-            $handlers[] = $handler;
-            $options[$handler] = $this->config->get(sprintf('adapters.%s.options', $handler), array());
-        }
-
-        return array_filter($options);
-    }
-
-    /**
-     * @param Envelope[] $envelopes
-     *
-     * @return array
-     */
-    protected function toArray(array $envelopes = array())
-    {
-        return array(
-            'scripts'   => $this->getScripts($envelopes),
-            'styles'    => $this->getStyles($envelopes),
-            'options'   => $this->getOptions($envelopes),
-            'envelopes' => $this->getEnvelopes($envelopes),
-        );
-    }
-
-    /**
-     * @param string     $keyword
-     * @param Envelope[] $envelopes
-     *
-     * @return string[]
-     */
-    private function getAssets($keyword, $envelopes)
-    {
-        $files = $this->config->get($keyword, array());
-        $handlers = array();
-
-        foreach ($envelopes as $envelope) {
-            $handler = $envelope->get('Flasher\Prime\Stamp\HandlerStamp')->getHandler();
-            if (in_array($handler, $handlers)) {
-                continue;
-            }
-
-            $handlers[] = $handler;
-            $files = array_merge($files, $this->config->get(sprintf('adapters.%s.%s', $handler, $keyword), array()));
-        }
-
-        return array_values(array_filter(array_unique($files)));
-    }
-}
diff --git a/src/Prime/Renderer/Presenter/ArrayPresenter.php b/src/Prime/Renderer/Presenter/ArrayPresenter.php
deleted file mode 100644
index 4113119d..00000000
--- a/src/Prime/Renderer/Presenter/ArrayPresenter.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer\Presenter;
-
-final class ArrayPresenter extends AbstractPresenter
-{
-    /**
-     * @inheritDoc
-     */
-    public function render(array $envelopes, array $context = array())
-    {
-        return $this->toArray($envelopes);
-    }
-}
diff --git a/src/Prime/Renderer/Presenter/HtmlPresenter.php b/src/Prime/Renderer/Presenter/HtmlPresenter.php
deleted file mode 100644
index 8d2276b3..00000000
--- a/src/Prime/Renderer/Presenter/HtmlPresenter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer\Presenter;
-
-final class HtmlPresenter extends AbstractPresenter
-{
-    /**
-     * @inheritDoc
-     */
-    public function render(array $envelopes, array $context = array())
-    {
-        if (empty($envelopes)) {
-            return '';
-        }
-
-        $scripts = $this->renderScripts($this->getScripts($envelopes), $context);
-        $response = json_encode($this->toArray($envelopes));
-
-        return <<<HTML
-{$scripts}
-<script type="text/javascript">
-if ("undefined" === typeof PHPFlasher) {
-    alert("[PHPFlasher] not found, please include the '/bundles/flasher/flasher.js' file");
-} else {
-    PHPFlasher.render({$response});
-}
-</script>
-HTML;
-    }
-
-    /**
-     * @param string[] $scripts
-     * @param array    $context
-     *
-     * @return string
-     */
-    public function renderScripts($scripts, array $context)
-    {
-        $html = '';
-
-        foreach ($scripts as $file) {
-            if (empty($context['content']) || false === strpos($context['content'], $file)) {
-                $html .= sprintf('<script src="%s"></script>', $file).PHP_EOL;
-            }
-        }
-
-        return $html;
-    }
-}
diff --git a/src/Prime/Renderer/Presenter/PresenterInterface.php b/src/Prime/Renderer/Presenter/PresenterInterface.php
deleted file mode 100644
index 70bdbfb8..00000000
--- a/src/Prime/Renderer/Presenter/PresenterInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer\Presenter;
-
-use Flasher\Prime\Envelope;
-
-interface PresenterInterface
-{
-    /**
-     * @param Envelope[] $envelopes
-     * @param array $context
-     *
-     * @return mixed
-     */
-    public function render(array $envelopes, array $context = array());
-}
diff --git a/src/Prime/Renderer/Presenter/PresenterManager.php b/src/Prime/Renderer/Presenter/PresenterManager.php
deleted file mode 100644
index f44b992d..00000000
--- a/src/Prime/Renderer/Presenter/PresenterManager.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer\Presenter;
-
-use Flasher\Prime\Config\ConfigInterface;
-
-final class PresenterManager implements PresenterManagerInterface
-{
-    /**
-     * @var array<string, PresenterInterface>
-     */
-    private $presenters;
-
-    public function __construct(ConfigInterface $config)
-    {
-        $this->addPresenter('array', new ArrayPresenter($config));
-        $this->addPresenter('html', new HtmlPresenter($config));
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function addPresenter($alias, PresenterInterface $response)
-    {
-        $this->presenters[$alias] = $response;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function create($alias)
-    {
-        if (!isset($this->presenters[$alias])) {
-            throw new \InvalidArgumentException(sprintf('[%s] presenter not supported.', $alias));
-        }
-
-        return $this->presenters[$alias];
-    }
-}
diff --git a/src/Prime/Renderer/Presenter/PresenterManagerInterface.php b/src/Prime/Renderer/Presenter/PresenterManagerInterface.php
deleted file mode 100644
index c4a8eea0..00000000
--- a/src/Prime/Renderer/Presenter/PresenterManagerInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer\Presenter;
-
-interface PresenterManagerInterface
-{
-    /**
-     * @param string             $alias
-     * @param PresenterInterface $response
-     */
-    public function addPresenter($alias, PresenterInterface $response);
-
-    /**
-     * @param string $alias
-     *
-     * @return PresenterInterface
-     */
-    public function create($alias);
-}
diff --git a/src/Prime/Renderer/Renderer.php b/src/Prime/Renderer/Renderer.php
deleted file mode 100644
index 2470578c..00000000
--- a/src/Prime/Renderer/Renderer.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer;
-
-use Flasher\Prime\Config\ConfigInterface;
-use Flasher\Prime\Envelope;
-use Flasher\Prime\EventDispatcher\Event\FilterEvent;
-use Flasher\Prime\EventDispatcher\Event\ResponseEvent;
-use Flasher\Prime\EventDispatcher\EventDispatcherInterface;
-use Flasher\Prime\Renderer\Presenter\PresenterManager;
-use Flasher\Prime\Renderer\Presenter\PresenterManagerInterface;
-use Flasher\Prime\Storage\StorageManagerInterface;
-
-final class Renderer implements RendererInterface
-{
-    /**
-     * @var StorageManagerInterface
-     */
-    private $storageManager;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @var PresenterManagerInterface
-     */
-    private $presenterManager;
-
-    /**
-     * @param StorageManagerInterface        $storageManager
-     * @param EventDispatcherInterface       $eventDispatcher
-     * @param ConfigInterface                $config
-     * @param PresenterManagerInterface|null $presenterManager
-     */
-    public function __construct(
-        StorageManagerInterface $storageManager,
-        EventDispatcherInterface $eventDispatcher,
-        ConfigInterface $config,
-        PresenterManagerInterface $presenterManager = null
-    ) {
-        $this->storageManager = $storageManager;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->config = $config;
-        $this->presenterManager = $presenterManager ?: new PresenterManager($config);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function render(array $criteria = array(), array $context = array())
-    {
-        $envelopes = $this->getEnvelopes($criteria);
-
-        $this->storageManager->remove($envelopes);
-
-        $event = new ResponseEvent($envelopes);
-        $this->eventDispatcher->dispatch($event);
-
-        $format = isset($context['format']) ? $context['format'] : 'array';
-
-        return $this->presenterManager->create($format)->render($event->getEnvelopes(), $context);
-    }
-
-    /**
-     * @param array $criteria
-     *
-     * @return Envelope[]
-     */
-    private function getEnvelopes(array $criteria)
-    {
-        $envelopes = $this->storageManager->all();
-
-        $event = new FilterEvent($envelopes, $criteria);
-        $this->eventDispatcher->dispatch($event);
-
-        return $event->getEnvelopes();
-    }
-}
diff --git a/src/Prime/Renderer/RendererInterface.php b/src/Prime/Renderer/RendererInterface.php
deleted file mode 100644
index 956e735b..00000000
--- a/src/Prime/Renderer/RendererInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Flasher\Prime\Renderer;
-
-interface RendererInterface
-{
-    /**
-     * @param array $criteria
-     * @param array $context
-     *
-     * @return mixed
-     */
-    public function render(array $criteria = array(), array $context = array());
-}
diff --git a/src/Prime/Resources/views/tailwindcss.php b/src/Prime/Resources/views/tailwindcss.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/Prime/Response/Presenter/ArrayPresenter.php b/src/Prime/Response/Presenter/ArrayPresenter.php
index 6fd60fed..7c56d23c 100755
--- a/src/Prime/Response/Presenter/ArrayPresenter.php
+++ b/src/Prime/Response/Presenter/ArrayPresenter.php
@@ -11,6 +11,6 @@ final class ArrayPresenter implements PresenterInterface
      */
     public function render(Response $response)
     {
-        return array();
+        return $response->toArray();
     }
 }
diff --git a/src/Prime/Response/Presenter/HtmlPresenter.php b/src/Prime/Response/Presenter/HtmlPresenter.php
index 5951c84a..81b1d636 100755
--- a/src/Prime/Response/Presenter/HtmlPresenter.php
+++ b/src/Prime/Response/Presenter/HtmlPresenter.php
@@ -21,11 +21,8 @@ final class HtmlPresenter implements PresenterInterface
         return <<<HTML
 {$scripts}
 <script type="text/javascript">
-if ("undefined" === typeof PHPFlasher) {
-    alert("[PHPFlasher] not found, please include ['/path/to/flasher.js'] file");
-} else {
-    PHPFlasher.render({$options});
-}
+const flasher = Flasher.getInstance();
+flasher.render({$options});
 </script>
 HTML;
     }
diff --git a/src/Prime/Response/Resource/ResourceManager.php b/src/Prime/Response/Resource/ResourceManager.php
index 844ecae1..81756dce 100644
--- a/src/Prime/Response/Resource/ResourceManager.php
+++ b/src/Prime/Response/Resource/ResourceManager.php
@@ -3,7 +3,10 @@
 namespace Flasher\Prime\Response\Resource;
 
 use Flasher\Prime\Config\ConfigInterface;
+use Flasher\Prime\Envelope;
 use Flasher\Prime\Response\Response;
+use Flasher\Prime\Stamp\TemplateStamp;
+use Flasher\Prime\Template\EngineInterface;
 
 final class ResourceManager implements ResourceManagerInterface
 {
@@ -13,11 +16,18 @@ final class ResourceManager implements ResourceManagerInterface
     private $config;
 
     /**
-     * @param ConfigInterface $config
+     * @var EngineInterface
      */
-    public function __construct(ConfigInterface $config)
+    private $templateEngine;
+
+    /**
+     * @param ConfigInterface $config
+     * @param EngineInterface $templateEngine
+     */
+    public function __construct(ConfigInterface $config, EngineInterface $templateEngine)
     {
         $this->config = $config;
+        $this->templateEngine = $templateEngine;
     }
 
     /**
@@ -46,6 +56,11 @@ final class ResourceManager implements ResourceManagerInterface
 
         foreach ($response->getEnvelopes() as $envelope) {
             $handler = $envelope->get('Flasher\Prime\Stamp\HandlerStamp')->getHandler();
+
+            if ('template' === $handler) {
+                $handler = $this->handleTemplateStamp($envelope);
+            }
+
             if (in_array($handler, $handlers)) {
                 continue;
             }
@@ -56,11 +71,11 @@ final class ResourceManager implements ResourceManagerInterface
                 $response->addScripts($this->scripts[$handler]);
             }
 
-            if (isset($this->scripts[$handler])) {
+            if (isset($this->styles[$handler])) {
                 $response->addStyles($this->styles[$handler]);
             }
 
-            if (isset($this->scripts[$handler])) {
+            if (isset($this->options[$handler])) {
                 $response->addOptions($handler, $this->options[$handler]);
             }
         }
@@ -91,4 +106,26 @@ final class ResourceManager implements ResourceManagerInterface
     {
         $this->options[$alias] = $options;
     }
+
+    private function handleTemplateStamp(Envelope $envelope)
+    {
+        $view = $this->config->get('template_factory.default');
+        $template = $this->config->get('template_factory.templates.'.$view.'.view');
+
+        $compiled = $this->templateEngine->render($template, array(
+            'envelope' => $envelope,
+        ));
+
+        $envelope->withStamp(new TemplateStamp($compiled));
+
+        return 'template_' . $view;
+    }
+
+    /**
+     * @return ConfigInterface
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
 }
diff --git a/src/Prime/Stamp/TemplateStamp.php b/src/Prime/Stamp/TemplateStamp.php
index 497894c2..185ce85b 100644
--- a/src/Prime/Stamp/TemplateStamp.php
+++ b/src/Prime/Stamp/TemplateStamp.php
@@ -4,38 +4,17 @@ namespace Flasher\Prime\Stamp;
 
 final class TemplateStamp implements StampInterface, PresentableStampInterface
 {
-    /**
-     * @var string
-     */
-    private $view;
-
     /**
      * @var string
      */
     private $template;
 
     /**
-     * @var array
-     */
-    private $context = array();
-
-    /**
-     * @param string $view
      * @param string $template
      */
-    public function __construct($view, $template = null, array $context = array())
+    public function __construct($template)
     {
-        $this->view = $view;
         $this->template = $template;
-        $this->context = $context;
-    }
-
-    /**
-     * @return string
-     */
-    public function getView()
-    {
-        return $this->view;
     }
 
     /**
@@ -46,14 +25,6 @@ final class TemplateStamp implements StampInterface, PresentableStampInterface
         return $this->template;
     }
 
-    /**
-     * @return array
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
     /**
      * @inheritDoc
      */
@@ -61,7 +32,6 @@ final class TemplateStamp implements StampInterface, PresentableStampInterface
     {
         return array(
             'template' => $this->getTemplate(),
-            'context'  => $this->getContext(),
         );
     }
 }
diff --git a/src/Prime/Template/Engine.php b/src/Prime/Template/Engine.php
index e34397d0..6d033c7c 100644
--- a/src/Prime/Template/Engine.php
+++ b/src/Prime/Template/Engine.php
@@ -6,6 +6,7 @@ final class Engine implements EngineInterface
 {
     public function render($name, array $context = array())
     {
-        return 'cute template';
+        /** @TODO use a native template engine */
+        return 'template ' . $name;
     }
 }
diff --git a/src/SweetAlert/Laravel/.gitignore b/src/SweetAlert/Laravel/.gitignore
index 409f0e32..89d72688 100644
--- a/src/SweetAlert/Laravel/.gitignore
+++ b/src/SweetAlert/Laravel/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/SweetAlert/Laravel/Resources/config/config.php b/src/SweetAlert/Laravel/Resources/config/config.php
index 0edd0558..800a6eed 100644
--- a/src/SweetAlert/Laravel/Resources/config/config.php
+++ b/src/SweetAlert/Laravel/Resources/config/config.php
@@ -2,33 +2,12 @@
 
 return array(
     'scripts' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-        'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.js',
-        'https://cdnjs.cloudflare.com/ajax/libs/promise-polyfill/8.2.0/polyfill.min.js',
-        '/vendor/flasher/flasher-sweet-alert.js',
-    ),
-    'styles' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css',
-        'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.css',
+        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+        'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js',
     ),
+    'styles'  => array(),
     'options' => array(
-        'timer'             => 5000,
-      //'width'             => '32rem',
-      //'heightAuto'        => true,
-        'padding'           => '1.25rem',
-        'showConfirmButton' => false,
-        'showCloseButton'   => false,
-        'toast'             => true,
-        'position'          => 'top-end',
-        'timerProgressBar'  => true,
-        'animation'         => true,
-        'showClass'         => array(
-            'popup' => 'animate__animated animate__fadeInDown',
-        ),
-        'hideClass'         => array(
-            'popup' => 'animate__animated animate__fadeOutUp',
-        ),
-        'backdrop'          => true,
-        'grow'              => true,
+        'timer' => 50000,
+        'timerProgressBar' => true,
     ),
 );
diff --git a/src/SweetAlert/Laravel/Resources/public/flasher-sweet-alert.js b/src/SweetAlert/Laravel/Resources/public/flasher-sweet-alert.js
deleted file mode 100644
index 547ce7a6..00000000
--- a/src/SweetAlert/Laravel/Resources/public/flasher-sweet-alert.js
+++ /dev/null
@@ -1,19 +0,0 @@
-PHPFlasher.addFactory('sweet_alert', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-
-        window.SwalToast.fire(notification.options);
-    };
-
-    exports.renderOptions = function (options) {
-        if ("undefined" === typeof window.SwalToast) {
-            window.SwalToast = Swal.mixin(options);
-        }
-    };
-
-    return exports;
-})());
diff --git a/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel.php b/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel.php
index 5f080beb..fa547fe9 100644
--- a/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel.php
@@ -2,7 +2,9 @@
 
 namespace Flasher\SweetAlert\Laravel\ServiceProvider\Providers;
 
+use Flasher\Laravel\ServiceProvider\ResourceManagerHelper;
 use Flasher\Prime\Flasher;
+use Flasher\Prime\Response\Resource\ResourceManager;
 use Flasher\SweetAlert\Laravel\FlasherSweetAlertServiceProvider;
 use Flasher\SweetAlert\Prime\SweetAlertFactory;
 use Illuminate\Container\Container;
@@ -37,7 +39,6 @@ class Laravel implements ServiceProviderInterface
     public function boot(FlasherSweetAlertServiceProvider $provider)
     {
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/config/config.php') => config_path('flasher_sweet_alert.php')), 'flasher-config');
-        $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/flasher'))), 'flasher-public');
     }
 
     /**
@@ -64,6 +65,12 @@ class Laravel implements ServiceProviderInterface
 
             return $manager;
         });
+
+        $this->app->extend('flasher.resource_manager', function (ResourceManager $resourceManager) {
+            ResourceManagerHelper::process($resourceManager, 'sweet_alert');
+
+            return $resourceManager;
+        });
     }
 
     public function appendToFlasherConfig()
diff --git a/src/SweetAlert/Laravel/Tests/FlasherSweetAlertServiceProviderTest.php b/src/SweetAlert/Laravel/Tests/FlasherSweetAlertServiceProviderTest.php
index 211e689b..39f6288a 100644
--- a/src/SweetAlert/Laravel/Tests/FlasherSweetAlertServiceProviderTest.php
+++ b/src/SweetAlert/Laravel/Tests/FlasherSweetAlertServiceProviderTest.php
@@ -24,34 +24,13 @@ class FlasherSweetAlertServiceProviderTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/promise-polyfill/8.2.0/polyfill.min.js',
-                '/vendor/flasher/flasher-sweet-alert.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css',
-                'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.css',
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js',
             ),
+            'styles'  => array(),
             'options' => array(
-                'timer'             => 5000,
-                //'width'             => '32rem',
-                //'heightAuto'        => true,
-                'padding'           => '1.25rem',
-                'showConfirmButton' => false,
-                'showCloseButton'   => false,
-                'toast'             => true,
-                'position'          => 'top-end',
-                'timerProgressBar'  => true,
-                'animation'         => true,
-                'showClass'         => array(
-                    'popup' => 'animate__animated animate__fadeInDown',
-                ),
-                'hideClass'         => array(
-                    'popup' => 'animate__animated animate__fadeOutUp',
-                ),
-                'backdrop'          => true,
-                'grow'              => true,
+                'timer' => 50000,
+                'timerProgressBar' => true,
             ),
         );
 
diff --git a/src/SweetAlert/Laravel/composer.json b/src/SweetAlert/Laravel/composer.json
index 4a0ae075..420021bc 100644
--- a/src/SweetAlert/Laravel/composer.json
+++ b/src/SweetAlert/Laravel/composer.json
@@ -29,8 +29,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-laravel": "^0.1",
-        "php-flasher/flasher-sweet-alert": "^0.1"
+        "php-flasher/flasher-laravel": "@dev",
+        "php-flasher/flasher-sweet-alert": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0",
diff --git a/src/SweetAlert/Prime/.gitignore b/src/SweetAlert/Prime/.gitignore
index 409f0e32..89d72688 100644
--- a/src/SweetAlert/Prime/.gitignore
+++ b/src/SweetAlert/Prime/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/SweetAlert/Prime/composer.json b/src/SweetAlert/Prime/composer.json
index a3c54cad..fb8f9e45 100644
--- a/src/SweetAlert/Prime/composer.json
+++ b/src/SweetAlert/Prime/composer.json
@@ -25,7 +25,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^0.1"
+        "php-flasher/flasher": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/SweetAlert/Symfony/.gitignore b/src/SweetAlert/Symfony/.gitignore
index 409f0e32..89d72688 100644
--- a/src/SweetAlert/Symfony/.gitignore
+++ b/src/SweetAlert/Symfony/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/SweetAlert/Symfony/DependencyInjection/Configuration.php b/src/SweetAlert/Symfony/DependencyInjection/Configuration.php
index b3831cac..602eb1b2 100644
--- a/src/SweetAlert/Symfony/DependencyInjection/Configuration.php
+++ b/src/SweetAlert/Symfony/DependencyInjection/Configuration.php
@@ -26,23 +26,19 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                        'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.js',
-                        'https://cdnjs.cloudflare.com/ajax/libs/promise-polyfill/8.2.0/polyfill.min.js',
-                        '/bundles/flashersweetalert/flasher-sweet-alert.js',
+                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                        'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js',
                     ))
                 ->end()
                 ->arrayNode('styles')
                     ->prototype('scalar')->end()
-                    ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.css',
-                    ))
+                    ->defaultValue(array())
                 ->end()
                 ->arrayNode('options')
                     ->ignoreExtraKeys(false)
                     ->prototype('variable')->end()
                     ->defaultValue(array(
-                        'timer'            => 50000,
+                        'timer' => 50000,
                         'timerProgressBar' => true,
                     ))
                 ->end()
diff --git a/src/SweetAlert/Symfony/Resources/public/flasher-sweet-alert.js b/src/SweetAlert/Symfony/Resources/public/flasher-sweet-alert.js
deleted file mode 100644
index 547ce7a6..00000000
--- a/src/SweetAlert/Symfony/Resources/public/flasher-sweet-alert.js
+++ /dev/null
@@ -1,19 +0,0 @@
-PHPFlasher.addFactory('sweet_alert', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-
-        window.SwalToast.fire(notification.options);
-    };
-
-    exports.renderOptions = function (options) {
-        if ("undefined" === typeof window.SwalToast) {
-            window.SwalToast = Swal.mixin(options);
-        }
-    };
-
-    return exports;
-})());
diff --git a/src/SweetAlert/Symfony/Tests/DependencyInjection/ConfigurationTest.php b/src/SweetAlert/Symfony/Tests/DependencyInjection/ConfigurationTest.php
index 55dbc5af..b3d3b881 100644
--- a/src/SweetAlert/Symfony/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/SweetAlert/Symfony/Tests/DependencyInjection/ConfigurationTest.php
@@ -14,32 +14,13 @@ class ConfigurationTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/promise-polyfill/8.2.0/polyfill.min.js',
-                '/bundles/flashersweetalert/flasher-sweet-alert.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css',
-                'https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/10.10.2/sweetalert2.min.css',
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js',
             ),
+            'styles'  => array(),
             'options' => array(
-                'timer'             => 5000,
-                'padding'           => '1.25rem',
-                'showConfirmButton' => false,
-                'showCloseButton'   => false,
-                'toast'             => true,
-                'position'          => 'top-end',
-                'timerProgressBar'  => true,
-                'animation'         => true,
-                'showClass'         => array(
-                    'popup' => 'animate__animated animate__fadeInDown',
-                ),
-                'hideClass'         => array(
-                    'popup' => 'animate__animated animate__fadeOutUp',
-                ),
-                'backdrop'          => true,
-                'grow'              => true,
+                'timer' => 50000,
+                'timerProgressBar' => true,
             ),
         );
 
diff --git a/src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php b/src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php
index 55b42f6b..0d027c5c 100644
--- a/src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php
+++ b/src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php
@@ -13,20 +13,14 @@ class FlasherSweetAlertExtensionTest extends TestCase
 {
     public function testContainerContainFlasherServices()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher', array());
-        $container->loadFromExtension('flasher_sweet_alert', array());
-        $container->compile();
+        $container = $this->getContainer();
 
         $this->assertTrue($container->has('flasher.sweet_alert'));
     }
 
     public function testCreateInstanceOfSweetAlertAdapter()
     {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher');
-        $container->loadFromExtension('flasher_sweet_alert');
-        $container->compile();
+        $container = $this->getContainer();
 
         $flasher = $container->getDefinition('flasher');
         $calls = $flasher->getMethodCalls();
@@ -42,13 +36,6 @@ class FlasherSweetAlertExtensionTest extends TestCase
         $this->assertSame('flasher.sweet_alert', (string) $calls[1][1][1]);
     }
 
-    public function testConfigurationInjectedIntoFlasherConfig()
-    {
-        $container = $this->getContainer();
-        $config = $container->get('flasher.config');
-        $this->assertNotEmpty($config->get('adapters.sweet_alert'));
-    }
-
     private function getRawContainer()
     {
         $container = new ContainerBuilder();
@@ -71,6 +58,8 @@ class FlasherSweetAlertExtensionTest extends TestCase
     private function getContainer()
     {
         $container = $this->getRawContainer();
+        $container->loadFromExtension('flasher', array());
+        $container->loadFromExtension('flasher_sweet_alert', array());
         $container->compile();
 
         return $container;
diff --git a/src/SweetAlert/Symfony/composer.json b/src/SweetAlert/Symfony/composer.json
index 0792bc64..68d13f2f 100644
--- a/src/SweetAlert/Symfony/composer.json
+++ b/src/SweetAlert/Symfony/composer.json
@@ -30,8 +30,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-symfony": "^0.1",
-        "php-flasher/flasher-sweet-alert": "^0.1"
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-sweet-alert": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Symfony/.gitignore b/src/Symfony/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Symfony/.gitignore
+++ b/src/Symfony/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Symfony/DependencyInjection/Configuration.php b/src/Symfony/DependencyInjection/Configuration.php
index 31043d23..bd3e45fb 100755
--- a/src/Symfony/DependencyInjection/Configuration.php
+++ b/src/Symfony/DependencyInjection/Configuration.php
@@ -25,12 +25,12 @@ final class Configuration implements ConfigurationInterface
             ->children()
                 ->scalarNode('default')
                     ->cannotBeEmpty()
-                    ->defaultValue('toastr')
+                    ->defaultValue('template')
                 ->end()
                 ->arrayNode('root_scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                       '/bundles/flasher/flasher.js',
+                       'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.3/dist/flasher.min.js',
                    ))
                 ->end()
                 ->arrayNode('template_factory')
@@ -57,13 +57,15 @@ final class Configuration implements ConfigurationInterface
                                 'tailwindcss'    => array(
                                     'view'   => '@Flasher/tailwindcss.html.twig',
                                     'styles' => array(
-                                        'https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css',
+                                        'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
+                                        'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
                                     ),
                                 ),
                                 'tailwindcss_bg' => array(
                                     'view'   => '@Flasher/tailwindcss_bg.html.twig',
                                     'styles' => array(
-                                        'https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css',
+                                        'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
+                                        'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
                                     ),
                                 ),
                                 'bootstrap'      => array(
diff --git a/src/Symfony/DependencyInjection/Extension.php b/src/Symfony/DependencyInjection/Extension.php
index ea8e9630..83ab80b9 100755
--- a/src/Symfony/DependencyInjection/Extension.php
+++ b/src/Symfony/DependencyInjection/Extension.php
@@ -7,6 +7,7 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension as SymfonyExtension;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 abstract class Extension extends SymfonyExtension implements CompilerPassInterface
 {
diff --git a/src/Symfony/DependencyInjection/FlasherExtension.php b/src/Symfony/DependencyInjection/FlasherExtension.php
index e04a5484..ae9b5c8b 100755
--- a/src/Symfony/DependencyInjection/FlasherExtension.php
+++ b/src/Symfony/DependencyInjection/FlasherExtension.php
@@ -25,17 +25,17 @@ final class FlasherExtension extends Extension
         $config = $container->getDefinition('flasher.config');
         $config->replaceArgument(0, $configration);
 
-//        $responseManager = $container->getDefinition('flasher.response_manager');
-//        foreach ($configration['template_factory']['templates'] as $template => $factory) {
-//            if (isset($factory['scripts'])) {
-//                $responseManager->addMethodCall('addScripts', array('template_'.$template, $factory['scripts']));
-//            }
-//            if (isset($factory['styles'])) {
-//                $responseManager->addMethodCall('addStyles', array('template_'.$template, $factory['styles']));
-//            }
-//            if (isset($factory['options'])) {
-//                $responseManager->addMethodCall('addOptions', array('template_'.$template, $factory['options']));
-//            }
-//        }
+        $responseManager = $container->getDefinition('flasher.resource_manager');
+        foreach ($configration['template_factory']['templates'] as $template => $factory) {
+            if (isset($factory['scripts'])) {
+                $responseManager->addMethodCall('addScripts', array('template_'.$template, $factory['scripts']));
+            }
+            if (isset($factory['styles'])) {
+                $responseManager->addMethodCall('addStyles', array('template_'.$template, $factory['styles']));
+            }
+            if (isset($factory['options'])) {
+                $responseManager->addMethodCall('addOptions', array('template_'.$template, $factory['options']));
+            }
+        }
     }
 }
diff --git a/src/Symfony/EventListener/SessionListener.php b/src/Symfony/EventListener/SessionListener.php
index df65a2b5..fa811052 100755
--- a/src/Symfony/EventListener/SessionListener.php
+++ b/src/Symfony/EventListener/SessionListener.php
@@ -23,18 +23,18 @@ final class SessionListener implements EventSubscriberInterface
     /**
      * @var ResponseManagerInterface
      */
-    private $renderer;
+    private $responseManager;
 
     /**
      * @param ConfigInterface          $config
      * @param FlasherInterface         $flasher
-     * @param ResponseManagerInterface $renderer
+     * @param ResponseManagerInterface $responseManager
      */
-    public function __construct(ConfigInterface $config, FlasherInterface $flasher, ResponseManagerInterface $renderer)
+    public function __construct(ConfigInterface $config, FlasherInterface $flasher, ResponseManagerInterface $responseManager)
     {
         $this->config = $config;
         $this->flasher = $flasher;
-        $this->renderer = $renderer;
+        $this->responseManager = $responseManager;
     }
 
     public function onKernelResponse(ResponseEvent $event)
@@ -69,7 +69,7 @@ final class SessionListener implements EventSubscriberInterface
 
         $content = $response->getContent();
 
-        $htmlResponse = $this->renderer->render(array(), 'html', array(
+        $htmlResponse = $this->responseManager->render(array(), 'html', array(
             'content' => $content,
         ));
 
diff --git a/src/Symfony/Resources/assets/package.json b/src/Symfony/Resources/assets/package.json
deleted file mode 100644
index 28e16b6c..00000000
--- a/src/Symfony/Resources/assets/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "@php-flasher/flasher",
-    "description": "Flasher factory adapter for the PHP Flasher library",
-    "license": "MIT",
-    "version": "0.1.0",
-    "scripts": {
-        "build": "babel src -d dist",
-        "lint": "eslint src test"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.12",
-        "@babel/preset-env": "^7.12"
-    }
-}
diff --git a/src/Symfony/Resources/config/config.yaml b/src/Symfony/Resources/config/config.yaml
index a0e192e4..af65ef76 100755
--- a/src/Symfony/Resources/config/config.yaml
+++ b/src/Symfony/Resources/config/config.yaml
@@ -56,15 +56,6 @@ services:
         tags:
             - { name: 'flasher.event_subscriber' }
 
-    flasher.event_listener.template_listener:
-        class: Flasher\Prime\EventDispatcher\EventListener\TemplateListener
-        public: false
-        arguments:
-            - '@flasher.config'
-            - '@flasher.template_engine'
-        tags:
-            - { name: 'flasher.event_subscriber' }
-
     flasher.twig.extension:
         class: Flasher\Symfony\Twig\FlasherTwigExtension
         arguments:
@@ -76,6 +67,7 @@ services:
         class: Flasher\Prime\Response\Resource\ResourceManager
         arguments:
             - '@flasher.config'
+            - '@flasher.template_engine'
 
     flasher.response_manager:
         class: Flasher\Prime\Response\ResponseManager
diff --git a/src/Symfony/Resources/public/flasher-template.js b/src/Symfony/Resources/public/flasher-template.js
deleted file mode 100644
index 383bbf36..00000000
--- a/src/Symfony/Resources/public/flasher-template.js
+++ /dev/null
@@ -1,142 +0,0 @@
-PHPFlasher.addFactory('template', (function () {
-    'use strict';
-
-    var exports = {};
-    var options = {
-        timeout: 5000,
-        fps: 30,
-        position: 'top-right',
-        direction: 'top'
-    };
-
-    exports.render = function (envelope) {
-        renderEnvelope(envelope);
-    };
-
-    exports.renderOptions = function (_setting) {
-        options = extend({}, options, _setting);
-    };
-
-    var renderEnvelope = function (envelope) {
-        var position = options.position;
-
-        if (undefined !== envelope.options && undefined !== envelope.options.position) {
-            position = envelope.options.position;
-        }
-
-        var container = document.getElementById('flasher-container-' + position);
-        if (null === container) {
-            container = document.createElement('div');
-            container.id = "flasher-container-" + options.position;
-            container.style.position = "fixed";
-            container.style.maxWidth = "304px";
-            container.style.width = "100%";
-
-            switch (options.position) {
-                case "top-left":
-                    container.style.top = 0;
-                    container.style.left = "0.5em";
-                    break;
-                case "top-right":
-                    container.style.top = 0;
-                    container.style.right = "0.5em";
-                    break;
-                case "bottom-left":
-                    container.style.bottom = 0;
-                    container.style.left = "0.5em";
-                    break;
-                case "bottom-right":
-                default:
-                    container.style.bottom = 0;
-                    container.style.right = "0.5em";
-                    break;
-            }
-            document.getElementsByTagName('body')[0].appendChild(container);
-        }
-
-        var template = stringToHTML(envelope.template);
-        template.style.transition = '0.8s';
-
-        switch (options.direction) {
-            case "top":
-                container.insertBefore(template, container.firstChild);
-                break;
-            case "bottom":
-            default:
-                container.appendChild(template);
-                break;
-        }
-
-        var progressBar = template.querySelector('.flasher-progress');
-        if (null !== progressBar) {
-            var width = 0;
-            var lapse = 1000 / options.fps;
-
-            var showProgress = function () {
-                width++;
-                var percent = (1 - lapse * width / options.timeout) * 100;
-                progressBar.style.width = percent + '%';
-
-                if (percent <= 0) {
-                    template.style.opacity = 0;
-                    clearInterval(progress);
-
-                    setTimeout(function () {
-                        template.remove();
-                    }, 900);
-                }
-            }
-
-            var progress = setInterval(showProgress, lapse);
-
-            template.addEventListener('mouseover', function () {
-                clearInterval(progress);
-            });
-
-            template.addEventListener("mouseout", function () {
-                progress = setInterval(showProgress, lapse);
-            });
-        }
-    }
-
-    var stringToHTML = function (str) {
-        var support = (function () {
-            if (!window.DOMParser) return false;
-            var parser = new DOMParser();
-            try {
-                parser.parseFromString('x', 'text/html');
-            } catch (err) {
-                return false;
-            }
-            return true;
-        })();
-
-        if (support) {
-            var parser = new DOMParser();
-            var doc = parser.parseFromString(str, 'text/html');
-            return doc.body.firstChild;
-        }
-
-        var dom = document.createElement('div');
-        dom.innerHTML = str;
-        return dom.firstElementChild;
-    };
-
-    var extend = function (out) {
-        out = out || {};
-
-        for (var i = 1; i < arguments.length; i++) {
-            if (!arguments[i])
-                continue;
-
-            for (var key in arguments[i]) {
-                if (arguments[i].hasOwnProperty(key))
-                    out[key] = arguments[i][key];
-            }
-        }
-
-        return out;
-    };
-
-    return exports;
-})());
diff --git a/src/Symfony/Resources/public/flasher.js b/src/Symfony/Resources/public/flasher.js
deleted file mode 100644
index ad3db142..00000000
--- a/src/Symfony/Resources/public/flasher.js
+++ /dev/null
@@ -1,114 +0,0 @@
-var PHPFlasher = (function () {
-    'use strict';
-
-    var exports = {};
-    var factories = {};
-
-    exports.render = function (_options) {
-        exports.addStyles(getStyles(_options), function () {
-            exports.addScripts(getScripts(_options), function () {
-                exports.renderOptions(_options.options);
-                exports.renderEnvelopes(_options.envelopes);
-            });
-        });
-    };
-
-    exports.addFactory = function (alias, factory) {
-        factories[alias] = factory;
-    };
-
-    exports.addStyles = function (urls, callback) {
-        if (0 === urls.length) {
-            if ("function" === typeof callback) {
-                callback();
-            }
-
-            return this;
-        }
-
-        if (null !== document.querySelector('link[href="' + urls[0] + '"]')) {
-            return exports.addStyles(urls.slice(1), callback);
-        }
-
-        var tag = document.createElement('link');
-
-        tag.href = urls[0];
-        tag.type = 'text/css';
-        tag.rel = 'stylesheet';
-        tag.onload = function () {
-            exports.addStyles(urls.slice(1), callback);
-        };
-
-        document.head.appendChild(tag);
-
-        return this;
-    };
-
-    exports.addScripts = function (urls, callback) {
-        if (0 === urls.length) {
-            if ("function" === typeof callback) {
-                callback();
-            }
-
-            return this;
-        }
-
-        if (null !== document.querySelector('script[src="' + urls[0] + '"]')) {
-            return exports.addScripts(urls.slice(1), callback);
-        }
-
-        var tag = document.createElement('script');
-
-        tag.src = urls[0];
-        tag.type = 'text/javascript';
-        tag.onload = function () {
-            exports.addScripts(urls.slice(1), callback);
-        };
-
-        document.body.appendChild(tag);
-
-        return this;
-    };
-
-    exports.renderOptions = function (options) {
-        Object.keys(options).forEach(function (library) {
-            factories[library].renderOptions(options[library]);
-        });
-    };
-
-    exports.renderEnvelopes = function (envelopes) {
-        envelopes.forEach(function (envelope) {
-            factories[envelope.handler].render(envelope);
-        })
-    };
-
-    var getStyles = function (_options) {
-        var styles = _options.styles;
-
-        _options.envelopes.forEach(function (envelope) {
-            if (undefined !== envelope.context && undefined !== envelope.context.styles) {
-                styles = styles.concat(envelope.context.styles);
-            }
-        });
-
-        return styles.filter(function (item, pos) {
-            return styles.indexOf(item) === pos;
-        });
-    }
-
-    var getScripts = function (_options) {
-        var scripts = _options.scripts;
-
-        _options.envelopes.forEach(function (envelope) {
-            if (undefined !== envelope.context && undefined !== envelope.context.scripts) {
-                scripts = scripts.concat(envelope.context.scripts);
-            }
-        });
-
-        return scripts.filter(function (item, pos) {
-            return scripts.indexOf(item) === pos;
-        });
-    }
-
-    return exports;
-})();
diff --git a/src/Symfony/Tests/DependencyInjection/Compiler/EventSubscriberCompilerPassTest.php b/src/Symfony/Tests/DependencyInjection/Compiler/EventSubscriberCompilerPassTest.php
index acc6366f..d8e4c271 100644
--- a/src/Symfony/Tests/DependencyInjection/Compiler/EventSubscriberCompilerPassTest.php
+++ b/src/Symfony/Tests/DependencyInjection/Compiler/EventSubscriberCompilerPassTest.php
@@ -22,7 +22,7 @@ class EventSubscriberCompilerPassTest extends TestCase
         $manager = $container->getDefinition('flasher.event_dispatcher');
         $calls = $manager->getMethodCalls();
 
-        $this->assertCount(5, $calls);
+        $this->assertCount(4, $calls);
 
         $this->assertEquals('addSubscriber', $calls[0][0]);
         $this->assertEquals('test_subscriber', $calls[0][1][0]);
diff --git a/src/Symfony/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Tests/DependencyInjection/ConfigurationTest.php
index ca5ecba5..136379fb 100644
--- a/src/Symfony/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Tests/DependencyInjection/ConfigurationTest.php
@@ -13,81 +13,59 @@ class ConfigurationTest extends TestCase
         $config = $this->process(array());
 
         $expected = array(
-            'scripts' => array(
-                '/bundles/flasher/flasher.js',
+            'default' => 'template',
+            'root_scripts' => array(
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.3/dist/flasher.min.js'
+            ),
+            'template_factory' => array(
+                'default' => 'tailwindcss',
+                'templates' => array(
+                    'tailwindcss' => array(
+                        'view' => '@Flasher/tailwindcss.html.twig',
+                        'styles' => array(
+                            'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
+                            'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css'
+                        ),
+                    ),
+                    'tailwindcss_bg' => array(
+                        'view' => '@Flasher/tailwindcss_bg.html.twig',
+                        "styles" => array(
+                            'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
+                            'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
+                        ),
+                    ),
+                    'bootstrap' => array(
+                        'view' => "@Flasher/bootstrap.html.twig",
+                        'styles' => array(
+                            "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/css/bootstrap.min.css",
+                        ),
+                    ),
+                ),
             ),
-            'styles' => array(),
             'auto_create_from_session' => true,
             'types_mapping' => array(
-                'success' => array('success'),
-                'error'   => array('error', 'danger'),
-                'warning' => array('warning', 'alarm'),
-                'info'    => array('info', 'notice', 'alert'),
+                'success' => array(
+                    'success',
+                ),
+                'error' => array(
+                    'error',
+                    'danger',
+                ),
+                'warning' => array(
+                    'warning',
+                    'alarm',
+                ),
+                'info' => array(
+                    'info',
+                    'notice',
+                    'alert',
+                ),
             ),
-            'adapters' => array(),
         );
 
         $this->assertSame($expected, $config);
     }
 
-    public function testSimpleConfig()
-    {
-        $config = $this->process(array(array(
-            'default' => 'notyf',
-            'adapters' => array(
-                'notyf' => array(
-                    'scripts' => array(
-                        'jquery.js',
-                        'notyf.js'
-                    ),
-                    'styles' => array(
-                        'notyf.css'
-                    ),
-                    'options' => array(
-                        'timeout' => 5000,
-                        'position' => 'top-right'
-                    )
-                )
-            ),
-            'scripts' => array(),
-            'styles' => array(
-               '/bundles/flasher/flasher.css',
-            )
-        )));
-
-        $expected = array(
-            'default' => 'notyf',
-            'scripts' => array(),
-            'styles' => array(
-               '/bundles/flasher/flasher.css',
-            ),
-            'auto_create_from_session' => true,
-            'types_mapping' => array(
-                'success' => array('success'),
-                'error'   => array('error', 'danger'),
-                'warning' => array('warning', 'alarm'),
-                'info'    => array('info', 'notice', 'alert'),
-            ),
-            'adapters' => array(
-                'notyf' => array(
-                    'scripts' => array(
-                        'jquery.js',
-                        'notyf.js'
-                    ),
-                    'styles' => array(
-                        'notyf.css'
-                    ),
-                    'options' => array(
-                        'timeout' => 5000,
-                        'position' => 'top-right'
-                    )
-                )
-            ),
-        );
-
-        $this->assertEquals($expected, $config);
-    }
-
     public function testEmptyDefault()
     {
         $this->setExpectedException('\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException', 'The path "flasher.default" cannot contain an empty value, but got "".');
diff --git a/src/Symfony/Tests/Twig/FlasherTwigExtensionTest.php b/src/Symfony/Tests/Twig/FlasherTwigExtensionTest.php
index ab7b2e05..e0f0e82e 100755
--- a/src/Symfony/Tests/Twig/FlasherTwigExtensionTest.php
+++ b/src/Symfony/Tests/Twig/FlasherTwigExtensionTest.php
@@ -14,10 +14,10 @@ class FlasherTwigExtensionTest extends TestCase
     {
         $expected = "<script>toastr.success('success title')</script>";
 
-        $renderer = $this->getMockBuilder('Flasher\Prime\Renderer\RendererInterface')->getMock();
-        $renderer->method('render')->willReturn($expected);
+        $responseManager = $this->getMockBuilder('Flasher\Prime\Response\ResponseManagerInterface')->getMock();
+        $responseManager->method('render')->willReturn($expected);
 
-        $this->assertEquals($expected, $this->render('{{ flasher_render() }}', $renderer));
+        $this->assertEquals($expected, $this->render('{{ flasher_render() }}', $responseManager));
     }
 
     private function render($template, ResponseManagerInterface $renderer)
diff --git a/src/Symfony/Twig/FlasherTwigExtension.php b/src/Symfony/Twig/FlasherTwigExtension.php
index 32c9d5e6..664e5601 100755
--- a/src/Symfony/Twig/FlasherTwigExtension.php
+++ b/src/Symfony/Twig/FlasherTwigExtension.php
@@ -11,14 +11,14 @@ final class FlasherTwigExtension extends AbstractExtension
     /**
      * @var ResponseManagerInterface
      */
-    private $renderer;
+    private $responseManager;
 
     /**
-     * @param ResponseManagerInterface $renderer
+     * @param ResponseManagerInterface $responseManager
      */
-    public function __construct(ResponseManagerInterface $renderer)
+    public function __construct(ResponseManagerInterface $responseManager)
     {
-        $this->renderer = $renderer;
+        $this->responseManager = $responseManager;
     }
 
     public function getFunctions()
@@ -37,6 +37,6 @@ final class FlasherTwigExtension extends AbstractExtension
      */
     public function flasherRender(array $criteria = array())
     {
-        return $this->renderer->render($criteria);
+        return $this->responseManager->render($criteria);
     }
 }
diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json
index ab82cff3..add5c882 100644
--- a/src/Symfony/composer.json
+++ b/src/Symfony/composer.json
@@ -29,12 +29,13 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^0.1",
+        "php-flasher/flasher": "@dev",
         "symfony/config": "^2.7|^3.0|^4.0|^5.0",
         "symfony/dependency-injection": "^2.7|^3.0|^4.0|^5.0",
         "symfony/http-kernel": "^2.7|^3.0|^4.0|^5.0",
         "symfony/yaml": "^2.7|^3.0|^4.0|^5.0",
-        "symfony/twig-bundle": "^2.7|^3.0|^4.0|^5.0"
+        "symfony/twig-bundle": "^2.7|^3.0|^4.0|^5.0",
+        "symfony/console": "^2.7|^3.0|^4.0|^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Symfony/composer.json.local b/src/Symfony/composer.json.local
new file mode 100644
index 00000000..0309a5c9
--- /dev/null
+++ b/src/Symfony/composer.json.local
@@ -0,0 +1,73 @@
+{
+    "name": "php-flasher/flasher-symfony",
+    "type": "symfony-bundle",
+    "description": "Symfony bundle integrating PHP Flasher into Symfony applications",
+    "keywords": [
+        "yoeunes",
+        "notify",
+        "php",
+        "laravel",
+        "symfony",
+        "Lumen",
+        "notifications",
+        "messages",
+        "alerts",
+        "pnotify",
+        "toastr ",
+        "bundle",
+        "flex"
+    ],
+    "homepage": "https://php-flasher.github.io/",
+    "authors": [
+        {
+            "name": "Younes Khoubza",
+            "email": "younes.khoubza@gmail.com",
+            "homepage": "https://github.com/yoeunes",
+            "role": "Developer"
+        }
+    ],
+    "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../Prime",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
+    "require": {
+        "php": ">=5.3",
+        "php-flasher/flasher": "@dev",
+        "symfony/config": "^2.7|^3.0|^4.0|^5.0",
+        "symfony/dependency-injection": "^2.7|^3.0|^4.0|^5.0",
+        "symfony/http-kernel": "^2.7|^3.0|^4.0|^5.0",
+        "symfony/yaml": "^2.7|^3.0|^4.0|^5.0",
+        "symfony/twig-bundle": "^2.7|^3.0|^4.0|^5.0",
+        "symfony/console": "^2.7|^3.0|^4.0|^5.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flasher\\Symfony\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Flasher\\Symfony\\Tests\\": "Tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "platform": {
+            "php": "5.3.10"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}
diff --git a/src/Toastr/Laravel/.gitignore b/src/Toastr/Laravel/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Toastr/Laravel/.gitignore
+++ b/src/Toastr/Laravel/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Toastr/Laravel/Resources/config/config.php b/src/Toastr/Laravel/Resources/config/config.php
index 686b75c5..64674154 100644
--- a/src/Toastr/Laravel/Resources/config/config.php
+++ b/src/Toastr/Laravel/Resources/config/config.php
@@ -2,51 +2,12 @@
 
 return array(
     'scripts' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-        'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js',
-        '/vendor/flasher/flasher-toastr.js',
-    ),
-    'styles' => array(
-        'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css',
+        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+        'https://cdn.jsdelivr.net/npm/@flasher/flasher-toastr@0.1.3/dist/flasher-toastr.min.js',
     ),
+    'styles' => array(),
     'options' => array(
-        'closeButton'       => true,
-        'closeClass'        => 'toast-close-button',
-        'closeDuration'     => 300,
-        'closeEasing'       => 'swing',
-        'closeHtml'         => '<button><i class="icon-off"></i></button>',
-        'closeMethod'       => 'fadeOut',
-        'closeOnHover'      => true,
-        'containerId'       => 'toast-container',
-        'debug'             => false,
-        'escapeHtml'        => false,
-        'extendedTimeOut'   => 10000,
-        'hideDuration'      => 1000,
-        'hideEasing'        => 'linear',
-        'hideMethod'        => 'fadeOut',
-        'iconClass'         => 'toast-info',
-        'iconClasses'       => array(
-            'error'   => 'toast-error',
-            'info'    => 'toast-info',
-            'success' => 'toast-success',
-            'warning' => 'toast-warning',
-        ),
-        'messageClass'      => 'toast-message',
-        'newestOnTop'       => false,
-        'onHidden'          => null,
-        'onShown'           => null,
-        'positionClass'     => 'toast-top-right',
-        'preventDuplicates' => false,
-        'progressBar'       => true,
-        'progressClass'     => 'toast-progress',
-        'rtl'               => false,
-        'showDuration'      => 300,
-        'showEasing'        => 'swing',
-        'showMethod'        => 'fadeIn',
-        'tapToDismiss'      => true,
-        'target'            => 'body',
-        'timeOut'           => 5000,
-        'titleClass'        => 'toast-title',
-        'toastClass'        => 'toast',
+        'progressBar' => true,
+        'timeOut' => 5000,
     ),
 );
diff --git a/src/Toastr/Laravel/Resources/public/flasher-toastr.js b/src/Toastr/Laravel/Resources/public/flasher-toastr.js
deleted file mode 100644
index 6d3fd4e2..00000000
--- a/src/Toastr/Laravel/Resources/public/flasher-toastr.js
+++ /dev/null
@@ -1,16 +0,0 @@
-PHPFlasher.addFactory('toastr', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        toastr[notification.type](notification.message, notification.title, notification.options);
-    };
-
-    exports.renderOptions = function (options) {
-        toastr.options = options;
-    };
-
-    return exports;
-})());
diff --git a/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php b/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php
index c366993f..be00c0fc 100644
--- a/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php
@@ -2,7 +2,9 @@
 
 namespace Flasher\Toastr\Laravel\ServiceProvider\Providers;
 
+use Flasher\Laravel\ServiceProvider\ResourceManagerHelper;
 use Flasher\Prime\Flasher;
+use Flasher\Prime\Response\Resource\ResourceManager;
 use Flasher\Toastr\Laravel\FlasherToastrServiceProvider;
 use Flasher\Toastr\Prime\ToastrFactory;
 use Illuminate\Container\Container;
@@ -37,7 +39,6 @@ class Laravel implements ServiceProviderInterface
     public function boot(FlasherToastrServiceProvider $provider)
     {
         $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/config/config.php') => config_path('flasher_toastr.php')), 'flasher-config');
-        $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/flasher'))), 'flasher-public');
     }
 
     /**
@@ -64,6 +65,12 @@ class Laravel implements ServiceProviderInterface
 
             return $flasher;
         });
+
+        $this->app->extend('flasher.resource_manager', function (ResourceManager $resourceManager) {
+            ResourceManagerHelper::process($resourceManager, 'toastr');
+
+            return $resourceManager;
+        });
     }
 
     public function appendToFlasherConfig()
diff --git a/src/Toastr/Laravel/Tests/FlasherToastrServiceProviderTest.php b/src/Toastr/Laravel/Tests/FlasherToastrServiceProviderTest.php
index de2e3b9f..01b612c6 100644
--- a/src/Toastr/Laravel/Tests/FlasherToastrServiceProviderTest.php
+++ b/src/Toastr/Laravel/Tests/FlasherToastrServiceProviderTest.php
@@ -24,52 +24,13 @@ class FlasherToastrServiceProviderTest extends TestCase
 
         $expected = array(
             'scripts' => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js',
-                '/vendor/flasher/flasher-toastr.js',
-            ),
-            'styles'  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css',
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-toastr@0.1.3/dist/flasher-toastr.min.js',
             ),
+            'styles' => array(),
             'options' => array(
-                'closeButton'       => true,
-                'closeClass'        => 'toast-close-button',
-                'closeDuration'     => 300,
-                'closeEasing'       => 'swing',
-                'closeHtml'         => '<button><i class="icon-off"></i></button>',
-                'closeMethod'       => 'fadeOut',
-                'closeOnHover'      => true,
-                'containerId'       => 'toast-container',
-                'debug'             => false,
-                'escapeHtml'        => false,
-                'extendedTimeOut'   => 10000,
-                'hideDuration'      => 1000,
-                'hideEasing'        => 'linear',
-                'hideMethod'        => 'fadeOut',
-                'iconClass'         => 'toast-info',
-                'iconClasses'       => array(
-                    'error'   => 'toast-error',
-                    'info'    => 'toast-info',
-                    'success' => 'toast-success',
-                    'warning' => 'toast-warning',
-                ),
-                'messageClass'      => 'toast-message',
-                'newestOnTop'       => false,
-                'onHidden'          => null,
-                'onShown'           => null,
-                'positionClass'     => 'toast-top-right',
-                'preventDuplicates' => false,
-                'progressBar'       => true,
-                'progressClass'     => 'toast-progress',
-                'rtl'               => false,
-                'showDuration'      => 300,
-                'showEasing'        => 'swing',
-                'showMethod'        => 'fadeIn',
-                'tapToDismiss'      => true,
-                'target'            => 'body',
-                'timeOut'           => 5000,
-                'titleClass'        => 'toast-title',
-                'toastClass'        => 'toast',
+                'progressBar' => true,
+                'timeOut' => 5000,
             ),
         );
 
diff --git a/src/Toastr/Laravel/composer.json b/src/Toastr/Laravel/composer.json
index 099dc5c6..677e32a5 100644
--- a/src/Toastr/Laravel/composer.json
+++ b/src/Toastr/Laravel/composer.json
@@ -28,8 +28,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-laravel": "^0.1",
-        "php-flasher/flasher-toastr": "^0.1"
+        "php-flasher/flasher-laravel": "@dev",
+        "php-flasher/flasher-toastr": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0",
diff --git a/src/Toastr/Laravel/composer.json.local b/src/Toastr/Laravel/composer.json.local
new file mode 100644
index 00000000..af12b154
--- /dev/null
+++ b/src/Toastr/Laravel/composer.json.local
@@ -0,0 +1,82 @@
+{
+    "name": "php-flasher/flasher-toastr-laravel",
+    "description": "PHP Flasher Laravel adapter for Toastr",
+    "keywords": [
+        "yoeunes",
+        "notify",
+        "php",
+        "laravel",
+        "symfony",
+        "Lumen",
+        "notifications",
+        "messages",
+        "alerts",
+        "pnotify",
+        "toastr ",
+        "bundle",
+        "flex"
+    ],
+    "homepage": "https://php-flasher.github.io/",
+    "authors": [
+        {
+            "name": "Younes Khoubza",
+            "email": "younes.khoubza@gmail.com",
+            "homepage": "https://github.com/yoeunes",
+            "role": "Developer"
+        }
+    ],
+    "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../Laravel",
+            "options": {
+                "symlink": true
+            }
+        },
+        {
+            "type": "path",
+            "url": "../Prime",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
+    "require": {
+        "php": ">=5.3",
+        "php-flasher/flasher-laravel": "@dev",
+        "php-flasher/flasher-toastr": "@dev"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0",
+        "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flasher\\Toastr\\Laravel\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Flasher\\Toastr\\Laravel\\Tests\\": "Tests/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Flasher\\Toastr\\Laravel\\FlasherToastrServiceProvider"
+            ]
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "platform": {
+            "php": "5.3.10"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}
diff --git a/src/Toastr/Prime/.gitignore b/src/Toastr/Prime/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Toastr/Prime/.gitignore
+++ b/src/Toastr/Prime/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Toastr/Prime/composer.json b/src/Toastr/Prime/composer.json
index d5c0b46d..98fd242b 100644
--- a/src/Toastr/Prime/composer.json
+++ b/src/Toastr/Prime/composer.json
@@ -25,7 +25,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^0.1"
+        "php-flasher/flasher": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Toastr/Symfony/.gitignore b/src/Toastr/Symfony/.gitignore
index 409f0e32..89d72688 100644
--- a/src/Toastr/Symfony/.gitignore
+++ b/src/Toastr/Symfony/.gitignore
@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache
diff --git a/src/Toastr/Symfony/DependencyInjection/Configuration.php b/src/Toastr/Symfony/DependencyInjection/Configuration.php
index 9ed4009a..fb38cda2 100755
--- a/src/Toastr/Symfony/DependencyInjection/Configuration.php
+++ b/src/Toastr/Symfony/DependencyInjection/Configuration.php
@@ -26,20 +26,21 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                        'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js',
-                        '/bundles/flashertoastr/flasher-toastr.js',
+                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                        'https://cdn.jsdelivr.net/npm/@flasher/flasher-toastr@0.1.3/dist/flasher-toastr.min.js',
                     ))
                 ->end()
                 ->arrayNode('styles')
                     ->prototype('scalar')->end()
-                    ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css',
-                    ))
+                    ->defaultValue(array())
                 ->end()
                 ->arrayNode('options')
                     ->prototype('variable')->end()
-                    ->defaultValue(array())
+                    ->ignoreExtraKeys(false)
+                    ->defaultValue(array(
+                       'progressBar' => true,
+                       'timeOut'     => 5000,
+                    ))
                 ->end()
             ->end()
         ;
diff --git a/src/Toastr/Symfony/Resources/public/flasher-toastr.js b/src/Toastr/Symfony/Resources/public/flasher-toastr.js
deleted file mode 100644
index 6d3fd4e2..00000000
--- a/src/Toastr/Symfony/Resources/public/flasher-toastr.js
+++ /dev/null
@@ -1,16 +0,0 @@
-PHPFlasher.addFactory('toastr', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        toastr[notification.type](notification.message, notification.title, notification.options);
-    };
-
-    exports.renderOptions = function (options) {
-        toastr.options = options;
-    };
-
-    return exports;
-})());
diff --git a/src/Toastr/Symfony/Tests/DependencyInjection/ConfigurationTest.php b/src/Toastr/Symfony/Tests/DependencyInjection/ConfigurationTest.php
index 18ffc86e..74139dcd 100644
--- a/src/Toastr/Symfony/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Toastr/Symfony/Tests/DependencyInjection/ConfigurationTest.php
@@ -13,54 +13,15 @@ class ConfigurationTest extends TestCase
         $config = $this->process(array());
 
         $expected = array(
-            'scripts'                  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js',
-                '/bundles/flashertoastr/flasher-toastr.js',
+            'scripts' => array(
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-toastr@0.1.3/dist/flasher-toastr.min.js',
             ),
-            'styles'                   => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css',
-            ),
-            'options' =>array(
-                        'closeButton'       => true,
-                        'closeClass'        => 'toast-close-button',
-                        'closeDuration'     => 300,
-                        'closeEasing'       => 'swing',
-                        'closeHtml'         => '<button><i class="icon-off"></i></button>',
-                        'closeMethod'       => 'fadeOut',
-                        'closeOnHover'      => true,
-                        'containerId'       => 'toast-container',
-                        'debug'             => false,
-                        'escapeHtml'        => false,
-                        'extendedTimeOut'   => 10000,
-                        'hideDuration'      => 1000,
-                        'hideEasing'        => 'linear',
-                        'hideMethod'        => 'fadeOut',
-                        'iconClass'         => 'toast-info',
-                        'iconClasses'       => array(
-                            'error'   => 'toast-error',
-                            'info'    => 'toast-info',
-                            'success' => 'toast-success',
-                            'warning' => 'toast-warning',
-                        ),
-                        'messageClass'      => 'toast-message',
-                        'newestOnTop'       => false,
-                        'onHidden'          => null,
-                        'onShown'           => null,
-                        'positionClass'     => 'toast-top-right',
-                        'preventDuplicates' => false,
-                        'progressBar'       => true,
-                        'progressClass'     => 'toast-progress',
-                        'rtl'               => false,
-                        'showDuration'      => 300,
-                        'showEasing'        => 'swing',
-                        'showMethod'        => 'fadeIn',
-                        'tapToDismiss'      => true,
-                        'target'            => 'body',
-                        'timeOut'           => 5000,
-                        'titleClass'        => 'toast-title',
-                        'toastClass'        => 'toast',
-                    )
+            'styles' => array(),
+            'options' => array(
+                'progressBar' => true,
+                'timeOut' => 5000,
+            )
         );
 
         $this->assertSame($expected, $config);
diff --git a/src/Toastr/Symfony/Tests/DependencyInjection/FlasherToastrExtensionTest.php b/src/Toastr/Symfony/Tests/DependencyInjection/FlasherToastrExtensionTest.php
index 13167e76..1d4f73ae 100644
--- a/src/Toastr/Symfony/Tests/DependencyInjection/FlasherToastrExtensionTest.php
+++ b/src/Toastr/Symfony/Tests/DependencyInjection/FlasherToastrExtensionTest.php
@@ -41,13 +41,6 @@ class FlasherToastrExtensionTest extends TestCase
         $this->assertSame('flasher.toastr', (string) $calls[1][1][1]);
     }
 
-    public function testConfigurationInjectedIntoFlasherConfig()
-    {
-        $container = $this->getContainer();
-        $config = $container->get('flasher.config');
-        $this->assertNotEmpty($config->get('adapters.toastr'));
-    }
-
     private function getRawContainer()
     {
         $container = new ContainerBuilder();
@@ -70,6 +63,8 @@ class FlasherToastrExtensionTest extends TestCase
     private function getContainer()
     {
         $container = $this->getRawContainer();
+        $container->loadFromExtension('flasher', array());
+        $container->loadFromExtension('flasher_toastr', array());
         $container->compile();
 
         return $container;
diff --git a/src/Toastr/Symfony/composer.json b/src/Toastr/Symfony/composer.json
index 79a6b115..c4134ce7 100644
--- a/src/Toastr/Symfony/composer.json
+++ b/src/Toastr/Symfony/composer.json
@@ -29,8 +29,8 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-symfony": "^0.1",
-        "php-flasher/flasher-toastr": "^0.1"
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-toastr": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
diff --git a/src/Toastr/Symfony/composer.json.local b/src/Toastr/Symfony/composer.json.local
new file mode 100644
index 00000000..1db32e39
--- /dev/null
+++ b/src/Toastr/Symfony/composer.json.local
@@ -0,0 +1,75 @@
+{
+    "name": "php-flasher/flasher-toastr-symfony",
+    "type": "symfony-bundle",
+    "description": "PHP Flasher Symfony adapter for Toastr",
+    "keywords": [
+        "yoeunes",
+        "notify",
+        "php",
+        "laravel",
+        "symfony",
+        "Lumen",
+        "notifications",
+        "messages",
+        "alerts",
+        "pnotify",
+        "toastr ",
+        "bundle",
+        "flex"
+    ],
+    "homepage": "https://php-flasher.github.io/",
+    "authors": [
+        {
+            "name": "Younes Khoubza",
+            "email": "younes.khoubza@gmail.com",
+            "homepage": "https://github.com/yoeunes",
+            "role": "Developer"
+        }
+    ],
+    "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../Symfony",
+            "options": {
+                "symlink": true
+            }
+        },
+        {
+            "type": "path",
+            "url": "../Prime",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
+    "require": {
+        "php": ">=5.3",
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-toastr": "@dev"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flasher\\Toastr\\Symfony\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Flasher\\Toastr\\Symfony\\Tests\\": "Tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "platform": {
+            "php": "5.3.10"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}