diff --git a/.php_cs.dist b/.php_cs.dist
index ab7058adc..0889a65ee 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -10,6 +10,7 @@ $finder = PhpCsFixer\Finder::create()
         'bootstrap',
         'tests',
         'node_modules',
+        'views',
     ])
     ->notPath('server.php')
 ;
diff --git a/Modules/Core/Blade/AsgardEditorDirective.php b/Modules/Core/Blade/AsgardEditorDirective.php
new file mode 100644
index 000000000..128ac17a7
--- /dev/null
+++ b/Modules/Core/Blade/AsgardEditorDirective.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\Core\Blade;
+
+class AsgardEditorDirective
+{
+    private $content;
+    private $lang;
+    private $fieldName;
+    private $labelName;
+
+    public function show($arguments)
+    {
+        $this->extractArguments($arguments);
+
+        if ($this->lang !== null) {
+            return asgard_i18n_editor($this->fieldName, $this->labelName, $this->content, $this->lang);
+        }
+        return asgard_editor($this->fieldName, $this->labelName, $this->content);
+    }
+
+    /**
+     * Extract the possible arguments as class properties
+     * @param array $arguments
+     */
+    private function extractArguments(array $arguments)
+    {
+        $this->fieldName = array_get($arguments, 0);
+        $this->labelName = array_get($arguments, 1);
+        $this->content = array_get($arguments, 2);
+        $this->lang = array_get($arguments, 3);
+    }
+}
diff --git a/Modules/Core/Blade/Facades/AsgardEditorDirective.php b/Modules/Core/Blade/Facades/AsgardEditorDirective.php
new file mode 100644
index 000000000..ad8db2a67
--- /dev/null
+++ b/Modules/Core/Blade/Facades/AsgardEditorDirective.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Modules\Core\Blade\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class AsgardEditorDirective extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'core.asgard.editor';
+    }
+}
diff --git a/Modules/Core/Composers/AssetsViewComposer.php b/Modules/Core/Composers/AssetsViewComposer.php
index 45e3ccd4d..68ba9496f 100644
--- a/Modules/Core/Composers/AssetsViewComposer.php
+++ b/Modules/Core/Composers/AssetsViewComposer.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
+use Modules\Core\Events\CollectingAssets;
+use Modules\Core\Events\EditorIsRendering;
 use Modules\Core\Foundation\Asset\Manager\AssetManager;
 use Modules\Core\Foundation\Asset\Pipeline\AssetPipeline;
 use Modules\Core\Foundation\Asset\Types\AssetTypeFactory;
@@ -48,7 +50,11 @@ public function compose(View $view)
         $this->assetPipeline->requireCss(config('asgard.core.core.admin-required-assets.css'));
         $this->assetPipeline->requireJs(config('asgard.core.core.admin-required-assets.js'));
 
+        event($editor = new EditorIsRendering($this->assetPipeline));
+        event(new CollectingAssets($this->assetPipeline));
+
         $view->with('cssFiles', $this->assetPipeline->allCss());
         $view->with('jsFiles', $this->assetPipeline->allJs());
+        $view->with('editor', $editor);
     }
 }
diff --git a/Modules/Core/Config/config.php b/Modules/Core/Config/config.php
index 65324c45b..317144b00 100644
--- a/Modules/Core/Config/config.php
+++ b/Modules/Core/Config/config.php
@@ -13,6 +13,9 @@
         'workshop',
         'setting',
         'media',
+        'tag',
+        'page',
+        'translation',
     ],
 
     /*
diff --git a/Modules/Core/Config/core.php b/Modules/Core/Config/core.php
index d4b45263d..67ec2a105 100644
--- a/Modules/Core/Config/core.php
+++ b/Modules/Core/Config/core.php
@@ -32,6 +32,18 @@
     */
     'skin' => 'skin-blue',
 
+   /*
+   |--------------------------------------------------------------------------
+   | WYSIWYG Backend Editor
+   |--------------------------------------------------------------------------
+   | Define which editor you would like to use for the backend wysiwygs.
+   | These classes are event handlers, listening to EditorIsRendering
+   | you can define your own handlers and use them here
+   | Options:
+   | - \Modules\Core\Events\Handlers\LoadCkEditor::class
+   | - \Modules\Core\Events\Handlers\LoadSimpleMde::class
+   */
+   'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
     /*
     |--------------------------------------------------------------------------
     | Custom CKeditor configuration file
@@ -84,6 +96,7 @@
         'selectize-default.css' => ['module' => 'core:vendor/selectize/dist/css/selectize.default.css'],
         'animate.css' => ['theme' => 'vendor/animate.css/animate.min.css'],
         'pace.css' => ['theme' => 'vendor/admin-lte/plugins/pace/pace.min.css'],
+        'simplemde.css' => ['theme' => 'vendor/simplemde/dist/simplemde.min.css'],
         // Javascript
         'bootstrap.js' => ['theme' => 'vendor/bootstrap/dist/js/bootstrap.min.js'],
         'mousetrap.js' => ['theme' => 'js/vendor/mousetrap.min.js'],
@@ -110,6 +123,7 @@
         'pace.js' => ['theme' => 'vendor/admin-lte/plugins/pace/pace.min.js'],
         'moment.js' => ['theme' => 'vendor/admin-lte/plugins/daterangepicker/moment.min.js'],
         'clipboard.js' => ['theme' => 'vendor/clipboard/dist/clipboard.min.js'],
+        'simplemde.js' => ['theme' => 'vendor/simplemde/dist/simplemde.min.js'],
     ],
 
     /*
diff --git a/Modules/Core/Contracts/EntityIsChanging.php b/Modules/Core/Contracts/EntityIsChanging.php
new file mode 100644
index 000000000..302efa549
--- /dev/null
+++ b/Modules/Core/Contracts/EntityIsChanging.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Core\Contracts;
+
+interface EntityIsChanging
+{
+    /**
+     * Get the attributes used to create or modify an entity
+     * @return array
+     */
+    public function getAttributes();
+    /**
+     * Set the attributes used to create or modify an entity
+     * @param array $attributes
+     */
+    public function setAttributes(array $attributes);
+    /**
+     * Get the original attributes untouched by other listeners
+     * @return array
+     */
+    public function getOriginal();
+}
diff --git a/Modules/Core/Events/AbstractEntityHook.php b/Modules/Core/Events/AbstractEntityHook.php
new file mode 100644
index 000000000..6e10abd42
--- /dev/null
+++ b/Modules/Core/Events/AbstractEntityHook.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Modules\Core\Events;
+
+abstract class AbstractEntityHook
+{
+    /**
+     * Contains the attributes which can be changed by other listeners
+     * @var array
+     */
+    private $attributes;
+    /**
+     * Contains the original attributes which cannot be changed
+     * @var array
+     */
+    private $original;
+
+    public function __construct(array $attributes)
+    {
+        $this->attributes = $attributes;
+        $this->original = $attributes;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * @param string $attribute
+     * @param null $default
+     * @return string|null
+     */
+    public function getAttribute($attribute, $default = null)
+    {
+        return data_get($this->attributes, $attribute, $default);
+    }
+
+    /**
+     * @param array $attributes
+     */
+    public function setAttributes(array $attributes)
+    {
+        $this->attributes = array_replace_recursive($this->attributes, $attributes);
+    }
+
+    /**
+     * @param string|null $key
+     * @param string|null $default
+     * @return array
+     */
+    public function getOriginal($key = null, $default = null)
+    {
+        if ($key !== null) {
+            return data_get($this->original, $key, $default);
+        }
+
+        return $this->original;
+    }
+}
diff --git a/Modules/Core/Events/CollectingAssets.php b/Modules/Core/Events/CollectingAssets.php
new file mode 100644
index 000000000..c31827755
--- /dev/null
+++ b/Modules/Core/Events/CollectingAssets.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Modules\Core\Events;
+
+use Modules\Core\Foundation\Asset\Pipeline\AssetPipeline;
+
+class CollectingAssets
+{
+    /**
+     * @var AssetPipeline
+     */
+    private $assetPipeline;
+
+    public function __construct(AssetPipeline $assetPipeline)
+    {
+        $this->assetPipeline = $assetPipeline;
+    }
+
+    /**
+     * @param string $asset
+     * @return AssetPipeline
+     */
+    public function requireJs($asset)
+    {
+        return $this->assetPipeline->requireJs($asset);
+    }
+
+    /**
+     * @param string $asset
+     * @return AssetPipeline
+     */
+    public function requireCss($asset)
+    {
+        return $this->assetPipeline->requireCss($asset);
+    }
+
+    /**
+     * Match a single route
+     * @param string|array $route
+     * @return bool
+     */
+    public function onRoute($route)
+    {
+        $request = request();
+
+        return str_is($route, $request->route()->getName());
+    }
+
+    /**
+     * Match multiple routes
+     * @param array $routes
+     * @return bool
+     */
+    public function onRoutes(array $routes)
+    {
+        $request = request();
+
+        foreach ($routes as $route) {
+            if (str_is($route, $request->route()->getName()) === true) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Modules/Core/Events/EditorIsRendering.php b/Modules/Core/Events/EditorIsRendering.php
new file mode 100644
index 000000000..27bc9c0f7
--- /dev/null
+++ b/Modules/Core/Events/EditorIsRendering.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Modules\Core\Events;
+
+use Modules\Core\Foundation\Asset\Pipeline\AssetPipeline;
+
+class EditorIsRendering
+{
+    /**
+     * @var AssetPipeline
+     */
+    private $assetPipeline;
+    private $editorClass;
+    private $editorJsPartial;
+    private $editorCssPartial;
+    private $editorComponents = [
+        'i18n' => 'core::components.i18n.textarea',
+        'normal' => 'core::components.textarea',
+    ];
+
+    public function __construct(AssetPipeline $assetPipeline)
+    {
+        $this->assetPipeline = $assetPipeline;
+    }
+
+    public function addJs($asset)
+    {
+        $this->assetPipeline->requireJs($asset);
+
+        return $this;
+    }
+
+    public function addCss($asset)
+    {
+        $this->assetPipeline->requireCss($asset);
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEditorClass()
+    {
+        return $this->editorClass;
+    }
+
+    /**
+     * @param mixed $editorClass
+     */
+    public function setEditorClass($editorClass)
+    {
+        $this->editorClass = $editorClass;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEditorJsPartial()
+    {
+        return $this->editorJsPartial;
+    }
+
+    /**
+     * @param mixed $editorJsPartial
+     */
+    public function setEditorJsPartial($editorJsPartial)
+    {
+        $this->editorJsPartial = $editorJsPartial;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEditorCssPartial()
+    {
+        return $this->editorCssPartial;
+    }
+
+    /**
+     * @param mixed $editorCssPartial
+     */
+    public function setEditorCssPartial($editorCssPartial)
+    {
+        $this->editorCssPartial = $editorCssPartial;
+    }
+
+    public function getI18nComponentName()
+    {
+        return $this->editorComponents['i18n'];
+    }
+
+    public function setI18nComponentName($componentName)
+    {
+        $this->editorComponents['i18n'] = $componentName;
+    }
+
+    public function getComponentName()
+    {
+        return $this->editorComponents['normal'];
+    }
+
+    public function setComponentName($componentName)
+    {
+        $this->editorComponents['normal'] = $componentName;
+    }
+}
diff --git a/Modules/Core/Events/Handlers/LoadCkEditor.php b/Modules/Core/Events/Handlers/LoadCkEditor.php
new file mode 100644
index 000000000..ae7bcac04
--- /dev/null
+++ b/Modules/Core/Events/Handlers/LoadCkEditor.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Core\Events\Handlers;
+
+use Modules\Core\Events\EditorIsRendering;
+
+class LoadCkEditor
+{
+    public function handle(EditorIsRendering $editor)
+    {
+        $editor->addJs('ckeditor.js');
+        $editor->setEditorClass('ckeditor');
+
+        return false;
+    }
+}
diff --git a/Modules/Core/Events/Handlers/LoadSimpleMde.php b/Modules/Core/Events/Handlers/LoadSimpleMde.php
new file mode 100644
index 000000000..01d71c4ad
--- /dev/null
+++ b/Modules/Core/Events/Handlers/LoadSimpleMde.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Modules\Core\Events\Handlers;
+
+use Modules\Core\Events\EditorIsRendering;
+
+class LoadSimpleMde
+{
+    public function handle(EditorIsRendering $editor)
+    {
+        $editor->addJs('simplemde.js')->addCss('simplemde.css');
+        $editor->setEditorClass('simplemde');
+        $editor->setEditorJsPartial('core::partials.simplemde');
+
+        return false;
+    }
+}
diff --git a/Modules/Core/Events/Handlers/RenderMarkdown.php b/Modules/Core/Events/Handlers/RenderMarkdown.php
new file mode 100644
index 000000000..81a9b141e
--- /dev/null
+++ b/Modules/Core/Events/Handlers/RenderMarkdown.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Core\Events\Handlers;
+
+use League\CommonMark\CommonMarkConverter;
+use Modules\Page\Events\ContentIsRendering;
+
+class RenderMarkdown
+{
+    public function handle(ContentIsRendering $event)
+    {
+        $converter = new CommonMarkConverter();
+
+        $html = $converter->convertToHtml($event->getOriginal());
+
+        $event->setBody($html);
+    }
+}
diff --git a/Modules/Core/Providers/CoreServiceProvider.php b/Modules/Core/Providers/CoreServiceProvider.php
index 11e82dcbb..ae42c5b5a 100644
--- a/Modules/Core/Providers/CoreServiceProvider.php
+++ b/Modules/Core/Providers/CoreServiceProvider.php
@@ -7,11 +7,13 @@
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\ServiceProvider;
+use Modules\Core\Blade\AsgardEditorDirective;
 use Modules\Core\Console\DeleteModuleCommand;
 use Modules\Core\Console\DownloadModuleCommand;
 use Modules\Core\Console\InstallCommand;
 use Modules\Core\Console\PublishModuleAssetsCommand;
 use Modules\Core\Console\PublishThemeAssetsCommand;
+use Modules\Core\Events\EditorIsRendering;
 use Modules\Core\Foundation\Theme\ThemeManager;
 use Modules\Core\Traits\CanPublishConfiguration;
 use Nwidart\Modules\Module;
@@ -53,6 +55,7 @@ public function boot()
         $this->registerModuleResourceNamespaces();
 
         $this->bladeDirectives();
+        $this->app['events']->listen(EditorIsRendering::class, config('asgard.core.core.wysiwyg-handler'));
     }
 
     /**
@@ -72,6 +75,10 @@ public function register()
         $this->registerCommands();
         $this->registerServices();
         $this->setLocalesConfigurations();
+
+        $this->app->bind('core.asgard.editor', function () {
+            return new AsgardEditorDirective();
+        });
     }
 
     /**
@@ -305,6 +312,10 @@ private function getCentralisedTranslationPath(Module $module)
      */
     public function bladeDirectives()
     {
+        if (app()->environment() === 'testing') {
+            return;
+        }
+
         /**
          * Set variable.
          * Usage: @set($variable, value)
@@ -314,6 +325,10 @@ public function bladeDirectives()
 
             return "<?php {$variable} = {$value}; ?>";
         });
+
+        $this->app['blade.compiler']->directive('editor', function ($value) {
+            return "<?php echo AsgardEditorDirective::show([$value]); ?>";
+        });
     }
 
     /**
diff --git a/Modules/Core/Resources/views/components/i18n/textarea-wrapper.blade.php b/Modules/Core/Resources/views/components/i18n/textarea-wrapper.blade.php
new file mode 100644
index 000000000..c04f432b6
--- /dev/null
+++ b/Modules/Core/Resources/views/components/i18n/textarea-wrapper.blade.php
@@ -0,0 +1,3 @@
+@component($editor->getI18nComponentName(), compact('lang', 'fieldName', 'labelName'))
+    {!! $content !!}
+@endcomponent
diff --git a/Modules/Core/Resources/views/components/i18n/textarea.blade.php b/Modules/Core/Resources/views/components/i18n/textarea.blade.php
new file mode 100644
index 000000000..bcc1a475a
--- /dev/null
+++ b/Modules/Core/Resources/views/components/i18n/textarea.blade.php
@@ -0,0 +1,19 @@
+@if ($editor->getEditorCssPartial() !== null)
+    @if (Cache::store('array')->add('textareaCssLoaded', true, 100))
+        @include($editor->getEditorCssPartial())
+    @endif
+@endif
+
+<div class='{{ $errors->has("{$lang}.{$fieldName}") ? ' has-error' : '' }}'>
+    {!! Form::label("{$lang}[{$fieldName}]", $labelName) !!}
+    <textarea class="{{ $editor->getEditorClass() }}" name="{{$lang}}[{{$fieldName}}]" rows="10" cols="80">{{ $slot }}</textarea>
+    {!! $errors->first("{$lang}.{$fieldName}", '<span class="help-block">:message</span>') !!}
+</div>
+
+@if ($editor->getEditorJsPartial() !== null)
+    @if (Cache::store('array')->add('textareaJsLoaded', true, 100))
+        @include($editor->getEditorJsPartial())
+    @endif
+@endif
+
+
diff --git a/Modules/Core/Resources/views/components/textarea-wrapper.blade.php b/Modules/Core/Resources/views/components/textarea-wrapper.blade.php
new file mode 100644
index 000000000..d37506195
--- /dev/null
+++ b/Modules/Core/Resources/views/components/textarea-wrapper.blade.php
@@ -0,0 +1,3 @@
+@component($editor->getComponentName(), compact('fieldName', 'labelName'))
+    {!! $content !!}
+@endcomponent
diff --git a/Modules/Core/Resources/views/components/textarea.blade.php b/Modules/Core/Resources/views/components/textarea.blade.php
new file mode 100644
index 000000000..c7413cef7
--- /dev/null
+++ b/Modules/Core/Resources/views/components/textarea.blade.php
@@ -0,0 +1,19 @@
+@if ($editor->getEditorCssPartial() !== null)
+    @if (Cache::store('array')->add('textareaCssLoaded', true, 100))
+        @include($editor->getEditorCssPartial())
+    @endif
+@endif
+
+<div class='{{ $errors->has($fieldName) ? ' has-error' : '' }}'>
+    {!! Form::label($fieldName, $labelName) !!}
+    <textarea class="{{ $editor->getEditorClass() }}" name="{{ $fieldName }}" rows="10" cols="80">{{ $slot }}</textarea>
+    {!! $errors->first($fieldName, '<span class="help-block">:message</span>') !!}
+</div>
+
+@if ($editor->getEditorJsPartial() !== null)
+    @if (Cache::store('array')->add('textareaJsLoaded', true, 100))
+        @include($editor->getEditorJsPartial())
+    @endif
+@endif
+
+
diff --git a/Modules/Core/Resources/views/partials/simplemde.blade.php b/Modules/Core/Resources/views/partials/simplemde.blade.php
new file mode 100644
index 000000000..e760fe2de
--- /dev/null
+++ b/Modules/Core/Resources/views/partials/simplemde.blade.php
@@ -0,0 +1,12 @@
+@push('js-stack')
+    <script>
+        $( document ).ready(function() {
+            $('.simplemde').each(function () {
+                var simplemde = new SimpleMDE({
+                    element: this,
+                });
+                simplemde.render();
+            });
+        });
+    </script>
+@endpush
diff --git a/Modules/Core/changelog.yml b/Modules/Core/changelog.yml
index 1b1840106..07fce4721 100644
--- a/Modules/Core/changelog.yml
+++ b/Modules/Core/changelog.yml
@@ -1,5 +1,15 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        added:
+            - Adding a <code>EntityIsChanging</code> interface to use on events which are triggered before a create / update action
+            - Create an <code>AbstractEntityHook</code> containing base logic for entity hooks
+            - Trigger the <code>EditorIsRendering</code> event on assets view composer and send editor variable to view
+            - New configuration value <code>wysiwyg-handler</code> in <code>config/asgard/core/core.php</code> to change the editor in backend
+            - New handler <code>RenderMarkdown</code> if you want to render markdown on a <code>ContentIsRendering</code> event
+            - New <code>@editor('fieldname', 'fieldlabel, 'content', 'locale')</code> blade directive to include a textarea. The last <code>locale</code> parameter is optional and can be omitted for non translatable textarea.
+        changed:
+            - Adding more core modules (tag, translation and page). Preventing them to be disabled.
     "2.3.0":
         added:
             - New command <code>php artisan asgard:download:module asgardcms/contact --migrations --seeds --assets</code>
diff --git a/Modules/Core/composers.php b/Modules/Core/composers.php
index 74283816a..500c20ed0 100644
--- a/Modules/Core/composers.php
+++ b/Modules/Core/composers.php
@@ -7,4 +7,4 @@
 view()->composer('core::fields.select-locales', \Modules\Core\Composers\SettingLocalesComposer::class);
 view()->composer('*', \Modules\Core\Composers\LocaleComposer::class);
 view()->composer('*', \Modules\Core\Composers\CurrentUserViewComposer::class);
-view()->composer('layouts.master', \Modules\Core\Composers\AssetsViewComposer::class);
+view()->composer('*', \Modules\Core\Composers\AssetsViewComposer::class);
diff --git a/Modules/Core/helpers.php b/Modules/Core/helpers.php
index 251f4f821..bb44b7913 100644
--- a/Modules/Core/helpers.php
+++ b/Modules/Core/helpers.php
@@ -33,3 +33,18 @@ function is_core_module($module)
         return in_array(strtolower($module), app('asgard.ModulesList'));
     }
 }
+
+if (! function_exists('asgard_i18n_editor')) {
+    function asgard_i18n_editor($fieldName, $labelName, $content, $lang)
+    {
+        return view('core::components.i18n.textarea-wrapper', compact('fieldName','labelName', 'content', 'lang'));
+    }
+}
+
+
+if (! function_exists('asgard_editor')) {
+    function asgard_editor($fieldName, $labelName, $content)
+    {
+        return view('core::components.textarea-wrapper', compact('fieldName','labelName', 'content'));
+    }
+}
diff --git a/Modules/Core/module.json b/Modules/Core/module.json
index c6a4d3685..9784cf347 100644
--- a/Modules/Core/module.json
+++ b/Modules/Core/module.json
@@ -4,7 +4,7 @@
     "description": "The core module with all base classes and logic.",
     "keywords": [],
     "require": {},
-    "version": "2.0.0",
+    "version": "2.5.0",
     "active": 1,
     "order": 0,
     "providers": [
@@ -20,7 +20,8 @@
     "aliases": {
         "Form": "Collective\\Html\\FormFacade",
         "Flash": "Laracasts\\Flash\\Flash",
-        "LaravelLocalization": "Mcamara\\LaravelLocalization\\Facades\\LaravelLocalization"
+        "LaravelLocalization": "Mcamara\\LaravelLocalization\\Facades\\LaravelLocalization",
+        "AsgardEditorDirective": "Modules\\Core\\Blade\\Facades\\AsgardEditorDirective"
     },
     "files": [
         "start.php",
diff --git a/Modules/Core/stylistPublishMix.js b/Modules/Core/stylistPublishMix.js
deleted file mode 100644
index 541768f63..000000000
--- a/Modules/Core/stylistPublishMix.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var gulp = require("gulp");
-var shell = require('gulp-shell');
-var elixir = require('laravel-elixir');
-var themeInfo = require('./theme.json');
-
-var Task = elixir.Task;
-
-elixir.extend('stylistPublish', function() {
-    new Task('stylistPublish', function() {
-        return gulp.src("").pipe(shell("php ../../artisan stylist:publish " + themeInfo.name));
-    });
-});
diff --git a/Modules/Dashboard/Resources/views/admin/dashboard.blade.php b/Modules/Dashboard/Resources/views/admin/dashboard.blade.php
index aea76b944..b4485bb82 100644
--- a/Modules/Dashboard/Resources/views/admin/dashboard.blade.php
+++ b/Modules/Dashboard/Resources/views/admin/dashboard.blade.php
@@ -12,13 +12,13 @@
     <div class="clearfix"></div>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .grid-stack-item {
             padding-right: 20px !important;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
 
@@ -46,7 +46,7 @@
     </div>
 @stop
 
-@section('scripts')
+@push('js-stack')
     @parent
     <script type="text/javascript">
         $(document).ready(function () {
@@ -157,4 +157,4 @@
 
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Dashboard/changelog.yml b/Modules/Dashboard/changelog.yml
index bb89aae5a..da22cc725 100644
--- a/Modules/Dashboard/changelog.yml
+++ b/Modules/Dashboard/changelog.yml
@@ -1,5 +1,9 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.0.0":
         added:
             - Laravel 5.4 compatibility
diff --git a/Modules/Dashboard/module.json b/Modules/Dashboard/module.json
index bb72ac2be..c74160cff 100644
--- a/Modules/Dashboard/module.json
+++ b/Modules/Dashboard/module.json
@@ -3,7 +3,7 @@
     "alias": "dashboard",
     "description": "The module responsible for the admin dashboard page.",
     "keywords": [],
-    "version": "2.0.0",
+    "version": "2.5.0",
     "active": 1,
     "order": 1,
     "providers": [
diff --git a/Modules/Media/Events/FileIsCreating.php b/Modules/Media/Events/FileIsCreating.php
new file mode 100644
index 000000000..649e4a0e0
--- /dev/null
+++ b/Modules/Media/Events/FileIsCreating.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\Media\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+final class FileIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
+}
diff --git a/Modules/Media/Events/FileIsUpdating.php b/Modules/Media/Events/FileIsUpdating.php
new file mode 100644
index 000000000..96f8424e1
--- /dev/null
+++ b/Modules/Media/Events/FileIsUpdating.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Media\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+use Modules\Media\Entities\File;
+
+final class FileIsUpdating extends AbstractEntityHook implements EntityIsChanging
+{
+    /**
+     * @var File
+     */
+    private $file;
+
+    public function __construct(File $file, array $attributes)
+    {
+        $this->file = $file;
+        parent::__construct($attributes);
+    }
+
+    /**
+     * @return File
+     */
+    public function getFile()
+    {
+        return $this->file;
+    }
+}
diff --git a/Modules/Media/Events/FileWasCreated.php b/Modules/Media/Events/FileWasCreated.php
new file mode 100644
index 000000000..4c2be45a5
--- /dev/null
+++ b/Modules/Media/Events/FileWasCreated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Media\Events;
+
+use Modules\Media\Entities\File;
+
+class FileWasCreated
+{
+    /**
+     * @var File
+     */
+    public $file;
+
+    public function __construct(File $file)
+    {
+        $this->file = $file;
+    }
+}
diff --git a/Modules/Media/Events/FileWasUpdated.php b/Modules/Media/Events/FileWasUpdated.php
new file mode 100644
index 000000000..ab4f416fb
--- /dev/null
+++ b/Modules/Media/Events/FileWasUpdated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Media\Events;
+
+use Modules\Media\Entities\File;
+
+class FileWasUpdated
+{
+    /**
+     * @var File
+     */
+    public $file;
+
+    public function __construct(File $file)
+    {
+        $this->file = $file;
+    }
+}
diff --git a/Modules/Media/Repositories/Eloquent/EloquentFileRepository.php b/Modules/Media/Repositories/Eloquent/EloquentFileRepository.php
index 4013e5dec..d925934d0 100644
--- a/Modules/Media/Repositories/Eloquent/EloquentFileRepository.php
+++ b/Modules/Media/Repositories/Eloquent/EloquentFileRepository.php
@@ -5,6 +5,10 @@
 use Illuminate\Database\Eloquent\Collection;
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
 use Modules\Media\Entities\File;
+use Modules\Media\Events\FileIsCreating;
+use Modules\Media\Events\FileIsUpdating;
+use Modules\Media\Events\FileWasCreated;
+use Modules\Media\Events\FileWasUpdated;
 use Modules\Media\Helpers\FileHelper;
 use Modules\Media\Repositories\FileRepository;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -19,10 +23,13 @@ class EloquentFileRepository extends EloquentBaseRepository implements FileRepos
      */
     public function update($file, $data)
     {
-        $file->update($data);
+        event($event = new FileIsUpdating($file, $data));
+        $file->update($event->getAttributes());
 
         $file->setTags(array_get($data, 'tags', []));
 
+        event(new FileWasUpdated($file));
+
         return $file;
     }
 
@@ -41,14 +48,21 @@ public function createFromFile(UploadedFile $file)
             $fileName = $this->getNewUniqueFilename($fileName);
         }
 
-        return $this->model->create([
+        $data = [
             'filename' => $fileName,
             'path' => config('asgard.media.config.files-path') . "{$fileName}",
-            'extension' => substr(strrchr($fileName, "."), 1),
+            'extension' => substr(strrchr($fileName, '.'), 1),
             'mimetype' => $file->getClientMimeType(),
             'filesize' => $file->getFileInfo()->getSize(),
             'folder_id' => 0,
-        ]);
+        ];
+
+        event($event = new FileIsCreating($data));
+
+        $file = $this->model->create($event->getAttributes());
+        event(new FileWasCreated($file));
+
+        return $file;
     }
 
     public function destroy($file)
diff --git a/Modules/Media/Resources/views/admin/edit.blade.php b/Modules/Media/Resources/views/admin/edit.blade.php
index 91b07e7f1..d601d0206 100644
--- a/Modules/Media/Resources/views/admin/edit.blade.php
+++ b/Modules/Media/Resources/views/admin/edit.blade.php
@@ -75,7 +75,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script>
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -85,4 +85,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Media/Resources/views/admin/index.blade.php b/Modules/Media/Resources/views/admin/index.blade.php
index 34b8c8b14..073a633dd 100644
--- a/Modules/Media/Resources/views/admin/index.blade.php
+++ b/Modules/Media/Resources/views/admin/index.blade.php
@@ -10,7 +10,7 @@
 </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
 <link href="{!! Module::asset('media:css/dropzone.css') !!}" rel="stylesheet" type="text/css" />
 <style>
 .dropzone {
@@ -19,7 +19,7 @@
     margin-bottom: 20px;
 }
 </style>
-@stop
+@endpush
 
 @section('content')
 <div class="row">
@@ -91,7 +91,7 @@
 @include('core::partials.delete-modal')
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script src="{!! Module::asset('media:js/dropzone.js') !!}"></script>
 <?php $config = config('asgard.media.config'); ?>
 <script>
@@ -117,4 +117,4 @@
         });
     });
 </script>
-@stop
+@endpush
diff --git a/Modules/Media/Tests/FileRepositoryTest.php b/Modules/Media/Tests/EloquentFileRepositoryTest.php
similarity index 54%
rename from Modules/Media/Tests/FileRepositoryTest.php
rename to Modules/Media/Tests/EloquentFileRepositoryTest.php
index 67755399a..6837fe373 100644
--- a/Modules/Media/Tests/FileRepositoryTest.php
+++ b/Modules/Media/Tests/EloquentFileRepositoryTest.php
@@ -2,13 +2,18 @@
 
 namespace Modules\Media\Tests;
 
+use Illuminate\Support\Facades\Event;
 use Mockery;
 use Modules\Media\Entities\File;
+use Modules\Media\Events\FileIsCreating;
+use Modules\Media\Events\FileIsUpdating;
+use Modules\Media\Events\FileWasCreated;
+use Modules\Media\Events\FileWasUpdated;
 use Modules\Media\Repositories\FileRepository;
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class FileRepositoryTest extends MediaTestCase
+class EloquentFileRepositoryTest extends MediaTestCase
 {
     /**
      * @var FileRepository
@@ -114,6 +119,99 @@ public function it_can_delete_a_file()
         $this->assertCount(0, $this->file->all());
     }
 
+    /** @test */
+    public function it_triggers_event_when_file_was_created()
+    {
+        Event::fake();
+        $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
+
+        Event::assertDispatched(FileWasCreated::class, function ($e) use ($file) {
+            return $e->file->id === $file->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_file_is_creating()
+    {
+        Event::fake();
+
+        $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
+
+        Event::assertDispatched(FileIsCreating::class, function ($e) use ($file) {
+            return $e->getAttribute('filename') === $file->filename;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_creating_event()
+    {
+        Event::listen(FileIsCreating::class, function (FileIsCreating $event) {
+            $event->setAttributes(['filename' => 'imabettername.jpg']);
+        });
+
+        $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
+
+        $this->assertEquals('imabettername.jpg', $file->filename);
+    }
+
+    /** @test */
+    public function it_triggers_event_when_file_was_updated()
+    {
+        Event::fake();
+
+        $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
+        $this->file->update($file, []);
+
+        Event::assertDispatched(FileWasUpdated::class, function ($e) use ($file) {
+            return $e->file->id === $file->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_file_is_updating()
+    {
+        Event::fake();
+
+        $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
+        $this->file->update($file, [
+            'en' => [
+                'description' => 'My cool file!',
+                'alt_attribute' => 'My cool file!',
+                'keywords' => 'My cool file!',
+            ]
+        ]);
+
+        Event::assertDispatched(FileIsUpdating::class, function ($e) use ($file) {
+            return $e->getFile()->id === $file->id &&
+                $e->getAttribute('en.description') === 'My cool file!';
+        });
+    }
+
+    /** @test */
+    public function it_can_change_properties_before_update()
+    {
+        Event::listen(FileIsUpdating::class, function (FileIsUpdating $event) {
+            $event->setAttributes([
+                'filename' => 'bettername.jpg',
+                'en' => [
+                    'description' => 'Hello World',
+                ]
+            ]);
+        });
+
+        $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
+        $this->file->update($file, [
+            'en' => [
+                'description' => 'My cool file!',
+                'alt_attribute' => 'My cool file!',
+                'keywords' => 'My cool file!',
+            ]
+        ]);
+
+        $this->assertEquals('bettername.jpg', $file->filename);
+        $this->assertEquals('Hello World', $file->translate('en')->description);
+    }
+
     private function createFile($fileName = 'random/name.jpg')
     {
         return File::create([
diff --git a/Modules/Media/changelog.yml b/Modules/Media/changelog.yml
index 0508c378a..f4b378ac2 100644
--- a/Modules/Media/changelog.yml
+++ b/Modules/Media/changelog.yml
@@ -1,5 +1,14 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        added:
+            - <code>FileWasCreated</code> event
+            - <code>FileWasUpdated</code> event
+            - <code>FileIsCreating</code> hookable event
+            - <code>FileIsUpdating</code> hookable event
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.4.0":
         added:
             - new blade directive for thumbnails <code>@thumbnail('path', 'thumbnailName')</code>
diff --git a/Modules/Media/module.json b/Modules/Media/module.json
index 5c8539064..49390b507 100644
--- a/Modules/Media/module.json
+++ b/Modules/Media/module.json
@@ -3,7 +3,7 @@
     "alias": "media",
     "description": "A media library, used throughout the CMS.",
     "keywords": [],
-    "version": "2.0.0",
+    "version": "2.5.0",
     "active": 1,
     "order": 1,
     "providers": [
diff --git a/Modules/Menu/Events/MenuIsCreating.php b/Modules/Menu/Events/MenuIsCreating.php
new file mode 100644
index 000000000..a12e1abac
--- /dev/null
+++ b/Modules/Menu/Events/MenuIsCreating.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\Menu\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+class MenuIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
+}
diff --git a/Modules/Menu/Events/MenuIsUpdating.php b/Modules/Menu/Events/MenuIsUpdating.php
new file mode 100644
index 000000000..8a5223a86
--- /dev/null
+++ b/Modules/Menu/Events/MenuIsUpdating.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Menu\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+use Modules\Menu\Entities\Menu;
+
+class MenuIsUpdating extends AbstractEntityHook implements EntityIsChanging
+{
+    /**
+     * @var Menu
+     */
+    private $menu;
+
+    public function __construct(Menu $menu, $attributes)
+    {
+        $this->menu = $menu;
+        parent::__construct($attributes);
+    }
+
+    /**
+     * @return Menu
+     */
+    public function getMenu()
+    {
+        return $this->menu;
+    }
+}
diff --git a/Modules/Menu/Events/MenuItemIsCreating.php b/Modules/Menu/Events/MenuItemIsCreating.php
new file mode 100644
index 000000000..1d0457d38
--- /dev/null
+++ b/Modules/Menu/Events/MenuItemIsCreating.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\Menu\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+class MenuItemIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
+}
diff --git a/Modules/Menu/Events/MenuItemIsUpdating.php b/Modules/Menu/Events/MenuItemIsUpdating.php
new file mode 100644
index 000000000..b427e6fdd
--- /dev/null
+++ b/Modules/Menu/Events/MenuItemIsUpdating.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Menu\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+use Modules\Menu\Entities\Menuitem;
+
+class MenuItemIsUpdating extends AbstractEntityHook implements EntityIsChanging
+{
+    /**
+     * @var Menuitem
+     */
+    private $menuItem;
+
+    public function __construct(Menuitem $menuItem, $attributes)
+    {
+        parent::__construct($attributes);
+        $this->menuItem = $menuItem;
+    }
+
+    /**
+     * @return Menuitem
+     */
+    public function getMenuItem()
+    {
+        return $this->menuItem;
+    }
+}
diff --git a/Modules/Menu/Events/MenuItemWasUpdated.php b/Modules/Menu/Events/MenuItemWasUpdated.php
new file mode 100644
index 000000000..025781725
--- /dev/null
+++ b/Modules/Menu/Events/MenuItemWasUpdated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Menu\Events;
+
+use Modules\Menu\Entities\Menuitem;
+
+class MenuItemWasUpdated
+{
+    /**
+     * @var Menuitem
+     */
+    public $menuItem;
+
+    public function __construct(Menuitem $menuItem)
+    {
+        $this->menuItem = $menuItem;
+    }
+}
diff --git a/Modules/Menu/Events/MenuWasUpdated.php b/Modules/Menu/Events/MenuWasUpdated.php
new file mode 100644
index 000000000..fbbe5b8e3
--- /dev/null
+++ b/Modules/Menu/Events/MenuWasUpdated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Menu\Events;
+
+use Modules\Menu\Entities\Menu;
+
+class MenuWasUpdated
+{
+    /**
+     * @var Menu
+     */
+    public $menu;
+
+    public function __construct(Menu $menu)
+    {
+        $this->menu = $menu;
+    }
+}
diff --git a/Modules/Menu/Providers/MenuServiceProvider.php b/Modules/Menu/Providers/MenuServiceProvider.php
index 87ca8fd63..67851d2ae 100644
--- a/Modules/Menu/Providers/MenuServiceProvider.php
+++ b/Modules/Menu/Providers/MenuServiceProvider.php
@@ -68,31 +68,25 @@ public function provides()
      */
     private function registerBindings()
     {
-        $this->app->bind(
-            'Modules\Menu\Repositories\MenuRepository',
-            function () {
-                $repository = new EloquentMenuRepository(new Menu());
+        $this->app->bind(MenuRepository::class, function () {
+            $repository = new EloquentMenuRepository(new Menu());
 
-                if (! config('app.cache')) {
-                    return $repository;
-                }
-
-                return new CacheMenuDecorator($repository);
+            if (! config('app.cache')) {
+                return $repository;
             }
-        );
 
-        $this->app->bind(
-            'Modules\Menu\Repositories\MenuItemRepository',
-            function () {
-                $repository = new EloquentMenuItemRepository(new Menuitem());
+            return new CacheMenuDecorator($repository);
+        });
 
-                if (! config('app.cache')) {
-                    return $repository;
-                }
+        $this->app->bind(MenuItemRepository::class, function () {
+            $repository = new EloquentMenuItemRepository(new Menuitem());
 
-                return new CacheMenuItemDecorator($repository);
+            if (! config('app.cache')) {
+                return $repository;
             }
-        );
+
+            return new CacheMenuItemDecorator($repository);
+        });
     }
 
     /**
diff --git a/Modules/Menu/Repositories/Eloquent/EloquentMenuItemRepository.php b/Modules/Menu/Repositories/Eloquent/EloquentMenuItemRepository.php
index ca6468b7c..cfd56e3c7 100644
--- a/Modules/Menu/Repositories/Eloquent/EloquentMenuItemRepository.php
+++ b/Modules/Menu/Repositories/Eloquent/EloquentMenuItemRepository.php
@@ -6,14 +6,18 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
+use Modules\Menu\Events\MenuItemIsCreating;
+use Modules\Menu\Events\MenuItemIsUpdating;
 use Modules\Menu\Events\MenuItemWasCreated;
+use Modules\Menu\Events\MenuItemWasUpdated;
 use Modules\Menu\Repositories\MenuItemRepository;
 
 class EloquentMenuItemRepository extends EloquentBaseRepository implements MenuItemRepository
 {
     public function create($data)
     {
-        $menuItem = $this->model->create($data);
+        event($event = new MenuItemIsCreating($data));
+        $menuItem = $this->model->create($event->getAttributes());
 
         event(new MenuItemWasCreated($menuItem));
 
@@ -22,7 +26,10 @@ public function create($data)
 
     public function update($menuItem, $data)
     {
-        $menuItem->update($data);
+        event($event = new MenuItemIsUpdating($menuItem, $data));
+        $menuItem->update($event->getAttributes());
+
+        event(new MenuItemWasUpdated($menuItem));
 
         return $menuItem;
     }
diff --git a/Modules/Menu/Repositories/Eloquent/EloquentMenuRepository.php b/Modules/Menu/Repositories/Eloquent/EloquentMenuRepository.php
index 05e3ede6b..ff481ba98 100644
--- a/Modules/Menu/Repositories/Eloquent/EloquentMenuRepository.php
+++ b/Modules/Menu/Repositories/Eloquent/EloquentMenuRepository.php
@@ -5,14 +5,18 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\App;
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
+use Modules\Menu\Events\MenuIsCreating;
+use Modules\Menu\Events\MenuIsUpdating;
 use Modules\Menu\Events\MenuWasCreated;
+use Modules\Menu\Events\MenuWasUpdated;
 use Modules\Menu\Repositories\MenuRepository;
 
 class EloquentMenuRepository extends EloquentBaseRepository implements MenuRepository
 {
     public function create($data)
     {
-        $menu = $this->model->create($data);
+        event($event = new MenuIsCreating($data));
+        $menu = $this->model->create($event->getAttributes());
 
         event(new MenuWasCreated($menu));
 
@@ -21,7 +25,10 @@ public function create($data)
 
     public function update($menu, $data)
     {
-        $menu->update($data);
+        event($event = new MenuIsUpdating($menu, $data));
+        $menu->update($event->getAttributes());
+
+        event(new MenuWasUpdated($menu));
 
         return $menu;
     }
diff --git a/Modules/Menu/Resources/views/admin/menuitems/create.blade.php b/Modules/Menu/Resources/views/admin/menuitems/create.blade.php
index ed56aaa37..aa396a207 100644
--- a/Modules/Menu/Resources/views/admin/menuitems/create.blade.php
+++ b/Modules/Menu/Resources/views/admin/menuitems/create.blade.php
@@ -11,9 +11,6 @@
 </ol>
 @stop
 
-@section('styles')
-@stop
-
 @section('content')
 {!! Form::open(['route' => ['dashboard.menuitem.store', $menu->id], 'method' => 'post']) !!}
 <div class="row">
@@ -90,7 +87,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $(document).keypressAction({
@@ -113,4 +110,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php b/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php
index bf786f96b..a80ba9c19 100644
--- a/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php
+++ b/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php
@@ -11,9 +11,6 @@
 </ol>
 @stop
 
-@section('styles')
-@stop
-
 @section('content')
 {!! Form::open(['route' => ['dashboard.menuitem.update', $menu->id, $menuItem->id], 'method' => 'put']) !!}
 <div class="row">
@@ -96,7 +93,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $(document).keypressAction({
@@ -129,4 +126,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Menu/Resources/views/admin/menus/create.blade.php b/Modules/Menu/Resources/views/admin/menus/create.blade.php
index 1b650fd50..9741eee5d 100644
--- a/Modules/Menu/Resources/views/admin/menus/create.blade.php
+++ b/Modules/Menu/Resources/views/admin/menus/create.blade.php
@@ -11,9 +11,6 @@
 </ol>
 @stop
 
-@section('styles')
-@stop
-
 @section('content')
 {!! Form::open(['route' => ['admin.menu.menu.store'], 'method' => 'post']) !!}
 <div class="row">
@@ -72,7 +69,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $(document).keypressAction({
@@ -86,4 +83,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Menu/Resources/views/admin/menus/edit.blade.php b/Modules/Menu/Resources/views/admin/menus/edit.blade.php
index 8d6a736bc..36b6ce90c 100644
--- a/Modules/Menu/Resources/views/admin/menus/edit.blade.php
+++ b/Modules/Menu/Resources/views/admin/menus/edit.blade.php
@@ -11,9 +11,9 @@
 </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <link href="{!! Module::asset('menu:css/nestable.css') !!}" rel="stylesheet" type="text/css" />
-@stop
+@endpush
 
 @section('content')
 {!! Form::open(['route' => ['admin.menu.menu.update', $menu->id], 'method' => 'put']) !!}
@@ -89,7 +89,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $(document).keypressAction({
@@ -160,4 +160,4 @@
         });
     });
 </script>
-@stop
+@endpush
diff --git a/Modules/Menu/Resources/views/admin/menus/index.blade.php b/Modules/Menu/Resources/views/admin/menus/index.blade.php
index ba44d3d75..cfa52b1c1 100644
--- a/Modules/Menu/Resources/views/admin/menus/index.blade.php
+++ b/Modules/Menu/Resources/views/admin/menus/index.blade.php
@@ -107,7 +107,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
 <?php $locale = App::getLocale(); ?>
 <script type="text/javascript">
     $( document ).ready(function() {
@@ -132,4 +132,4 @@
         });
     });
 </script>
-@stop
+@endpush
diff --git a/Modules/Menu/Tests/BaseMenuTest.php b/Modules/Menu/Tests/BaseMenuTest.php
index 6d0f6913b..57a7dbc53 100644
--- a/Modules/Menu/Tests/BaseMenuTest.php
+++ b/Modules/Menu/Tests/BaseMenuTest.php
@@ -9,10 +9,13 @@
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider;
 use Modules\Core\Providers\CoreServiceProvider;
+use Modules\Menu\Providers\EventServiceProvider;
 use Modules\Menu\Providers\MenuServiceProvider;
 use Modules\Menu\Repositories\MenuItemRepository;
 use Modules\Menu\Repositories\MenuRepository;
 use Modules\Page\Providers\PageServiceProvider;
+use Modules\Setting\Providers\SettingServiceProvider;
+use Modules\Setting\Repositories\SettingRepository;
 use Modules\Tag\Providers\TagServiceProvider;
 use Nwidart\Modules\LaravelModulesServiceProvider;
 use Orchestra\Testbench\TestCase;
@@ -39,6 +42,9 @@ public function setUp()
 
         $this->menu = app(MenuRepository::class);
         $this->menuItem = app(MenuItemRepository::class);
+        app(SettingRepository::class)->createOrUpdate([
+            'core::locales' => ['en', 'fr',]
+        ]);
     }
 
     protected function getPackageProviders($app)
@@ -48,6 +54,8 @@ protected function getPackageProviders($app)
             CoreServiceProvider::class,
             TagServiceProvider::class,
             PageServiceProvider::class,
+            SettingServiceProvider::class,
+            EventServiceProvider::class,
             MenuServiceProvider::class,
             LaravelLocalizationServiceProvider::class,
             SidebarServiceProvider::class,
@@ -96,6 +104,10 @@ private function resetDatabase()
             '--database' => 'sqlite',
             '--path'     => 'Modules/Tag/Database/Migrations',
         ]);
+        $this->artisan('migrate', [
+            '--database' => 'sqlite',
+            '--path'     => 'Modules/Setting/Database/Migrations',
+        ]);
     }
 
     public function createMenu($name, $title)
diff --git a/Modules/Menu/Tests/EloquentMenuItemRepositoryTest.php b/Modules/Menu/Tests/EloquentMenuItemRepositoryTest.php
index 7db6f4754..d14b6f663 100644
--- a/Modules/Menu/Tests/EloquentMenuItemRepositoryTest.php
+++ b/Modules/Menu/Tests/EloquentMenuItemRepositoryTest.php
@@ -2,6 +2,12 @@
 
 namespace Modules\Menu\Tests;
 
+use Illuminate\Support\Facades\Event;
+use Modules\Menu\Events\MenuItemIsCreating;
+use Modules\Menu\Events\MenuItemIsUpdating;
+use Modules\Menu\Events\MenuItemWasCreated;
+use Modules\Menu\Events\MenuItemWasUpdated;
+
 class EloquentMenuItemRepositoryTest extends BaseMenuTest
 {
     public function setUp()
@@ -53,8 +59,105 @@ public function it_destroys_menu_item()
         $secondaryItem2 = $this->createMenuItemForMenu($menu2->id, 1);
         $secondaryItem3 = $this->createMenuItemForMenu($menu2->id, 3);
 
-        $this->assertEquals(6, $this->menuItem->all()->count());
+        $this->assertEquals(8, $this->menuItem->all()->count());
         $this->menuItem->destroy($item2);
-        $this->assertEquals(5, $this->menuItem->all()->count());
+        $this->assertEquals(7, $this->menuItem->all()->count());
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_item_was_created()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $item1 = $this->createMenuItemForMenu($menu->id, 0);
+
+        Event::assertDispatched(MenuItemWasCreated::class, function ($e) use ($item1) {
+            return $e->menuItem->id === $item1->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_item_is_creating()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $item1 = $this->createMenuItemForMenu($menu->id, 0);
+
+        Event::assertDispatched(MenuItemIsCreating::class, function ($e) use ($item1) {
+            return $e->getAttribute('target') === $item1->target;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_creating_event()
+    {
+        Event::listen(MenuItemIsCreating::class, function (MenuItemIsCreating $event) {
+            $event->setAttributes([
+                'target' => '_blank',
+                'en' => [
+                    'title' => 'My Title',
+                ],
+            ]);
+        });
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $item = $this->createMenuItemForMenu($menu->id, 0);
+
+        $this->assertEquals('_blank', $item->target);
+        $this->assertEquals('My Title', $item->translate('en')->title);
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_item_is_updated()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $item1 = $this->createMenuItemForMenu($menu->id, 0);
+
+        $this->menuItem->update($item1, []);
+
+        Event::assertDispatched(MenuItemWasUpdated::class, function ($e) use ($item1) {
+            return $e->menuItem->id === $item1->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_item_is_updating()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $item1 = $this->createMenuItemForMenu($menu->id, 0);
+
+        $this->menuItem->update($item1, []);
+
+        Event::assertDispatched(MenuItemIsUpdating::class, function ($e) use ($item1) {
+            return $e->getMenuItem()->id === $item1->id;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_before_updating_menu_item()
+    {
+        Event::listen(MenuItemIsUpdating::class, function (MenuItemIsUpdating $event) {
+            $event->setAttributes([
+                'target' => '_blank',
+                'en' => [
+                    'title' => 'My Title',
+                ],
+            ]);
+        });
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $item1 = $this->createMenuItemForMenu($menu->id, 0);
+
+        $this->menuItem->update($item1, [
+            'en' => ['title' => 'This one!'],
+        ]);
+
+        $this->assertEquals('My Title', $item1->translate('en')->title);
     }
 }
diff --git a/Modules/Menu/Tests/EloquentMenuRepositoryTest.php b/Modules/Menu/Tests/EloquentMenuRepositoryTest.php
new file mode 100644
index 000000000..9cd036510
--- /dev/null
+++ b/Modules/Menu/Tests/EloquentMenuRepositoryTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Modules\Menu\Tests;
+
+use Illuminate\Support\Facades\Event;
+use Modules\Menu\Events\MenuIsCreating;
+use Modules\Menu\Events\MenuIsUpdating;
+use Modules\Menu\Events\MenuWasCreated;
+use Modules\Menu\Events\MenuWasUpdated;
+
+class EloquentMenuRepositoryTest extends BaseMenuTest
+{
+    /** @test */
+    public function it_creates_menu()
+    {
+        $menu = $this->createMenu('main', 'Main Menu');
+
+        $this->assertEquals(1, $this->menu->find($menu->id)->count());
+        $this->assertEquals($menu->name, $this->menu->find($menu->id)->name);
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_was_created()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+
+        Event::assertDispatched(MenuWasCreated::class, function ($e) use ($menu) {
+            return $e->menu->id === $menu->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_is_creating()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+
+        Event::assertDispatched(MenuIsCreating::class, function ($e) use ($menu) {
+            return $e->getAttribute('name') === $menu->name;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_creating_event()
+    {
+        Event::listen(MenuIsCreating::class, function (MenuIsCreating $event) {
+            $event->setAttributes(['name' => 'MAIN']);
+        });
+
+        $menu = $this->createMenu('main', 'Main Menu');
+
+        $this->assertEquals('MAIN', $menu->name);
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_item_was_updated()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $this->menu->update($menu, []);
+
+        Event::assertDispatched(MenuWasUpdated::class, function ($e) use ($menu) {
+            return $e->menu->id === $menu->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_menu_is_updating()
+    {
+        Event::fake();
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $this->menu->update($menu, []);
+
+        Event::assertDispatched(MenuIsUpdating::class, function ($e) use ($menu) {
+            return $e->getMenu()->id === $menu->id;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_attributes_before_update()
+    {
+        Event::listen(MenuIsUpdating::class, function (MenuIsUpdating $event) {
+            $event->setAttributes(['name' => 'MAIN']);
+        });
+
+        $menu = $this->createMenu('main', 'Main Menu');
+        $this->menu->update($menu, ['name' => 'better-one']);
+
+        $this->assertEquals('MAIN', $menu->name);
+    }
+
+    /** @test */
+    public function it_should_create_root_item_when_creating_new_menu()
+    {
+        $menu = $this->createMenu('main', 'Main Menu');
+
+        $items = $this->menuItem->allRootsForMenu($menu->id);
+        $this->assertCount(1, $items);
+    }
+}
diff --git a/Modules/Menu/Tests/MenuItemUriGeneratorTest.php b/Modules/Menu/Tests/MenuItemUriGeneratorTest.php
index 8612e4598..134f19f6a 100644
--- a/Modules/Menu/Tests/MenuItemUriGeneratorTest.php
+++ b/Modules/Menu/Tests/MenuItemUriGeneratorTest.php
@@ -2,6 +2,7 @@
 
 namespace Modules\Menu\Tests;
 
+use Illuminate\Support\Facades\Event;
 use Modules\Menu\Services\MenuItemUriGenerator;
 use Modules\Page\Repositories\PageRepository;
 
@@ -42,6 +43,7 @@ public function it_generates_basic_uri_without_parent()
     /** @test */
     public function it_generates_uri_with_the_parents_slug()
     {
+        Event::fake();
         $this->page->create([
             'is_home' => 1,
             'template' => 'default',
@@ -80,6 +82,7 @@ public function it_generates_uri_with_the_parents_slug()
     /** @test */
     public function it_generates_uri_with_multiple_parents()
     {
+        Event::fake();
         $this->page->create([
             'is_home' => 1,
             'template' => 'default',
@@ -140,6 +143,7 @@ public function it_generates_uri_with_multiple_parents()
     /** @test */
     public function it_generates_a_uri_if_parent_isnt_a_page()
     {
+        Event::fake();
         $this->page->create([
             'is_home' => 0,
             'template' => 'default',
diff --git a/Modules/Menu/Tests/MenuRepositoryTest.php b/Modules/Menu/Tests/MenuRepositoryTest.php
deleted file mode 100644
index 9dc59c45b..000000000
--- a/Modules/Menu/Tests/MenuRepositoryTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Modules\Menu\Tests;
-
-class MenuRepositoryTest extends BaseMenuTest
-{
-    /** @test */
-    public function it_creates_menu()
-    {
-        $menu = $this->createMenu('main', 'Main Menu');
-
-        $this->assertEquals(1, $this->menu->find($menu->id)->count());
-        $this->assertEquals($menu->name, $this->menu->find($menu->id)->name);
-    }
-
-    public function it_should_create_root_item_when_creating_new_menu()
-    {
-        $menu = $this->createMenu('main', 'Main Menu');
-
-        $items = $this->menuItem->allRootsForMenu($menu->id);
-    }
-}
diff --git a/Modules/Menu/changelog.yml b/Modules/Menu/changelog.yml
index 5f940596b..3a7eece10 100644
--- a/Modules/Menu/changelog.yml
+++ b/Modules/Menu/changelog.yml
@@ -1,5 +1,14 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        added:
+            - Trigger event before a menu is created (<code>MenuIsCreating</code>) allow data to be changed
+            - Trigger event before a menu is updated (<code>MenuIsUpdating</code>) allow data to be changed
+            - Trigger event before a menu item is created (<code>MenuItemIsCreating</code>) allow data to be changed
+            - Trigger event before a menu item is updated (<code>MenuItemIsUpdating</code>) allow data to be changed
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.2.0":
         changed:
             - Only registering the menus for the frontend part.
diff --git a/Modules/Menu/module.json b/Modules/Menu/module.json
index c08ec8727..778f51266 100644
--- a/Modules/Menu/module.json
+++ b/Modules/Menu/module.json
@@ -4,7 +4,7 @@
   "description": "Managing menus.",
   "keywords": [
   ],
-  "version": "2.0.0",
+  "version": "2.5.0",
   "active": 1,
   "order": 1,
   "providers": [
diff --git a/Modules/Page/Assets/.gitkeep b/Modules/Page/Assets/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Modules/Page/Console/.gitkeep b/Modules/Page/Console/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Modules/Page/Entities/PageTranslation.php b/Modules/Page/Entities/PageTranslation.php
index fd3ed17ab..bd73acb15 100644
--- a/Modules/Page/Entities/PageTranslation.php
+++ b/Modules/Page/Entities/PageTranslation.php
@@ -3,6 +3,7 @@
 namespace Modules\Page\Entities;
 
 use Illuminate\Database\Eloquent\Model;
+use Modules\Page\Events\ContentIsRendering;
 
 class PageTranslation extends Model
 {
@@ -20,4 +21,11 @@ class PageTranslation extends Model
         'og_image',
         'og_type',
     ];
+
+    public function getBodyAttribute($body)
+    {
+        event($event = new ContentIsRendering($body));
+
+        return $event->getBody();
+    }
 }
diff --git a/Modules/Page/Events/ContentIsRendering.php b/Modules/Page/Events/ContentIsRendering.php
new file mode 100644
index 000000000..5986a51bb
--- /dev/null
+++ b/Modules/Page/Events/ContentIsRendering.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Modules\Page\Events;
+
+class ContentIsRendering
+{
+    /**
+     * @var string The body of the page to render
+     */
+    private $body;
+    private $original;
+
+    public function __construct($body)
+    {
+        $this->body = $body;
+        $this->original = $body;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * @param string $body
+     */
+    public function setBody($body)
+    {
+        $this->body = $body;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOriginal()
+    {
+        return $this->original;
+    }
+
+    public function __toString()
+    {
+        return $this->getBody();
+    }
+}
diff --git a/Modules/Page/Events/PageIsCreating.php b/Modules/Page/Events/PageIsCreating.php
new file mode 100644
index 000000000..f2acb95d0
--- /dev/null
+++ b/Modules/Page/Events/PageIsCreating.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\Page\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+class PageIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
+}
diff --git a/Modules/Page/Events/PageIsUpdating.php b/Modules/Page/Events/PageIsUpdating.php
new file mode 100644
index 000000000..2353d0252
--- /dev/null
+++ b/Modules/Page/Events/PageIsUpdating.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Page\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+use Modules\Page\Entities\Page;
+
+class PageIsUpdating extends AbstractEntityHook implements EntityIsChanging
+{
+    /**
+     * @var Page
+     */
+    private $page;
+
+    public function __construct(Page $page, array $attributes)
+    {
+        $this->page = $page;
+        parent::__construct($attributes);
+    }
+
+    /**
+     * @return Page
+     */
+    public function getPage()
+    {
+        return $this->page;
+    }
+}
diff --git a/Modules/Page/Http/Controllers/.gitkeep b/Modules/Page/Http/Controllers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Modules/Page/Http/Controllers/Admin/PageController.php b/Modules/Page/Http/Controllers/Admin/PageController.php
index 6e644d04f..dd5330581 100644
--- a/Modules/Page/Http/Controllers/Admin/PageController.php
+++ b/Modules/Page/Http/Controllers/Admin/PageController.php
@@ -20,7 +20,6 @@ public function __construct(PageRepository $page)
         parent::__construct();
 
         $this->page = $page;
-        $this->assetPipeline->requireCss('icheck.blue.css');
     }
 
     public function index()
@@ -37,8 +36,6 @@ public function index()
      */
     public function create()
     {
-        $this->assetPipeline->requireJs('ckeditor.js');
-
         return view('page::admin.create');
     }
 
@@ -64,8 +61,6 @@ public function store(CreatePageRequest $request)
      */
     public function edit(Page $page)
     {
-        $this->assetPipeline->requireJs('ckeditor.js');
-
         return view('page::admin.edit', compact('page'));
     }
 
diff --git a/Modules/Page/Http/Filters/.gitkeep b/Modules/Page/Http/Filters/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Modules/Page/Providers/.gitkeep b/Modules/Page/Providers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Modules/Page/Providers/PageServiceProvider.php b/Modules/Page/Providers/PageServiceProvider.php
index 47721435a..3e5df72f0 100644
--- a/Modules/Page/Providers/PageServiceProvider.php
+++ b/Modules/Page/Providers/PageServiceProvider.php
@@ -4,10 +4,12 @@
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
+use Modules\Core\Events\CollectingAssets;
 use Modules\Core\Traits\CanPublishConfiguration;
 use Modules\Page\Entities\Page;
 use Modules\Page\Repositories\Cache\CachePageDecorator;
 use Modules\Page\Repositories\Eloquent\EloquentPageRepository;
+use Modules\Page\Repositories\PageRepository;
 use Modules\Page\Services\FinderService;
 use Modules\Tag\Repositories\TagManager;
 
@@ -38,6 +40,8 @@ public function boot()
 
         $this->app[TagManager::class]->registerNamespace(new Page());
         $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
+
+        $this->handleAssets();
     }
 
     /**
@@ -56,17 +60,27 @@ private function registerBindings()
             return new FinderService();
         });
 
-        $this->app->bind(
-            'Modules\Page\Repositories\PageRepository',
-            function () {
-                $repository = new EloquentPageRepository(new Page());
+        $this->app->bind(PageRepository::class, function () {
+            $repository = new EloquentPageRepository(new Page());
+
+            if (! Config::get('app.cache')) {
+                return $repository;
+            }
 
-                if (! Config::get('app.cache')) {
-                    return $repository;
-                }
+            return new CachePageDecorator($repository);
+        });
+    }
 
-                return new CachePageDecorator($repository);
+    /**
+     * Require iCheck on edit and create pages
+     */
+    private function handleAssets()
+    {
+        $this->app['events']->listen(CollectingAssets::class, function (CollectingAssets $event) {
+            if ($event->onRoutes(['*page*create', '*page*edit'])) {
+                $event->requireCss('icheck.blue.css');
+                $event->requireJs('icheck.js');
             }
-        );
+        });
     }
 }
diff --git a/Modules/Page/Repositories/Eloquent/EloquentPageRepository.php b/Modules/Page/Repositories/Eloquent/EloquentPageRepository.php
index 8d2088b0c..6cb9d5951 100644
--- a/Modules/Page/Repositories/Eloquent/EloquentPageRepository.php
+++ b/Modules/Page/Repositories/Eloquent/EloquentPageRepository.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
+use Modules\Page\Events\PageIsCreating;
+use Modules\Page\Events\PageIsUpdating;
 use Modules\Page\Events\PageWasCreated;
 use Modules\Page\Events\PageWasDeleted;
 use Modules\Page\Events\PageWasUpdated;
@@ -38,7 +40,9 @@ public function create($data)
         if (array_get($data, 'is_home') === '1') {
             $this->removeOtherHomepage();
         }
-        $page = $this->model->create($data);
+
+        event($event = new PageIsCreating($data));
+        $page = $this->model->create($event->getAttributes());
 
         event(new PageWasCreated($page->id, $data));
 
@@ -57,7 +61,9 @@ public function update($model, $data)
         if (array_get($data, 'is_home') === '1') {
             $this->removeOtherHomepage($model->id);
         }
-        $model->update($data);
+
+        event($event = new PageIsUpdating($model, $data));
+        $model->update($event->getAttributes());
 
         event(new PageWasUpdated($model->id, $data));
 
diff --git a/Modules/Page/Resources/views/admin/create.blade.php b/Modules/Page/Resources/views/admin/create.blade.php
index cab086fc7..db5c10b37 100644
--- a/Modules/Page/Resources/views/admin/create.blade.php
+++ b/Modules/Page/Resources/views/admin/create.blade.php
@@ -11,13 +11,13 @@
     </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .checkbox label {
             padding-left: 0;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
     {!! Form::open(['route' => ['admin.page.page.store'], 'method' => 'post']) !!}
@@ -87,7 +87,7 @@ class="flat-blue"
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script>
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -101,4 +101,4 @@ class="flat-blue"
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Page/Resources/views/admin/edit.blade.php b/Modules/Page/Resources/views/admin/edit.blade.php
index d43df1722..27f53d800 100644
--- a/Modules/Page/Resources/views/admin/edit.blade.php
+++ b/Modules/Page/Resources/views/admin/edit.blade.php
@@ -11,13 +11,13 @@
     </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .checkbox label {
             padding-left: 0;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
     {!! Form::open(['route' => ['admin.page.page.update', $page->id], 'method' => 'put']) !!}
@@ -94,7 +94,7 @@ class="flat-blue"
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script>
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -108,4 +108,4 @@ class="flat-blue"
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Page/Resources/views/admin/index.blade.php b/Modules/Page/Resources/views/admin/index.blade.php
index 58b8d6967..aaef45527 100644
--- a/Modules/Page/Resources/views/admin/index.blade.php
+++ b/Modules/Page/Resources/views/admin/index.blade.php
@@ -98,7 +98,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <?php $locale = App::getLocale(); ?>
     <script type="text/javascript">
         $( document ).ready(function() {
@@ -123,4 +123,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Page/Resources/views/admin/partials/create-fields.blade.php b/Modules/Page/Resources/views/admin/partials/create-fields.blade.php
index f23b6a2ad..31699930d 100644
--- a/Modules/Page/Resources/views/admin/partials/create-fields.blade.php
+++ b/Modules/Page/Resources/views/admin/partials/create-fields.blade.php
@@ -10,11 +10,9 @@
             {!! Form::text("{$lang}[slug]", old("{$lang}.slug"), ['class' => 'form-control slug', 'data-slug' => 'target', 'placeholder' => trans('page::pages.form.slug')]) !!}
             {!! $errors->first("{$lang}.slug", '<span class="help-block">:message</span>') !!}
         </div>
-        <div class='{{ $errors->has("{$lang}.body") ? ' has-error' : '' }}'>
-            {!! Form::label("{$lang}[body]", trans('page::pages.form.body')) !!}
-            <textarea class="ckeditor" name="{{$lang}}[body]" rows="10" cols="80">{{ old("{$lang}.body") }}</textarea>
-            {!! $errors->first("{$lang}.body", '<span class="help-block">:message</span>') !!}
-        </div>
+
+        @editor('body', trans('page::pages.form.body'), old("{$lang}.body"), $lang)
+
         <?php if (config('asgard.page.config.partials.translatable.create') !== []): ?>
             <?php foreach (config('asgard.page.config.partials.translatable.create') as $partial): ?>
                 @include($partial)
diff --git a/Modules/Page/Resources/views/admin/partials/edit-fields.blade.php b/Modules/Page/Resources/views/admin/partials/edit-fields.blade.php
index 176a19aba..09871ce56 100644
--- a/Modules/Page/Resources/views/admin/partials/edit-fields.blade.php
+++ b/Modules/Page/Resources/views/admin/partials/edit-fields.blade.php
@@ -12,14 +12,10 @@
             {!! Form::text("{$lang}[slug]", old("{$lang}.slug", $old), ['class' => 'form-control slug', 'data-slug' => 'target', 'placeholder' => trans('page::pages.form.slug')]) !!}
             {!! $errors->first("{$lang}.slug", '<span class="help-block">:message</span>') !!}
         </div>
-        <div class='{{ $errors->has("{$lang}.body") ? ' has-error' : '' }}'>
-            {!! Form::label("{$lang}[body]", trans('page::pages.form.body')) !!}
-            <?php $old = $page->hasTranslation($lang) ? $page->translate($lang)->body : '' ?>
-            <textarea class="ckeditor" name="{{$lang}}[body]" rows="10" cols="80">
-                {!! old("$lang.body", $old) !!}
-            </textarea>
-            {!! $errors->first("{$lang}.body", '<span class="help-block">:message</span>') !!}
-        </div>
+
+        <?php $old = $page->hasTranslation($lang) ? $page->translate($lang)->body : '' ?>
+        @editor('body', trans('page::pages.form.body'), old("$lang.body", $old), $lang)
+
         <?php if (config('asgard.page.config.partials.translatable.edit') !== []): ?>
             <?php foreach (config('asgard.page.config.partials.translatable.edit') as $partial): ?>
                 @include($partial)
diff --git a/Modules/Page/Tests/ContentIsRenderingTest.php b/Modules/Page/Tests/ContentIsRenderingTest.php
new file mode 100644
index 000000000..4d768ce17
--- /dev/null
+++ b/Modules/Page/Tests/ContentIsRenderingTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Modules\Page\Tests;
+
+use Illuminate\Support\Facades\Event;
+use Modules\Page\Events\ContentIsRendering;
+
+class ContentIsRenderingTest extends BasePageTest
+{
+    /** @test */
+    public function it_can_change_final_content()
+    {
+        Event::listen(ContentIsRendering::class, function (ContentIsRendering $event) {
+            $event->setBody('<strong>' . $event->getOriginal() . '</strong>');
+        });
+
+        $page = $this->createPage();
+
+        $this->assertEquals('<strong>My Page Body</strong>', $page->body);
+    }
+
+    /** @test */
+    public function it_doesnt_alter_content_if_no_listeners()
+    {
+        $page = $this->createPage();
+
+        $this->assertEquals('My Page Body', $page->body);
+    }
+
+    private function createPage()
+    {
+        return $this->page->create([
+            'is_home' => '1',
+            'template' => 'default',
+            'en' => [
+                'title' => 'My Other Page',
+                'slug' => 'my-other-page',
+                'body' => 'My Page Body',
+            ],
+        ]);
+    }
+}
diff --git a/Modules/Page/Tests/PagesTest.php b/Modules/Page/Tests/EloquentPageRepositoryTest.php
similarity index 65%
rename from Modules/Page/Tests/PagesTest.php
rename to Modules/Page/Tests/EloquentPageRepositoryTest.php
index 93fabd4fa..0ad843c74 100644
--- a/Modules/Page/Tests/PagesTest.php
+++ b/Modules/Page/Tests/EloquentPageRepositoryTest.php
@@ -3,11 +3,13 @@
 namespace Modules\Page\Tests;
 
 use Illuminate\Support\Facades\Event;
+use Modules\Page\Events\PageIsCreating;
+use Modules\Page\Events\PageIsUpdating;
 use Modules\Page\Events\PageWasCreated;
 use Modules\Page\Events\PageWasDeleted;
 use Modules\Page\Events\PageWasUpdated;
 
-class PagesTest extends BasePageTest
+class EloquentPageRepositoryTest extends BasePageTest
 {
     /** @test */
     public function it_makes_page_as_homepage()
@@ -93,6 +95,57 @@ public function it_triggers_event_when_page_was_created()
         });
     }
 
+    /** @test */
+    public function it_triggers_an_event_when_page_is_creating()
+    {
+        Event::fake();
+
+        $page = $this->createPage();
+
+        Event::assertDispatched(PageIsCreating::class, function ($e) use ($page) {
+            return $e->getAttribute('template') === $page->template;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_page_data_before_creating_page()
+    {
+        Event::listen(PageIsCreating::class, function (PageIsCreating $event) {
+            $event->setAttributes(['template' => 'better-tpl']);
+        });
+
+        $page = $this->createPage();
+
+        $this->assertEquals('better-tpl', $page->template);
+    }
+
+    /** @test */
+    public function it_triggers_an_event_when_page_is_updating()
+    {
+        Event::fake();
+        $page = $this->createPage();
+
+        $this->page->update($page, ['en' => ['title' => 'Better!']]);
+
+        Event::assertDispatched(PageIsUpdating::class, function ($e) use ($page) {
+            return $e->getPage()->id === $page->id;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_page_data_before_updating_page()
+    {
+        Event::listen(PageIsUpdating::class, function (PageIsUpdating $event) {
+            $event->setAttributes(['template' => 'better-tpl']);
+        });
+
+        $page = $this->createPage();
+        $this->page->update($page, ['template' => 'my-template', 'en' => ['title' => 'Better!']]);
+
+        $this->assertEquals('better-tpl', $page->template);
+    }
+
+
     /** @test */
     public function it_triggers_event_when_page_was_updated()
     {
@@ -135,4 +188,17 @@ public function it_triggers_event_when_page_was_deleted()
             return $e->page->id === $page->id;
         });
     }
+
+    private function createPage()
+    {
+        return $this->page->create([
+            'is_home' => '1',
+            'template' => 'default',
+            'en' => [
+                'title' => 'My Other Page',
+                'slug' => 'my-other-page',
+                'body' => 'My Page Body',
+            ],
+        ]);
+    }
 }
diff --git a/Modules/Page/changelog.yml b/Modules/Page/changelog.yml
index e591c7c7d..f6e372b10 100644
--- a/Modules/Page/changelog.yml
+++ b/Modules/Page/changelog.yml
@@ -1,5 +1,16 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        added:
+            - Trigger event before a page is created (<code>PageIsCreating</code>) allow data to be changed
+            - Trigger event before a page is updated (<code>PageIsUpdating</code>) allow data to be changed
+        changed:
+            - Requiring the editor assets via hook
+            - Making editor textarea dynamic
+            - Using the new <code>@editor</code> blade directive for the body textarea field
+            - Remove the ckeditor inclusion on create/edit view stubs
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.2.0":
         added:
             - Testing event trigger on page deletion
diff --git a/Modules/Page/module.json b/Modules/Page/module.json
index d02a59da5..01baafdcb 100644
--- a/Modules/Page/module.json
+++ b/Modules/Page/module.json
@@ -3,7 +3,7 @@
     "alias": "page",
     "description": "Managing pages.",
     "keywords": [],
-    "version": "2.0.0",
+    "version": "2.5.0",
     "active": 1,
     "order": 9999,
     "providers": [
diff --git a/Modules/Setting/Events/SettingIsCreating.php b/Modules/Setting/Events/SettingIsCreating.php
new file mode 100644
index 000000000..d5ae59f22
--- /dev/null
+++ b/Modules/Setting/Events/SettingIsCreating.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Modules\Setting\Events;
+
+class SettingIsCreating
+{
+    private $settingName;
+    private $settingValues;
+    private $original;
+
+    public function __construct($settingName, $settingValues)
+    {
+        $this->settingName = $settingName;
+        $this->settingValues = $settingValues;
+        $this->original = $settingValues;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSettingName()
+    {
+        return $this->settingName;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSettingValues()
+    {
+        return $this->settingValues;
+    }
+
+    /**
+     * @param mixed $settingValues
+     */
+    public function setSettingValues($settingValues)
+    {
+        $this->settingValues = $settingValues;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOriginal()
+    {
+        return $this->original;
+    }
+}
diff --git a/Modules/Setting/Events/SettingIsUpdating.php b/Modules/Setting/Events/SettingIsUpdating.php
new file mode 100644
index 000000000..30aa4f56e
--- /dev/null
+++ b/Modules/Setting/Events/SettingIsUpdating.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Modules\Setting\Events;
+
+use Modules\Setting\Entities\Setting;
+
+class SettingIsUpdating
+{
+    private $settingName;
+    private $settingValues;
+    private $original;
+    /**
+     * @var Setting
+     */
+    private $setting;
+
+    public function __construct(Setting $setting, $settingName, $settingValues)
+    {
+        $this->settingName = $settingName;
+        $this->settingValues = $settingValues;
+        $this->original = $settingValues;
+        $this->setting = $setting;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSettingName()
+    {
+        return $this->settingName;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSettingValues()
+    {
+        return $this->settingValues;
+    }
+
+    /**
+     * @param mixed $settingValues
+     */
+    public function setSettingValues($settingValues)
+    {
+        $this->settingValues = $settingValues;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getOriginal()
+    {
+        return $this->original;
+    }
+
+    /**
+     * @return Setting
+     */
+    public function getSetting()
+    {
+        return $this->setting;
+    }
+}
diff --git a/Modules/Setting/Events/SettingWasCreated.php b/Modules/Setting/Events/SettingWasCreated.php
index 70d48b6a2..b10d6b99b 100644
--- a/Modules/Setting/Events/SettingWasCreated.php
+++ b/Modules/Setting/Events/SettingWasCreated.php
@@ -2,30 +2,17 @@
 
 namespace Modules\Setting\Events;
 
+use Modules\Setting\Entities\Setting;
+
 class SettingWasCreated
 {
     /**
-     * @var bool
-     */
-    public $isTranslatable;
-    /**
-     * @var string Setting name
+     * @var Setting
      */
-    public $name;
-    /**
-     * @var string|array
-     */
-    public $values;
+    public $setting;
 
-    /**
-     * @param $name
-     * @param $isTranslatable
-     * @param $values
-     */
-    public function __construct($name, $isTranslatable, $values)
+    public function __construct(Setting $setting)
     {
-        $this->isTranslatable = $isTranslatable;
-        $this->name = $name;
-        $this->values = $values;
+        $this->setting = $setting;
     }
 }
diff --git a/Modules/Setting/Events/SettingWasUpdated.php b/Modules/Setting/Events/SettingWasUpdated.php
index 41a4de265..7a0da6a55 100644
--- a/Modules/Setting/Events/SettingWasUpdated.php
+++ b/Modules/Setting/Events/SettingWasUpdated.php
@@ -2,30 +2,17 @@
 
 namespace Modules\Setting\Events;
 
+use Modules\Setting\Entities\Setting;
+
 class SettingWasUpdated
 {
     /**
-     * @var string The setting name
-     */
-    public $name;
-    /**
-     * @var string|array
-     */
-    public $values;
-    /**
-     * @var string|array Containing the old values
-     */
-    public $oldValues;
-    /**
-     * @var bool
+     * @var Setting
      */
-    public $isTranslatable;
+    public $setting;
 
-    public function __construct($name, $isTranslatable, $values, $oldValues = null)
+    public function __construct(Setting $setting)
     {
-        $this->name = $name;
-        $this->isTranslatable = $isTranslatable;
-        $this->values = $values;
-        $this->oldValues = $oldValues;
+        $this->setting = $setting;
     }
 }
diff --git a/Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php b/Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php
index 623b9cc7a..27e46d7bb 100644
--- a/Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php
+++ b/Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Support\Facades\Config;
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
+use Modules\Setting\Entities\Setting;
+use Modules\Setting\Events\SettingIsCreating;
+use Modules\Setting\Events\SettingIsUpdating;
 use Modules\Setting\Events\SettingWasCreated;
 use Modules\Setting\Events\SettingWasUpdated;
 use Modules\Setting\Repositories\SettingRepository;
@@ -77,23 +80,28 @@ public function findByName($settingName)
      * Create a setting with the given name
      * @param string $settingName
      * @param $settingValues
+     * @return Setting
      */
     private function createForName($settingName, $settingValues)
     {
+        event($event = new SettingIsCreating($settingName, $settingValues));
+
         $setting = new $this->model();
         $setting->name = $settingName;
 
         if ($this->isTranslatableSetting($settingName)) {
             $setting->isTranslatable = true;
-            $this->setTranslatedAttributes($settingValues, $setting);
-            event(new SettingWasCreated($settingName, true, $settingValues));
+            $this->setTranslatedAttributes($event->getSettingValues(), $setting);
         } else {
             $setting->isTranslatable = false;
-            $setting->plainValue = $this->getSettingPlainValue($settingValues);
-            event(new SettingWasCreated($settingName, false, $settingValues));
+            $setting->plainValue = $this->getSettingPlainValue($event->getSettingValues());
         }
 
-        return $setting->save();
+        $setting->save();
+
+        event(new SettingWasCreated($setting));
+
+        return $setting;
     }
 
     /**
@@ -104,17 +112,18 @@ private function createForName($settingName, $settingValues)
     private function updateSetting($setting, $settingValues)
     {
         $name = $setting->name;
+        event($event = new SettingIsUpdating($setting, $name, $settingValues));
 
         if ($this->isTranslatableSetting($name)) {
-            $this->setTranslatedAttributes($settingValues, $setting);
-            event(new SettingWasUpdated($name, true, $settingValues));
+            $this->setTranslatedAttributes($event->getSettingValues(), $setting);
         } else {
-            $oldValues = $setting->plainValue;
-            $setting->plainValue = $this->getSettingPlainValue($settingValues);
-            event(new SettingWasUpdated($name, false, $settingValues, $oldValues));
+            $setting->plainValue = $this->getSettingPlainValue($event->getSettingValues());
         }
+        $setting->save();
+
+        event(new SettingWasUpdated($setting));
 
-        return $setting->save();
+        return $setting;
     }
 
     /**
diff --git a/Modules/Setting/Resources/views/admin/module-settings.blade.php b/Modules/Setting/Resources/views/admin/module-settings.blade.php
index 8e1640d5c..58d8b72ee 100644
--- a/Modules/Setting/Resources/views/admin/module-settings.blade.php
+++ b/Modules/Setting/Resources/views/admin/module-settings.blade.php
@@ -79,7 +79,7 @@ class="{{ $module == $currentModule->getLowerName() ? 'active' : '' }}">
 {!! Form::close() !!}
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $('input[type="checkbox"].flat-blue, input[type="radio"].flat-blue').iCheck({
@@ -98,4 +98,4 @@ class="{{ $module == $currentModule->getLowerName() ? 'active' : '' }}">
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Setting/Tests/EloquentSettingRepositoryTest.php b/Modules/Setting/Tests/EloquentSettingRepositoryTest.php
index ca1da43b8..021d49bff 100644
--- a/Modules/Setting/Tests/EloquentSettingRepositoryTest.php
+++ b/Modules/Setting/Tests/EloquentSettingRepositoryTest.php
@@ -2,6 +2,12 @@
 
 namespace Modules\Setting\Tests;
 
+use Illuminate\Support\Facades\Event;
+use Modules\Setting\Events\SettingIsCreating;
+use Modules\Setting\Events\SettingIsUpdating;
+use Modules\Setting\Events\SettingWasCreated;
+use Modules\Setting\Events\SettingWasUpdated;
+
 class EloquentSettingRepositoryTest extends BaseSettingTest
 {
     public function setUp()
@@ -111,4 +117,147 @@ public function it_encodes_array_of_non_translatable_data()
         $this->assertEquals('core::locales', $setting->name);
         $this->assertEquals('["su","bi","bs"]', $setting->plainValue);
     }
+
+    /** @test */
+    public function it_triggers_event_when_setting_was_created()
+    {
+        Event::fake();
+
+        $data = [
+            'core::template' => 'asgard',
+            'core::site-name' => [
+                'en' => 'AsgardCMS_en',
+                'fr' => 'AsgardCMS_fr',
+            ],
+        ];
+        $this->settingRepository->createOrUpdate($data);
+
+        Event::assertDispatched(SettingWasCreated::class, function ($e) {
+            return $e->setting->name === 'core::template';
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_setting_is_creating()
+    {
+        Event::fake();
+
+        $data = [
+            'core::template' => 'asgard',
+            'core::site-name' => [
+                'en' => 'AsgardCMS_en',
+                'fr' => 'AsgardCMS_fr',
+            ],
+        ];
+        $this->settingRepository->createOrUpdate($data);
+
+        Event::assertDispatched(SettingIsCreating::class, function (SettingIsCreating $e) {
+            return $e->getSettingName() === 'core::template' && $e->getSettingValues() === 'asgard';
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_creating_event()
+    {
+        Event::listen(SettingIsCreating::class, function (SettingIsCreating $event) {
+            if ($event->getSettingName() === 'core::template') {
+                $event->setSettingValues('my-template');
+            }
+            if ($event->getSettingName() === 'core::site-name') {
+                $event->setSettingValues([
+                    'en' => 'English AsgardCMS'
+                ]);
+            }
+        });
+
+        $data = [
+            'core::template' => 'asgard',
+            'blog::posts' => 10,
+            'core::site-name' => [
+                'en' => 'AsgardCMS_en',
+                'fr' => 'AsgardCMS_fr',
+            ],
+        ];
+        $this->settingRepository->createOrUpdate($data);
+
+        $this->assertEquals('my-template', $this->settingRepository->findByName('core::template')->plainValue);
+        $this->assertEquals(10, $this->settingRepository->findByName('blog::posts')->plainValue);
+        $this->assertEquals('English AsgardCMS', $this->settingRepository->findByName('core::site-name')->translate('en')->value);
+    }
+
+    /** @test */
+    public function it_triggers_event_when_setting_was_updated()
+    {
+        Event::fake();
+
+        $data = [
+            'core::template' => 'asgard',
+            'core::site-name' => [
+                'en' => 'AsgardCMS_en',
+                'fr' => 'AsgardCMS_fr',
+            ],
+        ];
+        $this->settingRepository->createOrUpdate($data);
+        $this->settingRepository->createOrUpdate(['core::template' => 'flatly']);
+
+        Event::assertDispatched(SettingWasUpdated::class, function ($e) {
+            return $e->setting->name === 'core::template';
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_setting_is_updating()
+    {
+        Event::fake();
+
+        $data = [
+            'core::template' => 'asgard',
+            'core::site-name' => [
+                'en' => 'AsgardCMS_en',
+                'fr' => 'AsgardCMS_fr',
+            ],
+        ];
+        $this->settingRepository->createOrUpdate($data);
+        $this->settingRepository->createOrUpdate(['core::template' => 'flatly']);
+
+        Event::assertDispatched(SettingIsUpdating::class, function ($e) {
+            return $e->getSetting()->name === 'core::template';
+        });
+    }
+
+    /** @test */
+    public function it_can_change_date_when_updating_setting()
+    {
+        Event::listen(SettingIsUpdating::class, function (SettingIsUpdating $event) {
+            if ($event->getSettingName() === 'core::template') {
+                $event->setSettingValues('my-template');
+            }
+            if ($event->getSettingName() === 'core::site-name') {
+                $event->setSettingValues([
+                    'en' => 'English AsgardCMS'
+                ]);
+            }
+        });
+
+        $data = [
+            'core::template' => 'asgard',
+            'blog::posts' => 10,
+            'core::site-name' => [
+                'en' => 'AsgardCMS_en',
+                'fr' => 'AsgardCMS_fr',
+            ],
+        ];
+        $this->settingRepository->createOrUpdate($data);
+        $this->settingRepository->createOrUpdate([
+            'core::template' => 'flatly',
+            'core::site-name' => [
+                'en' => 'The AsgardCMS_en',
+                'fr' => 'The AsgardCMS_fr',
+            ],
+        ]);
+
+        $this->assertEquals('my-template', $this->settingRepository->findByName('core::template')->plainValue);
+        $this->assertEquals(10, $this->settingRepository->findByName('blog::posts')->plainValue);
+        $this->assertEquals('English AsgardCMS', $this->settingRepository->findByName('core::site-name')->translate('en')->value);
+    }
 }
diff --git a/Modules/Setting/changelog.yml b/Modules/Setting/changelog.yml
index 6cef67b54..44fbcca32 100644
--- a/Modules/Setting/changelog.yml
+++ b/Modules/Setting/changelog.yml
@@ -1,5 +1,14 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        changed:
+            - Normalise the setting was created event
+            - Normalise the setting was updated event
+            - Trigger <code>SettingIsCreating</code> hook
+            - Trigger <code>SettingIsUpdating</code> hook
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.0.0":
         added:
             - Laravel 5.2 compatibility
diff --git a/Modules/Setting/module.json b/Modules/Setting/module.json
index ee3085053..f89af1c65 100644
--- a/Modules/Setting/module.json
+++ b/Modules/Setting/module.json
@@ -6,7 +6,7 @@
         "asgardcms",
         "settings"
     ],
-    "version": "2.0.0",
+    "version": "2.5.0",
     "active": 1,
     "order": 1,
     "providers": [
diff --git a/Modules/Tag/Events/TagIsCreating.php b/Modules/Tag/Events/TagIsCreating.php
new file mode 100644
index 000000000..5a42277bf
--- /dev/null
+++ b/Modules/Tag/Events/TagIsCreating.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\Tag\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+class TagIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
+}
diff --git a/Modules/Tag/Events/TagIsUpdating.php b/Modules/Tag/Events/TagIsUpdating.php
new file mode 100644
index 000000000..88f06e00a
--- /dev/null
+++ b/Modules/Tag/Events/TagIsUpdating.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Tag\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+use Modules\Tag\Entities\Tag;
+
+class TagIsUpdating extends AbstractEntityHook implements EntityIsChanging
+{
+    /**
+     * @var Tag
+     */
+    private $tag;
+
+    public function __construct(Tag $tag, $attributes)
+    {
+        $this->tag = $tag;
+        parent::__construct($attributes);
+    }
+
+    /**
+     * @return Tag
+     */
+    public function getTag()
+    {
+        return $this->tag;
+    }
+}
diff --git a/Modules/Tag/Events/TagWasCreated.php b/Modules/Tag/Events/TagWasCreated.php
new file mode 100644
index 000000000..99ac7d1df
--- /dev/null
+++ b/Modules/Tag/Events/TagWasCreated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Tag\Events;
+
+use Modules\Tag\Entities\Tag;
+
+class TagWasCreated
+{
+    /**
+     * @var Tag
+     */
+    public $tag;
+
+    public function __construct(Tag $tag)
+    {
+        $this->tag = $tag;
+    }
+}
diff --git a/Modules/Tag/Events/TagWasUpdated.php b/Modules/Tag/Events/TagWasUpdated.php
new file mode 100644
index 000000000..6184fb8fa
--- /dev/null
+++ b/Modules/Tag/Events/TagWasUpdated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Tag\Events;
+
+use Modules\Tag\Entities\Tag;
+
+class TagWasUpdated
+{
+    /**
+     * @var Tag
+     */
+    public $tag;
+
+    public function __construct(Tag $tag)
+    {
+        $this->tag = $tag;
+    }
+}
diff --git a/Modules/Tag/Repositories/Eloquent/EloquentTagRepository.php b/Modules/Tag/Repositories/Eloquent/EloquentTagRepository.php
index 6fcb96d84..ce1a8c872 100644
--- a/Modules/Tag/Repositories/Eloquent/EloquentTagRepository.php
+++ b/Modules/Tag/Repositories/Eloquent/EloquentTagRepository.php
@@ -3,6 +3,10 @@
 namespace Modules\Tag\Repositories\Eloquent;
 
 use Modules\Core\Repositories\Eloquent\EloquentBaseRepository;
+use Modules\Tag\Events\TagIsCreating;
+use Modules\Tag\Events\TagIsUpdating;
+use Modules\Tag\Events\TagWasCreated;
+use Modules\Tag\Events\TagWasUpdated;
 use Modules\Tag\Repositories\TagRepository;
 
 class EloquentTagRepository extends EloquentBaseRepository implements TagRepository
@@ -16,4 +20,25 @@ public function allForNamespace($namespace)
     {
         return $this->model->with('translations')->where('namespace', $namespace)->get();
     }
+
+    public function create($data)
+    {
+        event($event = new TagIsCreating($data));
+        $tag = $this->model->create($event->getAttributes());
+
+        event(new TagWasCreated($tag));
+
+        return $tag;
+    }
+
+    public function update($tag, $data)
+    {
+        event($event = new TagIsUpdating($tag, $data));
+        $tag->update($event->getAttributes());
+
+        event(new TagWasUpdated($tag));
+
+        return $tag;
+    }
+
 }
diff --git a/Modules/Tag/Resources/views/admin/tags/create.blade.php b/Modules/Tag/Resources/views/admin/tags/create.blade.php
index 46aa65c05..d04130866 100644
--- a/Modules/Tag/Resources/views/admin/tags/create.blade.php
+++ b/Modules/Tag/Resources/views/admin/tags/create.blade.php
@@ -11,9 +11,6 @@
     </ol>
 @stop
 
-@section('styles')
-@stop
-
 @section('content')
     {!! Form::open(['route' => ['admin.tag.tag.store'], 'method' => 'post']) !!}
     <div class="row">
@@ -61,7 +58,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script type="text/javascript">
         $( document ).ready(function() {
             $('.selectize').selectize();
@@ -80,4 +77,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Tag/Resources/views/admin/tags/edit.blade.php b/Modules/Tag/Resources/views/admin/tags/edit.blade.php
index 3d8deb6dd..9e24c027c 100644
--- a/Modules/Tag/Resources/views/admin/tags/edit.blade.php
+++ b/Modules/Tag/Resources/views/admin/tags/edit.blade.php
@@ -11,10 +11,6 @@
     </ol>
 @stop
 
-@section('styles')
-    {!! Theme::script('js/vendor/ckeditor/ckeditor.js') !!}
-@stop
-
 @section('content')
     {!! Form::open(['route' => ['admin.tag.tag.update', $tag->id], 'method' => 'put']) !!}
     <div class="row">
@@ -62,7 +58,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script type="text/javascript">
         $( document ).ready(function() {
             $('.selectize').selectize();
@@ -81,4 +77,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Tag/Resources/views/admin/tags/index.blade.php b/Modules/Tag/Resources/views/admin/tags/index.blade.php
index 876bba18f..41bc6669f 100644
--- a/Modules/Tag/Resources/views/admin/tags/index.blade.php
+++ b/Modules/Tag/Resources/views/admin/tags/index.blade.php
@@ -83,7 +83,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script type="text/javascript">
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -110,4 +110,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Tag/Tests/Integration/EloquentTagRepositoryTest.php b/Modules/Tag/Tests/Integration/EloquentTagRepositoryTest.php
new file mode 100644
index 000000000..052930d6f
--- /dev/null
+++ b/Modules/Tag/Tests/Integration/EloquentTagRepositoryTest.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Modules\Tag\Tests\Integration;
+
+use Illuminate\Support\Facades\Event;
+use Modules\Tag\Events\TagIsCreating;
+use Modules\Tag\Events\TagIsUpdating;
+use Modules\Tag\Events\TagWasCreated;
+use Modules\Tag\Events\TagWasUpdated;
+use Modules\Tag\Repositories\TagRepository;
+use Modules\Tag\Tests\BaseTestCase;
+
+class EloquentTagRepositoryTest extends BaseTestCase
+{
+    /**
+     * @var TagRepository
+     */
+    private $tag;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->tag = app(TagRepository::class);
+    }
+
+    /** @test */
+    public function it_gets_all_tags_for_a_namespace()
+    {
+        $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+        $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+        $this->tag->create([
+            'namespace' => 'asgardcms/blog',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+
+        $this->assertCount(1, $this->tag->allForNamespace('asgardcms/blog'));
+    }
+
+    /** @test */
+    public function it_triggers_event_when_tag_was_created()
+    {
+        Event::fake();
+
+        $tag = $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+
+        Event::assertDispatched(TagWasCreated::class, function ($e) use ($tag) {
+            return $e->tag->id === $tag->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_tag_is_creating()
+    {
+        Event::fake();
+
+        $tag = $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+
+        Event::assertDispatched(TagIsCreating::class, function ($e) use ($tag) {
+            return $e->getAttribute('namespace') === $tag->namespace;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_creating_event()
+    {
+        Event::listen(TagIsCreating::class, function (TagIsCreating $event) {
+            $event->setAttributes(['en' => ['name' => 'MEDIA TAG']]);
+        });
+
+        $tag = $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+
+        $this->assertEquals('MEDIA TAG', $tag->translate('en')->name);
+    }
+
+    /** @test */
+    public function it_triggers_event_when_tag_was_updated()
+    {
+        Event::fake();
+
+        $tag = $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+        $this->tag->update($tag, []);
+
+        Event::assertDispatched(TagWasUpdated::class, function ($e) use ($tag) {
+            return $e->tag->id === $tag->id;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_updating_event()
+    {
+        Event::listen(TagIsUpdating::class, function (TagIsUpdating $event) {
+            $event->setAttributes(['en' => ['name' => 'MEDIA TAG']]);
+        });
+
+        $tag = $this->tag->create([
+            'namespace' => 'asgardcms/media',
+            'en' => [
+                'slug' => 'media-tag',
+                'name' => 'media tag',
+            ],
+        ]);
+        $this->tag->update($tag, []);
+
+        $this->assertEquals('MEDIA TAG', $tag->translate('en')->name);
+    }
+}
diff --git a/Modules/Tag/Tests/Integration/TagRepositoryTest.php b/Modules/Tag/Tests/Integration/TagRepositoryTest.php
deleted file mode 100644
index d1af8b52c..000000000
--- a/Modules/Tag/Tests/Integration/TagRepositoryTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Modules\Tag\Tests\Integration;
-
-use Modules\Tag\Repositories\TagRepository;
-use Modules\Tag\Tests\BaseTestCase;
-
-class TagRepositoryTest extends BaseTestCase
-{
-    /**
-     * @var TagRepository
-     */
-    private $tag;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->tag = app(TagRepository::class);
-    }
-
-    /** @test */
-    public function it_gets_all_tags_for_a_namespace()
-    {
-        $this->tag->create([
-            'namespace' => 'asgardcms/media',
-            'en' => [
-                'slug' => 'media-tag',
-                'name' => 'media tag',
-            ],
-        ]);
-        $this->tag->create([
-            'namespace' => 'asgardcms/media',
-            'en' => [
-                'slug' => 'media-tag',
-                'name' => 'media tag',
-            ],
-        ]);
-        $this->tag->create([
-            'namespace' => 'asgardcms/blog',
-            'en' => [
-                'slug' => 'media-tag',
-                'name' => 'media tag',
-            ],
-        ]);
-
-        $this->assertCount(1, $this->tag->allForNamespace('asgardcms/blog'));
-    }
-}
diff --git a/Modules/Tag/changelog.yml b/Modules/Tag/changelog.yml
index 2c854f36a..84097342a 100644
--- a/Modules/Tag/changelog.yml
+++ b/Modules/Tag/changelog.yml
@@ -1,5 +1,13 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        added:
+            - Create and trigger events when tags are created and updated
+            - Trigger event before a tag is created (<code>TagIsCreating</code>) allow data to be changed
+            - Trigger event before a tag is updated (<code>TagIsUpdating</code>) allow data to be changed
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.1.0":
         changed:
             - Fixed tags not being removed probably on update & delete
diff --git a/Modules/Tag/module.json b/Modules/Tag/module.json
index 922c3a8a2..15d1644c2 100644
--- a/Modules/Tag/module.json
+++ b/Modules/Tag/module.json
@@ -7,6 +7,7 @@
         "AsgardCMS",
         "taggable"
     ],
+    "version": "2.5.0",
     "active": 1,
     "order": 1,
     "providers": [
diff --git a/Modules/Translation/Resources/views/admin/translations/index.blade.php b/Modules/Translation/Resources/views/admin/translations/index.blade.php
index 7eac135c4..701c2c6fc 100644
--- a/Modules/Translation/Resources/views/admin/translations/index.blade.php
+++ b/Modules/Translation/Resources/views/admin/translations/index.blade.php
@@ -121,7 +121,7 @@
 
 @stop
 
-@section('scripts')
+@push('js-stack')
     <?php if ($errors->has('file')): ?>
     <script>
         $( document ).ready(function() {
@@ -223,4 +223,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Translation/Tests/.gitkeep b/Modules/Translation/Tests/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Modules/Translation/Tests/BaseTranslationTest.php b/Modules/Translation/Tests/BaseTranslationTest.php
new file mode 100644
index 000000000..4503c8050
--- /dev/null
+++ b/Modules/Translation/Tests/BaseTranslationTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Modules\Translation\Tests;
+
+use Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider;
+use Modules\Core\Providers\CoreServiceProvider;
+use Modules\Core\Providers\SidebarServiceProvider;
+use Modules\Translation\Providers\TranslationServiceProvider;
+use Nwidart\Modules\LaravelModulesServiceProvider;
+use Orchestra\Testbench\TestCase;
+
+abstract class BaseTranslationTest extends TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->resetDatabase();
+    }
+
+    protected function getPackageProviders($app)
+    {
+        return [
+            LaravelModulesServiceProvider::class,
+            CoreServiceProvider::class,
+            TranslationServiceProvider::class,
+            LaravelLocalizationServiceProvider::class,
+            SidebarServiceProvider::class,
+        ];
+    }
+
+    protected function getPackageAliases($app)
+    {
+        return [];
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['path.base'] = __DIR__ . '/..';
+        $app['config']->set('database.default', 'sqlite');
+        $app['config']->set('database.connections.sqlite', array(
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ));
+        $app['config']->set('translatable.locales', ['en', 'fr']);
+    }
+
+    private function resetDatabase()
+    {
+        // Makes sure the migrations table is created
+        $this->artisan('migrate', [
+            '--database' => 'sqlite',
+        ]);
+        // We empty all tables
+        $this->artisan('migrate:reset', [
+            '--database' => 'sqlite',
+        ]);
+        // Migrate
+        $this->artisan('migrate', [
+            '--database' => 'sqlite',
+        ]);
+    }
+}
diff --git a/Modules/Translation/Tests/EloquentTranslationRepositoryTest.php b/Modules/Translation/Tests/EloquentTranslationRepositoryTest.php
new file mode 100644
index 000000000..f8348ce76
--- /dev/null
+++ b/Modules/Translation/Tests/EloquentTranslationRepositoryTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\Translation\Tests;
+
+use Modules\Translation\Repositories\TranslationRepository;
+
+class EloquentTranslationRepositoryTest extends BaseTranslationTest
+{
+    /**
+     * @var TranslationRepository
+     */
+    private $translation;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->translation = app(TranslationRepository::class);
+    }
+
+    /** @test */
+    public function it_is_true()
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/Modules/Translation/changelog.yml b/Modules/Translation/changelog.yml
index 495183eda..45fa23011 100644
--- a/Modules/Translation/changelog.yml
+++ b/Modules/Translation/changelog.yml
@@ -1,5 +1,9 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.2.0":
         changed:
             - Optimising the checking and loading of module translations (~20% speed increase)
diff --git a/Modules/Translation/module.json b/Modules/Translation/module.json
index 0eba3c06a..b404548c1 100644
--- a/Modules/Translation/module.json
+++ b/Modules/Translation/module.json
@@ -2,7 +2,7 @@
     "name": "Translation",
     "alias": "translation",
     "description": "Module containing all AsgardCms translations",
-    "version": "2.0.0",
+    "version": "2.5.0",
     "keywords": [],
     "active": 1,
     "order": 2,
diff --git a/Modules/User/Events/RoleIsCreating.php b/Modules/User/Events/RoleIsCreating.php
new file mode 100644
index 000000000..7000e32c4
--- /dev/null
+++ b/Modules/User/Events/RoleIsCreating.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\User\Events;
+
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+class RoleIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
+}
diff --git a/Modules/User/Events/RoleIsUpdating.php b/Modules/User/Events/RoleIsUpdating.php
new file mode 100644
index 000000000..02f776bcf
--- /dev/null
+++ b/Modules/User/Events/RoleIsUpdating.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\User\Events;
+
+use Cartalyst\Sentinel\Roles\RoleInterface;
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+
+class RoleIsUpdating extends AbstractEntityHook implements EntityIsChanging
+{
+    /**
+     * @var RoleInterface
+     */
+    private $role;
+
+    public function __construct(RoleInterface $role, $attributes)
+    {
+        $this->role = $role;
+        parent::__construct($attributes);
+    }
+
+    /**
+     * @return RoleInterface
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+}
diff --git a/Modules/User/Events/RoleWasCreated.php b/Modules/User/Events/RoleWasCreated.php
new file mode 100644
index 000000000..1ed5997cb
--- /dev/null
+++ b/Modules/User/Events/RoleWasCreated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\User\Events;
+
+use Cartalyst\Sentinel\Roles\RoleInterface;
+
+class RoleWasCreated
+{
+    /**
+     * @var RoleInterface
+     */
+    public $role;
+
+    public function __construct(RoleInterface $role)
+    {
+        $this->role = $role;
+    }
+}
diff --git a/Modules/User/Events/UserIsCreating.php b/Modules/User/Events/UserIsCreating.php
index da576daa0..35357b604 100644
--- a/Modules/User/Events/UserIsCreating.php
+++ b/Modules/User/Events/UserIsCreating.php
@@ -2,33 +2,9 @@
 
 namespace Modules\User\Events;
 
-final class UserIsCreating
-{
-    /**
-     * @var array
-     */
-    private $attributes;
-    public $original;
-
-    public function __construct(array $attributes)
-    {
-        $this->attributes = $attributes;
-        $this->original = $attributes;
-    }
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
 
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = array_merge($this->attributes, $attributes);
-    }
+final class UserIsCreating extends AbstractEntityHook implements EntityIsChanging
+{
 }
diff --git a/Modules/User/Events/UserIsUpdating.php b/Modules/User/Events/UserIsUpdating.php
index 8560b681c..1b84278af 100644
--- a/Modules/User/Events/UserIsUpdating.php
+++ b/Modules/User/Events/UserIsUpdating.php
@@ -2,12 +2,28 @@
 
 namespace Modules\User\Events;
 
-class UserIsUpdating
+use Modules\Core\Events\AbstractEntityHook;
+use Modules\Core\Contracts\EntityIsChanging;
+use Modules\User\Entities\UserInterface;
+
+final class UserIsUpdating extends AbstractEntityHook implements EntityIsChanging
 {
-    public $user;
+    /**
+     * @var UserInterface
+     */
+    private $user;
 
-    public function __construct($user)
+    public function __construct(UserInterface $user, array $data)
     {
         $this->user = $user;
+        parent::__construct($data);
+    }
+
+    /**
+     * @return UserInterface
+     */
+    public function getUser()
+    {
+        return $this->user;
     }
 }
diff --git a/Modules/User/Repositories/Sentinel/SentinelRoleRepository.php b/Modules/User/Repositories/Sentinel/SentinelRoleRepository.php
index 7438b04a2..9f42f7cb1 100644
--- a/Modules/User/Repositories/Sentinel/SentinelRoleRepository.php
+++ b/Modules/User/Repositories/Sentinel/SentinelRoleRepository.php
@@ -3,6 +3,9 @@
 namespace Modules\User\Repositories\Sentinel;
 
 use Cartalyst\Sentinel\Laravel\Facades\Sentinel;
+use Modules\User\Events\RoleIsCreating;
+use Modules\User\Events\RoleIsUpdating;
+use Modules\User\Events\RoleWasCreated;
 use Modules\User\Events\RoleWasUpdated;
 use Modules\User\Repositories\RoleRepository;
 
@@ -33,7 +36,12 @@ public function all()
      */
     public function create($data)
     {
-        return $this->role->create($data);
+        event($event = new RoleIsCreating($data));
+        $role = $this->role->create($event->getAttributes());
+
+        event(new RoleWasCreated($role));
+
+        return $role;
     }
 
     /**
@@ -56,8 +64,9 @@ public function update($id, $data)
     {
         $role = $this->role->find($id);
 
-        $role->fill($data);
+        event($event = new RoleIsUpdating($role, $data));
 
+        $role->fill($event->getAttributes());
         $role->save();
 
         event(new RoleWasUpdated($role));
diff --git a/Modules/User/Repositories/Sentinel/SentinelUserRepository.php b/Modules/User/Repositories/Sentinel/SentinelUserRepository.php
index 963e544f2..ec1ce45de 100644
--- a/Modules/User/Repositories/Sentinel/SentinelUserRepository.php
+++ b/Modules/User/Repositories/Sentinel/SentinelUserRepository.php
@@ -126,10 +126,9 @@ public function update($user, $data)
     {
         $this->checkForNewPassword($data);
 
-        $user->fill($data);
-
-        event(new UserIsUpdating($user));
+        event($event = new UserIsUpdating($user, $data));
 
+        $user->fill($event->getAttributes());
         $user->save();
 
         event(new UserWasUpdated($user));
@@ -152,10 +151,9 @@ public function updateAndSyncRoles($userId, $data, $roles)
 
         $this->checkForManualActivation($user, $data);
 
-        $user = $user->fill($data);
-
-        event(new UserIsUpdating($user));
+        event($event = new UserIsUpdating($user, $data));
 
+        $user->fill($event->getAttributes());
         $user->save();
 
         event(new UserWasUpdated($user));
diff --git a/Modules/User/Resources/views/admin/account/api-keys/index.blade.php b/Modules/User/Resources/views/admin/account/api-keys/index.blade.php
index 7f5ee08cd..94d6a2bfb 100644
--- a/Modules/User/Resources/views/admin/account/api-keys/index.blade.php
+++ b/Modules/User/Resources/views/admin/account/api-keys/index.blade.php
@@ -62,7 +62,7 @@
     @include('core::partials.delete-modal')
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script>
         new Clipboard('.jsClipboardButton', {
             target: function(trigger) {
@@ -70,4 +70,4 @@
             }
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/account/profile/edit.blade.php b/Modules/User/Resources/views/admin/account/profile/edit.blade.php
index 450475714..d88ee216e 100644
--- a/Modules/User/Resources/views/admin/account/profile/edit.blade.php
+++ b/Modules/User/Resources/views/admin/account/profile/edit.blade.php
@@ -62,7 +62,8 @@
 @stop
 @section('shortcuts')
 @stop
-@section('scripts')
+
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $('[data-toggle="tooltip"]').tooltip();
@@ -72,4 +73,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/roles/create.blade.php b/Modules/User/Resources/views/admin/roles/create.blade.php
index 20b2323e5..c8415bedf 100644
--- a/Modules/User/Resources/views/admin/roles/create.blade.php
+++ b/Modules/User/Resources/views/admin/roles/create.blade.php
@@ -61,7 +61,8 @@
         <dd>{{ trans('user::roles.navigation.back to index') }}</dd>
     </dl>
 @stop
-@section('scripts')
+
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $('input[type="checkbox"].flat-blue, input[type="radio"].flat-blue').iCheck({
@@ -75,4 +76,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/roles/edit.blade.php b/Modules/User/Resources/views/admin/roles/edit.blade.php
index 0ce269891..4e601f428 100644
--- a/Modules/User/Resources/views/admin/roles/edit.blade.php
+++ b/Modules/User/Resources/views/admin/roles/edit.blade.php
@@ -80,7 +80,8 @@
         <dd>{{ trans('user::roles.navigation.back to index') }}</dd>
     </dl>
 @stop
-@section('scripts')
+
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $(document).keypressAction({
@@ -94,4 +95,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/roles/index.blade.php b/Modules/User/Resources/views/admin/roles/index.blade.php
index 8a3ea5aff..2bd03b028 100644
--- a/Modules/User/Resources/views/admin/roles/index.blade.php
+++ b/Modules/User/Resources/views/admin/roles/index.blade.php
@@ -82,7 +82,7 @@
 @include('core::partials.delete-modal')
 @stop
 
-@section('scripts')
+@push('js-stack')
 <?php $locale = App::getLocale(); ?>
 <script type="text/javascript">
     $( document ).ready(function() {
@@ -107,4 +107,4 @@
         });
     });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/users/create.blade.php b/Modules/User/Resources/views/admin/users/create.blade.php
index a21454678..b791f3a3b 100644
--- a/Modules/User/Resources/views/admin/users/create.blade.php
+++ b/Modules/User/Resources/views/admin/users/create.blade.php
@@ -113,7 +113,8 @@
         <dd>{{ trans('user::users.navigation.back to index') }}</dd>
     </dl>
 @stop
-@section('scripts')
+
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $(document).keypressAction({
@@ -127,4 +128,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/users/edit.blade.php b/Modules/User/Resources/views/admin/users/edit.blade.php
index f976cde2c..750922ef6 100644
--- a/Modules/User/Resources/views/admin/users/edit.blade.php
+++ b/Modules/User/Resources/views/admin/users/edit.blade.php
@@ -135,7 +135,8 @@ class="flat-blue"
         <dd>{{ trans('user::users.navigation.back to index') }}</dd>
     </dl>
 @stop
-@section('scripts')
+
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $('[data-toggle="tooltip"]').tooltip();
@@ -150,4 +151,4 @@ class="flat-blue"
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Resources/views/admin/users/index.blade.php b/Modules/User/Resources/views/admin/users/index.blade.php
index c3980cced..dfc23e312 100644
--- a/Modules/User/Resources/views/admin/users/index.blade.php
+++ b/Modules/User/Resources/views/admin/users/index.blade.php
@@ -99,7 +99,7 @@
 @include('core::partials.delete-modal')
 @stop
 
-@section('scripts')
+@push('js-stack')
 <?php $locale = App::getLocale(); ?>
 <script type="text/javascript">
     $( document ).ready(function() {
@@ -124,4 +124,4 @@
         });
     });
 </script>
-@stop
+@endpush
diff --git a/Modules/User/Tests/SentinelRoleRepositoryTest.php b/Modules/User/Tests/SentinelRoleRepositoryTest.php
index ed54b0dfd..adedc387f 100644
--- a/Modules/User/Tests/SentinelRoleRepositoryTest.php
+++ b/Modules/User/Tests/SentinelRoleRepositoryTest.php
@@ -3,6 +3,9 @@
 namespace Modules\User\Tests;
 
 use Illuminate\Support\Facades\Event;
+use Modules\User\Events\RoleIsCreating;
+use Modules\User\Events\RoleIsUpdating;
+use Modules\User\Events\RoleWasCreated;
 use Modules\User\Events\RoleWasUpdated;
 use Modules\User\Repositories\RoleRepository;
 
@@ -27,6 +30,42 @@ public function it_creates_a_role()
         $this->assertCount(1, $this->role->all());
     }
 
+    /** @test */
+    public function it_triggers_event_when_role_was_created()
+    {
+        Event::fake();
+
+        $role = $this->role->create(['name' => 'Admin', 'slug' => 'admin']);
+
+        Event::assertDispatched(RoleWasCreated::class, function ($e) use ($role) {
+            return $e->role->name === $role->name;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_role_is_creating()
+    {
+        Event::fake();
+
+        $role = $this->role->create(['name' => 'Admin', 'slug' => 'admin']);
+
+        Event::assertDispatched(RoleIsCreating::class, function ($e) use ($role) {
+            return $e->getAttribute('name') === $role->name;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_when_it_is_creating_event()
+    {
+        Event::listen(RoleIsCreating::class, function (RoleIsCreating $event) {
+            $event->setAttributes(['name' => 'BETTER']);
+        });
+
+        $role = $this->role->create(['name' => 'Admin', 'slug' => 'admin']);
+
+        $this->assertEquals('BETTER', $role->name);
+    }
+
     /** @test */
     public function it_finds_a_role_by_id()
     {
@@ -63,6 +102,32 @@ public function it_triggers_role_updated_event()
         });
     }
 
+    /** @test */
+    public function it_fires_event_when_role_is_updating()
+    {
+        Event::fake();
+
+        $role = $this->role->create(['name' => 'Admin', 'slug' => 'admin']);
+        $this->role->update($role->id, ['name' => 'Better Admin']);
+
+        Event::assertDispatched(RoleIsUpdating::class, function ($e) use ($role) {
+            return $e->getRole()->id === $role->id;
+        });
+    }
+
+    /** @test */
+    public function it_can_change_data_before_role_is_updated()
+    {
+        Event::listen(RoleIsUpdating::class, function (RoleIsUpdating $event) {
+            $event->setAttributes(['name' => 'BETTER']);
+        });
+
+        $role = $this->role->create(['name' => 'Admin', 'slug' => 'admin']);
+        $role = $this->role->update($role->id, ['name' => 'Better Admin']);
+
+        $this->assertEquals('BETTER', $role->name);
+    }
+
     /** @test */
     public function it_deletes_a_role()
     {
diff --git a/Modules/User/Tests/SentinelUserRepositoryTest.php b/Modules/User/Tests/SentinelUserRepositoryTest.php
index 371daae24..e97ee182d 100644
--- a/Modules/User/Tests/SentinelUserRepositoryTest.php
+++ b/Modules/User/Tests/SentinelUserRepositoryTest.php
@@ -56,7 +56,7 @@ public function it_fires_event_when_user_is_creating()
         ]);
 
         Event::assertDispatched(UserIsCreating::class, function ($e) use ($user) {
-            return $e->getAttributes()['email'] === $user->email;
+            return $e->getAttribute('email') === $user->email;
         });
     }
 
@@ -104,7 +104,7 @@ public function it_makes_sure_the_event_contains_original_attributes()
         ]);
 
         Event::assertDispatched(UserIsCreating::class, function ($e) {
-            return $e->original['email'] === 'n.widart@gmail.com';
+            return $e->getOriginal('email')=== 'n.widart@gmail.com';
         });
     }
 
@@ -237,10 +237,45 @@ public function it_triggers_events_on_user_update()
             return $e->user->id === $user->id;
         });
         Event::assertDispatched(UserIsUpdating::class, function ($e) use ($user) {
-            return $e->user->id === $user->id;
+            return $e->getUser()->id === $user->id;
+        });
+    }
+
+    /** @test */
+    public function it_triggers_event_when_user_is_updating()
+    {
+        $user = $this->user->create([
+            'email' => 'n.widart@gmail.com',
+            'password' => 'demo1234',
+        ]);
+
+        Event::fake();
+
+        $this->user->update($user, ['first_name' => 'John', 'last_name' => 'Doe']);
+
+        Event::assertDispatched(UserIsUpdating::class, function ($e) use ($user) {
+            return $e->getUser()->id === $user->id &&
+                    $e->getAttribute('first_name') === 'John';
         });
     }
 
+    /** @test */
+    public function it_can_change_properties_before_update()
+    {
+        Event::listen(UserIsUpdating::class, function (UserIsUpdating $event) {
+            $event->setAttributes(['first_name' => 'Jane']);
+        });
+
+        $user = $this->user->create([
+            'email' => 'n.widart@gmail.com',
+            'password' => 'demo1234',
+        ]);
+
+        $this->user->update($user, ['first_name' => 'John', 'last_name' => 'Doe']);
+
+        $this->assertEquals('Jane', $this->user->find(1)->first_name);
+    }
+
     /** @test */
     public function it_updates_user_and_syncs_roles()
     {
@@ -277,10 +312,28 @@ public function it_triggers_event_on_user_update_and_role_sync()
             return $e->user->id === $user->id;
         });
         Event::assertDispatched(UserIsUpdating::class, function ($e) use ($user) {
-            return $e->user->id === $user->id;
+            return $e->getUser()->id === $user->id;
         });
     }
 
+    /** @test */
+    public function it_can_change_properties_before_update_and_sync_roles()
+    {
+        Event::listen(UserIsUpdating::class, function (UserIsUpdating $event) {
+            $event->setAttributes(['first_name' => 'Jane']);
+        });
+
+        $this->createRole('Admin');
+        $user = $this->user->createWithRoles([
+            'email' => 'n.widart@gmail.com',
+            'password' => 'demo1234',
+        ], [1]);
+
+        $this->user->updateAndSyncRoles($user->id, ['first_name' => 'John', 'last_name' => 'Doe', 'activated' => 1], [1]);
+
+        $this->assertEquals('Jane', $this->user->find(1)->first_name);
+    }
+
     /** @test */
     public function it_deletes_a_user()
     {
diff --git a/Modules/User/changelog.yml b/Modules/User/changelog.yml
index f5f888c72..1db70eeda 100644
--- a/Modules/User/changelog.yml
+++ b/Modules/User/changelog.yml
@@ -1,5 +1,13 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        added:
+            - Trigger an event (<code>UserIsUpdating</code>) before a user is updated
+            - Trigger an event (<code>RoleIsCreating</code>) before a role is created
+            - Trigger an event (<code>RoleIsUpdating</code>) before a role is updated
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
     "2.4.0":
         added:
             - Trigger an event (<code>UserIsCreating</code>) before a user is created, allowing customising its data via listeners
diff --git a/Modules/User/module.json b/Modules/User/module.json
index 90e857065..e494a98fc 100644
--- a/Modules/User/module.json
+++ b/Modules/User/module.json
@@ -3,7 +3,7 @@
   "alias": "user",
   "description": "The user module is responsible for managing users and permissions.",
   "keywords": [],
-  "version": "2.0.0",
+  "version": "2.5.0",
   "active": 1,
   "order": 1,
   "providers": [
diff --git a/Modules/Workshop/Resources/views/admin/modules/index.blade.php b/Modules/Workshop/Resources/views/admin/modules/index.blade.php
index 0777b7b85..385e91f0b 100644
--- a/Modules/Workshop/Resources/views/admin/modules/index.blade.php
+++ b/Modules/Workshop/Resources/views/admin/modules/index.blade.php
@@ -10,13 +10,13 @@
 </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .jsUpdateModule {
             transition: all .5s ease-in-out;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
     <div class="row">
@@ -75,7 +75,7 @@
     </div>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <?php $locale = locale(); ?>
     <script>
         $(function () {
@@ -130,4 +130,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Resources/views/admin/modules/show.blade.php b/Modules/Workshop/Resources/views/admin/modules/show.blade.php
index 99a4351b1..89e793ff3 100644
--- a/Modules/Workshop/Resources/views/admin/modules/show.blade.php
+++ b/Modules/Workshop/Resources/views/admin/modules/show.blade.php
@@ -17,7 +17,7 @@
     </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .module-type {
             text-align: center;
@@ -32,7 +32,7 @@
             display: inline;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
     <div class="row">
@@ -90,7 +90,7 @@
     <?php endif; ?>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script>
         $( document ).ready(function() {
             $('.jsPublishAssets').on('click',function (event) {
@@ -108,4 +108,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Resources/views/admin/themes/index.blade.php b/Modules/Workshop/Resources/views/admin/themes/index.blade.php
index 3ec9482c8..6dcd9239c 100644
--- a/Modules/Workshop/Resources/views/admin/themes/index.blade.php
+++ b/Modules/Workshop/Resources/views/admin/themes/index.blade.php
@@ -10,13 +10,13 @@
 </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .jsUpdateModule {
             transition: all .5s ease-in-out;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
     <div class="row">
@@ -82,7 +82,7 @@
     </div>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <?php $locale = locale(); ?>
     <script>
         $(function () {
@@ -137,4 +137,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Resources/views/admin/themes/show.blade.php b/Modules/Workshop/Resources/views/admin/themes/show.blade.php
index 24d2cc12d..670b674c4 100644
--- a/Modules/Workshop/Resources/views/admin/themes/show.blade.php
+++ b/Modules/Workshop/Resources/views/admin/themes/show.blade.php
@@ -17,7 +17,7 @@
     </ol>
 @stop
 
-@section('styles')
+@push('css-stack')
     <style>
         .module-type {
             text-align: center;
@@ -36,7 +36,7 @@
             display: inline;
         }
     </style>
-@stop
+@endpush
 
 @section('content')
     <div class="row">
@@ -95,7 +95,7 @@
     <?php endif; ?>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script>
         $( document ).ready(function() {
             $('.jsPublishAssets').on('click',function (event) {
@@ -113,4 +113,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Resources/views/admin/workbench/index.blade.php b/Modules/Workshop/Resources/views/admin/workbench/index.blade.php
index 9571c5b63..45f27dda4 100644
--- a/Modules/Workshop/Resources/views/admin/workbench/index.blade.php
+++ b/Modules/Workshop/Resources/views/admin/workbench/index.blade.php
@@ -35,7 +35,7 @@
 </div>
 @stop
 
-@section('scripts')
+@push('js-stack')
 <script>
 $( document ).ready(function() {
     $('input[type="checkbox"].flat-blue, input[type="radio"].flat-blue').iCheck({
@@ -44,4 +44,4 @@
     });
 });
 </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Scaffold/Module/stubs/create-view.stub b/Modules/Workshop/Scaffold/Module/stubs/create-view.stub
index 2cfd4c3ad..3fca93b9b 100644
--- a/Modules/Workshop/Scaffold/Module/stubs/create-view.stub
+++ b/Modules/Workshop/Scaffold/Module/stubs/create-view.stub
@@ -11,10 +11,6 @@
     </ol>
 @stop
 
-@section('styles')
-    {!! Theme::script('js/vendor/ckeditor/ckeditor.js') !!}
-@stop
-
 @section('content')
     {!! Form::open(['route' => ['admin.$LOWERCASE_MODULE_NAME$.$LOWERCASE_CLASS_NAME$.store'], 'method' => 'post']) !!}
     <div class="row">
@@ -51,7 +47,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script type="text/javascript">
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -69,4 +65,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Scaffold/Module/stubs/edit-view.stub b/Modules/Workshop/Scaffold/Module/stubs/edit-view.stub
index fdab1230e..d2c196887 100644
--- a/Modules/Workshop/Scaffold/Module/stubs/edit-view.stub
+++ b/Modules/Workshop/Scaffold/Module/stubs/edit-view.stub
@@ -11,10 +11,6 @@
     </ol>
 @stop
 
-@section('styles')
-    {!! Theme::script('js/vendor/ckeditor/ckeditor.js') !!}
-@stop
-
 @section('content')
     {!! Form::open(['route' => ['admin.$LOWERCASE_MODULE_NAME$.$LOWERCASE_CLASS_NAME$.update', $$LOWERCASE_CLASS_NAME$->id], 'method' => 'put']) !!}
     <div class="row">
@@ -51,7 +47,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script type="text/javascript">
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -69,4 +65,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/Scaffold/Module/stubs/index-view.stub b/Modules/Workshop/Scaffold/Module/stubs/index-view.stub
index ba59c00cb..0c4712669 100644
--- a/Modules/Workshop/Scaffold/Module/stubs/index-view.stub
+++ b/Modules/Workshop/Scaffold/Module/stubs/index-view.stub
@@ -79,7 +79,7 @@
     </dl>
 @stop
 
-@section('scripts')
+@push('js-stack')
     <script type="text/javascript">
         $( document ).ready(function() {
             $(document).keypressAction({
@@ -106,4 +106,4 @@
             });
         });
     </script>
-@stop
+@endpush
diff --git a/Modules/Workshop/changelog.yml b/Modules/Workshop/changelog.yml
index e2d642add..022ebebe9 100644
--- a/Modules/Workshop/changelog.yml
+++ b/Modules/Workshop/changelog.yml
@@ -1,5 +1,11 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0@unreleased":
+        changed:
+            - Using the @push js stacks over the scripts section
+            - Using the @push css stacks over the styles section
+        removed:
+            - Removing ckeditor from the default scaffolded views, now included via <code>EditorIsRendering</code> hook
     "2.4.0":
         added:
             - Add the ability to set custom stubs folder used by generated modules
diff --git a/Modules/Workshop/module.json b/Modules/Workshop/module.json
index 8e7dabe34..6b686ba70 100644
--- a/Modules/Workshop/module.json
+++ b/Modules/Workshop/module.json
@@ -4,7 +4,7 @@
   "description": "Module used to handle the create of new modules.",
   "keywords": [
   ],
-  "version": "2.0.0",
+  "version": "2.5.0",
   "active": 1,
   "order": 1,
   "providers": [
diff --git a/Themes/Adminlte/changelog.yml b/Themes/Adminlte/changelog.yml
index aaba5a846..d89c4bf70 100644
--- a/Themes/Adminlte/changelog.yml
+++ b/Themes/Adminlte/changelog.yml
@@ -1,5 +1,8 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "2.5.0":
+        added:
+            - <code>js-stack</code> and <code>css-stack</code> stacks
     "2.4.0":
         changed:
             - Moved to using laravel.mix
diff --git a/Themes/Adminlte/theme.json b/Themes/Adminlte/theme.json
index e38e4e67f..47e1d65eb 100644
--- a/Themes/Adminlte/theme.json
+++ b/Themes/Adminlte/theme.json
@@ -2,5 +2,5 @@
   "name": "AdminLTE",
   "description": "This is an administration theme",
   "type": "backend",
-  "version": "2.0.0"
+  "version": "2.5.0"
 }
diff --git a/Themes/Adminlte/views/layouts/master.blade.php b/Themes/Adminlte/views/layouts/master.blade.php
index 713a1ee41..1d68b3263 100644
--- a/Themes/Adminlte/views/layouts/master.blade.php
+++ b/Themes/Adminlte/views/layouts/master.blade.php
@@ -17,6 +17,7 @@
     @include('partials.asgard-globals')
     @section('styles')
     @show
+    @stack('css-stack')
 
     <script>
         $.ajaxSetup({
@@ -88,5 +89,6 @@
 <?php endif; ?>
 @section('scripts')
 @show
+@stack('js-stack')
 </body>
 </html>
diff --git a/Themes/Flatly/assets/js/all.js b/Themes/Flatly/assets/js/all.js
index dfac2eee3..d41c5f788 100644
--- a/Themes/Flatly/assets/js/all.js
+++ b/Themes/Flatly/assets/js/all.js
@@ -10252,6 +10252,13 @@ if ( !noGlobal ) {
 return jQuery;
 } );
 
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){document===a.target||this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);if(this.$element.trigger(g),!g.isDefaultPrevented())return f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=window.SVGElement&&c instanceof window.SVGElement,g=d?{top:0,left:0}:f?null:b.offset(),h={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},i=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,h,i,g)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){
+this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e<c&&"top";if("bottom"==this.affixed)return null!=c?!(e+this.unpin<=f.top)&&"bottom":!(e+g<=a-d)&&"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&e<=c?"top":null!=d&&i+j>=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
 
 /* **********************************************
      Begin prism-core.js
diff --git a/Themes/Flatly/theme.json b/Themes/Flatly/theme.json
index 26d9e9c1c..8d54d09f8 100644
--- a/Themes/Flatly/theme.json
+++ b/Themes/Flatly/theme.json
@@ -2,5 +2,5 @@
   "name": "Flatly",
   "description": "This is the Flatly theme",
   "type": "frontend",
-  "version": "2.0.0"
+  "version": "2.5.0"
 }
diff --git a/Themes/Flatly/webpack.mix.js b/Themes/Flatly/webpack.mix.js
index 3ad428509..aad8c6a7a 100644
--- a/Themes/Flatly/webpack.mix.js
+++ b/Themes/Flatly/webpack.mix.js
@@ -12,7 +12,7 @@ mix.less('resources/less/main.less', 'assets/css/main.css')
  */
 mix.scripts([
   'node_modules/jquery/dist/jquery.js',
-  'node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js',
+  'node_modules/bootstrap/dist/js/bootstrap.min.js',
   'node_modules/prismjs/prism.js',
   'resources/js/bootswatch.js'
 ], 'assets/js/all.js');
@@ -32,4 +32,4 @@ mix.webpackConfig({
   plugins: [
     new WebpackShellPlugin({onBuildEnd:['php ../../artisan stylist:publish ' + themeInfo.name]})
   ]
-});
\ No newline at end of file
+});
diff --git a/composer.json b/composer.json
index e12ecec7d..81ccc27c7 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,8 @@
         "symfony/dom-crawler": "3.1.*",
         "barryvdh/laravel-debugbar": "~2.3",
         "orchestra/testbench": "^3.4",
-        "league/flysystem-aws-s3-v3": "^1.0"
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "league/commonmark": "^0.15.4"
     },
     "autoload": {
         "classmap": [
diff --git a/config/asgard/core/config.php b/config/asgard/core/config.php
index 65324c45b..317144b00 100644
--- a/config/asgard/core/config.php
+++ b/config/asgard/core/config.php
@@ -13,6 +13,9 @@
         'workshop',
         'setting',
         'media',
+        'tag',
+        'page',
+        'translation',
     ],
 
     /*
diff --git a/config/asgard/core/core.php b/config/asgard/core/core.php
index d4b45263d..67ec2a105 100644
--- a/config/asgard/core/core.php
+++ b/config/asgard/core/core.php
@@ -32,6 +32,18 @@
     */
     'skin' => 'skin-blue',
 
+   /*
+   |--------------------------------------------------------------------------
+   | WYSIWYG Backend Editor
+   |--------------------------------------------------------------------------
+   | Define which editor you would like to use for the backend wysiwygs.
+   | These classes are event handlers, listening to EditorIsRendering
+   | you can define your own handlers and use them here
+   | Options:
+   | - \Modules\Core\Events\Handlers\LoadCkEditor::class
+   | - \Modules\Core\Events\Handlers\LoadSimpleMde::class
+   */
+   'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
     /*
     |--------------------------------------------------------------------------
     | Custom CKeditor configuration file
@@ -84,6 +96,7 @@
         'selectize-default.css' => ['module' => 'core:vendor/selectize/dist/css/selectize.default.css'],
         'animate.css' => ['theme' => 'vendor/animate.css/animate.min.css'],
         'pace.css' => ['theme' => 'vendor/admin-lte/plugins/pace/pace.min.css'],
+        'simplemde.css' => ['theme' => 'vendor/simplemde/dist/simplemde.min.css'],
         // Javascript
         'bootstrap.js' => ['theme' => 'vendor/bootstrap/dist/js/bootstrap.min.js'],
         'mousetrap.js' => ['theme' => 'js/vendor/mousetrap.min.js'],
@@ -110,6 +123,7 @@
         'pace.js' => ['theme' => 'vendor/admin-lte/plugins/pace/pace.min.js'],
         'moment.js' => ['theme' => 'vendor/admin-lte/plugins/daterangepicker/moment.min.js'],
         'clipboard.js' => ['theme' => 'vendor/clipboard/dist/clipboard.min.js'],
+        'simplemde.js' => ['theme' => 'vendor/simplemde/dist/simplemde.min.js'],
     ],
 
     /*
diff --git a/public/themes/flatly/js/all.js b/public/themes/flatly/js/all.js
index dfac2eee3..d41c5f788 100644
--- a/public/themes/flatly/js/all.js
+++ b/public/themes/flatly/js/all.js
@@ -10252,6 +10252,13 @@ if ( !noGlobal ) {
 return jQuery;
 } );
 
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){document===a.target||this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);if(this.$element.trigger(g),!g.isDefaultPrevented())return f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=window.SVGElement&&c instanceof window.SVGElement,g=d?{top:0,left:0}:f?null:b.offset(),h={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},i=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,h,i,g)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){
+this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e<c&&"top";if("bottom"==this.affixed)return null!=c?!(e+this.unpin<=f.top)&&"bottom":!(e+g<=a-d)&&"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&e<=c?"top":null!=d&&i+j>=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
 
 /* **********************************************
      Begin prism-core.js