diff --git a/artisan b/artisan
index df630d0d6..961e94d0b 100644
--- a/artisan
+++ b/artisan
@@ -28,7 +28,7 @@ $app = require_once __DIR__.'/bootstrap/app.php';
 |
 */
 
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+$kernel = $app->make('Illuminate\Contracts\Console\Kernel');
 
 $status = $kernel->handle(
     $input = new Symfony\Component\Console\Input\ArgvInput,
@@ -48,4 +48,4 @@ $status = $kernel->handle(
 
 $kernel->terminate($input, $status);
 
-exit($status);
+exit($status);
\ No newline at end of file
diff --git a/index.php b/index.php
index 9c4d23a06..ba43df3ec 100644
--- a/index.php
+++ b/index.php
@@ -37,7 +37,7 @@ $app = require_once __DIR__.'/bootstrap/app.php';
 |
 */
 
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
+$kernel = $app->make('Illuminate\Contracts\Http\Kernel');
 
 $response = $kernel->handle(
     $request = Illuminate\Http\Request::capture()
diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index e21bda158..7452c4247 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -80,7 +80,6 @@ class ServiceProvider extends ModuleServiceProvider
             $combiner->registerBundle('~/modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/sensitive/assets/less/sensitive.less');
 
             /*
              * Rich Editor is protected by DRM
@@ -165,16 +164,10 @@ class ServiceProvider extends ModuleServiceProvider
                 'backend.manage_editor' => [
                     'label' => 'system::lang.permissions.manage_editor',
                     'tab'   => 'system::lang.permissions.name',
-                    'roles' => UserRole::CODE_DEVELOPER,
-                ],
-                'backend.manage_own_editor' => [
-                    'label' => 'system::lang.permissions.manage_own_editor',
-                    'tab'   => 'system::lang.permissions.name',
                 ],
                 'backend.manage_branding' => [
                     'label' => 'system::lang.permissions.manage_branding',
                     'tab'   => 'system::lang.permissions.name',
-                    'roles' => UserRole::CODE_DEVELOPER,
                 ],
                 'media.manage_media' => [
                     'label' => 'backend::lang.permissions.manage_media',
@@ -209,7 +202,6 @@ class ServiceProvider extends ModuleServiceProvider
             $manager->registerFormWidget('Backend\FormWidgets\TagList', 'taglist');
             $manager->registerFormWidget('Backend\FormWidgets\MediaFinder', 'mediafinder');
             $manager->registerFormWidget('Backend\FormWidgets\NestedForm', 'nestedform');
-            $manager->registerFormWidget('Backend\FormWidgets\Sensitive', 'sensitive');
         });
     }
 
diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 5703da3d0..e11e70041 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -679,10 +679,9 @@ nav#layout-mainmenu .toolbar-item:before {left:-12px}
 nav#layout-mainmenu .toolbar-item:after {right:-12px}
 nav#layout-mainmenu .toolbar-item.scroll-active-before:before {color:#fff}
 nav#layout-mainmenu .toolbar-item.scroll-active-after:after {color:#fff}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action {margin:0}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action:first-child {margin-left:21px}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action i {font-size:20px}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action a {position:relative;padding:0 10px;top:-1px}
+nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview {margin:0 0 0 21px}
+nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview i {font-size:20px}
+nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a {position:relative;padding:0 10px;top:-1px}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account {margin-right:0}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account >a {padding:0 15px 0 10px;font-size:13px;position:relative}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account.highlight >a {z-index:600}
@@ -707,8 +706,8 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu li:first-child a:active:after {c
 nav#layout-mainmenu ul li .mainmenu-accountmenu li.divider {height:1px;width:100%;background-color:#e0e0e0}
 nav#layout-mainmenu.navbar-mode-inline,
 nav#layout-mainmenu.navbar-mode-inline_no_icons {height:60px}
-nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-quick-action a,
-nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-quick-action a {height:60px;line-height:60px}
+nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-preview a,
+nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-preview a {height:60px;line-height:60px}
 nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-account >a,
 nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-account >a {height:60px;line-height:60px}
 nav#layout-mainmenu.navbar-mode-inline ul li .mainmenu-accountmenu,
@@ -731,7 +730,7 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child,
 nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li:last-child {margin-right:0}
 nav#layout-mainmenu.navbar-mode-inline_no_icons .nav-icon {display:none !important}
 nav#layout-mainmenu.navbar-mode-tile {height:78px}
-nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-quick-action a {height:78px;line-height:78px}
+nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a {height:78px;line-height:78px}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-account >a {height:78px;line-height:78px}
 nav#layout-mainmenu.navbar-mode-tile ul li .mainmenu-accountmenu {top:88px}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a {position:relative;width:65px;height:65px}
@@ -750,14 +749,14 @@ nav#layout-mainmenu .menu-toggle .menu-toggle-title {margin-left:10px}
 nav#layout-mainmenu .menu-toggle:hover .menu-toggle-icon {opacity:1}
 body.mainmenu-open nav#layout-mainmenu .menu-toggle-icon {opacity:1}
 nav#layout-mainmenu.navbar-mode-collapse {padding-left:0;height:45px}
-nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-quick-action a {height:45px;line-height:45px}
+nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-preview a {height:45px;line-height:45px}
 nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-account >a {height:45px;line-height:45px}
 nav#layout-mainmenu.navbar-mode-collapse ul li .mainmenu-accountmenu {top:55px}
 nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-account >a {padding-right:0}
 nav#layout-mainmenu.navbar-mode-collapse ul li .mainmenu-accountmenu:after {right:13px}
 nav#layout-mainmenu.navbar-mode-collapse ul.nav {display:none}
 nav#layout-mainmenu.navbar-mode-collapse .menu-toggle {display:inline-block;color:#fff !important}
-@media (max-width:769px) {nav#layout-mainmenu.navbar {padding-left:0;height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-quick-action a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {top:55px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {padding-right:0 }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {right:13px }nav#layout-mainmenu.navbar ul.nav {display:none }nav#layout-mainmenu.navbar .menu-toggle {display:inline-block;color:#fff !important }}
+@media (max-width:769px) {nav#layout-mainmenu.navbar {padding-left:0;height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-preview a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {top:55px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {padding-right:0 }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {right:13px }nav#layout-mainmenu.navbar ul.nav {display:none }nav#layout-mainmenu.navbar .menu-toggle {display:inline-block;color:#fff !important }}
 .mainmenu-collapsed {position:absolute;height:100%;top:0;left:0;margin:0;background:#000}
 .mainmenu-collapsed >div {display:block;height:100%}
 .mainmenu-collapsed >div ul.mainmenu-nav li a {position:relative;width:65px;height:65px}
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index f4b8c37cb..5d3492c26 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -47,7 +47,7 @@ body.mainmenu-open {
     height: @height;
 
     ul.mainmenu-toolbar {
-        li.mainmenu-quick-action {
+        li.mainmenu-preview {
             a {
                 height: @height;
                 line-height: @height;
@@ -191,12 +191,8 @@ nav#layout-mainmenu {
     //
 
     ul.mainmenu-toolbar {
-        li.mainmenu-quick-action {
-            margin: 0;
-
-            &:first-child {
-                margin-left: 21px;
-            }
+        li.mainmenu-preview {
+            margin: 0 0 0 21px;
 
             i {
                 font-size: 20px;
diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 0af1497ac..c146050b6 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -11,7 +11,7 @@ use Backend\Behaviors\ImportExportController\TranscodeFilter;
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use League\Csv\Reader as CsvReader;
 use League\Csv\Writer as CsvWriter;
-use League\Csv\EscapeFormula as CsvEscapeFormula;
+use October\Rain\Parse\League\EscapeFormula as CsvEscapeFormula;
 use ApplicationException;
 use SplTempFileObject;
 use Exception;
@@ -624,7 +624,9 @@ class ImportExportController extends ControllerBehavior
         $csv->setDelimiter($options['delimiter']);
         $csv->setEnclosure($options['enclosure']);
         $csv->setEscape($options['escape']);
-        $csv->addFormatter(new CsvEscapeFormula());
+
+        // Temporary until upgrading to league/csv >= 9.1.0 (will be $csv->addFormatter($formatter))
+        $formatter = new CsvEscapeFormula();
 
         /*
          * Add headers
@@ -660,6 +662,9 @@ class ImportExportController extends ControllerBehavior
                 $record[] = $value;
             }
 
+            // Temporary until upgrading to league/csv >= 9.1.0
+            $record = $formatter($record);
+
             $csv->insertOne($record);
         }
 
@@ -803,9 +808,9 @@ class ImportExportController extends ControllerBehavior
 
         if (
             $options['encoding'] !== null &&
-            $reader->supportsStreamFilter()
+            $reader->isActiveStreamFilter()
         ) {
-            $reader->addStreamFilter(sprintf(
+            $reader->appendStreamFilter(sprintf(
                 '%s%s:%s',
                 TranscodeFilter::FILTER_NAME,
                 strtolower($options['encoding']),
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index 4bc6c4d8b..d885f1625 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -297,6 +297,16 @@ class ListController extends ControllerBehavior
             return call_user_func_array([$this->controller, 'onDelete'], func_get_args());
         }
 
+        /*
+         * Validate checked identifiers
+         */
+        $checkedIds = post('checked');
+
+        if (!$checkedIds || !is_array($checkedIds) || !count($checkedIds)) {
+            Flash::error(Lang::get('backend::lang.list.delete_selected_empty'));
+            return $this->controller->listRefresh();
+        }
+
         /*
          * Establish the list definition
          */
@@ -308,20 +318,6 @@ class ListController extends ControllerBehavior
 
         $listConfig = $this->controller->listGetConfig($definition);
 
-        /*
-         * Validate checked identifiers
-         */
-        $checkedIds = post('checked');
-
-        if (!$checkedIds || !is_array($checkedIds) || !count($checkedIds)) {
-            Flash::error(Lang::get(
-                (!empty($listConfig->noRecordsDeletedMessage))
-                    ? $listConfig->noRecordsDeletedMessage
-                    : 'backend::lang.list.delete_selected_empty'
-            ));
-            return $this->controller->listRefresh();
-        }
-
         /*
          * Create the model
          */
@@ -348,18 +344,10 @@ class ListController extends ControllerBehavior
                 $record->delete();
             }
 
-            Flash::success(Lang::get(
-                (!empty($listConfig->deleteMessage))
-                    ? $listConfig->deleteMessage
-                    : 'backend::lang.list.delete_selected_success'
-            ));
+            Flash::success(Lang::get('backend::lang.list.delete_selected_success'));
         }
         else {
-            Flash::error(Lang::get(
-                (!empty($listConfig->noRecordsDeletedMessage))
-                    ? $listConfig->noRecordsDeletedMessage
-                    : 'backend::lang.list.delete_selected_empty'
-            ));
+            Flash::error(Lang::get('backend::lang.list.delete_selected_empty'));
         }
 
         return $this->controller->listRefresh($definition);
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 88ef54ff4..f6c96382d 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -669,9 +669,8 @@ class RelationController extends ControllerBehavior
             $config->defaultSort = $this->getConfig('view[defaultSort]');
             $config->recordsPerPage = $this->getConfig('view[recordsPerPage]');
             $config->showCheckboxes = $this->getConfig('view[showCheckboxes]', !$this->readOnly);
-            $config->recordUrl = $this->getConfig('view[recordUrl]');
-            $config->customViewPath = $this->getConfig('view[customViewPath]');
-            $config->noRecordsMessage = $this->getConfig('view[noRecordsMessage]');
+            $config->recordUrl = $this->getConfig('view[recordUrl]', null);
+            $config->customViewPath = $this->getConfig('view[customViewPath]', null);
 
             $defaultOnClick = sprintf(
                 "$.oc.relationBehavior.clickViewListRecord(':%s', '%s', '%s')",
@@ -819,7 +818,6 @@ class RelationController extends ControllerBehavior
             $config->showSorting = $this->getConfig('manage[showSorting]', !$isPivot);
             $config->defaultSort = $this->getConfig('manage[defaultSort]');
             $config->recordsPerPage = $this->getConfig('manage[recordsPerPage]');
-            $config->noRecordsMessage = $this->getConfig('manage[noRecordsMessage]');
 
             if ($this->viewMode == 'single') {
                 $config->showCheckboxes = false;
@@ -1115,7 +1113,7 @@ class RelationController extends ControllerBehavior
             $this->relationObject->add($newModel, $sessionKey);
         }
         elseif ($this->viewMode == 'single') {
-            $newModel = $this->viewModel = $this->viewWidget->model = $this->manageWidget->model;
+            $newModel = $this->manageWidget->model;
             $this->viewWidget->setFormValues($saveData);
 
             /*
@@ -1125,15 +1123,6 @@ class RelationController extends ControllerBehavior
                 $newModel->save(null, $this->manageWidget->getSessionKey());
             }
 
-            if ($this->relationType === 'hasOne') {
-                // Unassign previous relation if one is already assigned
-                $relation = $this->relationObject->getParent()->{$this->relationName} ?? null;
-
-                if ($relation) {
-                    $this->relationObject->remove($relation, $sessionKey);
-                }
-            }
-
             $this->relationObject->add($newModel, $sessionKey);
 
             /*
@@ -1168,11 +1157,7 @@ class RelationController extends ControllerBehavior
             }
         }
         elseif ($this->viewMode == 'single') {
-            // Ensure that the view widget model is the same instance as the manage widget model
-            // since they will technically be different object instances in this context as
-            // $viewWidet->model is populated by $this->relationObject->getResults() and
-            // $manageWidget->model is populated by $this->relationModel->find($manageId);
-            $this->viewModel = $this->viewWidget->model = $this->manageWidget->model;
+            $this->viewModel = $this->manageWidget->model;
 
             $this->viewWidget->setFormValues($saveData);
             $this->viewModel->save(null, $this->manageWidget->getSessionKey());
@@ -1256,15 +1241,6 @@ class RelationController extends ControllerBehavior
          */
         elseif ($this->viewMode == 'single') {
             if ($recordId && ($model = $this->relationModel->find($recordId))) {
-                if ($this->relationType === 'hasOne') {
-                    // Unassign previous relation if one is already assigned
-                    $relation = $this->relationObject->getParent()->{$this->relationName} ?? null;
-
-                    if ($relation) {
-                        $this->relationObject->remove($relation, $sessionKey);
-                    }
-                }
-
                 $this->relationObject->add($model, $sessionKey);
                 $this->viewWidget->setFormValues($model->attributes);
 
@@ -1333,11 +1309,7 @@ class RelationController extends ControllerBehavior
                 }
             }
 
-            // Reinitialise the form with a blank model
-            $this->initRelation($this->model);
-
             $this->viewWidget->setFormValues([]);
-            $this->viewModel = $this->relationModel;
         }
 
         return $this->relationRefresh();
diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index 4b9681972..1795afca0 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -214,10 +214,7 @@ class ReorderController extends ControllerBehavior
         $model = $this->controller->reorderGetModel();
         $modelTraits = class_uses($model);
 
-        if (
-            isset($modelTraits[\October\Rain\Database\Traits\Sortable::class]) ||
-            $model->isClassExtendedWith(\October\Rain\Database\Behaviors\Sortable::class)
-        ) {
+        if (isset($modelTraits[\October\Rain\Database\Traits\Sortable::class])) {
             $this->sortMode = 'simple';
         }
         elseif (isset($modelTraits[\October\Rain\Database\Traits\NestedTree::class])) {
@@ -225,7 +222,7 @@ class ReorderController extends ControllerBehavior
             $this->showTree = true;
         }
         else {
-            throw new ApplicationException('The model must implement the Sortable trait/behavior or the NestedTree trait.');
+            throw new ApplicationException('The model must implement the NestedTree or Sortable traits.');
         }
 
         return $model;
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index d9782a267..f2b6efc68 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -124,7 +124,7 @@ class FormField
     /**
      * @var string Specifies a comment to accompany the field
      */
-    public $comment = '';
+    public $comment;
 
     /**
      * @var string Specifies the comment position.
@@ -139,7 +139,7 @@ class FormField
     /**
      * @var string Specifies a message to display when there is no value supplied (placeholder).
      */
-    public $placeholder = '';
+    public $placeholder;
 
     /**
      * @var array Contains a list of attributes specified in the field configuration.
diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php
index f88baf6c9..ee57c1666 100644
--- a/modules/backend/classes/NavigationManager.php
+++ b/modules/backend/classes/NavigationManager.php
@@ -28,11 +28,6 @@ class NavigationManager
      */
     protected $items;
 
-    /**
-     * @var QuickActionItem[] List of registered quick actions.
-     */
-    protected $quickActions;
-
     protected $contextSidenavPartials = [];
 
     protected $contextOwner;
@@ -59,9 +54,6 @@ class NavigationManager
      */
     protected function loadItems()
     {
-        $this->items = [];
-        $this->quickActions = [];
-
         /*
          * Load module items
          */
@@ -76,18 +68,11 @@ class NavigationManager
 
         foreach ($plugins as $id => $plugin) {
             $items = $plugin->registerNavigation();
-            $quickActions = $plugin->registerQuickActions();
-
-            if (!is_array($items) && !is_array($quickActions)) {
+            if (!is_array($items)) {
                 continue;
             }
 
-            if (is_array($items)) {
-                $this->registerMenuItems($id, $items);
-            }
-            if (is_array($quickActions)) {
-                $this->registerQuickActions($id, $quickActions);
-            }
+            $this->registerMenuItems($id, $items);
         }
 
         /**
@@ -106,21 +91,17 @@ class NavigationManager
         Event::fire('backend.menu.extendItems', [$this]);
 
         /*
-         * Sort menu items and quick actions
+         * Sort menu items
          */
         uasort($this->items, static function ($a, $b) {
             return $a->order - $b->order;
         });
-        uasort($this->quickActions, static function ($a, $b) {
-            return $a->order - $b->order;
-        });
 
         /*
-         * Filter items and quick actions that the user lacks permission for
+         * Filter items user lacks permission for
          */
         $user = BackendAuth::getUser();
         $this->items = $this->filterItemPermissions($user, $this->items);
-        $this->quickActions = $this->filterItemPermissions($user, $this->quickActions);
 
         foreach ($this->items as $item) {
             if (!$item->sideMenu || !count($item->sideMenu)) {
@@ -202,6 +183,10 @@ class NavigationManager
      */
     public function registerMenuItems($owner, array $definitions)
     {
+        if (!$this->items) {
+            $this->items = [];
+        }
+
         $validator = Validator::make($definitions, [
             '*.label' => 'required',
             '*.icon' => 'required_without:*.iconSvg',
@@ -335,21 +320,6 @@ class NavigationManager
         return true;
     }
 
-    /**
-     * Remove multiple side menu items
-     *
-     * @param string $owner
-     * @param string $code
-     * @param array  $sideCodes
-     * @return void
-     */
-    public function removeSideMenuItems($owner, $code, $sideCodes)
-    {
-        foreach ($sideCodes as $sideCode) {
-            $this->removeSideMenuItem($owner, $code, $sideCode);
-        }
-    }
-
     /**
      * Removes a single main menu item
      * @param string $owner
@@ -376,12 +346,8 @@ class NavigationManager
      */
     public function listMainMenuItems()
     {
-        if ($this->items === null && $this->quickActions === null) {
-            $this->loadItems();
-        }
-
         if ($this->items === null) {
-            return [];
+            $this->loadItems();
         }
 
         foreach ($this->items as $item) {
@@ -463,137 +429,6 @@ class NavigationManager
         return $items;
     }
 
-    /**
-     * Registers quick actions in the main navigation.
-     *
-     * Quick actions are single purpose links displayed to the left of the user menu in the
-     * backend main navigation.
-     *
-     * The argument is an array of the quick action items. The array keys represent the
-     * quick action item codes, specific for the plugin/module. Each element in the
-     * array should be an associative array with the following keys:
-     * - label - specifies the action label localization string key, used as a tooltip, required.
-     * - icon - an icon name from the Font Awesome icon collection, required if iconSvg is unspecified.
-     * - iconSvg - a custom SVG icon to use for the icon, required if icon is unspecified.
-     * - url - the back-end relative URL the quick action item should point to, required.
-     * - permissions - an array of permissions the back-end user should have, optional.
-     *   The item will be displayed if the user has any of the specified permissions.
-     * - order - a position of the item in the menu, optional.
-     *
-     * @param string $owner Specifies the quick action items owner plugin or module in the format Author.Plugin.
-     * @param array $definitions An array of the quick action item definitions.
-     * @return void
-     * @throws SystemException If the validation of the quick action configuration fails
-     */
-    public function registerQuickActions($owner, array $definitions)
-    {
-        $validator = Validator::make($definitions, [
-            '*.label' => 'required',
-            '*.icon' => 'required_without:*.iconSvg',
-            '*.url' => 'required'
-        ]);
-
-        if ($validator->fails()) {
-            $errorMessage = 'Invalid quick action item detected in ' . $owner . '. Contact the plugin author to fix (' . $validator->errors()->first() . ')';
-            if (Config::get('app.debug', false)) {
-                throw new SystemException($errorMessage);
-            }
-
-            Log::error($errorMessage);
-        }
-
-        $this->addQuickActionItems($owner, $definitions);
-    }
-
-    /**
-     * Dynamically add an array of quick action items
-     *
-     * @param string $owner
-     * @param array  $definitions
-     * @return void
-     */
-    public function addQuickActionItems($owner, array $definitions)
-    {
-        foreach ($definitions as $code => $definition) {
-            $this->addQuickActionItem($owner, $code, $definition);
-        }
-    }
-
-    /**
-     * Dynamically add a single quick action item
-     *
-     * @param string $owner
-     * @param string $code
-     * @param array  $definition
-     * @return void
-     */
-    public function addQuickActionItem($owner, $code, array $definition)
-    {
-        $itemKey = $this->makeItemKey($owner, $code);
-
-        if (isset($this->quickActions[$itemKey])) {
-            $definition = array_merge((array) $this->quickActions[$itemKey], $definition);
-        }
-
-        $item = array_merge($definition, [
-            'code'  => $code,
-            'owner' => $owner
-        ]);
-
-        $this->quickActions[$itemKey] = QuickActionItem::createFromArray($item);
-    }
-
-    /**
-     * Gets the instance of a specified quick action item.
-     *
-     * @param string $owner
-     * @param string $code
-     * @return QuickActionItem
-     * @throws SystemException
-     */
-    public function getQuickActionItem(string $owner, string $code)
-    {
-        $itemKey = $this->makeItemKey($owner, $code);
-
-        if (!array_key_exists($itemKey, $this->quickActions)) {
-            throw new SystemException('No quick action item found with key ' . $itemKey);
-        }
-
-        return $this->quickActions[$itemKey];
-    }
-
-    /**
-     * Removes a single quick action item
-     *
-     * @param $owner
-     * @param $code
-     * @return void
-     */
-    public function removeQuickActionItem($owner, $code)
-    {
-        $itemKey = $this->makeItemKey($owner, $code);
-        unset($this->quickActions[$itemKey]);
-    }
-
-    /**
-     * Returns a list of quick action items.
-     *
-     * @return array
-     * @throws SystemException
-     */
-    public function listQuickActionItems()
-    {
-        if ($this->items === null && $this->quickActions === null) {
-            $this->loadItems();
-        }
-
-        if ($this->quickActions === null) {
-            return [];
-        }
-
-        return $this->quickActions;
-    }
-
     /**
      * Sets the navigation context.
      * The function sets the navigation owner, main menu item code and the side menu item code.
diff --git a/modules/backend/composer.json b/modules/backend/composer.json
index c199e9fe1..aae3d258f 100644
--- a/modules/backend/composer.json
+++ b/modules/backend/composer.json
@@ -8,13 +8,11 @@
     "authors": [
         {
             "name": "Alexey Bobkov",
-            "email": "aleksey.bobkov@gmail.com",
-            "role": "Co-founder"
+            "email": "aleksey.bobkov@gmail.com"
         },
         {
             "name": "Samuel Georges",
-            "email": "daftspunky@gmail.com",
-            "role": "Co-founder"
+            "email": "daftspunky@gmail.com"
         },
         {
             "name": "Luke Towers",
@@ -24,10 +22,9 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.0",
         "composer/installers": "~1.0",
-        "october/rain": "~1.1.0",
-        "laravel/framework": "~6.0"
+        "october/rain": "~1.0.469"
     },
     "autoload": {
         "psr-4": {
diff --git a/modules/backend/controllers/Preferences.php b/modules/backend/controllers/Preferences.php
index 1a9e25828..9a79f88b5 100644
--- a/modules/backend/controllers/Preferences.php
+++ b/modules/backend/controllers/Preferences.php
@@ -57,7 +57,7 @@ class Preferences extends Controller
      */
     public function formExtendFields($form)
     {
-        if (!$this->user->hasAccess('backend.manage_own_editor')) {
+        if (!$this->user->hasAccess('backend.manage_editor')) {
             $form->removeTab('backend::lang.backend_preferences.code_editor');
         }
     }
diff --git a/modules/backend/controllers/users/config_filter.yaml b/modules/backend/controllers/users/config_filter.yaml
index d9660cc48..08ebb3f56 100644
--- a/modules/backend/controllers/users/config_filter.yaml
+++ b/modules/backend/controllers/users/config_filter.yaml
@@ -8,8 +8,8 @@ scopes:
         label: backend::lang.user.superuser
         type: switch
         conditions:
-            - is_superuser = 0
-            - is_superuser = 1
+            - is_superuser = false
+            - is_superuser = true
 
     login_date:
         label: backend::lang.user.last_login
diff --git a/modules/backend/database/seeds/DatabaseSeeder.php b/modules/backend/database/seeds/DatabaseSeeder.php
index 50701273e..7be5f9885 100644
--- a/modules/backend/database/seeds/DatabaseSeeder.php
+++ b/modules/backend/database/seeds/DatabaseSeeder.php
@@ -1,6 +1,5 @@
 <?php namespace Backend\Database\Seeds;
 
-use Str;
 use Seeder;
 use Eloquent;
 
@@ -9,22 +8,12 @@ class DatabaseSeeder extends Seeder
     /**
      * Run the database seeds.
      *
-     * @return string
+     * @return void
      */
     public function run()
     {
-        $adminPassword = Str::random(22);
+        Eloquent::unguard();
 
-        Eloquent::unguarded(function () use ($adminPassword) {
-            // Generate a random password for the seeded admin account
-            $adminSeeder = new \Backend\Database\Seeds\SeedSetupAdmin;
-            $adminSeeder->setDefaults([
-                'password' => $adminPassword
-            ]);
-            $this->call($adminSeeder);
-        });
-
-        return 'The following password has been automatically generated for the "admin" account: '
-            . "<fg=yellow;options=bold>${adminPassword}</>";
+        $this->call('Backend\Database\Seeds\SeedSetupAdmin');
     }
 }
diff --git a/modules/backend/facades/Backend.php b/modules/backend/facades/Backend.php
index 1a1ae24bd..4ca59f641 100644
--- a/modules/backend/facades/Backend.php
+++ b/modules/backend/facades/Backend.php
@@ -2,24 +2,12 @@
 
 use October\Rain\Support\Facade;
 
-/**
- * @method static string uri()
- * @method static string url(string $path = null, array $parameters = [], bool $secure = null)
- * @method static string baseUrl(string $path = null)
- * @method static string skinAsset(string $path = null)
- * @method static \Illuminate\Http\RedirectResponse redirect(string $path, int $status = 302, array $headers = [], bool $secure = null)
- * @method static \Illuminate\Http\RedirectResponse redirectGuest(string $path, int $status = 302, array $headers = [], bool $secure = null)
- * @method static \Illuminate\Http\RedirectResponse redirectIntended(string $path, int $status = 302, array $headers = [], bool $secure = null)
- * @method static string date($dateTime, array $options = [])
- * @method static string dateTime($dateTime, array $options = [])
- *
- * @see \Backend\Helpers\Backend
- */
 class Backend extends Facade
 {
     /**
      * Get the registered name of the component.
      *
+     * @see \Backend\Helpers\Backend
      * @return string
      */
     protected static function getFacadeAccessor()
diff --git a/modules/backend/facades/BackendAuth.php b/modules/backend/facades/BackendAuth.php
index 6c3cfc078..99dde86f3 100644
--- a/modules/backend/facades/BackendAuth.php
+++ b/modules/backend/facades/BackendAuth.php
@@ -2,22 +2,14 @@
 
 use October\Rain\Support\Facade;
 
-/**
- * @method static void registerCallback(callable $callback)
- * @method static void registerPermissions(string $owner, array $definitions)
- * @method static void removePermission(string $owner, string $code)
- * @method static array listPermissions()
- * @method static array listTabbedPermissions()
- * @method static array listPermissionsForRole(string $role, bool $includeOrphans = true)
- * @method static boolean hasPermissionsForRole(string $role)
- *
- * @see \Backend\Classes\AuthManager
- */
 class BackendAuth extends Facade
 {
     /**
      * Get the registered name of the component.
      *
+     * Resolves to:
+     * - Backend\Classes\AuthManager
+     *
      * @return string
      */
     protected static function getFacadeAccessor()
diff --git a/modules/backend/facades/BackendMenu.php b/modules/backend/facades/BackendMenu.php
index 9b305c188..eb93dff9a 100644
--- a/modules/backend/facades/BackendMenu.php
+++ b/modules/backend/facades/BackendMenu.php
@@ -2,36 +2,14 @@
 
 use October\Rain\Support\Facade;
 
-/**
- * @method static void registerCallback(callable $callback)
- * @method static void registerMenuItems(string $owner, array $definitions)
- * @method static void addMainMenuItems(string $owner, array $definitions)
- * @method static void addMainMenuItem(string $owner, $code, array $definition)
- * @method static \Backend\Classes\MainMenuItem getMainMenuItem(string $owner, string $code)
- * @method static void removeMainMenuItem(string $owner, string $code)
- * @method static void addSideMenuItems(string $owner, string $code, array $definitions)
- * @method static bool addSideMenuItem(string $owner, string $code, string $sideCode, array $definition)
- * @method static bool removeSideMenuItem(string $owner, string $code, string $sideCode)
- * @method static \Backend\Classes\MainMenuItem[] listMainMenuItems()
- * @method static \Backend\Classes\SideMenuItem[] listSideMenuItems(string|null $owner = null, string|null $code = null)
- * @method static void setContext(string $owner, string $mainMenuItemCode, string|null $sideMenuItemCode = null)
- * @method static void setContextOwner(string $owner)
- * @method static void setContextMainMenu(string $mainMenuItemCode)
- * @method static object getContext()
- * @method static void setContextSideMenu(string $sideMenuItemCode)
- * @method static bool isMainMenuItemActive(\Backend\Classes\MainMenuItem $item)
- * @method static \Backend\Classes\MainMenuItem|null getActiveMainMenuItem()
- * @method static bool isSideMenuItemActive(\Backend\Classes\SideMenuItem $item)
- * @method static void registerContextSidenavPartial(string $owner, string $mainMenuItemCode, string $partial)
- * @method static mixed getContextSidenavPartial(string $owner, string $mainMenuItemCode)
- *
- * @see \Backend\Classes\NavigationManager
- */
 class BackendMenu extends Facade
 {
     /**
      * Get the registered name of the component.
      *
+     * Resolves to:
+     * - Backend\Classes\NavigationManager
+     *
      * @return string
      */
     protected static function getFacadeAccessor()
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index 159f20c3e..95ac67c90 100644
--- a/modules/backend/formwidgets/Repeater.php
+++ b/modules/backend/formwidgets/Repeater.php
@@ -248,6 +248,16 @@ class Repeater extends FormWidgetBase
             }
         }
 
+        if (!$this->childAddItemCalled && $currentValue === null) {
+            $this->formWidgets = [];
+            return;
+        }
+
+        if ($this->childAddItemCalled && !isset($currentValue[$this->childIndexCalled])) {
+            // If no value is available but a child repeater has added an item, add a "stub" repeater item
+            $this->makeItemFormWidget($this->childIndexCalled);
+        }
+
         // Ensure that the minimum number of items are preinitialized
         // ONLY DONE WHEN NOT IN GROUP MODE
         if (!$this->useGroups && $this->minItems > 0) {
@@ -263,16 +273,6 @@ class Repeater extends FormWidgetBase
             }
         }
 
-        if (!$this->childAddItemCalled && $currentValue === null) {
-            $this->formWidgets = [];
-            return;
-        }
-
-        if ($this->childAddItemCalled && !isset($currentValue[$this->childIndexCalled])) {
-            // If no value is available but a child repeater has added an item, add a "stub" repeater item
-            $this->makeItemFormWidget($this->childIndexCalled);
-        }
-
         if (!is_array($currentValue)) {
             return;
         }
diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php
index d8d26785e..0949ced02 100644
--- a/modules/backend/formwidgets/RichEditor.php
+++ b/modules/backend/formwidgets/RichEditor.php
@@ -186,19 +186,6 @@ class RichEditor extends FormWidgetBase
     {
         $result = [];
 
-        /**
-         * @event backend.richeditor.listTypes
-         * Register additional "page link types" to the RichEditor FormWidget
-         *
-         * Example usage:
-         *
-         *     Event::listen('backend.richeditor.listTypes', function () {
-         *          return [
-         *              'my-identifier' => 'author.plugin::lang.richeditor.link_types.my_identifier',
-         *          ];
-         *     });
-         *
-         */
         $apiResult = Event::fire('backend.richeditor.listTypes');
         if (is_array($apiResult)) {
             foreach ($apiResult as $typeList) {
@@ -218,28 +205,6 @@ class RichEditor extends FormWidgetBase
     protected function getPageLinks($type)
     {
         $result = [];
-
-        /**
-         * @event backend.richeditor.getTypeInfo
-         * Register additional "page link types" to the RichEditor FormWidget
-         *
-         * Example usage:
-         *
-         *     Event::listen('backend.richeditor.getTypeInfo', function ($type) {
-         *          if ($type === 'my-identifier') {
-         *              return [
-         *                  'https://example.com/page1' => 'Page 1',
-         *                  'https://example.com/parent-page' => [
-         *                      'title' => 'Parent Page',
-         *                      'links' => [
-         *                          'https://example.com/child-page' => 'Child Page',
-         *                      ],
-         *                  ],
-         *              ];
-         *          }
-         *     });
-         *
-         */
         $apiResult = Event::fire('backend.richeditor.getTypeInfo', [$type]);
         if (is_array($apiResult)) {
             foreach ($apiResult as $typeInfo) {
diff --git a/modules/backend/formwidgets/fileupload/assets/js/fileupload.js b/modules/backend/formwidgets/fileupload/assets/js/fileupload.js
index 23a7bed70..021fcab97 100644
--- a/modules/backend/formwidgets/fileupload/assets/js/fileupload.js
+++ b/modules/backend/formwidgets/fileupload/assets/js/fileupload.js
@@ -142,7 +142,7 @@
             targetWidth,
             targetHeight
 
-        if (!this.options.thumbnailWidth && !this.options.thumbnailHeight) {
+        if (!this.options.thumbnailWidth && !this.options.thumbnailWidth) {
             targetWidth = targetHeight = 100
         }
         else if (this.options.thumbnailWidth) {
diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php
index de9cae563..18671e94e 100644
--- a/modules/backend/helpers/Backend.php
+++ b/modules/backend/helpers/Backend.php
@@ -214,14 +214,14 @@ class Backend
         $contents = file_get_contents($assetFile);
 
         // Find all assets that are compiled in this file
-        preg_match_all('/^=require\s+([A-z0-9-_+\.\/]+)[\n|\r\n|$]/m', $contents, $matches, PREG_SET_ORDER);
+        preg_match_all('/^=require\s+([A-z0-9-_+\.\/]+)$/m', $contents, $matches, PREG_SET_ORDER);
 
         // Determine correct asset path
         $directory = str_replace(basename($file), '', $file);
 
         if (count($matches)) {
             $results = array_map(function ($match) use ($directory) {
-                return str_replace('/', DIRECTORY_SEPARATOR, $directory . $match[1]);
+                return $directory . $match[1];
             }, $matches);
 
             foreach ($results as $i => $result) {
diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
index e765f39f6..5118bb7f5 100644
--- a/modules/backend/lang/de/lang.php
+++ b/modules/backend/lang/de/lang.php
@@ -2,15 +2,12 @@
 
 return [
     'auth' => [
-        'title' => 'Admin-Bereich',
-        'invalid_login' => 'Die Angaben stimmen nicht mit unseren Aufzeichnungen überein. Überprüfen Sie diese und versuchen Sie es noch einmal.',
+        'title' => 'Admin-Bereich'
     ],
     'field' => [
         'invalid_type' => 'Ungültiger Feldtyp :type.',
         'options_method_invalid_model' => 'Das Attribut ":field" löst sich nicht zu einen gültigen Model auf. Probiere die options Methode der Model-Klasse :model explicit zu definieren.',
-        'options_method_not_exists' => 'Die Modell-Klasse :model muss eine Methode :method() mit Rückgabe der Werte von ":field" besitzen.',
-        'options_static_method_invalid_value' => "Die statische Methode ':method()' in der Klasse :class hat kein valides Optionsarray zurückgegeben.",
-        'colors_method_not_exists' => "Die Modellklasse :model muss eine Methode :method() definieren, welche html color (HEX) codes für das ':field' Formularfeld zurückgibt.",
+        'options_method_not_exists' => 'Die Model-Klasse :model muss eine Methode :method() mit Rückgabe der Werte von ":field" besitzen.',
     ],
     'widget' => [
         'not_registered' => "Ein Widget namens ':name' wurde nicht registriert",
@@ -18,11 +15,6 @@ return [
     ],
     'page' => [
         'untitled' => "Unbenannt",
-        '404' => [
-            'label' => 'Seite nicht gefunden',
-            'help' => "Die von Ihnen angeforderte Seite konnte nicht gefunden werden.",
-            'back_link' => 'Zurück zur vorigen Seite',
-        ],
         'access_denied' => [
             'label' => "Zugriff verweigert",
             'help' => "Sie haben nicht die erforderlichen Berechtigungen, um diese Seite zu sehen.",
@@ -36,23 +28,14 @@ return [
     ],
     'partial' => [
         'not_found_name' => "Das Partial ':name' wurde nicht gefunden.",
-        'invalid_name' => 'Ungültiger Partial: :name.',
-    ],
-    'ajax_handler' => [
-        'invalid_name' => 'Ungültiger AJAX handler: :name.',
-        'not_found' => "AJAX handler ':name' wurde nicht gefunden.",
     ],
     'account' => [
-        'impersonate_confirm' => 'Sind Sie sicher, dass Sie sich als dieser Benutzer anmelden wollen? Sie können zu Ihrem ursprünglichen Zustand zurückkehren, indem Sie sich abmelden.',
-        'impersonate_success' => 'Sie sind jetzt als dieser Benutzer angemeldet',
-        'signed_in_as' => 'Angemeldet als :full_name',
         'sign_out' => 'Abmelden',
         'login' => 'Anmelden',
         'reset' => 'Zurücksetzen',
         'restore' => 'Wiederherstellen',
         'login_placeholder' => 'Benutzername',
         'password_placeholder' => 'Passwort',
-        'remember_me' => 'Angemeldet bleiben',
         'forgot_password' => "Passwort vergessen?",
         'enter_email' => "Bitte E-Mail-Adresse eingeben",
         'enter_login' => "Bitte Benutzernamen eingeben",
@@ -129,8 +112,6 @@ return [
         'last_name' => 'Nachname',
         'full_name' => 'Kompletter Name',
         'email' => 'E-Mail',
-        'role_field' => 'Rolle',
-        'role_comment' => 'Rollen definieren Benutzerberechtigungen, die auf Benutzerebene auf der Registerkarte Berechtigungen überschrieben werden können.',
         'groups' => 'Gruppen',
         'groups_comment' => 'Geben Sie hier die Gruppenzugehörigkeit an',
         'avatar' => 'Avatar',
@@ -167,25 +148,9 @@ return [
             'return' => 'Zurück zur Gruppen-Übersicht',
             'users_count' => 'Benutzer',
         ],
-        'role' => [
-            'name' => 'Rolle',
-            'name_field' => 'Name',
-            'name_comment' => 'Der Name wird in der Rollenliste auf dem Administratorformular angezeigt.',
-            'description_field' => 'Beschreibung',
-            'code_field' => 'Code',
-            'code_comment' => 'Geben Sie einen eindeutigen Code an, wenn Sie mit der API auf das Rollenobjekt zugreifen möchten.',
-            'menu_label' => 'Rollen verwalten',
-            'list_title' => 'Rollen verwalten',
-            'new' => 'Neue Rolle',
-            'delete_confirm' => 'Diese Administratorrolle löschen?',
-            'return' => 'Zurück zur Rollenliste',
-            'users_count' => 'Benutzer',
-        ],
         'preferences' => [
             'not_authenticated' => 'Zum Speichern oder Anzeigen dieser Einstellungen liegt kein Nutzerkonto vor'
-        ],
-        'trashed_hint_title' => 'Dieses Konto wurde gelöscht.',
-        'trashed_hint_desc' => 'Dieses Konto wurde gelöscht und kann nicht mehr angemeldet werden. Um es wiederherzustellen, klicken Sie auf das Symbol "Benutzer wiederherstellen" unten rechts',
+        ]
     ],
     'list' => [
         'default_title' => 'Auflisten',
@@ -230,11 +195,6 @@ return [
         'remove_confirm' => 'Sind Sie sicher?',
         'remove_file' => 'Datei entfernen',
     ],
-    'repeater' => [
-        'add_new_item' => 'Neues Element hinzufügen',
-        'min_items_failed' => ':name erfordert ein Minimum an :min Elementen, aber es wurden nur :items bereitgestellt',
-        'max_items_failed' => ':name lässt nur bis zu :max Elemente zu, :items wurden bereitgestellt',
-    ],
     'form' => [
         'create_title' => "Neuer :name",
         'update_title' => "Bearbeite :name",
@@ -352,8 +312,6 @@ return [
         'permissions'  => 'Verzeichnis :name oder ein Unterverzeichnis kann nicht von PHP beschrieben werden. Bitte setzen Sie die korrekten Rechte für den Webserver in diesem Verzeichnis.',
         'extension' => 'Die PHP Erweiterung :name ist nicht installiert. Bitte installieren Sie diese Library und aktivieren Sie die Erweiterung.',
         'plugin_missing' => 'Das Plugin :name hat eine Abhängigkeit die nicht installiert ist. Bitte installieren Sie alle benötigten Plugins.',
-        'debug' => 'Der Debug-Modus ist aktiviert. Dies wird für Produktionsinstallationen nicht empfohlen.',
-        'decompileBackendAssets' => 'Assets im Backend sind derzeit dekompiliert. Dies wird für Produktionsinstallationen nicht empfohlen.',
     ],
     'editor' => [
         'menu_label' => 'Editor Einstellungen',
@@ -409,8 +367,6 @@ return [
             'minimal' => 'Minimal',
             'full' => 'Vollständig',
         ],
-        'paragraph_formats' => 'Absatzformatierungen',
-        'paragraph_formats_comment' => 'Die Optionen, welche in der Dropdown-Liste für Absatzformatierungen angezeigt werden.',
     ],
     'tooltips' => [
         'preview_website' => 'Vorschau der Webseite'
@@ -430,8 +386,6 @@ return [
         'brand' => 'Brand',
         'logo' => 'Logo',
         'logo_description' => 'Lade ein eigenes Logo hoch, das im Backend verwendet werden soll.',
-        'favicon' => 'Favicon',
-        'favicon_description' => 'Laden Sie ein benutzerdefiniertes Favicon zur Verwendung im Back-End hoch',
         'app_name' => 'App-Name',
         'app_name_description' => 'Dieser Name wird als Titel des Backends angezeigt.',
         'app_tagline' => 'App-Tagline',
@@ -445,7 +399,6 @@ return [
         'navigation' => 'Navigation',
         'menu_mode' => 'Menustyles',
         'menu_mode_inline' => 'Inline',
-        'menu_mode_inline_no_icons' => 'Inline (ohne Icons)',
         'menu_mode_tile' => 'Tiles',
         'menu_mode_collapsed' => 'Collapsed'
     ],
@@ -550,7 +503,6 @@ return [
     ],
     'permissions' => [
         'manage_media' => 'Medien verwalten',
-        'allow_unsafe_markdown' => 'Unsicheres Markdown verwenden (kann Javascript enthalten)',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
@@ -582,12 +534,7 @@ return [
         'multiple_selected' => 'Mehrere Dateien ausgewählt.',
         'uploading_file_num' => 'Lade :number Datei(en)...',
         'uploading_complete' => 'Upload vollständig',
-        'uploading_error' => 'Upload fehlgeschlagen',
-        'type_blocked' => 'Der verwendete Dateityp ist aus Sicherheitsgründen gesperrt.',
         'order_by' => 'Sortieren nach',
-        'direction' => 'Direction',
-        'direction_asc' => 'Aufsteigend',
-        'direction_desc' => 'Absteigend',
         'folder' => 'Ordner',
         'no_files_found' => 'Keine entsprechenden Dateien gefunden.',
         'delete_empty' => 'Bitte Wählen Sie Dateien zum Löschen aus.',
@@ -610,11 +557,11 @@ return [
         'restore' => 'Alle Änderungen rückgängig machen',
         'resize' => 'Größe anpassen...',
         'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Festes Verhältnis',
-        'selection_mode_fixed_size' => 'Feste Größe',
+        'selection_mode_fixed_ratio' => 'Fixes Verhältnis',
+        'selection_mode_fixed_size' => 'Fixe Größe',
         'height' => 'Höhe',
         'width' => 'Breite',
-        'selection_mode' => 'Auswahlmodus',
+        'selection_mode' => 'Selection mode',
         'resize_image' => 'Bildgröße anpassen',
         'image_size' => 'Dimensionen:',
         'selected_size' => 'Ausgewählt:'
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index aca0ab6cd..368664c63 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -9,7 +9,6 @@ return [
         'invalid_type' => 'Invalid field type used :type.',
         'options_method_invalid_model' => "The attribute ':field' does not resolve to a valid model. Try specifying the options method for model class :model explicitly.",
         'options_method_not_exists' => "The model class :model must define a method :method() returning options for the ':field' form field.",
-        'options_static_method_invalid_value' => "The static method ':method()' on :class did not return a valid options array.",
         'colors_method_not_exists' => "The model class :model must define a method :method() returning html color HEX codes for the ':field' form field.",
     ],
     'widget' => [
@@ -373,7 +372,6 @@ return [
     'editor' => [
         'menu_label' => 'Editor settings',
         'menu_description' => 'Customize the global editor preferences, such as font size and color scheme.',
-        'preview' => 'Preview',
         'font_size' => 'Font size',
         'tab_size' => 'Tab size',
         'use_hard_tabs' => 'Indent using tabs',
diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php
index e8c0a257e..2e5764c61 100644
--- a/modules/backend/lang/es/lang.php
+++ b/modules/backend/lang/es/lang.php
@@ -307,11 +307,11 @@ return [
         'auto_closing' => 'Cerrado de etiquetas automático',
         'show_invisibles' => 'Mostrar caracteres invisibles',
         'show_gutter' => 'Mostrar numeros de línea',
-        'basic_autocompletion' => 'Autocompletado Basico (Ctrl + Espacio)',
-        'live_autocompletion' => 'Autocompletado en Vivo',
-        'enable_snippets' => 'Activar uso de Snippets',
-        'display_indent_guides' => 'Mostrar Guias de Identado',
-        'show_print_margin' => 'Mostrar Margen de impresión',
+        'basic_autocompletion'=> 'Autocompletado Basico (Ctrl + Espacio)',
+        'live_autocompletion'=> 'Autocompletado en Vivo',
+        'enable_snippets'=> 'Activar uso de Snippets',
+        'display_indent_guides'=> 'Mostrar Guias de Identado',
+        'show_print_margin'=> 'Mostrar Margen de impresión',
         'mode_off' => 'Off',
         'mode_fluid' => 'Fluido',
         '40_characters' => '40 Caracteres',
@@ -396,8 +396,7 @@ return [
     'filter' => [
         'all' => 'todo',
         'options_method_not_exists' => "La clase de modelo :model debe definir un método :method() para regresar opciones para el filtro ':filter'.",
-        'date_all' => 'todo el período',
-        'number_all' => 'todos los números'
+        'date_all' => 'todo el período'
     ],
     'import_export' => [
         'upload_csv_file' => '1. Subir un archivo CSV',
diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php
index e0dab8b92..022bdbb33 100644
--- a/modules/backend/lang/it/lang.php
+++ b/modules/backend/lang/it/lang.php
@@ -228,7 +228,7 @@ return [
         'preview_no_record_message' => 'Nessun record selezionato.',
         'select' => 'Seleziona',
         'select_all' => 'seleziona tutto',
-        'select_none' => 'deseleziona tutto',
+        'select_none' => 'non selezionare niente',
         'select_placeholder' => 'seleziona',
         'insert_row' => 'Inserisci riga',
         'insert_row_below' => 'Inserisci riga sotto',
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index 4c8375b32..d214a087c 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -9,7 +9,6 @@ return [
         'invalid_type' => 'Ongeldig type veld: :type.',
         'options_method_invalid_model' => "Het attribuut ':field' levert geen geldig model op. Probeer de opties methode expliciet te specifieren voor modelklasse :model.",
         'options_method_not_exists' => 'De modelklasse :model moet de methode :method() definiëren met daarin opties voor het veld ":field".',
-        'options_static_method_invalid_value' => "De statische methode ':method()' in :class leverde geen geldige array met opties op.",
         'colors_method_not_exists' => 'De modelklasse :model moet de methode :method() definiëren met daarin html HEX kleurcodes voor het veld ":field".',
     ],
     'widget' => [
@@ -373,7 +372,6 @@ return [
     'editor' => [
         'menu_label' => 'Editor instellingen',
         'menu_description' => 'Beheer editor instellingen, zoals lettergrootte en kleurschema.',
-        'preview' => 'Voorbeeldweergave',
         'font_size' => 'Lettergrootte',
         'tab_size' => 'Tab grootte',
         'use_hard_tabs' => 'Inspringen met tabs',
@@ -408,7 +406,6 @@ return [
         'label' => 'Label',
         'class_name' => 'Class naam',
         'markup_tags' => 'Opmaak HTML-tags',
-        'markup_tag' => 'Opmaak HTML-tag',
         'allowed_empty_tags' => 'Toegestane lege HTML-tags',
         'allowed_empty_tags_comment' => 'Een lijst van HTML-tags die niet worden verwijderd als ze leeg zijn.',
         'allowed_tags' => 'Toegestane HTML-tags',
@@ -419,7 +416,6 @@ return [
         'remove_tags_comment' => 'Een lijst van HTML-tags die samen met hun inhoud worden verwijderd.',
         'line_breaker_tags' => 'Line breaker tags',
         'line_breaker_tags_comment' => 'Een lijst van HTML-tags waartussen een line breaker element wordt geplaatst.',
-        'toolbar_options' => 'Toolbar opties',
         'toolbar_buttons' => 'Toolbar knoppen',
         'toolbar_buttons_comment' => 'De toolbar knoppen die standaard getoond worden door de Rich Editor.',
         'toolbar_buttons_preset' => 'Voeg preset toe voor toolbar knoppen:',
@@ -428,11 +424,9 @@ return [
             'minimal' => 'Minimaal',
             'full' => 'Volledig',
         ],
-        'paragraph_formats' => 'Paragraaf formaten',
-        'paragraph_formats_comment' => 'De opties die in de "Paragraaf formaat" lijst zullen verschijnen.',
     ],
     'tooltips' => [
-        'preview_website' => 'Voorbeeldweergave website',
+        'preview_website' => 'Voorvertoning website',
     ],
     'mysettings' => [
         'menu_label' => 'Mijn instellingen',
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
index eedd93811..f7db22112 100644
--- a/modules/backend/lang/ru/lang.php
+++ b/modules/backend/lang/ru/lang.php
@@ -7,9 +7,8 @@ return [
     ],
     'field' => [
         'invalid_type' => 'Использован неверный тип поля: :type.',
-        'options_method_invalid_model' => "Атрибут ':field' не соответствует допустимой модели. Попробуйте явно указать метод параметров для класса :model .",
         'options_method_not_exists' => "Класс модели :model должен содержать метод :method(), возвращающий опции для поля формы ':field'.",
-        'colors_method_not_exists' => "Класс модели :model должен содержать метод :method(), возвращающий HTML цвет в HEX для поля формы ':field'.",
+        'colors_method_not_exists' => "Класс модели :model должен содержать метод :method(), возвращающий HTML цвет в HEX для поля формы ':field'."
     ],
     'widget' => [
         'not_registered' => "Класс виджета ':name' не зарегистрирован.",
@@ -25,12 +24,12 @@ return [
         'access_denied' => [
             'label' => 'Доступ запрещен',
             'help' => 'У вас нет необходимых прав для просмотра этой страницы.',
-            'cms_link' => 'Перейти к CMS',
+            'cms_link' => 'Перейти к CMS'
         ],
         'no_database' => [
             'label' => 'Отсутствует база данных',
             'help' => "Для доступа к серверу требуется база данных. Проверьте, что база данных настроена и перенесена, прежде чем повторять попытку.",
-            'cms_link' => 'Вернуться на главную страницу',
+            'cms_link' => 'Вернуться на главную страницу'
         ],
     ],
     'partial' => [
@@ -42,12 +41,6 @@ return [
         'not_found' => "AJAX обработчик ':name' не найден.",
     ],
     'account' => [
-        'impersonate' => 'Имперсонация пользователя',
-        'impersonate_confirm' => 'Вы уверены, что хотите имперсонировать себя в качестве этого пользователя? Вы сможете вернуться в исходное состояние выйдя из системы.',
-        'impersonate_success' => 'Теперь вы имперсонированы как этот пользователь',
-        'impersonate_working' => 'Имперсонация...',
-        'impersonating' => 'Имперсонация :full_name',
-        'stop_impersonating' => 'Остановить имперсонацию',
         'signed_in_as' => 'Выполнен вход как :full_name',
         'sign_out' => 'Выйти',
         'login' => 'Вход',
@@ -57,9 +50,9 @@ return [
         'password_placeholder' => 'пароль',
         'remember_me' => 'Оставаться в системе',
         'forgot_password' => 'Забыли пароль?',
-        'enter_email' => 'Введите ваш Email',
+        'enter_email' => 'Введите вашу почту',
         'enter_login' => 'Введите ваш Логин',
-        'email_placeholder' => 'email',
+        'email_placeholder' => 'почта',
         'enter_new_password' => 'Введите новый пароль',
         'password_reset' => 'Сбросить пароль',
         'restore_success' => 'На вашу электронную почту отправлено сообщение с инструкциями для восстановления пароля.',
@@ -70,7 +63,7 @@ return [
         'apply' => 'Применить',
         'cancel' => 'Отменить',
         'delete' => 'Удалить',
-        'ok' => 'OK',
+        'ok' => 'OK'
     ],
     'dashboard' => [
         'menu_label' => 'Панель управления',
@@ -99,7 +92,7 @@ return [
         'expand_all' => 'Развернуть всё',
         'status' => [
             'widget_title_default' => 'Статус системы',
-            'update_available' => '{0} нет новых обновлений!|{1} доступно новое обновление!|[2,Inf] доступны новые обновления!',
+            'update_available' => '{0} нет новый обновлений!|{1} доступно новое обновление!|[2,Inf] доступны новые обновления!',
             'updates_pending' => 'Доступны обновления',
             'updates_nil' => 'Используется последняя версия',
             'updates_link' => 'Обновить',
@@ -109,7 +102,7 @@ return [
             'core_build' => 'Сборка',
             'event_log' => 'Лог событий',
             'request_log' => 'Лог запросов',
-            'app_birthday' => 'Онлайн с',
+            'app_birthday' => 'Онлайн с'
         ],
         'welcome' => [
             'widget_title_default' => 'Добро пожаловать',
@@ -118,7 +111,7 @@ return [
             'first_sign_in' => 'Это первый раз, когда вы вошли в систему.',
             'last_sign_in' => 'Последний раз вы заходили',
             'view_access_logs' => 'Посмотреть лог доступа',
-            'nice_message' => 'Хорошего дня!',
+            'nice_message' => 'Хорошего дня!'
         ],
     ],
     'user' => [
@@ -170,7 +163,7 @@ return [
             'new' => 'Добавить группу',
             'delete_confirm' => 'Вы действительно хотите удалить эту группу администраторов?',
             'return' => 'Вернуться к списку групп',
-            'users_count' => 'Пользователи',
+            'users_count' => 'Пользователи'
         ],
         'role' => [
             'name' => 'Роль',
@@ -184,10 +177,10 @@ return [
             'new' => 'Новая роль',
             'delete_confirm' => 'Удалить эту роль администратора?',
             'return' => 'Вернуться к списку ролей',
-            'users_count' => 'Пользователи',
+            'users_count' => 'Пользователи'
         ],
         'preferences' => [
-            'not_authenticated' => 'Невозможно загрузить или сохранить настройки для неавторизованного пользователя.',
+            'not_authenticated' => 'Невозможно загрузить или сохранить настройки для неавторизованного пользователя.'
         ],
         'trashed_hint_title' => 'Этот аккаунт был удален',
         'trashed_hint_desc' => 'Этот аккаунт был удален и не может быть авторизован. Чтобы восстановить его, нажмите иконку восстановления пользователя в правом нижнем углу.',
@@ -221,7 +214,7 @@ return [
         'delete_selected_confirm' => 'Удалить выбранные записи?',
         'delete_selected_success' => 'Выбранные записи успешно удалены.',
         'column_switch_true' => 'Да',
-        'column_switch_false' => 'Нет',
+        'column_switch_false' => 'Нет'
     ],
     'fileupload' => [
         'attachment' => 'Приложение',
@@ -233,7 +226,7 @@ return [
         'upload_file' => 'Загрузить файл',
         'upload_error' => 'Ошибка загрузки',
         'remove_confirm' => 'Вы уверены?',
-        'remove_file' => 'Удалить файл',
+        'remove_file' => 'Удалить файл'
     ],
     'repeater' => [
         'add_new_item' => 'Добавить новый объект',
@@ -299,16 +292,15 @@ return [
         'delete_row' => 'Удалить строку',
         'concurrency_file_changed_title' => 'Файл был изменен',
         'concurrency_file_changed_description' => 'Файл,редактируемый вами, был изменен другим пользователем. Вы можете перезагрузить файл и потерять ваши изменения или перезаписать его',
-        'return_to_list' => 'Вернуться к списку',
+        'return_to_list' => 'Вернуться к списку'
     ],
     'recordfinder' => [
         'find_record' => 'Найти запись',
-        'invalid_model_class' => 'Предоставленный класс модели ":modelClass" для поиска записи является недействительным',
-        'cancel' => 'Отмена',
+        'cancel' => 'Отмена'
     ],
     'pagelist' => [
         'page_link' => 'Ссылка на страницу',
-        'select_page' => 'Выберите страницу...',
+        'select_page' => 'Выберите страницу...'
     ],
     'relation' => [
         'missing_config' => "Поведение отношения не имеет конфигурации для ':config'.",
@@ -341,11 +333,11 @@ return [
         'link_name' => 'Соединение :name',
         'unlink' => 'Отвязать',
         'unlink_name' => 'Разъединение :name',
-        'unlink_confirm' => 'Вы уверены?',
+        'unlink_confirm' => 'Вы уверены?'
     ],
     'reorder' => [
         'default_title' => 'Сортировать записи',
-        'no_records' => 'Нет доступных записей для сортировки.',
+        'no_records' => 'Нет доступных записей для сортировки.'
     ],
     'model' => [
         'name' => 'Модель',
@@ -363,7 +355,6 @@ return [
         'extension' => 'Расширение PHP :name не установлено. Установите эту библиотеку и активируйте расширение.',
         'plugin_missing' => 'Плагин :name имеет зависимость. Установите этот плагин.',
         'debug' => 'Режим отладки включен. Это не рекомендуется для рабочих инсталяций.',
-        'decompileBackendAssets' => 'Ассеты в бэкенде в настоящее время декомпилированы. Это не рекомендуется для рабочих инсталяций.',
     ],
     'editor' => [
         'menu_label' => 'Настройки редактора',
@@ -402,7 +393,6 @@ return [
         'label' => 'Название',
         'class_name' => 'Класс',
         'markup_tags' => 'Теги разметки',
-        'markup_tag' => 'Тег разметки',
         'allowed_empty_tags' => 'Разрешенные пустые теги',
         'allowed_empty_tags_comment' => 'Список тегов, которые не будут удаляться, если внутри них нет содержания.',
         'allowed_tags' => 'Разрешенные теги',
@@ -413,29 +403,20 @@ return [
         'remove_tags_comment' => 'Список тегов, которые будут удалены вместе с их содержанием.',
         'line_breaker_tags' => 'Теги с переводом строки',
         'line_breaker_tags_comment' => 'Список тегов, в которых будет использоваться тег перевода строки',
-        'toolbar_options' => 'Опции панели инструментов',
         'toolbar_buttons' => 'Кнопки панели инструментов',
-        'toolbar_buttons_comment' => 'Кнопки панели инструментов, которые будут отображаться в Rich Editor по умолчанию.',
-        'toolbar_buttons_preset' => 'Вставить предустановленный набор кнопок панели инструментов:',
-        'toolbar_buttons_presets' => [
-            'default' => 'По умолчанию',
-            'minimal' => 'Минимальный',
-            'full' => 'Полный',
-        ],
-        'paragraph_formats' => 'Форматы абзацев',
-        'paragraph_formats_comment' => 'Опции появляющиеся в выпадающем списке Форматы абзацев.',
+        'toolbar_buttons_comment' => 'Кнопки панели инструментов, которые будут отображаться в Rich Editor по умолчанию.'
     ],
     'tooltips' => [
-        'preview_website' => 'Просмотр сайта',
+        'preview_website' => 'Просмотр сайта'
     ],
     'mysettings' => [
         'menu_label' => 'Мои настройки',
-        'menu_description' => 'Управление настройками учетной записи администратора.',
+        'menu_description' => 'Управление настройками учетной записи администратора.'
     ],
     'myaccount' => [
         'menu_label' => 'Мой аккаунт',
         'menu_description' => 'Управление личной информацией (имя, почта, пароль)',
-        'menu_keywords' => 'безопасность логин',
+        'menu_keywords' => 'безопасность логин'
     ],
     'branding' => [
         'menu_label' => 'Персонализация панели управления',
@@ -460,7 +441,7 @@ return [
         'menu_mode_inline' => 'Строчный',
         'menu_mode_inline_no_icons' => 'Строчный (без иконок)',
         'menu_mode_tile' => 'Плитка',
-        'menu_mode_collapsed' => 'Схлопнутый',
+        'menu_mode_collapsed' => 'Схлопнутый'
     ],
     'backend_preferences' => [
         'menu_label' => 'Настройки панели управления',
@@ -470,7 +451,7 @@ return [
         'timezone' => 'Часовой пояс',
         'timezone_comment' => 'Выводить даты в выбранном часовом поясе.',
         'locale' => 'Язык',
-        'locale_comment' => 'Выберите желаемый язык панели управления.',
+        'locale_comment' => 'Выберите желаемый язык панели управления.'
     ],
     'access_log' => [
         'hint' => 'В этом журнале отображается список успешных попыток авторизаций администраторов. Записи хранятся :days дней.',
@@ -483,13 +464,13 @@ return [
         'ip_address' => 'IP адрес',
         'first_name' => 'Имя',
         'last_name' => 'Фамилия',
-        'email' => 'Email',
+        'email' => 'Почта'
     ],
     'filter' => [
         'all' => 'все',
         'options_method_not_exists' => "Модель класса :model должна определить метод :method() возвращающего варианты для фильтра ':filter'.",
         'date_all' => 'весь период',
-        'number_all' => 'все номера',
+        'number_all' => 'все номера'
     ],
     'import_export' => [
         'upload_csv_file' => '1. Загрузка CSV-файл',
@@ -560,14 +541,12 @@ return [
             'iso_8859_13' => 'ISO-8859-13 (Latin-7, Baltic Rim)',
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
-            'windows_1250' => 'Windows-1250 (CP1250, Central and Eastern European)',
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
     ],
     'permissions' => [
         'manage_media' => 'Загрузка и управление медиаконтентом - изображениями, видео, звуками, документами',
-        'allow_unsafe_markdown' => 'Использовать небезопасный Markdown (может включать Javascript)',
     ],
     'mediafinder' => [
         'label' => 'Поиск медиа',
@@ -635,6 +614,6 @@ return [
         'selection_mode' => 'Режим выделения',
         'resize_image' => 'Изменение размера изображения',
         'image_size' => 'Размер изображения:',
-        'selected_size' => 'Выбрано:',
+        'selected_size' => 'Выбрано:'
     ],
 ];
diff --git a/modules/backend/lang/sl/lang.php b/modules/backend/lang/sl/lang.php
index 4cb459a2b..d8ca85772 100644
--- a/modules/backend/lang/sl/lang.php
+++ b/modules/backend/lang/sl/lang.php
@@ -6,11 +6,10 @@ return [
         'invalid_login' => 'Podatki, ki ste jih vnesli, se ne ujemajo z našimi zapisi. Prosimo, ponovno preverite podatke in poskusite znova.',
     ],
     'field'               => [
-        'invalid_type'                        => 'Uporabljen je neveljaven tip polja :type.',
-        'options_method_invalid_model'        => "Atribut ':field' ne ustreza veljavnemu modelu. Poskusite natančno določiti možnosti metode za model :model.",
-        'options_method_not_exists'           => "Model :model mora vsebovati metodo :method(), ki vrača možnosti za polje ':field' na obrazcu.",
-        'options_static_method_invalid_value' => "Statična metoda ':method()' v razredu :class ni vrnila veljavnih možnosti.",
-        'colors_method_not_exists'            => "Model :model mora vsebovati metodo :method(), ki vrača HTML barvne kode v HEX formatu za polje ':field' na obrazcu.",
+        'invalid_type'                 => 'Uporabljen je neveljaven tip polja :type.',
+        'options_method_invalid_model' => "Atribut ':field' ne ustreza veljavnemu modelu. Poskusite natančno določiti možnosti metode za model :model.",
+        'options_method_not_exists'    => "Model :model mora vsebovati metodo :method(), ki vrača možnosti za polje ':field' na obrazcu.",
+        'colors_method_not_exists'     => "Model :model mora vsebovati metodo :method(), ki vrača HTML barvne kode v HEX formatu za polje ':field' na obrazcu.",
     ],
     'widget'              => [
         'not_registered' => "Ime vtičnika ':name' ni bilo registrirano.",
@@ -49,10 +48,6 @@ return [
         'impersonate_working'  => 'Impersoniram...',
         'impersonating'        => 'Impersonacija uporabnika :full_name',
         'stop_impersonating'   => 'Prekliči impersonacijo',
-        'unsuspend'            => 'Odsuspendiraj',
-        'unsuspend_confirm'    => 'Ali ste prepričani, da želite odsuspendirati tega uporabnika?',
-        'unsuspend_success'    => 'Uporabnik je odsuspendiran.',
-        'unsuspend_working'    => 'Odsuspendiram...',
         'signed_in_as'         => 'Prijavljeni ste kot :full_name',
         'sign_out'             => 'Odjava',
         'login'                => 'Prijava',
@@ -407,7 +402,6 @@ return [
         'label'                      => 'Opis',
         'class_name'                 => 'Oznaka razreda',
         'markup_tags'                => 'Označevalne oznake',
-        'markup_tag'                 => 'Označevalna oznaka',
         'allowed_empty_tags'         => 'Dovoljene prazne oznake',
         'allowed_empty_tags_comment' => 'Seznam oznak, ki niso odstranjene, če v njih ni vsebine.',
         'allowed_tags'               => 'Dovoljene oznake',
@@ -418,7 +412,6 @@ return [
         'remove_tags_comment'        => 'Seznam oznak, ki so odstranjene skupaj z njihovo vsebino.',
         'line_breaker_tags'          => 'Oznake prekinitve vrstic',
         'line_breaker_tags_comment'  => 'Seznam oznak, ki se uporabljajo za postavitev elementa prekinitve med vrstice.',
-        'toolbar_options'            => 'Nastavitve orodne vrstice',
         'toolbar_buttons'            => 'Gumbi orodne vrstice',
         'toolbar_buttons_comment'    => 'Gumbi orodne vrstice, ki se privzeto prikažejo v urejevalniku. [fullscreen, bold, italic, underline, strikeThrough, subscript, superscript, fontFamily, fontSize, |, color, emoticons, inlineStyle, paragraphStyle, |, paragraphFormat, align, formatOL, formatUL, outdent, indent, quote, insertHR, -, insertLink, insertImage, insertVideo, insertAudio, insertFile, insertTable, undo, redo, clearFormatting, selectAll, html]',
         'toolbar_buttons_preset'     => 'Vstavite prednastavljeno konfiguracijo gumbov orodne vrstice:',
@@ -427,8 +420,6 @@ return [
             'minimal' => 'Minimalno',
             'full'    => 'Polno',
         ],
-        'paragraph_formats'          => 'Formati odstavkov',
-        'paragraph_formats_comment'  => 'Možnosti, ki se prikažejo v spustnem seznamu Format odstavka.',
     ],
     'tooltips'            => [
         'preview_website' => 'Ogled spletne strani',
@@ -479,7 +470,7 @@ return [
     ],
     'access_log'          => [
         'hint'             => 'Ta dnevnik beleži seznam uspešnih prijav administratorjev. Zapisi se hranijo :days dni.',
-        'menu_label'       => 'Dnevnik dostopov',
+        'menu_label'       => 'Dnevnik dostopa',
         'menu_description' => 'Prikaz seznama uspešnih prijav administratorjev.',
         'id'               => 'ID',
         'created_at'       => 'Datum in čas',
@@ -567,12 +558,11 @@ return [
             'iso_8859_15'  => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1250' => 'Windows-1250 (CP1250, Central and Eastern European)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)',
-        ],
+            'windows_1252' => 'Windows-1252 (CP1252)'
+        ]
     ],
     'permissions'         => [
-        'manage_media'          => 'Nalaganje in upravljanje z media vsebinami - slike, video posnetki, zvočni posnetki, dokumenti',
-        'allow_unsafe_markdown' => 'Dovoli uporabo nevarnih označb (lahko vključi Javascript)',
+        'manage_media' => 'Nalaganje in upravljanje z media vsebinami - slike, video posnetki, zvočni posnetki, dokumenti',
     ],
     'mediafinder'         => [
         'label'          => 'Media brskalnik',
diff --git a/modules/backend/lang/zh-tw/lang.php b/modules/backend/lang/zh-tw/lang.php
index 9655ef6e6..35ab3510b 100644
--- a/modules/backend/lang/zh-tw/lang.php
+++ b/modules/backend/lang/zh-tw/lang.php
@@ -52,7 +52,6 @@ return [
         'widget_width' => '寬度',
         'full_width' => '全部寬度',
         'add_widget' => '新增元件',
-        'manage_widgets' => '管理元件',
         'widget_inspector_title' => '元件設定',
         'widget_inspector_description' => '設定報表元件',
         'widget_columns_label' => '寬度 :columns',
@@ -63,12 +62,6 @@ return [
         'widget_new_row_description' => '把元件放到新列',
         'widget_title_label' => '元件標題',
         'widget_title_error' => '需要元件標題',
-        'reset_layout' => '重置版面',
-        'reset_layout_confirm' => '確定重置為預設版面？',
-        'reset_layout_success' => '版面已重置。',
-        'make_default' => '設定為預設',
-        'make_default_confirm' => '確定將此版面設定為預設？',
-        'make_default_success' => '已設定此版面為預設。',
         'status' => [
             'widget_title_default' => '系統狀態',
             'update_available' => '{0} 更新可用!|{1} 更新可用!|[2,Inf] 更新可用!'
@@ -177,7 +170,7 @@ return [
         'field_off' => '關',
         'field_on' => '開',
         'add' => '增加',
-        'apply' => '確定',
+        'apply' => '應用',
         'cancel' => '取消',
         'close' => '關閉',
         'confirm' => '確認',
@@ -304,9 +297,7 @@ return [
         'email' => 'Email'
     ],
     'filter' => [
-        'all' => '全部',
-        'date_all' => '全部區間',
-        'number_all' => '全部數目',
+      'all' => '全部'
     ],
     'permissions' => [
         'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
@@ -325,10 +316,10 @@ return [
         'display' => '顯示',
         'filter_everything' => '所有',
         'filter_images' => '圖片',
-        'filter_video' => '影片',
-        'filter_audio' => '音訊',
+        'filter_video' => '視頻',
+        'filter_audio' => '音頻',
         'filter_documents' => '文檔',
-        'library' => '媒體庫',
+        'library' => '庫',
         'size' => '大小',
         'title' => '標題',
         'last_modified' => '最近修改',
@@ -341,7 +332,7 @@ return [
         'multiple_selected' => '多選.',
         'uploading_file_num' => '上傳 :number 檔案...',
         'uploading_complete' => '上傳完畢',
-        'order_by' => '排列方式',
+        'order_by' => '排序',
         'folder' => '檔案夾',
         'no_files_found' => '沒找到您請求的檔案.',
         'delete_empty' => '請選擇刪除項.',
@@ -371,9 +362,6 @@ return [
         'selection_mode' => '選擇模式',
         'resize_image' => '調整圖片',
         'image_size' => '圖片大小:',
-        'selected_size' => '選中:',
-        'direction' => '順序',
-        'direction_asc' => '升冪',
-        'direction_desc' => '降冪',
+        'selected_size' => '選中:'
     ]
 ];
diff --git a/modules/backend/layouts/_custom_styles.htm b/modules/backend/layouts/_custom_styles.htm
index cb4e3ad82..8eec0413b 100644
--- a/modules/backend/layouts/_custom_styles.htm
+++ b/modules/backend/layouts/_custom_styles.htm
@@ -9,6 +9,6 @@
 <?php endif ?>
 <?php if (EditorSetting::isConfigured()): ?>
     <style>
-        <?= strip_tags(EditorSetting::renderCss()) ?>
+        <?= EditorSetting::renderCss() ?>
     </style>
 <?php endif ?>
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index 3327218e4..0cf31ac6d 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -49,24 +49,15 @@
     </div>
     <div class="toolbar-item toolbar-item-account">
         <ul class="mainmenu-toolbar">
-            <?php foreach (BackendMenu::listQuickActionItems() as $item): ?>
-                <li class="mainmenu-quick-action with-tooltip">
-                    <a
-                        href="<?= $item->url ?>"
-                        title="<?= e(trans($item->label)) ?>"
-                        <?= Html::attributes($item->attributes) ?>
-                    >
-
-                        <?php if ($item->iconSvg): ?>
-                            <img
-                                src="<?= Url::asset($item->iconSvg) ?>"
-                                class="svg-icon" loading="lazy" width="20" height="20" />
-                        <?php endif ?>
-
-                        <i class="<?= $item->iconSvg ? 'svg-replace' : null ?> <?= $item->icon ?>"></i>
-                    </a>
-                </li>
-            <?php endforeach ?>
+            <li class="mainmenu-preview with-tooltip">
+                <a
+                    href="<?= Url::to('/') ?>"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    title="<?= e(trans('backend::lang.tooltips.preview_website')) ?>">
+                    <i class="icon-crosshairs"></i>
+                </a>
+            </li>
             <li class="mainmenu-account with-tooltip">
                 <a
                     href="javascript:;" onclick="$.oc.layout.toggleAccountMenu(this)"
diff --git a/modules/backend/models/AccessLog.php b/modules/backend/models/AccessLog.php
index 9ca8be6e8..2e22e0462 100644
--- a/modules/backend/models/AccessLog.php
+++ b/modules/backend/models/AccessLog.php
@@ -48,7 +48,8 @@ class AccessLog extends Model
         $records = static::where('user_id', $user->id)
             ->orderBy('created_at', 'desc')
             ->limit(2)
-            ->get();
+            ->get()
+        ;
 
         if (!count($records)) {
             return null;
diff --git a/modules/backend/models/ExportModel.php b/modules/backend/models/ExportModel.php
index e6a767e80..1a03a813b 100644
--- a/modules/backend/models/ExportModel.php
+++ b/modules/backend/models/ExportModel.php
@@ -5,7 +5,7 @@ use Lang;
 use Model;
 use Response;
 use League\Csv\Writer as CsvWriter;
-use League\Csv\EscapeFormula as CsvEscapeFormula;
+use October\Rain\Parse\League\EscapeFormula as CsvEscapeFormula;
 use ApplicationException;
 use SplTempFileObject;
 
@@ -112,7 +112,8 @@ abstract class ExportModel extends Model
             $csv->setEscape($options['escape']);
         }
 
-        $csv->addFormatter(new CsvEscapeFormula());
+        // Temporary until upgrading to league/csv >= 9.1.0 (will be $csv->addFormatter($formatter))
+        $formatter = new CsvEscapeFormula();
 
         /*
          * Add headers
@@ -127,6 +128,10 @@ abstract class ExportModel extends Model
          */
         foreach ($results as $result) {
             $data = $this->matchDataToColumns($result, $columns);
+
+            // Temporary until upgrading to league/csv >= 9.1.0
+            $data = $formatter($data);
+
             $csv->insertOne($data);
         }
 
diff --git a/modules/backend/models/ImportModel.php b/modules/backend/models/ImportModel.php
index 09c1bf426..12f937a16 100644
--- a/modules/backend/models/ImportModel.php
+++ b/modules/backend/models/ImportModel.php
@@ -5,7 +5,6 @@ use Str;
 use Lang;
 use Model;
 use League\Csv\Reader as CsvReader;
-use League\Csv\Statement as CsvStatement;
 
 /**
  * Model used for importing data
@@ -109,6 +108,11 @@ abstract class ImportModel extends Model
          */
         $reader = CsvReader::createFromPath($filePath, 'r');
 
+        // Filter out empty rows
+        $reader->addFilter(function (array $row) {
+            return count($row) > 1 || reset($row) !== null;
+        });
+
         if ($options['delimiter'] !== null) {
             $reader->setDelimiter($options['delimiter']);
         }
@@ -121,11 +125,15 @@ abstract class ImportModel extends Model
             $reader->setEscape($options['escape']);
         }
 
+        if ($options['firstRowTitles']) {
+            $reader->setOffset(1);
+        }
+
         if (
             $options['encoding'] !== null &&
-            $reader->supportsStreamFilter()
+            $reader->isActiveStreamFilter()
         ) {
-            $reader->addStreamFilter(sprintf(
+            $reader->appendStreamFilter(sprintf(
                 '%s%s:%s',
                 TranscodeFilter::FILTER_NAME,
                 strtolower($options['encoding']),
@@ -133,19 +141,8 @@ abstract class ImportModel extends Model
             ));
         }
 
-        // Create reader statement
-        $stmt = (new CsvStatement)
-            ->where(function (array $row) {
-                // Filter out empty rows
-                return count($row) > 1 || reset($row) !== null;
-            });
-
-        if ($options['firstRowTitles']) {
-            $stmt = $stmt->offset(1);
-        }
-
         $result = [];
-        $contents = $stmt->process($reader);
+        $contents = $reader->fetch();
         foreach ($contents as $row) {
             $result[] = $this->processImportRow($row, $matches);
         }
diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php
index 46259792b..650a1378e 100644
--- a/modules/backend/models/User.php
+++ b/modules/backend/models/User.php
@@ -27,8 +27,8 @@ class User extends UserBase
     public $rules = [
         'email' => 'required|between:6,255|email|unique:backend_users',
         'login' => 'required|between:2,255|unique:backend_users',
-        'password' => 'required:create|min:4|confirmed',
-        'password_confirmation' => 'required_with:password|min:4'
+        'password' => 'required:create|between:4,255|confirmed',
+        'password_confirmation' => 'required_with:password|between:4,255'
     ];
 
     /**
diff --git a/modules/backend/models/brandsetting/custom.less b/modules/backend/models/brandsetting/custom.less
index 729f58680..c15fc93a1 100644
--- a/modules/backend/models/brandsetting/custom.less
+++ b/modules/backend/models/brandsetting/custom.less
@@ -193,31 +193,3 @@ div.control-componentlist {
 .nav.selector-group li.active {
     border-left-color: @brand-secondary;
 }
-
-//
-// Fancy breadcrumb
-//
-body.breadcrumb-fancy .control-breadcrumb,
-.control-breadcrumb.breadcrumb-fancy {
-    background-color: mix(black, saturate(@brand-secondary, 20%), 16%);
-
-    li {
-        background-color: mix(black, saturate(@brand-secondary, 20%), 31%);
-
-        &:last-child {
-            background-color: mix(black, saturate(@brand-secondary, 20%), 16%);
-
-            &::before {
-                border-left-color: mix(black, saturate(@brand-secondary, 20%), 16%);
-            }
-        }
-
-        &::after {
-            border-left-color: mix(black, saturate(@brand-secondary, 20%), 31%);
-        }
-
-        &:not(:last-child)::before {
-            border-left-color: @brand-secondary;
-        }
-    }
-}
diff --git a/modules/backend/models/preference/fields.yaml b/modules/backend/models/preference/fields.yaml
index f8e0aad97..dd4cedb4a 100644
--- a/modules/backend/models/preference/fields.yaml
+++ b/modules/backend/models/preference/fields.yaml
@@ -21,7 +21,6 @@ tabs:
 
         editor_preview:
             type: partial
-            label: backend::lang.editor.preview
             tab: backend::lang.backend_preferences.code_editor
             path: field_editor_preview
 
diff --git a/modules/backend/routes.php b/modules/backend/routes.php
index 0268f7efc..81904802f 100644
--- a/modules/backend/routes.php
+++ b/modules/backend/routes.php
@@ -25,7 +25,7 @@ App::before(function ($request) {
             'middleware' => ['web'],
             'prefix' => Config::get('cms.backendUri', 'backend')
         ], function () {
-            Route::any('{slug?}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?');
+            Route::any('{slug}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?');
         })
     ;
 
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index c2acbb2a3..5b79a6c75 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -1283,7 +1283,6 @@ class Form extends WidgetBase
     {
         /*
          * Advanced usage, supplied options are callable
-         * [\Path\To\Class, methodName]
          */
         if (is_array($fieldOptions) && is_callable($fieldOptions)) {
             $fieldOptions = call_user_func($fieldOptions, $this, $field);
@@ -1329,22 +1328,6 @@ class Form extends WidgetBase
          * Field options are an explicit method reference
          */
         elseif (is_string($fieldOptions)) {
-            // \Path\To\Class::staticMethodOptions
-            if (str_contains($fieldOptions, '::')) {
-                $options = explode('::', $fieldOptions);
-                if (count($options) === 2 && class_exists($options[0]) && method_exists($options[0], $options[1])) {
-                    $result = $options[0]::{$options[1]}();
-                    if (!is_array($result)) {
-                        throw new ApplicationException(Lang::get('backend::lang.field.options_static_method_invalid_value', [
-                            'class' => $options[0],
-                            'method' => $options[1]
-                        ]));
-                    }
-                    return $result;
-                }
-            }
-
-            // $model->{$fieldOptions}()
             if (!$this->objectMethodExists($this->model, $fieldOptions)) {
                 throw new ApplicationException(Lang::get('backend::lang.field.options_method_not_exists', [
                     'model'  => get_class($this->model),
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 9a8ae69a9..bc83c11f6 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -10,8 +10,6 @@ use October\Rain\Html\Helper as HtmlHelper;
 use October\Rain\Router\Helper as RouterHelper;
 use System\Helpers\DateTime as DateTimeHelper;
 use System\Classes\PluginManager;
-use System\Classes\MediaLibrary;
-use System\Classes\ImageResizer;
 use Backend\Classes\ListColumn;
 use Backend\Classes\WidgetBase;
 use October\Rain\Database\Model;
@@ -524,7 +522,7 @@ class Lists extends WidgetBase
         /*
          * Apply sorting
          */
-        if (($sortColumn = $this->getSortColumn()) && !$this->showTree && in_array($sortColumn, array_keys($this->getVisibleColumns()))) {
+        if (($sortColumn = $this->getSortColumn()) && !$this->showTree) {
             if (($column = array_get($this->allColumns, $sortColumn)) && $column->valueFrom) {
                 $sortColumn = $this->isColumnPivot($column)
                     ? 'pivot_' . $column->valueFrom
@@ -1189,42 +1187,6 @@ class Lists extends WidgetBase
         return htmlentities($value, ENT_QUOTES, 'UTF-8', false);
     }
 
-    /**
-     * Process an image value
-     * @return string
-     */
-    protected function evalImageTypeValue($record, $column, $value)
-    {
-        $config = $column->config;
-
-        // Get config options with defaults
-        $width = isset($config['width']) ? $config['width'] : 50;
-        $height = isset($config['height']) ? $config['height'] : 50;
-        $options = isset($config['options']) ? $config['options'] : [];
-
-        // Handle attachMany relationships
-        if (isset($record->attachMany[$column->columnName])) {
-            $image = $value->first();
-
-        // Handle attachOne relationships
-        } elseif (isset($record->attachOne[$column->columnName])) {
-            $image = $value;
-
-        // Handle absolute URLs
-        } elseif (str_contains($value, '://')) {
-            $image = $value;
-
-        // Assume all other values to be from the media library
-        } else {
-            $image = MediaLibrary::url($value);
-        }
-
-        if (!is_null($image)) {
-            $imageUrl = ImageResizer::filterGetUrl($image, $width, $height, $options);
-            return "<img src='$imageUrl' width='$width' height='$height' />";
-        }
-    }
-
     /**
      * Process as number, proxy to text
      * @return string
diff --git a/modules/backend/widgets/filter/partials/_filter.htm b/modules/backend/widgets/filter/partials/_filter.htm
index 2d8f51025..4bec44577 100644
--- a/modules/backend/widgets/filter/partials/_filter.htm
+++ b/modules/backend/widgets/filter/partials/_filter.htm
@@ -1,5 +1,4 @@
 <div
-    id="<?= $this->getId(); ?>"
     class="control-filter <?= $cssClasses ?>"
     data-control="filterwidget"
     data-options-handler="<?= $this->getEventHandler('onFilterGetOptions') ?>"
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index 160bf8bc3..40e170787 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -1,15 +1,11 @@
 <?php namespace Cms;
 
 use App;
-use Url;
-use Lang;
-use File;
 use Event;
 use Backend;
 use BackendMenu;
 use BackendAuth;
 use Backend\Models\UserRole;
-use Cms\Classes\Theme as CmsTheme;
 use Backend\Classes\WidgetManager;
 use October\Rain\Support\ModuleServiceProvider;
 use System\Classes\SettingsManager;
@@ -58,10 +54,6 @@ class ServiceProvider extends ModuleServiceProvider
 
         $this->bootMenuItemEvents();
         $this->bootRichEditorEvents();
-
-        if (App::runningInBackend()) {
-            $this->bootBackendLocalization();
-        }
     }
 
     /**
@@ -175,19 +167,6 @@ class ServiceProvider extends ModuleServiceProvider
                     ]
                 ]
             ]);
-
-            $manager->registerQuickActions('October.Cms', [
-                'preview' => [
-                    'label'      => 'backend::lang.tooltips.preview_website',
-                    'icon'       => 'icon-crosshairs',
-                    'url'        => Url::to('/'),
-                    'order'      => 10,
-                    'attributes' => [
-                        'target' => '_blank',
-                        'rel'    => 'noopener noreferrer',
-                    ],
-                ],
-            ]);
         });
     }
 
@@ -305,20 +284,6 @@ class ServiceProvider extends ModuleServiceProvider
         });
     }
 
-    /**
-     * Boots localization from an active theme for backend items.
-     */
-    protected function bootBackendLocalization()
-    {
-        $theme = CmsTheme::getActiveTheme();
-
-        $langPath = $theme->getPath() . '/lang';
-
-        if (File::isDirectory($langPath)) {
-            Lang::addNamespace('themes.' . $theme->getId(), $langPath);
-        }
-    }
-
     /**
      * Registers events for menu items.
      */
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index 9a83504ba..1073f8ed8 100644
--- a/modules/cms/classes/Asset.php
+++ b/modules/cms/classes/Asset.php
@@ -4,11 +4,10 @@ use File;
 use Lang;
 use Config;
 use Request;
-use ApplicationException;
-use ValidationException;
 use Cms\Helpers\File as FileHelper;
 use October\Rain\Extension\Extendable;
-use October\Rain\Filesystem\PathResolver;
+use ApplicationException;
+use ValidationException;
 
 /**
  * The CMS theme asset file class.
@@ -286,15 +285,14 @@ class Asset extends Extendable
             $fileName = $this->fileName;
         }
 
+        // Limit paths to those under the assets directory
         $directory = $this->theme->getPath() . '/' . $this->dirName . '/';
-        $filePath = $directory . $fileName;
-
-        // Limit paths to those under the theme's assets directory
-        if (!PathResolver::within($filePath, $directory)) {
+        $path = realpath($directory . $fileName);
+        if (!starts_with($path, $directory)) {
             return false;
         }
 
-        return PathResolver::resolve($filePath);
+        return $path;
     }
 
     /**
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index fca40ff67..5705515bc 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -316,8 +316,7 @@ class CmsCompoundObject extends CmsObject
 
         self::$objectComponentPropertyMap = $objectComponentMap;
 
-        $expiresAt = now()->addMinutes(Config::get('cms.parsedPageCacheTTL', 10));
-        Cache::put($key, base64_encode(serialize($objectComponentMap)), $expiresAt);
+        Cache::put($key, base64_encode(serialize($objectComponentMap)), Config::get('cms.parsedPageCacheTTL', 10));
 
         if (array_key_exists($componentName, $objectComponentMap[$objectCode])) {
             return $objectComponentMap[$objectCode][$componentName];
diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index eb4e73e5f..45a4d172a 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -4,12 +4,11 @@ use App;
 use Lang;
 use Event;
 use Config;
-use Exception;
-use ValidationException;
-use ApplicationException;
-use Cms\Contracts\CmsObject as CmsObjectContract;
-use October\Rain\Filesystem\PathResolver;
 use October\Rain\Halcyon\Model as HalcyonModel;
+use Cms\Contracts\CmsObject as CmsObjectContract;
+use ApplicationException;
+use ValidationException;
+use Exception;
 
 /**
  * This is a base class for all CMS objects - content files, pages, partials and layouts.
@@ -235,15 +234,7 @@ class CmsObject extends HalcyonModel implements CmsObjectContract
             $fileName = $this->fileName;
         }
 
-        $directory = $this->theme->getPath() . '/' . $this->getObjectTypeDirName() . '/';
-        $filePath = $directory . $fileName;
-
-        // Limit paths to those under the corresponding theme directory
-        if (!PathResolver::within($filePath, $directory)) {
-            return false;
-        }
-
-        return PathResolver::resolve($filePath);
+        return $this->theme->getPath().'/'.$this->getObjectTypeDirName().'/'.$fileName;
     }
 
     /**
diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
index 2105789ac..ffc7afc73 100644
--- a/modules/cms/classes/CmsObjectCollection.php
+++ b/modules/cms/classes/CmsObjectCollection.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\Classes;
 
-use ApplicationException;
 use October\Rain\Support\Collection as CollectionBase;
 
 /**
@@ -38,32 +37,15 @@ class CmsObjectCollection extends CollectionBase
 
     /**
      * Returns objects whose properties match the supplied value.
-     *
-     * Note that this deviates from Laravel 6's Illuminate\Support\Traits\EnumeratesValues::where() method signature,
-     * which uses ($key, $operator = null, $value = null) as parameters and that this class extends.
-     *
-     * To ensure backwards compatibility with our current Halcyon functionality, this method retains the original
-     * parameters and functions the same way as before, with handling for the $value and $strict parameters to ensure
-     * they match the previously expected formats. This means that you cannot use operators for "where" queries on
-     * CMS object collections.
-     *
-     * @param  string  $property
-     * @param  string  $value
-     * @param  bool  $strict
+     * @param string $property
+     * @param string $value
+     * @param bool $strict
      * @return static
      */
-    public function where($property, $value = null, $strict = null)
+    public function where($property, $value, $strict = true)
     {
-        if (empty($value) || !is_string($value)) {
-            throw new ApplicationException('You must provide a string value to compare with when executing a "where" '
-             . 'query for CMS object collections.');
-        }
-
-        if (!isset($strict) || !is_bool($strict)) {
-            $strict = true;
-        }
-
         return $this->filter(function ($object) use ($property, $value, $strict) {
+
             if (!array_key_exists($property, $object->settings)) {
                 return false;
             }
diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php
index f0cdb13be..dd6687637 100644
--- a/modules/cms/classes/CodeParser.php
+++ b/modules/cms/classes/CodeParser.php
@@ -129,7 +129,7 @@ class CodeParser
         $body = preg_replace('/^\s*function/m', 'public function', $body);
 
         $namespaces = [];
-        $pattern = '/(use\s+[a-z0-9_\\\\]+(\s+as\s+[a-z0-9_]+)?;(\r\n|\n)?)/mi';
+        $pattern = '/(use\s+[a-z0-9_\\\\]+(\s+as\s+[a-z0-9_]+)?;\n?)/mi';
         preg_match_all($pattern, $body, $namespaces);
         $body = preg_replace($pattern, '', $body);
 
@@ -141,15 +141,14 @@ class CodeParser
         $fileContents = '<?php '.PHP_EOL;
 
         foreach ($namespaces[0] as $namespace) {
-            // Only allow compound or aliased use statements
-            if (str_contains($namespace, '\\') || str_contains($namespace, ' as ')) {
-                $fileContents .= trim($namespace).PHP_EOL;
+            if (str_contains($namespace, '\\')) {
+                $fileContents .= $namespace;
             }
         }
 
         $fileContents .= 'class '.$className.$parentClass.PHP_EOL;
         $fileContents .= '{'.PHP_EOL;
-        $fileContents .= trim($body).PHP_EOL;
+        $fileContents .= $body.PHP_EOL;
         $fileContents .= '}'.PHP_EOL;
 
         $this->validate($fileContents);
@@ -225,8 +224,7 @@ class CodeParser
         $cached = $this->getCachedInfo() ?: [];
         $cached[$this->filePath] = $cacheItem;
 
-        $expiresAt = now()->addMinutes(1440);
-        Cache::put($this->dataCacheKey, base64_encode(serialize($cached)), $expiresAt);
+        Cache::put($this->dataCacheKey, base64_encode(serialize($cached)), 1440);
 
         self::$cache[$this->filePath] = $result;
     }
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 873b51855..ad3b1d46d 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -1,7 +1,6 @@
 <?php namespace Cms\Classes;
 
 use Lang;
-use BackendAuth;
 use ApplicationException;
 use October\Rain\Filesystem\Definitions as FileDefinitions;
 
@@ -198,12 +197,6 @@ class Page extends CmsCompoundObject
             }
 
             $page = self::loadCached($theme, $item->reference);
-
-            // Remove hidden CMS pages from menus when backend user is logged out
-            if ($page && $page->is_hidden && !BackendAuth::getUser()) {
-                return;
-            }
-
             $controller = Controller::getController() ?: new Controller;
             $pageUrl = $controller->pageUrl($item->reference, [], false);
 
diff --git a/modules/cms/classes/Partial.php b/modules/cms/classes/Partial.php
index 768d72e91..18d0e1aff 100644
--- a/modules/cms/classes/Partial.php
+++ b/modules/cms/classes/Partial.php
@@ -13,6 +13,11 @@ class Partial extends CmsCompoundObject
      */
     protected $dirName = 'partials';
 
+    /**
+     * @var array Allowable file extensions. TEMPORARY! DO NOT INCLUDE in Build 1.1.x, workaround for unsupported code
+     */
+    protected $allowedExtensions = ['htm', 'html', 'css', 'js', 'svg'];
+
     /**
      * Returns name of a PHP class to us a parent for the PHP class created for the object's PHP section.
      * @return string Returns the class name.
diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
index 4f75656f1..0c033fd81 100644
--- a/modules/cms/classes/Router.php
+++ b/modules/cms/classes/Router.php
@@ -127,11 +127,10 @@ class Router
                             : $fileName;
 
                         $key = $this->getUrlListCacheKey();
-                        $expiresAt = now()->addMinutes(Config::get('cms.urlCacheTtl', 1));
                         Cache::put(
                             $key,
                             base64_encode(serialize($urlList)),
-                            $expiresAt
+                            Config::get('cms.urlCacheTtl', 1)
                         );
                     }
                 }
@@ -252,8 +251,7 @@ class Router
 
             $this->urlMap = $map;
             if ($cacheable) {
-                $expiresAt = now()->addMinutes(Config::get('cms.urlCacheTtl', 1));
-                Cache::put($key, base64_encode(serialize($map)), $expiresAt);
+                Cache::put($key, base64_encode(serialize($map)), Config::get('cms.urlCacheTtl', 1));
             }
 
             return false;
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 6ce06a1c5..a5306c897 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -158,8 +158,7 @@ class Theme
         if ($checkDatabase && App::hasDatabase()) {
             try {
                 try {
-                    $expiresAt = now()->addMinutes(1440);
-                    $dbResult = Cache::remember(self::ACTIVE_KEY, $expiresAt, function () {
+                    $dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function () {
                         return Parameter::applyKey(self::ACTIVE_KEY)->value('value');
                     });
                 }
diff --git a/modules/cms/composer.json b/modules/cms/composer.json
index ed41ab843..ebba04c17 100644
--- a/modules/cms/composer.json
+++ b/modules/cms/composer.json
@@ -8,13 +8,11 @@
     "authors": [
         {
             "name": "Alexey Bobkov",
-            "email": "aleksey.bobkov@gmail.com",
-            "role": "Co-founder"
+            "email": "aleksey.bobkov@gmail.com"
         },
         {
             "name": "Samuel Georges",
-            "email": "daftspunky@gmail.com",
-            "role": "Co-founder"
+            "email": "daftspunky@gmail.com"
         },
         {
             "name": "Luke Towers",
@@ -24,10 +22,9 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.0",
         "composer/installers": "~1.0",
-        "october/rain": "~1.1.0",
-        "laravel/framework": "~6.0"
+        "october/rain": "~1.0.469"
     },
     "autoload": {
         "psr-4": {
diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php
index 78068c83a..b20fd5eae 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -103,11 +103,8 @@ class ThemeOptions extends Controller
 
     /**
      * Default to the active theme if user doesn't have access to manage all themes
-     *
-     * @param string $dirName
-     * @return string
      */
-    protected function getDirName(string $dirName = null)
+    protected function getDirName($dirName = null)
     {
         /*
          * Only the active theme can be managed without this permission
diff --git a/modules/cms/facades/Cms.php b/modules/cms/facades/Cms.php
index 4657595e4..81931d80b 100644
--- a/modules/cms/facades/Cms.php
+++ b/modules/cms/facades/Cms.php
@@ -2,16 +2,12 @@
 
 use October\Rain\Support\Facade;
 
-/**
- * @method static string url(string $path = null)
- *
- * @see \Cms\Helpers\Cms
- */
 class Cms extends Facade
 {
     /**
      * Get the registered name of the component.
      *
+     * @see \Cms\Helpers\Cms
      * @return string
      */
     protected static function getFacadeAccessor()
diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
index e8f5a35fe..3c52cfd83 100644
--- a/modules/cms/lang/de/lang.php
+++ b/modules/cms/lang/de/lang.php
@@ -10,24 +10,12 @@ return [
         'invalid_file_extension'=>'Ungültige Dateiendung: :invalid. Erlaubt sind: :allowed.',
         'error_deleting' => 'Fehler beim Löschen der Template-Datei ":name".',
         'delete_success' => 'Templates wurden erfolgreich gelöscht: :count.',
-        'file_name_required' => 'Ein Dateiname ist erforderlich.',
-        'safe_mode_enabled' => 'Der abgesicherte Modus ist derzeit aktiviert. Die Bearbeitung des PHP-Codes von CMS-Templates ist deaktiviert. Um den abgesicherten Modus zu deaktivieren, setzen Sie den Konfigurationswert `cms.enableSafeMode` auf `false`.',
-    ],
-    'dashboard' => [
-        'active_theme' => [
-            'widget_title_default' => 'Website',
-            'online' => 'Online',
-            'maintenance' => 'In der Wartung',
-            'manage_themes' => 'Themes Verwalten',
-            'customize_theme' => 'Theme anpassen',
-        ],
+        'file_name_required' => 'Ein Dateiname ist erforderlich.'
     ],
     'theme' => [
         'not_found_name' => "Das Theme ':name' konnte nicht gefunden werden.",
-        'by_author' => 'Von :name',
         'active' => [
             'not_set' => "Aktives Theme nicht definiert",
-            'not_found' => 'Aktives Theme wurde nicht gefunden.',
         ],
         'edit' => [
             'not_set' => "Edit Theme nicht definiert",
@@ -47,8 +35,6 @@ return [
         'homepage_placeholder' => 'Webseiten URL',
         'code_label' => 'Code',
         'code_placeholder' => 'Ein einzigartiger Code genutzt bei der Weiterverbreitung dieses Themes',
-        'preview_image_label' => 'Bildvorschau',
-        'preview_image_placeholder' => 'Der Pfad des Theme-Vorschaubildes.',
         'dir_name_label' => 'Verzeichnisname',
         'dir_name_create_label' => 'Name des Zielverzeichnisses',
         'theme_label' => 'Theme',
@@ -98,8 +84,7 @@ return [
         'settings_menu' => 'Wartungsmodus',
         'settings_menu_description' => 'Konfigurieren Sie den Wartungsmodus.',
         'is_enabled' => 'Wartungsmodus aktivieren',
-        'is_enabled_comment' => 'Sobald aktiviert, werden Besucher die unten ausgewählte Seite sehen.',
-        'hint' => 'Im Wartungsmodus wird die Wartungsseite für Besucher angezeigt, die nicht im Back-End-Bereich angemeldet sind.',
+        'is_enabled_comment' => 'Sobald aktiviert, werden Besucher die unten ausgewählte Seite sehen.'
     ],
     'page' => [
         'not_found_name' => "Die Seite ':name' konnte nicht gefunden werden",
@@ -112,22 +97,16 @@ return [
             'help' => "Entschuldigung, ein Fehler trat auf, sodass die gewünschte Seite nicht angezeigt werden kann.",
         ],
         'menu_label' => 'Seiten',
-        'unsaved_label' => 'Ungespeicherte Seite(n)',
         'no_list_records' => 'Keine Seiten gefunden',
         'new' => 'Neue Seite',
         'invalid_url' => 'Ungültiges URL-Format. Die URL muss mit einem Slash beginnen und darf nur Ziffern, lateinische Zeichen und die folgenden Symbole beinhalten: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Seiten wirklich löschen?',
         'delete_confirm_single' => 'Wollen Sie diese Seite wirklich löschen?',
-        'no_layout' => '-- Kein Layout --',
-        'cms_page' => 'CMS Seite',
-        'title' => 'Seitentitel',
-        'url' => 'Seiten-URL',
-        'file_name' => 'Seiten-Dateiname',
+        'no_layout' => '-- Kein Layout --'
     ],
     'layout' => [
         'not_found_name' => "Das Layout ':name' wurde nicht gefunden",
         'menu_label' => 'Layouts',
-        'unsaved_label' => 'Ungespeicherte(s) Layout(s)',
         'no_list_records' => 'Keine Layouts gefunden',
         'new' => 'Neues Layout',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Layouts wirklich löschen?',
@@ -137,7 +116,6 @@ return [
         'not_found_name' => "Das Partial ':name' wurde nicht gefunden.",
         'invalid_name' => "Ungültiger Partial-Name: :name.",
         'menu_label' => 'Partials',
-        'unsaved_label' => 'Ungespeicherte(s) Partial(s)',
         'no_list_records' => 'Keine Partials gefunden',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Partials wirklich löschen?',
         'delete_confirm_single' => 'Wollen Sie das ausgewählte Partial wirklich löschen?',
@@ -146,7 +124,6 @@ return [
     'content' => [
         'not_found_name' => "Die Inhaltsdatei ':name' wurde nicht gefunden.",
         'menu_label' => 'Inhalt',
-        'unsaved_label' => 'Ungespeicherter Inhalt',
         'no_list_records' => 'Keine Inhaltsdateien gefunden',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Inhalte und Verzeichnisse wirklich löschen?',
         'delete_confirm_single' => 'Wollen Sie diese Inhaltsdatei wirklich löschen?',
@@ -181,34 +158,18 @@ return [
         'hidden' => 'Versteckt',
         'hidden_comment' => 'Versteckte Seiten können nur von eingeloggten Backend-Benutzern genutzt werden.',
         'enter_fullscreen' => 'In den Vollbildmodus wechseln',
-        'exit_fullscreen' => 'Vollbildmodus beenden',
-        'open_searchbox' => 'Suchfeld öffnen',
-        'close_searchbox' => 'Suchfeld schließen',
-        'open_replacebox' => 'Ersetzen-Feld öffnen',
-        'close_replacebox' => 'Ersetzen-Feld schließen',
-        'commit' => 'Commit',
-        'reset' => 'Zurücksetzen',
-        'commit_confirm' => 'Sind Sie sicher, dass Sie Ihre Änderungen an dieser Datei auf das Dateisystem übertragen wollen? Dies wird die bestehende Datei auf dem Dateisystem überschreiben',
-        'reset_confirm' => 'Sind Sie sicher, dass Sie diese Datei auf die Kopie zurücksetzen wollen, die sich auf dem Dateisystem befindet? Dadurch wird sie vollständig durch die Datei ersetzt, die sich auf dem Dateisystem befindet.',
-        'committing' => 'Committing',
-        'resetting' => 'Zurücksetzen',
-        'commit_success' => 'Der :type wurde auf das Dateisystem übertragen',
-        'reset_success' => 'Der :type wurde auf die Dateisystemversion zurückgesetzt',
+        'exit_fullscreen' => 'Vollbildmodus beenden'
     ],
     'asset' => [
         'menu_label' => "Assets",
-        'unsaved_label' => 'Ungespeicherte(s) Asset(s)',
         'drop_down_add_title' => 'Hinzufügen...',
         'drop_down_operation_title' => 'Aktion...',
         'upload_files' => 'Datei(en) hochladen',
         'create_file' => 'Datei erstellen',
         'create_directory' => 'Verzeichnis erstellen',
-        'directory_popup_title' => 'Neues Verzeichnis',
-        'directory_name' => 'Verzeichnisname',
         'rename' => 'Umbenennen',
         'delete' => 'Löschen',
         'move' => 'Verschieben',
-        'select' => 'Auswählen',
         'new' => 'Neue Datei',
         'rename_popup_title' => 'Umbenennen',
         'rename_new_name' => 'Neuer Name',
@@ -235,8 +196,6 @@ return [
         'error_moving_file' => 'Fehler beim Verschieben der Datei :file',
         'error_moving_directory' => 'Fehler beim Verschieben des Verzeichnisses :dir',
         'error_deleting_directory' => 'Fehler beim Löschen des Originalverzeichnisses :dir',
-        'no_list_records' => 'Keine Dateien gefunden',
-        'delete_confirm' => 'Ausgewählte Dateien oder Verzeichnisse löschen?',
         'path' => 'Pfad'
     ],
     'component' => [
@@ -249,17 +208,12 @@ return [
         'invalid_request' => "Aufgrund ungültiger Komponentendaten kann das Template nicht gespeichert werden.",
         'no_records' => 'Keine Komponenten gefunden',
         'not_found' => "Die Komponente ':name' wurde nicht gefunden.",
-        'no_default_partial' => "Diese Komponente hat keinen 'default' Partial",
         'method_not_found' => "Die Komponente ':name' enthält keine Methode mit Namen ':method'.",
-        'soft_component_description' => 'Diese Komponente fehlt, aber Sie ist optional.',
     ],
     'template' => [
         'invalid_type' => "Unbekannter Template-Typ.",
         'not_found' => "Das angeforderte Template wurde nicht gefunden.",
-        'saved'=> "Das Template wurde erfolgreich gespeichert.",
-        'no_list_records' => 'Keine Einträge gefunden',
-        'delete_confirm' => 'Ausgewählte Templates löschen?',
-        'order_by' => 'Sortieren nach',
+        'saved'=> "Das Template wurde erfolgreich gespeichert."
     ],
     'permissions' => [
         'name' => 'Cms',
@@ -269,35 +223,5 @@ return [
         'manage_layouts' => 'Layouts verwalten',
         'manage_partials' => 'Partials verwalten',
         'manage_themes' => 'Themes verwalten',
-        'manage_theme_options' => 'Konfigurieren Sie Anpassungsoptionen für das aktive Theme',
-    ],
-    'theme_log' => [
-        'hint' => 'Dieses Protokoll zeigt alle Änderungen an, die von Administratoren im Back-End-Bereich am Theme vorgenommen wurden.',
-        'menu_label' => 'Theme Protokoll',
-        'menu_description' => 'Zeigen Sie die am aktiven Theme vorgenommenen Änderungen an.',
-        'empty_link' => 'Leeres Theme Protokoll',
-        'empty_loading' => 'Leeren des Theme Protokolls...',
-        'empty_success' => 'Theme Protokoll',
-        'return_link' => 'Zurück zum Theme Protokoll',
-        'id' => 'ID',
-        'id_label' => 'Protokoll ID',
-        'created_at' => 'Datum & Zeit',
-        'user' => 'Benutzer',
-        'type' => 'Typ',
-        'type_create' => 'Erstellen',
-        'type_update' => 'Aktualisieren',
-        'type_delete' => 'Löschen',
-        'theme_name' => 'Theme',
-        'theme_code' => 'Theme Code',
-        'old_template' => 'Template (Alt)',
-        'new_template' => 'Template (Neu)',
-        'template' => 'Template',
-        'diff' => 'Änderungen',
-        'old_value' => 'Alter Wert',
-        'new_value' => 'Neuer Wert',
-        'preview_title' => 'Templateänderungen',
-        'template_updated' => 'Template wurde aktualisiert',
-        'template_created' => 'Template wurde erstellt',
-        'template_deleted' => 'Template wurde gelöscht',
     ],
 ];
diff --git a/modules/cms/lang/nl/lang.php b/modules/cms/lang/nl/lang.php
index defd17170..ab6ec9fa7 100644
--- a/modules/cms/lang/nl/lang.php
+++ b/modules/cms/lang/nl/lang.php
@@ -11,7 +11,7 @@ return [
         'error_deleting' => 'Fout bij het verwijderen van template: ":name". Controleer de schrijfrechten.',
         'delete_success' => 'Templates zijn succesvol verwijderd: :count.',
         'file_name_required' => 'Het invullen van een bestandsnaam is verplicht.',
-        'safe_mode_enabled' => 'Veilige modus is op dit moment ingeschakeld.',
+        'safe_mode_enabled' => 'Beveiligde modus is op dit moment ingeschakeld.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -245,12 +245,11 @@ return [
         'no_description' => 'Geen beschrijving opgegeven',
         'alias' => 'Alias',
         'alias_description' => 'Een unieke naam voor dit component voor gebruik in de code van een pagina of layout.',
-        'validation_message' => 'Een alias voor de component is verplicht en mag alleen bestaan uit letters, cijfers en underscores. De alias moet beginnen met een letter.',
+        'validation_message' => 'Een alias voor het component is verplicht en mag alleen bestaan uit letters, cijfers en underscores. De alias moet beginnen met een letter.',
         'invalid_request' => 'De template kan niet worden opgeslagen vanwege ongeldige componentgegevens.',
         'no_records' => 'Geen componenten gevonden',
-        'not_found' => 'De component \':name\' is niet gevonden.',
-        'no_default_partial' => "De component bevat geen 'standaard' sjabloon",
-        'method_not_found' => 'De component \':name\' bevat geen \':method\' methode.',
+        'not_found' => 'Het component \':name\' is niet gevonden.',
+        'method_not_found' => 'Het component \':name\' bevat geen \':method\' methode.',
         'soft_component' => 'Soft Component',
         'soft_component_description' => 'Dit component ontbreekt, maar is optioneel.',
     ],
diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php
index d3cf55c2d..6d2b99fd4 100644
--- a/modules/cms/lang/ru/lang.php
+++ b/modules/cms/lang/ru/lang.php
@@ -11,7 +11,7 @@ return [
         'error_deleting' => "Невозможно удалить файл шаблона ':name'. Пожалуйста, проверьте права на запись.",
         'delete_success' => 'Шаблоны были успешно удалены: :count.',
         'file_name_required' => 'Пожалуйста, укажите имя файла шаблона.',
-        'safe_mode_enabled' => 'В настоящий момент включен безопасный режим.',
+        'safe_mode_enabled' => 'В настоящий момент включен безопасный режим.'
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,7 +19,7 @@ return [
             'online' => 'Онлайн',
             'maintenance' => 'в разработке',
             'manage_themes' => 'Управление темами',
-            'customize_theme' => 'Настройка темы',
+            'customize_theme' => 'Настройка Темы'
         ],
     ],
     'theme' => [
@@ -27,12 +27,12 @@ return [
         'by_author' => 'Создано :name',
         'active' => [
             'not_set' => 'Активная тема не установлена.',
-            'not_found' => 'Активная тема не найдена.',
+            'not_found' => 'Активная тема не найдена.'
         ],
         'edit' => [
             'not_set' => 'Тема для редактирования не установлена.',
             'not_found' => 'Тема для редактирования не найдена.',
-            'not_match' => 'Объект, который вы пытаетесь открыть, не принадлежит редактируемой теме. Пожалуйста, обновите страницу.',
+            'not_match' => 'Объект, который вы пытаетесь открыть, не принадлежит редактируемой теме. Пожалуйста, обновите страницу.'
         ],
         'settings_menu' => 'Фронтенд темы',
         'settings_menu_description' => 'Управление темой интерфейса',
@@ -55,7 +55,7 @@ return [
         'theme_title' => 'Темы',
         'activate_button' => 'Активировать',
         'active_button' => 'Активировано',
-        'customize_theme' => 'Настройка темы',
+        'customize_theme' => 'Настройка Темы',
         'customize_button' => 'Настроить',
         'duplicate_button' => 'Дублировать',
         'duplicate_title' => 'Дублировать тему',
@@ -83,7 +83,7 @@ return [
         'delete_theme_success' => 'Удаление темы успешно завершено!',
         'create_title' => 'Создать тему',
         'create_button' => 'Создать',
-        'create_new_blank_theme' => 'Создать новую пустую тему',
+        'create_new_blank_theme' => 'Создать новый бланк темы',
         'create_theme_success' => 'Создание темы успешно завершено!',
         'create_theme_required_name' => 'Пожалуйста, укажите имя для темы.',
         'new_directory_name_label' => 'Директория темы',
@@ -92,24 +92,24 @@ return [
         'dir_name_taken' => 'Указанный каталог уже существует.',
         'find_more_themes' => 'Найти еще темы',
         'saving' => 'Сохранение темы...',
-        'return' => 'Вернуться к списку тем',
+        'return' => 'Вернуться к списку тем'
     ],
     'maintenance' => [
         'settings_menu' => 'Режим обслуживания',
         'settings_menu_description' => 'Управление режимом работы сайта.',
         'is_enabled' => 'Включить режим обслуживания',
         'is_enabled_comment' => 'При активации этого режима посетители сайта увидят страницу выбранную ниже.',
-        'hint' => 'Режим обслуживания покажет страницу обслуживания для посетителей, которые не вошли в бэкенд.',
+        'hint' => 'Режим обслуживания покажет страницу обслуживания для посетителей, которые не авторизовались в CMS.'
     ],
     'page' => [
         'not_found_name' => "Страница ':name' не найдена",
         'not_found' => [
             'label' => 'Страница не найдена',
-            'help' => 'Запрошенная страница не найдена.',
+            'help' => 'Запрошенная страница не найдена.'
         ],
         'custom_error' => [
             'label' => 'Ошибка на странице',
-            'help' => 'К сожалению, страница не может быть отображена из-за ошибки.',
+            'help' => 'К сожалению, страница не может быть отображена из-за ошибки.'
         ],
         'menu_label' => 'Страницы',
         'unsaved_label' => 'Несохранённая(е) страница(ы)',
@@ -122,46 +122,46 @@ return [
         'cms_page' => 'CMS страница',
         'title' => 'Заголовок страницы',
         'url' => 'Страница URL',
-        'file_name' => 'Имя файла страницы',
+        'file_name' => 'Имя файла страницы'
     ],
     'layout' => [
-        'not_found_name' => "Не удалось найти макет с именем :name.",
-        'menu_label' => 'Макеты',
-        'unsaved_label' => 'Несохранённый(е) макет(ы)',
-        'no_list_records' => 'Макет не найдено',
-        'new' => 'Новый макет',
-        'delete_confirm_multiple' => 'Удалить выделенные макеты?',
-        'delete_confirm_single' => 'Удалить этот макет?',
+        'not_found_name' => "Не удалось найти шаблон (layout) с именем :name.",
+        'menu_label' => 'Шаблоны',
+        'unsaved_label' => 'Несоsхранённый(е) макет(ы)',
+        'no_list_records' => 'Шаблоны не найдены',
+        'new' => 'Новый шаблон',
+        'delete_confirm_multiple' => 'Вы действительно хотите удалить выделенные шаблоны?',
+        'delete_confirm_single' => 'Вы действительно хотите удалить этот шаблон?'
     ],
     'partial' => [
-        'not_found_name' => "Не удалось найти фрагмент с именем :name.",
-        'invalid_name' => 'Ошибка в имени фрагмента :name.',
+        'not_found_name' => "Не удалось найти шаблон (partial) с именем :name.",
+        'invalid_name' => 'Ошибка в имени шаблона (partial) :name.',
         'menu_label' => 'Фрагменты',
         'unsaved_label' => 'Несохранённый(е) фрагмент(ы)',
         'no_list_records' => 'Фрагменты не найдены',
-        'delete_confirm_multiple' => 'Удалить выделенные фрагменты?',
-        'delete_confirm_single' => 'Удалить этот фрагмент?',
-        'new' => 'Новый фрагмент',
+        'delete_confirm_multiple' => 'Вы действительно хотите удалить выделенные фрагменты?',
+        'delete_confirm_single' => 'Вы действительно хотите удалить этот фрагмент?',
+        'new' => 'Новый фрагмент'
     ],
     'content' => [
-        'not_found_name' => "Не удалось найти контент-файл: ':name'.",
-        'menu_label' => 'Контент',
-        'unsaved_label' => 'Несохранённый контент',
-        'no_list_records' => 'Контент-файлы не найдены',
+        'not_found_name' => "Не удалось найти файл содержимого (content file): ':name'.",
+        'menu_label' => 'Содержимое',
+        'unsaved_label' => 'Несохранённое содержимое',
+        'no_list_records' => 'Файлы с содержимым не найдены',
         'delete_confirm_multiple' => 'Вы действительно хотите удалить выделенные файлы?',
         'delete_confirm_single' => 'Вы действительно хотите удалить этот файл?',
-        'new' => 'Новый контент-файл',
+        'new' => 'Новый файл содержимого'
     ],
     'ajax_handler' => [
         'invalid_name' => 'Ошибка в имени обработчика AJAX: :name.',
-        'not_found' => "Обработчик AJAX не найден: ':name'.",
+        'not_found' => "Обработчик AJAX не найден: ':name'."
     ],
     'cms' => [
-        'menu_label' => 'CMS',
+        'menu_label' => 'CMS'
     ],
     'sidebar' => [
         'add' => 'Добавить',
-        'search' => 'Поиск...',
+        'search' => 'Поиск...'
     ],
     'editor' => [
         'settings' => 'Настройки',
@@ -182,21 +182,13 @@ return [
         'hidden_comment' => 'Скрытые страницы доступны только для вошедших в систему пользователей.',
         'enter_fullscreen' => 'Войти в полноэкранный режим',
         'exit_fullscreen' => 'Выйти из полноэкранного режима',
-        'open_searchbox' => 'Открыть окно поиска',
+        'open_searchbox' => 'Открыть поле поиска',
         'close_searchbox' => 'Закрыть окно поиска',
         'open_replacebox' => 'Открыть поле "Заменить"',
-        'close_replacebox' => 'Закрыть поле "Заменить"',
-        'commit' => 'Зафиксировать',
-        'reset' => 'Сброс',
-        'commit_confirm' => 'Вы уверены, что хотите сохранить изменения этого файла в файловой системе? Это перезапишет существующий в файловой системе файл',
-        'reset_confirm' => 'Вы уверены, что хотите сбросить этот файл до копии, которая находится в файловой системе? Это полностью заменит его файлом, который находится в файловой системе.',
-        'committing' => 'Зафиксировать',
-        'resetting' => 'Сбросить',
-        'commit_success' => ':type был зафиксирован в файловой системе',
-        'reset_success' => ':type был сброшен до версии из файловой системы',
+        'close_replacebox' => 'Закрыть Заменить коробку'
     ],
     'asset' => [
-        'menu_label' => 'Ассеты',
+        'menu_label' => 'Ресурсы',
         'unsaved_label' => 'Несохранённый(е) файл(ы)',
         'drop_down_add_title' => 'Добавить...',
         'drop_down_operation_title' => 'Действие...',
@@ -237,7 +229,7 @@ return [
         'error_deleting_directory' => 'Не удалось удалить директорию :dir',
         'no_list_records' => 'Файлы не найдены',
         'delete_confirm' => 'Удалить выбранные файлы или каталоги?',
-        'path' => 'Путь',
+        'path' => 'Путь'
     ],
     'component' => [
         'menu_label' => 'Компоненты',
@@ -249,10 +241,7 @@ return [
         'invalid_request' => 'Шаблон не может быть сохранен, так как запрос содержит поврежденную информацию о компонентах.',
         'no_records' => 'Компоненты не найдены',
         'not_found' => "Компонент ':name' не найден.",
-        'no_default_partial' => "Этот компонент не имеет 'default' фрагмента (partial)",
-        'method_not_found' => "Компонент ':name' не содержит метод ':method'.",
-        'soft_component' => 'Мягкий компонент',
-        'soft_component_description' => 'Этот компонент отсутствует, но он не является обязательным.',
+        'method_not_found' => "Компонент ':name' не содержит метод ':method'."
     ],
     'template' => [
         'invalid_type' => 'Неизвестный тип шаблона.',
@@ -260,17 +249,17 @@ return [
         'saved' => 'Шаблон был успешно сохранен.',
         'no_list_records' => 'Записи не найдены',
         'delete_confirm' => 'Удалить выбранные шаблоны?',
-        'order_by' => 'Сортировать по',
+        'order_by' => 'Сортировать по'
     ],
     'permissions' => [
-        'name' => 'CMS',
-        'manage_content' => 'Управление контент-файлами сайта',
-        'manage_assets' => 'Управление ассетами сайта - изображениями, JavaScript и CSS файлами',
-        'manage_pages' => 'Создание, редактирование и удаление страниц сайта',
-        'manage_layouts' => 'Создание, редактирование и удаление CMS макетами',
-        'manage_partials' => 'Создание, редактирование и удаление CMS фрагментами',
-        'manage_themes' => 'Активация, деактивация и конфигурация CMS тем',
-        'manage_theme_options' => 'Настройка параметров для активной темы',
+        'name' => 'Управление CMS',
+        'manage_content' => 'Управление контентом',
+        'manage_assets' => 'Управление файлами',
+        'manage_pages' => 'Управление страницами',
+        'manage_layouts' => 'Управление шаблонами',
+        'manage_partials' => 'Управление фрагментами',
+        'manage_themes' => 'Управление темами',
+        'manage_theme_options' => 'Настроить текущую тему CMS',
     ],
     'theme_log' => [
         'hint' => 'В этом журнале отображаются изменения, внесенные в тему администраторами во внутренней области CMS.',
@@ -299,6 +288,6 @@ return [
         'preview_title' => 'Изменение шаблона',
         'template_updated' => 'Шаблон обновлен',
         'template_created' => 'Шаблон был создан',
-        'template_deleted' => 'Шаблон был удален',
-    ],
+        'template_deleted' => 'Шаблон был удален'
+    ]
 ];
diff --git a/modules/cms/lang/zh-tw/lang.php b/modules/cms/lang/zh-tw/lang.php
index 3c69e4484..9cbed535f 100644
--- a/modules/cms/lang/zh-tw/lang.php
+++ b/modules/cms/lang/zh-tw/lang.php
@@ -46,8 +46,8 @@ return [
         'dir_name_create_label' => '目標主題目錄',
         'theme_label' => '主題',
         'theme_title' => '主題',
-        'activate_button' => '啟用',
-        'active_button' => '啟用',
+        'activate_button' => '激活',
+        'active_button' => '激活',
         'customize_theme' => '自訂主題',
         'customize_button' => '自訂',
         'duplicate_button' => '複製',
@@ -110,10 +110,7 @@ return [
         'invalid_url' => '不合法的URL格式. URL可以正斜槓開頭, 包含數字, 拉丁字母和下面的字元: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => '真的想要刪除選擇的頁面嗎?',
         'delete_confirm_single' => '真的想要刪除這個頁面嗎?',
-        'no_layout' => '-- 沒有佈局 --',
-        'title' => '頁面標題',
-        'url' => '頁面網址',
-        'file_name' => '頁面檔案名稱',
+        'no_layout' => '-- 沒有佈局 --'
     ],
     'layout' => [
         'not_found_name' => "佈局 ':name' 找不到",
@@ -171,8 +168,8 @@ return [
         'content' => '內容',
         'hidden' => '隱藏',
         'hidden_comment' => '隱藏頁面只能被登錄的後台使用者訪問.',
-        'enter_fullscreen' => '進入全螢幕模式',
-        'exit_fullscreen' => '退出全螢幕模式',
+        'enter_fullscreen' => '進入全屏模式',
+        'exit_fullscreen' => '退出全屏模式'
     ],
     'asset' => [
         'menu_label' => '資源',
@@ -184,12 +181,12 @@ return [
         'create_directory' => '新建目錄',
         'directory_popup_title' => '新目錄',
         'directory_name' => '目錄名',
-        'rename' => '重新命名',
+        'rename' => '重命名',
         'delete' => '刪除',
         'move' => '移動',
         'select' => '選擇',
         'new' => '新檔案',
-        'rename_popup_title' => '重新命名',
+        'rename_popup_title' => '重命名',
         'rename_new_name' => '新名稱',
         'invalid_path' => '路徑名稱只能包含數字, 拉丁字母和以下字元: _-/',
         'error_deleting_file' => '刪除檔案 :name 錯誤.',
@@ -198,7 +195,7 @@ return [
         'invalid_name' => '名稱只能包含數字, 拉丁字母, 空格和以下字元: _-',
         'original_not_found' => '原始檔案或目錄找不到',
         'already_exists' => '檔案或目錄已存在',
-        'error_renaming' => '重新命名檔案或目錄錯誤',
+        'error_renaming' => '重命名檔案或目錄錯誤',
         'name_cant_be_empty' => '名稱不能為空',
         'too_large' => '上傳的檔案太大. 最大檔案大小是 :max_size',
         'type_not_allowed' => '只有下面的檔案類型是允許的: :allowed_types',
diff --git a/modules/cms/routes.php b/modules/cms/routes.php
index 1aaf5ec5d..76f35c4b3 100644
--- a/modules/cms/routes.php
+++ b/modules/cms/routes.php
@@ -22,7 +22,7 @@ App::before(function ($request) {
      * The CMS module intercepts all URLs that were not
      * handled by the back-end modules.
      */
-    Route::any('{slug?}', 'Cms\Classes\CmsController@run')->where('slug', '(.*)?')->middleware('web');
+    Route::any('{slug}', 'Cms\Classes\CmsController@run')->where('slug', '(.*)?')->middleware('web');
 
     /**
      * @event cms.route
diff --git a/modules/cms/traits/UrlMaker.php b/modules/cms/traits/UrlMaker.php
index ebe0c050f..210922cfa 100644
--- a/modules/cms/traits/UrlMaker.php
+++ b/modules/cms/traits/UrlMaker.php
@@ -190,8 +190,7 @@ trait UrlMaker
             'mtime'    => @File::lastModified($filePath)
         ];
 
-        $expiresAt = now()->addMinutes(Config::get('cms.parsedPageCacheTTL', 1440));
-        Cache::put($key, serialize($cached), $expiresAt);
+        Cache::put($key, serialize($cached), Config::get('cms.parsedPageCacheTTL', 1440));
 
         return static::$urlPageName = $baseFileName;
     }
diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php
index f974bb8e2..242eb23a5 100644
--- a/modules/cms/twig/DebugExtension.php
+++ b/modules/cms/twig/DebugExtension.php
@@ -8,7 +8,7 @@ use Cms\Classes\Controller;
 use Cms\Classes\ComponentBase;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
-use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Illuminate\Support\Debug\HtmlDumper;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use October\Rain\Database\Model;
 
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index e18477565..284dbb94b 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -97,14 +97,6 @@ class ServiceProvider extends ModuleServiceProvider
             }
         }
 
-        /*
-         * Set a default samesite config value for invalid values
-         */
-        if (!in_array(strtolower(Config::get('session.same_site')), ['lax', 'strict', 'none'])) {
-            Config::set('session.same_site', 'Lax');
-        }
-
-        Paginator::useBootstrapThree();
         Paginator::defaultSimpleView('system::pagination.simple-default');
 
         /*
@@ -143,7 +135,7 @@ class ServiceProvider extends ModuleServiceProvider
     protected function registerPrivilegedActions()
     {
         $requests = ['/combine/', '@/system/updates', '@/system/install', '@/backend/auth'];
-        $commands = ['october:up', 'october:update', 'october:env', 'october:version'];
+        $commands = ['october:up', 'october:update'];
 
         /*
          * Requests
@@ -258,8 +250,6 @@ class ServiceProvider extends ModuleServiceProvider
         $this->registerConsoleCommand('october.env', 'System\Console\OctoberEnv');
         $this->registerConsoleCommand('october.install', 'System\Console\OctoberInstall');
         $this->registerConsoleCommand('october.passwd', 'System\Console\OctoberPasswd');
-        $this->registerConsoleCommand('october.version', 'System\Console\OctoberVersion');
-        $this->registerConsoleCommand('october.manifest', 'System\Console\OctoberManifest');
 
         $this->registerConsoleCommand('plugin.install', 'System\Console\PluginInstall');
         $this->registerConsoleCommand('plugin.remove', 'System\Console\PluginRemove');
diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index d6364cd13..bcb2c78b2 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -16,6 +16,7 @@ return [
     'Eloquent'  => Illuminate\Database\Eloquent\Model::class,
     'Event'     => Illuminate\Support\Facades\Event::class,
     'Hash'      => Illuminate\Support\Facades\Hash::class,
+    'Input'     => Illuminate\Support\Facades\Input::class,
     'Lang'      => Illuminate\Support\Facades\Lang::class,
     'Log'       => Illuminate\Support\Facades\Log::class,
     'Mail'      => Illuminate\Support\Facades\Mail::class,
@@ -29,6 +30,7 @@ return [
     'Storage'   => Illuminate\Support\Facades\Storage::class,
     'Url'       => Illuminate\Support\Facades\URL::class, // Preferred
     'URL'       => Illuminate\Support\Facades\URL::class,
+    'Validator' => Illuminate\Support\Facades\Validator::class,
     'View'      => Illuminate\Support\Facades\View::class,
 
     /*
@@ -40,7 +42,6 @@ return [
     'Config'          => October\Rain\Support\Facades\Config::class,
     'Seeder'          => October\Rain\Database\Updates\Seeder::class,
     'Flash'           => October\Rain\Support\Facades\Flash::class,
-    'Input'           => October\Rain\Support\Facades\Input::class,
     'Form'            => October\Rain\Support\Facades\Form::class,
     'Html'            => October\Rain\Support\Facades\Html::class,
     'Http'            => October\Rain\Support\Facades\Http::class,
@@ -51,7 +52,6 @@ return [
     'Twig'            => October\Rain\Support\Facades\Twig::class,
     'DbDongle'        => October\Rain\Support\Facades\DbDongle::class,
     'Schema'          => October\Rain\Support\Facades\Schema::class,
-    'Validator'       => October\Rain\Support\Facades\Validator::class,
     'Cms'             => Cms\Facades\Cms::class,
     'Backend'         => Backend\Facades\Backend::class,
     'BackendMenu'     => Backend\Facades\BackendMenu::class,
@@ -60,12 +60,4 @@ return [
     'SystemException'      => October\Rain\Exception\SystemException::class,
     'ApplicationException' => October\Rain\Exception\ApplicationException::class,
     'ValidationException'  => October\Rain\Exception\ValidationException::class,
-
-    /*
-     * Fallback aliases
-     */
-    // Input facade was removed in Laravel 6 - we are keeping it in the Rain library for backwards compatibility.
-    'Illuminate\Support\Facades\Input' => October\Rain\Support\Facades\Input::class,
-    // Illuminate's HtmlDumper was "dumped" in Laravel 6 - we'll route this to Symfony's HtmlDumper as Laravel have done.
-    'Illuminate\Support\Debug\HtmlDumper' => Symfony\Component\VarDumper\Dumper\HtmlDumper::class,
 ];
diff --git a/modules/system/assets/js/framework-min.js b/modules/system/assets/js/framework-min.js
index 3d7146a4c..a75e43143 100644
--- a/modules/system/assets/js/framework-min.js
+++ b/modules/system/assets/js/framework-min.js
@@ -69,8 +69,7 @@ var fieldElement=$form.find('[name="'+fieldName+'"], [name="'+fieldName+'[]"], [
 if(fieldElement.length>0){var _event=jQuery.Event('ajaxInvalidField')
 $(window).trigger(_event,[fieldElement.get(0),fieldName,fieldMessages,isFirstInvalidField])
 if(isFirstInvalidField){if(!_event.isDefaultPrevented())fieldElement.focus()
-isFirstInvalidField=false}}})},handleFlashMessage:function(message,type){},handleRedirectResponse:function(url){window.location.assign(url)
-$el.trigger('ajaxDone')},handleUpdateResponse:function(data,textStatus,jqXHR){var updatePromise=$.Deferred().done(function(){for(var partial in data){var selector=(options.update[partial])?options.update[partial]:partial
+isFirstInvalidField=false}}})},handleFlashMessage:function(message,type){},handleRedirectResponse:function(url){window.location.assign(url)},handleUpdateResponse:function(data,textStatus,jqXHR){var updatePromise=$.Deferred().done(function(){for(var partial in data){var selector=(options.update[partial])?options.update[partial]:partial
 if($.type(selector)=='string'&&selector.charAt(0)=='@'){$(selector.substring(1)).append(data[partial]).trigger('ajaxUpdate',[context,data,textStatus,jqXHR])}
 else if($.type(selector)=='string'&&selector.charAt(0)=='^'){$(selector.substring(1)).prepend(data[partial]).trigger('ajaxUpdate',[context,data,textStatus,jqXHR])}
 else{$(selector).trigger('ajaxBeforeReplace')
diff --git a/modules/system/assets/js/framework.combined-min.js b/modules/system/assets/js/framework.combined-min.js
index 4aad7c23b..382a869ec 100644
--- a/modules/system/assets/js/framework.combined-min.js
+++ b/modules/system/assets/js/framework.combined-min.js
@@ -69,8 +69,7 @@ var fieldElement=$form.find('[name="'+fieldName+'"], [name="'+fieldName+'[]"], [
 if(fieldElement.length>0){var _event=jQuery.Event('ajaxInvalidField')
 $(window).trigger(_event,[fieldElement.get(0),fieldName,fieldMessages,isFirstInvalidField])
 if(isFirstInvalidField){if(!_event.isDefaultPrevented())fieldElement.focus()
-isFirstInvalidField=false}}})},handleFlashMessage:function(message,type){},handleRedirectResponse:function(url){window.location.assign(url)
-$el.trigger('ajaxDone')},handleUpdateResponse:function(data,textStatus,jqXHR){var updatePromise=$.Deferred().done(function(){for(var partial in data){var selector=(options.update[partial])?options.update[partial]:partial
+isFirstInvalidField=false}}})},handleFlashMessage:function(message,type){},handleRedirectResponse:function(url){window.location.assign(url)},handleUpdateResponse:function(data,textStatus,jqXHR){var updatePromise=$.Deferred().done(function(){for(var partial in data){var selector=(options.update[partial])?options.update[partial]:partial
 if($.type(selector)=='string'&&selector.charAt(0)=='@'){$(selector.substring(1)).append(data[partial]).trigger('ajaxUpdate',[context,data,textStatus,jqXHR])}
 else if($.type(selector)=='string'&&selector.charAt(0)=='^'){$(selector.substring(1)).prepend(data[partial]).trigger('ajaxUpdate',[context,data,textStatus,jqXHR])}
 else{$(selector).trigger('ajaxBeforeReplace')
diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index afcf8423e..c97a1554c 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -288,11 +288,6 @@ if (window.jQuery.request !== undefined) {
              */
             handleRedirectResponse: function(url) {
                 window.location.assign(url)
-                // Indicate that the AJAX request is finished if we're still on the current page
-                // so that the loading indicator for redirects that cause a browser to download 
-                // a file instead of leave the page will properly stop.
-                // @see https://github.com/octobercms/october/issues/5055
-                $el.trigger('ajaxDone')
             },
 
             /*
@@ -979,4 +974,4 @@ if (window.jQuery.request !== undefined) {
         return sanitize(html)
     };
 
-}(window);
+}(window);
\ No newline at end of file
diff --git a/modules/system/assets/js/lang/lang.zh-tw.js b/modules/system/assets/js/lang/lang.zh-tw.js
index cbcae46b4..8aecf9d62 100644
--- a/modules/system/assets/js/lang/lang.zh-tw.js
+++ b/modules/system/assets/js/lang/lang.zh-tw.js
@@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['zh-tw'] = $.extend(
     $.oc.langMessages['zh-tw'] || {},
-    {"markdowneditor":{"formatting":"\u683c\u5f0f","quote":"\u5f15\u8a00","code":"\u7a0b\u5f0f\u78bc","header1":"\u6a19\u984c\u4e00","header2":"\u6a19\u984c\u4e8c","header3":"\u6a19\u984c\u4e09","header4":"\u6a19\u984c\u56db","header5":"\u6a19\u984c\u4e94","header6":"\u6a19\u984c\u516d","bold":"\u7c97\u9ad4","italic":"\u659c\u9ad4","unorderedlist":"\u9805\u76ee\u6e05\u55ae","orderedlist":"\u6578\u5b57\u6e05\u55ae","video":"\u5f71\u7247","image":"\u5716\u7247","link":"\u9023\u7d50","horizontalrule":"\u63d2\u5165\u6c34\u5e73\u7dda","fullscreen":"\u5168\u87a2\u5e55","preview":"\u9810\u89bd"},"mediamanager":{"insert_link":"\u63d2\u5165\u5a92\u9ad4\u6ac3\u9023\u7d50","insert_image":"\u63d2\u5165\u5a92\u9ad4\u6ac3\u5716\u7247","insert_video":"\u63d2\u5165\u5a92\u9ad4\u6ac3\u5f71\u7247","insert_audio":"\u63d2\u5165\u5a92\u9ad4\u6ac3\u97f3\u8a0a","invalid_file_empty_insert":"\u8acb\u9078\u64c7\u6a94\u6848\u4ee5\u63d2\u5165\u9023\u7d50\u3002","invalid_file_single_insert":"\u8acb\u9078\u64c7\u4e00\u500b\u6a94\u6848\u3002","invalid_image_empty_insert":"\u8acb\u9078\u64c7\u63d2\u5165\u7684\u5716\u7247\u3002","invalid_video_empty_insert":"\u8acb\u9078\u64c7\u63d2\u5165\u7684\u5f71\u7247\u3002","invalid_audio_empty_insert":"\u8acb\u9078\u64c7\u63d2\u5165\u7684\u97f3\u8a0a\u3002"},"alert":{"confirm_button_text":"\u78ba\u8a8d","cancel_button_text":"\u53d6\u6d88","widget_remove_confirm":"\u78ba\u5b9a\u79fb\u9664\u6b64\u5143\u4ef6\uff1f"},"datepicker":{"previousMonth":"\u4e0a\u500b\u6708","nextMonth":"\u4e0b\u500b\u6708","months":["\u4e00\u6708","\u4e8c\u6708","\u4e09\u6708","\u56db\u6708","\u4e94\u6708","\u516d\u6708","\u4e03\u6708","\u516b\u6708","\u4e5d\u6708","\u5341\u6708","\u5341\u4e00\u6708","\u5341\u4e8c\u6708"],"weekdays":["\u661f\u671f\u65e5","\u661f\u671f\u4e00","\u661f\u671f\u4e8c","\u661f\u671f\u4e09","\u661f\u671f\u56db","\u661f\u671f\u4e94","\u661f\u671f\u516d"],"weekdaysShort":["\u9031\u65e5","\u9031\u4e00","\u9031\u4e8c","\u9031\u4e09","\u9031\u56db","\u9031\u4e94","\u9031\u516d"]},"colorpicker":{"choose":"\u78ba\u5b9a"},"filter":{"group":{"all":"\u5168\u90e8"},"scopes":{"apply_button_text":"\u78ba\u5b9a","clear_button_text":"\u6e05\u9664"},"dates":{"all":"\u5168\u90e8","filter_button_text":"\u7be9\u9078","reset_button_text":"\u91cd\u7f6e","date_placeholder":"\u65e5\u671f","after_placeholder":"\u5728\u6b64\u4e4b\u5f8c","before_placeholder":"\u5728\u6b64\u4e4b\u524d"},"numbers":{"all":"\u5168\u90e8","filter_button_text":"\u7be9\u9078","reset_button_text":"\u91cd\u7f6e","min_placeholder":"\u6700\u5c0f\u503c","max_placeholder":"\u6700\u5927\u503c"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}}
+    {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Previous Month","nextMonth":"Next Month","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"all"},"scopes":{"apply_button_text":"Apply","clear_button_text":"Clear"},"dates":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","date_placeholder":"Date","after_placeholder":"After","before_placeholder":"Before"},"numbers":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","min_placeholder":"Min","max_placeholder":"Max"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}}
 );
 
 //! moment.js locale configuration v2.22.2
diff --git a/modules/system/assets/ui/js/tab.js b/modules/system/assets/ui/js/tab.js
index 6de904055..da11f553a 100644
--- a/modules/system/assets/ui/js/tab.js
+++ b/modules/system/assets/ui/js/tab.js
@@ -89,7 +89,7 @@
         this.updateClasses()
 
         if (location.hash && this.$tabsContainer.is('[data-linkable]')) {
-            $('li > a[href="' + location.hash + '"]', this.$tabsContainer).tab('show')
+            $('li > a[href=' + location.hash + ']', this.$tabsContainer).tab('show')
         }
     }
 
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index e5bf9a051..e5b26e6a0 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -4597,7 +4597,7 @@ if(tabUrl){window.history.replaceState({},'Tab link reference',tabUrl)}})
 if(this.options.slidable){this.$pagesContainer.touchwipe({wipeRight:function(){self.prev();},wipeLeft:function(){self.next();},preventDefaultEvents:false,min_move_x:60});}
 this.$tabsContainer.toolbar({scrollClassContainer:this.$el})
 this.updateClasses()
-if(location.hash&&this.$tabsContainer.is('[data-linkable]')){$('li > a[href="'+location.hash+'"]',this.$tabsContainer).tab('show')}}
+if(location.hash&&this.$tabsContainer.is('[data-linkable]')){$('li > a[href='+location.hash+']',this.$tabsContainer).tab('show')}}
 Tab.prototype.initTab=function(li){var
 $tabs=$('>li',this.$tabsContainer),tabIndex=$tabs.index(li),time=new Date().getTime(),targetId=this.tabId+'-tab-'+tabIndex+time,$anchor=$('a',li)
 $anchor.data('target','#'+targetId).attr('data-target','#'+targetId).attr('data-toggle','tab')
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 17ec7c2bd..50a03c292 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -10,11 +10,11 @@ use Route;
 use Config;
 use Request;
 use Response;
-use October\Rain\Assetic\Asset\FileAsset;
-use October\Rain\Assetic\Asset\AssetCache;
-use October\Rain\Assetic\Asset\AssetCollection;
-use October\Rain\Assetic\Cache\FilesystemCache;
-use October\Rain\Assetic\Factory\AssetFactory;
+use Assetic\Asset\FileAsset;
+use Assetic\Asset\AssetCache;
+use Assetic\Asset\AssetCollection;
+use Assetic\Factory\AssetFactory;
+use October\Rain\Parse\Assetic\FilesystemCache;
 use System\Helpers\Cache as CacheHelper;
 use ApplicationException;
 use DateTime;
@@ -126,22 +126,22 @@ class CombineAssets
         /*
          * Register JavaScript filters
          */
-        $this->registerFilter('js', new \October\Rain\Assetic\Filter\JavascriptImporter);
+        $this->registerFilter('js', new \October\Rain\Parse\Assetic\JavascriptImporter);
 
         /*
          * Register CSS filters
          */
-        $this->registerFilter('css', new \October\Rain\Assetic\Filter\CssImportFilter);
-        $this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Assetic\Filter\CssRewriteFilter);
-        $this->registerFilter('less', new \October\Rain\Assetic\Filter\LessCompiler);
-        $this->registerFilter('scss', new \October\Rain\Assetic\Filter\ScssCompiler);
+        $this->registerFilter('css', new \Assetic\Filter\CssImportFilter);
+        $this->registerFilter(['css', 'less', 'scss'], new \Assetic\Filter\CssRewriteFilter);
+        $this->registerFilter('less', new \October\Rain\Parse\Assetic\LessCompiler);
+        $this->registerFilter('scss', new \October\Rain\Parse\Assetic\ScssCompiler);
 
         /*
          * Minification filters
          */
         if ($this->useMinify) {
-            $this->registerFilter('js', new \October\Rain\Assetic\Filter\JSMinFilter);
-            $this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Assetic\Filter\StylesheetMinify);
+            $this->registerFilter('js', new \Assetic\Filter\JSMinFilter);
+            $this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Parse\Assetic\StylesheetMinify);
         }
 
         /*
diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php
index ec5524946..4a5836f05 100644
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@@ -1,5 +1,6 @@
 <?php namespace System\Classes;
 
+use Log;
 use View;
 use Config;
 use Cms\Classes\Theme;
@@ -7,7 +8,6 @@ use Cms\Classes\Router;
 use Cms\Classes\Controller as CmsController;
 use October\Rain\Exception\ErrorHandler as ErrorHandlerBase;
 use October\Rain\Exception\SystemException;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * System Error Handler, this class handles application exception events.
@@ -34,6 +34,18 @@ class ErrorHandler extends ErrorHandlerBase
     //     return parent::handleException($proposedException);
     // }
 
+    /**
+     * We are about to display an error page to the user,
+     * if it is an SystemException, this event should be logged.
+     * @return void
+     */
+    public function beforeHandleError($exception)
+    {
+        if ($exception instanceof SystemException) {
+            Log::error($exception);
+        }
+    }
+
     /**
      * Looks up an error page using the CMS route "/error". If the route does not
      * exist, this function will use the error view found in the Cms module.
@@ -62,7 +74,7 @@ class ErrorHandler extends ErrorHandlerBase
         }
 
         // Extract content from response object
-        if ($result instanceof Response) {
+        if ($result instanceof \Symfony\Component\HttpFoundation\Response) {
             $result = $result->getContent();
         }
 
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index f11a17bad..50a6cc8f9 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -134,11 +134,10 @@ class MediaLibrary
             $folderContents = $this->scanFolderContents($fullFolderPath);
 
             $cached[$fullFolderPath] = $folderContents;
-            $expiresAt = now()->addMinutes(Config::get('cms.storage.media.ttl', 10));
             Cache::put(
                 $this->cacheKey,
                 base64_encode(serialize($cached)),
-                $expiresAt
+                Config::get('cms.storage.media.ttl', 10)
             );
         }
 
@@ -536,7 +535,7 @@ class MediaLibrary
      */
     public function getPathUrl($path)
     {
-        $path = $this->validatePath($path, true);
+        $path = $this->validatePath($path);
 
         $fullPath = $this->storagePath . implode("/", array_map("rawurlencode", explode("/", $path)));
 
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index f21e99daa..a2ba1bd1a 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -120,29 +120,6 @@ class PluginBase extends ServiceProviderBase
         }
     }
 
-    /**
-     * Registers back-end quick actions for this plugin.
-     *
-     * @return array
-     */
-    public function registerQuickActions()
-    {
-        $configuration = $this->getConfigurationFromYaml();
-        if (array_key_exists('quickActions', $configuration)) {
-            $quickActions = $configuration['quickActions'];
-
-            if (is_array($quickActions)) {
-                array_walk_recursive($quickActions, function (&$item, $key) {
-                    if ($key === 'url') {
-                        $item = Backend::url($item);
-                    }
-                });
-            }
-
-            return $quickActions;
-        }
-    }
-
     /**
      * Registers any back-end permissions used by this plugin.
      *
diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index dff071c75..e5a9b590e 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -238,6 +238,18 @@ class PluginManager
             ComposerManager::instance()->autoload($pluginPath . '/vendor');
         }
 
+        /**
+         * Disable plugin registration for restricted pages, unless elevated
+         */
+        if (self::$noInit && !$plugin->elevated) {
+            return;
+        }
+
+        /**
+         * Run the plugin's register() method
+         */
+        $plugin->register();
+
         /*
          * Register configuration path
          */
@@ -254,18 +266,6 @@ class PluginManager
             View::addNamespace($pluginNamespace, $viewsPath);
         }
 
-        /**
-         * Disable plugin registration for restricted pages, unless elevated
-         */
-        if (self::$noInit && !$plugin->elevated) {
-            return;
-        }
-
-        /**
-         * Run the plugin's register() method
-         */
-        $plugin->register();
-
         /*
          * Add init, if available
          */
@@ -346,24 +346,15 @@ class PluginManager
 
     /**
      * Returns an array with all enabled plugins
+     * The index is the plugin namespace, the value is the plugin information object.
      *
-     * @return array [$code => $pluginObj]
+     * @return array
      */
     public function getPlugins()
     {
         return array_diff_key($this->plugins, $this->disabledPlugins);
     }
 
-    /**
-     * Returns an array will all plugins detected on the filesystem
-     *
-     * @return array [$code => $pluginObj]
-     */
-    public function getAllPlugins()
-    {
-        return $this->plugins;
-    }
-
     /**
      * Returns a plugin registration class based on its namespace (Author\Plugin).
      *
diff --git a/modules/system/classes/SystemController.php b/modules/system/classes/SystemController.php
index 1b36c7b49..ed5a922f6 100644
--- a/modules/system/classes/SystemController.php
+++ b/modules/system/classes/SystemController.php
@@ -1,12 +1,10 @@
 <?php namespace System\Classes;
 
 use Lang;
-use Config;
-use Response;
-use Exception;
-use SystemException;
 use ApplicationException;
 use Illuminate\Routing\Controller as ControllerBase;
+use Exception;
+use Response;
 
 /**
  * The is the master controller for system related routing.
@@ -14,7 +12,7 @@ use Illuminate\Routing\Controller as ControllerBase;
  *
  * @see System\Classes\CombineAssets Asset combiner class
  * @package october\system
- * @author Alexey Bobkov, Samuel Georges, Luke Towers
+ * @author Alexey Bobkov, Samuel Georges
  */
 class SystemController extends ControllerBase
 {
@@ -37,49 +35,9 @@ class SystemController extends ControllerBase
             $combiner = CombineAssets::instance();
 
             return $combiner->getContents($cacheId);
-        } catch (Exception $ex) {
+        }
+        catch (Exception $ex) {
             return Response::make('/* '.e($ex->getMessage()).' */', 500);
         }
     }
-
-    /**
-     * Resizes an image using the provided configuration
-     * and returns a redirect to the resized image
-     *
-     * @param string $identifier The identifier used to retrieve the image configuration
-     * @param string $encodedUrl The double-encoded URL of the resized image, see https://github.com/octobercms/october/issues/3592#issuecomment-671017380
-     * @return RedirectResponse
-     */
-    public function resizer(string $identifier, string $encodedUrl)
-    {
-        $resizedUrl = ImageResizer::getValidResizedUrl($identifier, $encodedUrl);
-        if (empty($resizedUrl)) {
-            return response('Invalid identifier or redirect URL', 400);
-        }
-
-        // Attempt to process the resize
-        try {
-            $resizer = ImageResizer::fromIdentifier($identifier);
-            $resizer->resize();
-        } catch (SystemException $ex) {
-            // If the resizing failed with a SystemException, it was most
-            // likely because it is in progress or has already finished
-            // although it could also be because the cache system used to store
-            // configuration data is broken
-            if (Config::get('cache.default', 'file') === 'array') {
-                throw new Exception('Image resizing requires a persistent cache driver, "array" is not supported. Try changing config/cache.php -> default to a persistent cache driver.');
-            }
-        } catch (Exception $ex) {
-            // If it failed for any other reason, restore the config so that
-            // the resizer route will continue to work until it succeeds
-            if ($resizer) {
-                $resizer->storeConfig();
-            }
-
-            // Rethrow the exception
-            throw $ex;
-        }
-
-        return redirect()->to($resizedUrl);
-    }
 }
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index bd621743a..7e4779de1 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -29,6 +29,11 @@ class UpdateManager
 {
     use \October\Rain\Support\Traits\Singleton;
 
+    /**
+     * @var array The notes for the current operation.
+     */
+    protected $notes = [];
+
     /**
      * @var \Illuminate\Console\OutputStyle
      */
@@ -89,11 +94,6 @@ class UpdateManager
      */
     protected $repository;
 
-    /**
-     * @var array An array of messages returned by migrations / seeders. Returned at the end of the update process.
-     */
-    protected $messages = [];
-
     /**
      * Initialize this singleton.
      */
@@ -167,9 +167,6 @@ class UpdateManager
             }
         }
 
-        // Print messages returned by migrations / seeders
-        $this->printMessages();
-
         return $this;
     }
 
@@ -348,13 +345,13 @@ class UpdateManager
         /*
          * Rollback modules
          */
-        if (isset($this->notesOutput)) {
-            $this->migrator->setOutput($this->notesOutput);
-        }
-
         while (true) {
             $rolledBack = $this->migrator->rollback($paths, ['pretend' => false]);
 
+            foreach ($this->migrator->getNotes() as $note) {
+                $this->note($note);
+            }
+
             if (count($rolledBack) == 0) {
                 break;
             }
@@ -366,41 +363,23 @@ class UpdateManager
     }
 
     /**
-     * Determines build number from source manifest.
-     *
-     * This will return an array with the following information:
-     *  - `build`: The build number we determined was most likely the build installed.
-     *  - `modified`: Whether we detected any modifications between the installed build and the manifest.
-     *  - `confident`: Whether we are at least 60% sure that this is the installed build. More modifications to
-     *                  to the code = less confidence.
-     *  - `changes`: If $detailed is true, this will include the list of files modified, created and deleted.
-     *
-     * @param bool $detailed If true, the list of files modified, added and deleted will be included in the result.
-     * @return array
-     */
-    public function getBuildNumberManually($detailed = false)
-    {
-        $source = new SourceManifest();
-        $manifest = new FileManifest(null, null, true);
-
-        // Find build by comparing with source manifest
-        return $source->compare($manifest, $detailed);
-    }
-
-    /**
-     * Sets the build number in the database.
-     *
-     * @param bool $detailed If true, the list of files modified, added and deleted will be included in the result.
+     * Asks the gateway for the lastest build number and stores it.
      * @return void
      */
-    public function setBuildNumberManually($detailed = false)
+    public function setBuildNumberManually()
     {
-        $build = $this->getBuildNumberManually($detailed);
+        $postData = [];
 
-        if ($build['confident']) {
-            $this->setBuild($build['build'], null, $build['modified']);
+        if (Config::get('cms.edgeUpdates', false)) {
+            $postData['edge'] = 1;
         }
 
+        $result = $this->requestServerData('ping', $postData);
+
+        $build = (int) array_get($result, 'pong', 420);
+
+        $this->setBuild($build);
+
         return $build;
     }
 
@@ -424,13 +403,13 @@ class UpdateManager
      */
     public function migrateModule($module)
     {
-        if (isset($this->notesOutput)) {
-            $this->migrator->setOutput($this->notesOutput);
-        }
+        $this->migrator->run(base_path() . '/modules/' . strtolower($module) . '/database/migrations');
 
         $this->note($module);
 
-        $this->migrator->run(base_path() . '/modules/'.strtolower($module).'/database/migrations');
+        foreach ($this->migrator->getNotes() as $note) {
+            $this->note(' - ' . $note);
+        }
 
         return $this;
     }
@@ -448,11 +427,7 @@ class UpdateManager
         }
 
         $seeder = App::make($className);
-        $return = $seeder->run();
-
-        if (isset($return) && (is_string($return) || is_array($return))) {
-            $this->addMessage($className, $return);
-        }
+        $seeder->run();
 
         $this->note(sprintf('<info>Seeded %s</info> ', $module));
         return $this;
@@ -487,14 +462,12 @@ class UpdateManager
      * Sets the build number and hash
      * @param string $hash
      * @param string $build
-     * @param bool $modified
      * @return void
      */
-    public function setBuild($build, $hash = null, $modified = false)
+    public function setBuild($build, $hash = null)
     {
         $params = [
-            'system::core.build' => $build,
-            'system::core.modified' => $modified,
+            'system::core.build' => $build
         ];
 
         if ($hash) {
@@ -545,9 +518,13 @@ class UpdateManager
 
         $this->note($name);
 
-        $this->versionManager->setNotesOutput($this->notesOutput);
+        $this->versionManager->resetNotes()->setNotesOutput($this->notesOutput);
 
-        $this->versionManager->updatePlugin($plugin);
+        if ($this->versionManager->updatePlugin($plugin) !== false) {
+            foreach ($this->versionManager->getNotes() as $note) {
+                $this->note($note);
+            }
+        }
 
         return $this;
     }
@@ -736,8 +713,7 @@ class UpdateManager
         }
 
         $data = $this->requestServerData($type . '/popular');
-        $expiresAt = now()->addMinutes(60);
-        Cache::put($cacheKey, base64_encode(serialize($data)), $expiresAt);
+        Cache::put($cacheKey, base64_encode(serialize($data)), 60);
 
         foreach ($data as $product) {
             $code = array_get($product, 'code', -1);
@@ -826,11 +802,35 @@ class UpdateManager
     {
         if ($this->notesOutput !== null) {
             $this->notesOutput->writeln($message);
+        } else {
+            $this->notes[] = $message;
         }
 
         return $this;
     }
 
+    /**
+     * Get the notes for the last operation.
+     * @return array
+     */
+    public function getNotes()
+    {
+        return $this->notes;
+    }
+
+    /**
+     * Resets the notes store.
+     * @return self
+     */
+    public function resetNotes()
+    {
+        $this->notesOutput = null;
+
+        $this->notes = [];
+
+        return $this;
+    }
+
     /**
      * Sets an output stream for writing notes.
      * @param Illuminate\Console\Command $output
@@ -1015,50 +1015,4 @@ class UpdateManager
     {
         return Config::get('database.migrations', 'migrations');
     }
-
-    /**
-     * Adds a message from a specific migration or seeder.
-     *
-     * @param string|object $class
-     * @param string|array $message
-     * @return void
-     */
-    protected function addMessage($class, $message)
-    {
-        if (is_object($class)) {
-            $class = get_class($class);
-        }
-        if (!isset($this->messages[$class])) {
-            $this->messages[$class] = [];
-        }
-
-        if (is_string($message)) {
-            $this->messages[$class][] = $message;
-        } else if (is_array($message)) {
-            array_merge($this->messages[$class], $message);
-        }
-    }
-
-    /**
-     * Prints collated messages from the migrations and seeders
-     *
-     * @return void
-     */
-    protected function printMessages()
-    {
-        if (!count($this->messages)) {
-            return;
-        }
-
-        // Add a line break
-        $this->note('');
-
-        foreach ($this->messages as $class => $messages) {
-            $this->note(sprintf('<info>%s reported:</info>', $class));
-
-            foreach ($messages as $message) {
-                $this->note(' - ' . (string) $message);
-            }
-        }
-    }
 }
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index 696e567be..77127cf12 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -29,6 +29,12 @@ class VersionManager
     const HISTORY_TYPE_COMMENT = 'comment';
     const HISTORY_TYPE_SCRIPT = 'script';
 
+    /**
+     * The notes for the current operation.
+     * @var array
+     */
+    protected $notes = [];
+
     /**
      * @var \Illuminate\Console\OutputStyle
      */
@@ -83,7 +89,7 @@ class VersionManager
 
         // No updates needed
         if ($currentVersion == $databaseVersion) {
-            $this->note(' - <info>Nothing to update.</info>');
+            $this->note('- <info>Nothing to update.</info>');
             return;
         }
 
@@ -140,7 +146,7 @@ class VersionManager
             foreach ($comments as $comment) {
                 $this->applyDatabaseComment($code, $version, $comment);
 
-                $this->note(sprintf(' - <info>v%s: </info> %s', $version, $comment));
+                $this->note(sprintf('- <info>v%s: </info> %s', $version, $comment));
             }
         }
 
@@ -420,7 +426,6 @@ class VersionManager
          * Execute the database PHP script
          */
         $updateFile = $this->pluginManager->getPluginPath($code) . '/updates/' . $script;
-
         $this->updater->packDown($updateFile);
 
         Db::table('system_plugin_history')
@@ -503,11 +508,35 @@ class VersionManager
     {
         if ($this->notesOutput !== null) {
             $this->notesOutput->writeln($message);
+        } else {
+            $this->notes[] = $message;
         }
 
         return $this;
     }
 
+    /**
+     * Get the notes for the last operation.
+     * @return array
+     */
+    public function getNotes()
+    {
+        return $this->notes;
+    }
+
+    /**
+     * Resets the notes store.
+     * @return self
+     */
+    public function resetNotes()
+    {
+        $this->notesOutput = null;
+
+        $this->notes = [];
+
+        return $this;
+    }
+
     /**
      * Sets an output stream for writing notes.
      * @param Illuminate\Console\Command $output
@@ -521,7 +550,8 @@ class VersionManager
     }
 
     /**
-     * Extract script and comments from version details
+     * @param $details
+     *
      * @return array
      */
     protected function extractScriptsAndComments($details): array
@@ -536,8 +566,7 @@ class VersionManager
             $scripts = array_values(array_filter($details, function ($detail) use ($fileNamePattern) {
                 return preg_match($fileNamePattern, $detail);
             }));
-        }
-        else {
+        } else {
             $comments = (array)$details;
             $scripts = [];
         }
diff --git a/modules/system/composer.json b/modules/system/composer.json
index fbbb2e077..b75fe1a01 100644
--- a/modules/system/composer.json
+++ b/modules/system/composer.json
@@ -8,13 +8,11 @@
     "authors": [
         {
             "name": "Alexey Bobkov",
-            "email": "aleksey.bobkov@gmail.com",
-            "role": "Co-founder"
+            "email": "aleksey.bobkov@gmail.com"
         },
         {
             "name": "Samuel Georges",
-            "email": "daftspunky@gmail.com",
-            "role": "Co-founder"
+            "email": "daftspunky@gmail.com"
         },
         {
             "name": "Luke Towers",
@@ -24,10 +22,9 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.0",
         "composer/installers": "~1.0",
-        "october/rain": "~1.1.0",
-        "laravel/framework": "~6.0"
+        "october/rain": "~1.0.469"
     },
     "autoload": {
         "psr-4": {
diff --git a/modules/system/console/OctoberEnv.php b/modules/system/console/OctoberEnv.php
index d13997b3e..cc735c2c4 100644
--- a/modules/system/console/OctoberEnv.php
+++ b/modules/system/console/OctoberEnv.php
@@ -1,6 +1,5 @@
 <?php namespace System\Console;
 
-use App;
 use Illuminate\Console\Command;
 
 /**
@@ -328,7 +327,7 @@ class OctoberEnv extends Command
      */
     protected function writeToConfigFile($content)
     {
-        file_put_contents(rtrim(App::make('path.config'), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $this->config . '.php', $content);
+        file_put_contents(config_path($this->config . '.php'), $content);
     }
 
     /**
@@ -336,7 +335,7 @@ class OctoberEnv extends Command
      */
     protected function lines()
     {
-        return file(rtrim(App::make('path.config'), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $this->config . '.php');
+        return file(config_path($this->config . '.php'));
     }
 
     /**
@@ -370,7 +369,7 @@ class OctoberEnv extends Command
                 'SESSION_DRIVER' => 'driver',
             ],
             'queue' => [
-                'QUEUE_CONNECTION' => 'default',
+                'QUEUE_DRIVER' => 'default',
             ],
             'mail' => [
                 'MAIL_DRIVER' => 'driver',
diff --git a/modules/system/console/OctoberFresh.php b/modules/system/console/OctoberFresh.php
index a10283268..e87e5422d 100644
--- a/modules/system/console/OctoberFresh.php
+++ b/modules/system/console/OctoberFresh.php
@@ -35,30 +35,17 @@ class OctoberFresh extends Command
         if (!$this->confirmToProceed('Are you sure?')) {
             return;
         }
-        
-        $themeRemoved = false;
-        $pluginRemoved = false;
 
         $demoThemePath = themes_path().'/demo';
+
         if (File::exists($demoThemePath)) {
-            File::deleteDirectory($demoThemePath);
-            $themeRemoved = true;
-        }
-
-        $demoPluginPath = plugins_path().'/october/demo';
-        if (File::exists($demoPluginPath)) {
             Artisan::call('plugin:remove', ['name' => 'October.Demo', '--force' => true]);
-            $pluginRemoved = true;
-        }
+            File::deleteDirectory($demoThemePath);
 
-        if ($themeRemoved && $pluginRemoved) {
-            $this->info('Demo theme and plugin have been removed! Enjoy a fresh start.');
-        } elseif ($themeRemoved) {
-            $this->info('Demo theme has been removed! Enjoy a fresh start.');
-        } elseif ($pluginRemoved) {
-            $this->info('Demo plugin has been removed! Enjoy a fresh start.');
-        } else {
-            $this->info('Demo theme and plugin have already been removed.');
+            $this->info('Demo has been removed! Enjoy a fresh start.');
+        }
+        else {
+            $this->error('Demo theme is already removed.');
         }
     }
 
diff --git a/modules/system/console/OctoberMirror.php b/modules/system/console/OctoberMirror.php
index 602c12501..4fb0689bc 100644
--- a/modules/system/console/OctoberMirror.php
+++ b/modules/system/console/OctoberMirror.php
@@ -41,7 +41,6 @@ class OctoberMirror extends Command
     protected $directories = [
         'storage/app/uploads/public',
         'storage/app/media',
-        'storage/app/resized',
         'storage/temp/public',
     ];
 
diff --git a/modules/system/console/OctoberUpdate.php b/modules/system/console/OctoberUpdate.php
index 200dcd221..b826fe305 100644
--- a/modules/system/console/OctoberUpdate.php
+++ b/modules/system/console/OctoberUpdate.php
@@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputOption;
  */
 class OctoberUpdate extends Command
 {
+
     /**
      * The console command name.
      */
diff --git a/modules/system/console/OctoberUtil.php b/modules/system/console/OctoberUtil.php
index 14700a31f..dba334058 100644
--- a/modules/system/console/OctoberUtil.php
+++ b/modules/system/console/OctoberUtil.php
@@ -1,5 +1,6 @@
 <?php namespace System\Console;
 
+use App;
 use Lang;
 use File;
 use Config;
@@ -8,8 +9,8 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use System\Classes\UpdateManager;
 use System\Classes\CombineAssets;
+use Exception;
 use System\Models\Parameter;
-use System\Models\File as FileModel;
 
 /**
  * Console command for other utility commands.
@@ -26,6 +27,7 @@ use System\Models\File as FileModel;
  * - compile less: Compile registered LESS files only.
  * - compile scss: Compile registered SCSS files only.
  * - compile lang: Compile registered Language files only.
+ * - set build: Pull the latest stable build number from the update gateway and set it as the current build number.
  * - set project --projectId=<id>: Set the projectId for this october instance.
  *
  * @package october\system
@@ -108,10 +110,31 @@ class OctoberUtil extends Command
 
     protected function utilSetBuild()
     {
-        $this->comment('NOTE: This command is now deprecated. Please use "php artisan october:version" instead.');
-        $this->comment('');
+        $this->comment('-');
 
-        return $this->call('october:version');
+        /*
+         * Skip setting the build number if no database is detected to set it within
+         */
+        if (!App::hasDatabase()) {
+            $this->comment('No database detected - skipping setting the build number.');
+            return;
+        }
+
+        try {
+            $build = UpdateManager::instance()->setBuildNumberManually();
+            $this->comment('*** October sets build: '.$build);
+        }
+        catch (Exception $ex) {
+            $this->comment('*** You were kicked from #october by Ex: ('.$ex->getMessage().')');
+        }
+
+        $this->comment('-');
+        sleep(1);
+        $this->comment('Ping? Pong!');
+        $this->comment('-');
+        sleep(1);
+        $this->comment('Ping? Pong!');
+        $this->comment('-');
     }
 
     protected function utilCompileJs()
@@ -271,66 +294,7 @@ class OctoberUtil extends Command
             return;
         }
 
-        $uploadsDisk = Config::get('cms.storage.uploads.disk', 'local');
-        if ($uploadsDisk !== 'local') {
-            $this->error("Purging uploads is only supported on the 'local' disk, current uploads disk is $uploadsDisk");
-            return;
-        }
-
-        $totalCount = 0;
-        $validFiles = FileModel::pluck('disk_name')->all();
-        $uploadsPath = Config::get('filesystems.disks.local.root', storage_path('app')) . '/' . Config::get('cms.storage.uploads.folder', 'uploads');
-
-        // Recursive function to scan the directory for files and ensure they exist in system_files.
-        $purgeFunc = function ($targetDir) use (&$purgeFunc, &$totalCount, $uploadsPath, $validFiles) {
-            if ($files = File::glob($targetDir.'/*')) {
-                if ($dirs = File::directories($targetDir)) {
-                    foreach ($dirs as $dir) {
-                        $purgeFunc($dir);
-
-                        if (File::isDirectoryEmpty($dir) && is_writeable($dir)) {
-                            rmdir($dir);
-                            $this->info('Removed folder: '. str_replace($uploadsPath, '', $dir));
-                        }
-                    }
-                }
-
-                foreach ($files as $file) {
-                    if (!is_file($file)) {
-                        continue;
-                    }
-
-                    // Skip .gitignore files
-                    if ($file === '.gitignore') {
-                        continue;
-                    }
-
-                    // Skip files unable to be purged
-                    if (!is_writeable($file)) {
-                        $this->warn('Unable to purge file: ' . str_replace($uploadsPath, '', $file));
-                        continue;
-                    }
-
-                    // Skip valid files
-                    if (in_array(basename($file), $validFiles)) {
-                        $this->warn('Skipped file in use: '. str_replace($uploadsPath, '', $file));
-                        continue;
-                    }
-
-                    unlink($file);
-                    $this->info('Purged: '. str_replace($uploadsPath, '', $file));
-                    $totalCount++;
-                }
-            }
-        };
-
-        $purgeFunc($uploadsPath);
-
-        if ($totalCount > 0) {
-            $this->comment(sprintf('Successfully deleted %d invalid file(s), leaving %d valid files', $totalCount, count($validFiles)));
-        } else {
-            $this->comment('No files found to purge.');
-        }
+        // @todo
     }
 
     protected function utilPurgeOrphans()
diff --git a/modules/system/console/ThemeSync.php b/modules/system/console/ThemeSync.php
index 2f813ba27..f709921d0 100644
--- a/modules/system/console/ThemeSync.php
+++ b/modules/system/console/ThemeSync.php
@@ -105,7 +105,7 @@ class ThemeSync extends Command
 
             foreach ($userPaths as $userPath) {
                 foreach ($themePaths as $themePath) {
-                    $pregMatch = '/^' . str_replace('/', '\/', $userPath) . '/i';
+                    $pregMatch = '/' . str_replace('/', '\/', $userPath) . '/i';
 
                     if ($userPath === $themePath || preg_match($pregMatch, $themePath)) {
                         $paths[] = $themePath;
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 719dff20e..7ba29dea7 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -2,8 +2,6 @@
 
 use Lang;
 use Flash;
-use Config;
-use Request;
 use Backend;
 use BackendMenu;
 use System\Classes\SettingsManager;
@@ -141,22 +139,6 @@ class Settings extends Controller
         return $this->formWidget->render($options);
     }
 
-    /**
-     * Returns the form widget used by this behavior.
-     *
-     * @return \Backend\Widgets\Form
-     */
-    public function formGetWidget()
-    {
-        if (is_null($this->formWidget)) {
-            $item = $this->findSettingItem();
-            $model = $this->createModel($item);
-            $this->initWidgets($model);
-        }
-
-        return $this->formWidget;
-    }
-
     /**
      * Prepare the widgets used by this action
      * Model $model
@@ -187,22 +169,10 @@ class Settings extends Controller
     }
 
     /**
-     * Locates a setting item for a module or plugin.
-     *
-     * If none of the parameters are provided, they will be auto-guessed from the URL.
-     *
-     * @param string|null $author
-     * @param string|null $plugin
-     * @param string|null $code
-     *
-     * @return array
+     * Locates a setting item for a module or plugin
      */
-    protected function findSettingItem($author = null, $plugin = null, $code = null)
+    protected function findSettingItem($author, $plugin, $code)
     {
-        if (is_null($author) || is_null($plugin)) {
-            [$author, $plugin, $code] = $this->guessSettingItem();
-        }
-
         $manager = SettingsManager::instance();
 
         $moduleOwner = $author;
@@ -217,23 +187,4 @@ class Settings extends Controller
 
         return $item;
     }
-
-    /**
-     * Guesses the requested setting item from the current URL segments provided by the Request object.
-     *
-     * @return array
-     */
-    protected function guessSettingItem()
-    {
-        $segments = Request::segments();
-
-        if (!empty(Config::get('cms.backendUri', 'backend'))) {
-            array_splice($segments, 0, 4);
-        } else {
-            array_splice($segments, 0, 3);
-        }
-
-        // Ensure there's at least 3 segments
-        return array_pad($segments, 3, null);
-    }
 }
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 230cd57c2..ed66175d5 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -75,7 +75,6 @@ class Updates extends Controller
     public function index()
     {
         $this->vars['coreBuild'] = Parameter::get('system::core.build');
-        $this->vars['coreBuildModified'] = Parameter::get('system::core.modified', false);
         $this->vars['projectId'] = Parameter::get('system::project.id');
         $this->vars['projectName'] = Parameter::get('system::project.name');
         $this->vars['projectOwner'] = Parameter::get('system::project.owner');
@@ -450,15 +449,12 @@ class Updates extends Controller
 
     /**
      * Contacts the update server for a list of necessary updates.
-     *
-     * @param bool $force Whether or not to force the redownload of existing tools
-     * @return string The rendered "execute" partial
      */
-    public function onForceUpdate($force = true)
+    public function onForceUpdate()
     {
         try {
             $manager = UpdateManager::instance();
-            $result = $manager->requestUpdateList($force);
+            $result = $manager->requestUpdateList(true);
 
             $coreHash = array_get($result, 'core.hash', false);
             $coreBuild = array_get($result, 'core.build', false);
@@ -709,7 +705,7 @@ class Updates extends Controller
                 'system::project.owner' => $result['owner'],
             ]);
 
-            return $this->onForceUpdate(false);
+            return $this->onForceUpdate();
         }
         catch (Exception $ex) {
             $this->handleError($ex);
@@ -881,7 +877,7 @@ class Updates extends Controller
         }
 
         Flash::success(Lang::get("system::lang.plugins.{$bulkAction}_success"));
-        return redirect()->refresh();
+        return $this->listRefresh('manage');
     }
 
     //
diff --git a/modules/system/controllers/settings/update.htm b/modules/system/controllers/settings/update.htm
index 3925c7208..64f63117a 100644
--- a/modules/system/controllers/settings/update.htm
+++ b/modules/system/controllers/settings/update.htm
@@ -11,6 +11,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -20,6 +21,7 @@
                 <button
                     type="button"
                     data-request="onSave"
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/system/controllers/updates/_list_toolbar.htm b/modules/system/controllers/updates/_list_toolbar.htm
index 0d8743072..fc32bc329 100644
--- a/modules/system/controllers/updates/_list_toolbar.htm
+++ b/modules/system/controllers/updates/_list_toolbar.htm
@@ -6,16 +6,16 @@
         data-handler="onLoadUpdates">
         <?= e(trans('system::lang.updates.check_label')) ?>
     </a>
-    <a
-        href="<?= Backend::url('system/updates/install') ?>"
-        class="btn btn-success oc-icon-plus">
-        <?= e(trans('system::lang.plugins.install')) ?>
-    </a>
     <a
         href="<?= Backend::url('system/updates/install/themes') ?>"
         class="btn btn-success oc-icon-plus">
         <?= e(trans('system::lang.themes.install')) ?>
     </a>
+    <a
+        href="<?= Backend::url('system/updates/install') ?>"
+        class="btn btn-success oc-icon-plus">
+        <?= e(trans('system::lang.plugins.install')) ?>
+    </a>
     <a
         href="<?= Backend::url('system/updates/manage') ?>"
         class="btn btn-default oc-icon-puzzle-piece">
diff --git a/modules/system/controllers/updates/index.htm b/modules/system/controllers/updates/index.htm
index 64f2b831a..f59abe07c 100644
--- a/modules/system/controllers/updates/index.htm
+++ b/modules/system/controllers/updates/index.htm
@@ -34,19 +34,7 @@
         <?php if ($coreBuild): ?>
             <div class="scoreboard-item title-value">
                 <h4><?= e(trans('system::lang.updates.core_current_build')) ?></h4>
-                <?php if ($coreBuildModified): ?>
-                    <p
-                        class="oc-icon-exclamation-circle"
-                        data-toggle="tooltip"
-                        data-placement="bottom"
-                        title="This build has been modified"
-                    >
-                        <?= $coreBuild ?>
-                    </p>
-                <?php else: ?>
-                    <p><?= $coreBuild ?></p>
-                <?php endif; ?>
-
+                <p><?= $coreBuild ?></p>
                 <p class="description">
                     <a
                         href="javascript:;"
diff --git a/modules/system/database/seeds/DatabaseSeeder.php b/modules/system/database/seeds/DatabaseSeeder.php
index 7dec41339..f2f924b13 100644
--- a/modules/system/database/seeds/DatabaseSeeder.php
+++ b/modules/system/database/seeds/DatabaseSeeder.php
@@ -13,8 +13,8 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        Eloquent::unguarded(function () {
-            $this->call('System\Database\Seeds\SeedSetupMailLayouts');
-        });
+        Eloquent::unguard();
+
+        $this->call('System\Database\Seeds\SeedSetupMailLayouts');
     }
 }
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 136841bdd..fa55cb114 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -441,8 +441,7 @@ return [
         'manage_other_administrators' => 'Manage other administrators',
         'impersonate_users' => 'Impersonate users',
         'manage_preferences' => 'Manage backend preferences',
-        'manage_editor' => 'Manage global code editor preferences',
-        'manage_own_editor' => 'Manage personal code editor preferences',
+        'manage_editor' => 'Manage code editor preferences',
         'view_the_dashboard' => 'View the dashboard',
         'manage_default_dashboard' => 'Manage the default dashboard',
         'manage_branding' => 'Customize the back-end',
diff --git a/modules/system/lang/en/validation.php b/modules/system/lang/en/validation.php
index ad6561c9e..edc036dd0 100644
--- a/modules/system/lang/en/validation.php
+++ b/modules/system/lang/en/validation.php
@@ -32,7 +32,6 @@ return [
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
     'date'                 => 'The :attribute is not a valid date.',
-    'date_equals'          => 'The :attribute must be a date equal to :date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
     'digits'               => 'The :attribute must be :digits digits.',
@@ -40,22 +39,9 @@ return [
     'dimensions'           => 'The :attribute has invalid image dimensions.',
     'distinct'             => 'The :attribute field has a duplicate value.',
     'email'                => 'The :attribute must be a valid email address.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
     'exists'               => 'The selected :attribute is invalid.',
     'file'                 => 'The :attribute must be a file.',
     'filled'               => 'The :attribute field must have a value.',
-    'gt'                   => [
-        'numeric' => 'The :attribute must be greater than :value.',
-        'file'    => 'The :attribute must be greater than :value kilobytes.',
-        'string'  => 'The :attribute must be greater than :value characters.',
-        'array'   => 'The :attribute must have more than :value items.',
-    ],
-    'gte'                  => [
-        'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
-    ],
     'image'                => 'The :attribute must be an image.',
     'in'                   => 'The selected :attribute is invalid.',
     'in_array'             => 'The :attribute field does not exist in :other.',
@@ -64,18 +50,6 @@ return [
     'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
     'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
     'json'                 => 'The :attribute must be a valid JSON string.',
-    'lt'                   => [
-        'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
-    ],
-    'lte'                  => [
-        'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
-    ],
     'max'                  => [
         'numeric' => 'The :attribute may not be greater than :max.',
         'file'    => 'The :attribute may not be greater than :max kilobytes.',
@@ -91,7 +65,6 @@ return [
         'array'   => 'The :attribute must have at least :min items.',
     ],
     'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
     'regex'                => 'The :attribute format is invalid.',
@@ -109,13 +82,11 @@ return [
         'string'  => 'The :attribute must be :size characters.',
         'array'   => 'The :attribute must contain :size items.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
     'timezone'             => 'The :attribute must be a valid zone.',
     'unique'               => 'The :attribute has already been taken.',
     'uploaded'             => 'The :attribute failed to upload.',
     'url'                  => 'The :attribute format is invalid.',
-    'uuid'                 => 'The :attribute must be a valid UUID.',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/lang/es/client.php b/modules/system/lang/es/client.php
index fb6f31ead..95602d98a 100644
--- a/modules/system/lang/es/client.php
+++ b/modules/system/lang/es/client.php
@@ -33,6 +33,7 @@ return [
         'fullscreen' => 'Pantalla completa',
         'preview' => 'Previsualizar'
     ],
+
     'mediamanager' => [
         'insert_link' => "Insertar Media Vínculo",
         'insert_image' => "Insertar Media Imagen",
@@ -44,10 +45,12 @@ return [
         'invalid_video_empty_insert' => "Por favor seleccione un archivo de video para insertar.",
         'invalid_audio_empty_insert' => "Por favor seleccione un archivo de audio para insertar.",
     ],
+
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Cancelar'
     ],
+
     'datepicker' => [
         'previousMonth' => 'Mes Anterior',
         'nextMonth' => 'Mes Siguiente',
@@ -55,31 +58,21 @@ return [
         'weekdays' => ['Domingo', 'Lunes', 'Martes', 'Miercoles', 'Jueves', 'Viernes', 'Sabado'],
         'weekdaysShort' => ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab']
     ],
+
     'filter' => [
         'group' => [
             'all' => 'todos'
         ],
-        'scopes' => [
-            'apply_button_text' => 'Aplicar',
-            'clear_button_text' => 'Limpiar',
-        ],
         'dates' => [
-            'all' => 'todas',
-            'filter_button_text' => 'Filtrar',
-            'reset_button_text' => 'Restablecer',
-            'date_placeholder' => 'Fecha',
-            'after_placeholder' => 'Desde',
-            'before_placeholder' => 'Hasta'
-        ],
-        'numbers' => [
             'all' => 'todos',
-            'filter_button_text' => 'Filtrar',
-            'reset_button_text' => 'Restablecer',
-            'min_placeholder' => 'Mínimo',
-            'max_placeholder' => 'Máximo',
-            'number_placeholder' => 'Número'
-        ],
+            'filter_button_text' => 'Filtro',
+            'reset_button_text'  => 'Restablecer',
+            'date_placeholder' => 'Fecha',
+            'after_placeholder' => 'Despues',
+            'before_placeholder' => 'Antes'
+        ]
     ],
+
     'eventlog' => [
         'show_stacktrace' => 'Mostrar el seguimiento de la pila',
         'hide_stacktrace' => 'Ocultar el seguimiento de la pila',
@@ -91,7 +84,7 @@ return [
             'title' => 'Seleccione el editor de código fuente a usar',
             'description' => 'Su entorno de sistema operativo debe estar configurado para escuchar a uno de estos esquemas de URL.',
             'openWith' => 'Abrir con',
-            'rememberChoice' => 'Recuerde la opción seleccionada para esta sesión del navegador',
+            'rememberChoice' => 'Recuerde que la opción seleccionada para esta sesión del navegador',
             'open' => 'Abrir',
             'cancel' => 'Cancelar'
         ]
diff --git a/modules/system/lang/fr/validation.php b/modules/system/lang/fr/validation.php
index 0fe72612f..7f02f584e 100644
--- a/modules/system/lang/fr/validation.php
+++ b/modules/system/lang/fr/validation.php
@@ -22,7 +22,7 @@ return [
     'alpha_num'            => 'Le champ :attribute ne peut contenir que des lettres et des chiffres.',
     'array'                => 'Le champ :attribute doit être un groupe.',
     'before'               => 'Le champ :attribute doit être une date avant le :date.',
-    'before_or_equal'      => 'Le champ :attribute doit être une date avant le ou égal à :date.',
+    'before_or_equal'      => 'LE champ :attribute doit être une date avant le ou égal à :date.',
     'between'              => [
         'numeric' => 'Le champ :attribute doit être compris entre :min - :max.',
         'file'    => 'Le champ :attribute doit être compris entre :min - :max kilooctets.',
@@ -36,8 +36,8 @@ return [
     'different'            => 'Le champ :attribute et :other doivent être différents.',
     'digits'               => 'Le champ :attribute doit être de :digits chiffres.',
     'digits_between'       => 'Le champ :attribute doit être compris entre :min et :max chiffres.',
-    'dimensions'           => 'Le champ :attribute a des dimensions d’image invalides.',
-    'distinct'             => 'Le champ :attribute a une valeur en double..',
+    'dimensions'           => 'Le cahmp :attribute a des dimensions d’image invalides.',
+    'distinct'             => 'Le cahmp :attribute a une valeur en double..',
     'email'                => 'Le format du champ :attribute n’est pas valide.',
     'exists'               => 'Le champ :attribute sélectionné n’est pas valide.',
     'file'                 => 'Le champ :attribute doit être un fichier.',
diff --git a/modules/system/lang/it/client.php b/modules/system/lang/it/client.php
index 0eea9a73b..0c13c7181 100644
--- a/modules/system/lang/it/client.php
+++ b/modules/system/lang/it/client.php
@@ -33,6 +33,7 @@ return [
         'fullscreen' => 'Schermo intero',
         'preview' => 'Anteprima',
     ],
+
     'mediamanager' => [
         'insert_link' => "Inserisci collegamento elemento multimediale",
         'insert_image' => "Inserisci immagine",
@@ -44,28 +45,23 @@ return [
         'invalid_video_empty_insert' => "Si prega di selezionare un file video da inserire.",
         'invalid_audio_empty_insert' => "Si prega di selezionare un file audio da inserire.",
     ],
+
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Annulla',
-        'widget_remove_confirm' => 'Rimuovere questo widget?',
     ],
+
     'datepicker' => [
         'previousMonth' => 'Mese precedente',
         'nextMonth' => 'Mese successivo',
         'months' => ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
         'weekdays' => ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
-        'weekdaysShort' => ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'],
-    ],
-    'colorpicker' => [
-        'choose' => 'OK',
+        'weekdaysShort' => ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab']
     ],
+
     'filter' => [
         'group' => [
-            'all' => 'tutti',
-        ],
-        'scopes' => [
-            'apply_button_text' => 'Applica',
-            'clear_button_text' => 'Rimuovi',
+            'all' => 'tutti'
         ],
         'dates' => [
             'all' => 'tutte',
@@ -73,16 +69,10 @@ return [
             'reset_button_text'  => 'Reimposta',
             'date_placeholder' => 'Data',
             'after_placeholder' => 'Dopo',
-            'before_placeholder' => 'Prima',
-        ],
-        'numbers' => [
-            'all' => 'tutti',
-            'filter_button_text' => 'Filtra',
-            'reset_button_text' => 'Reset',
-            'min_placeholder' => 'Min',
-            'max_placeholder' => 'Max',
-        ],
+            'before_placeholder' => 'Prima'
+        ]
     ],
+
     'eventlog' => [
         'show_stacktrace' => 'Visualizza la traccia dello stack',
         'hide_stacktrace' => 'Nascondi la traccia dello stack',
@@ -96,7 +86,7 @@ return [
             'openWith' => 'Apri con',
             'remember_choice' => 'Ricorda l\'opzione selezionata per questa sessione',
             'open' => 'Apri',
-            'cancel' => 'Annulla',
+            'cancel' => 'Annulla'
         ]
     ]
 ];
diff --git a/modules/system/lang/it/validation.php b/modules/system/lang/it/validation.php
index 52b885798..69af90970 100644
--- a/modules/system/lang/it/validation.php
+++ b/modules/system/lang/it/validation.php
@@ -37,7 +37,7 @@ return [
     "exists"           => "Il valore di :attribute non è valido.",
     "image"            => ":attribute deve essere un'immagine.",
     "in"               => "Il valore di  :attribute non è valido.",
-    "integer"          => ":attribute deve essere un numero intero.",
+    "integer"          => ":attribute deve essere un numero interno.",
     "ip"               => ":attribute deve essere un indirizzo IP valido.",
     "max"              => [
         "numeric" => ":attribute non può essere maggiore di :max.",
diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php
index edd07010b..5697e60d5 100644
--- a/modules/system/lang/nl/lang.php
+++ b/modules/system/lang/nl/lang.php
@@ -331,8 +331,6 @@ return [
         'core_downloading' => 'Bestanden aan het downloaden',
         'core_extracting' => 'Bestanden aan het uitpakken',
         'core_set_build' => 'Bouwnummer bijwerken',
-        'update_warnings_title' => 'Enkele problemen zijn gedetecteerd en vereisen aandacht:',
-        'update_warnings_plugin_missing' => 'De :parent_code plugin vereist dat :code geinstalleerd is, alvorens deze zal werken',
         'changelog' => 'Logboek van wijzigingen',
         'changelog_view_details' => 'Bekijk details',
         'plugins' => 'Plugins',
@@ -440,9 +438,8 @@ return [
         'manage_mail_settings' => 'Beheer e-mailinstellingen',
         'manage_other_administrators' => 'Beheer mede-beheerders',
         'impersonate_users' => 'Inloggen als',
-        'manage_preferences' => 'Beheer back-end voorkeuren',
-        'manage_editor' => 'Beheer code editor voorkeuren',
-        'manage_own_editor' => 'Beheer persoonlijk code editor voorkeuren',
+        'manage_preferences' => 'Beheer back-end instellingen',
+        'manage_editor' => 'Beheer code editor instellingen',
         'view_the_dashboard' => 'Toon dashboard',
         'manage_default_dashboard' => 'Beheer het standaard dashboard',
         'manage_branding' => 'Back-end aanpassen',
diff --git a/modules/system/lang/nl/validation.php b/modules/system/lang/nl/validation.php
index 26540f0e7..38bc6c060 100644
--- a/modules/system/lang/nl/validation.php
+++ b/modules/system/lang/nl/validation.php
@@ -32,7 +32,6 @@ return [
     'boolean'              => ':attribute moet ja of nee zijn.',
     'confirmed'            => ':attribute bevestiging komt niet overeen.',
     'date'                 => ':attribute moet een datum bevatten.',
-    'date_equals'          => ':attribute moet een datum zijn gelijk aan :date.',
     'date_format'          => ':attribute moet een geldig datum formaat bevatten.',
     'different'            => ':attribute en :other moeten verschillend zijn.',
     'digits'               => ':attribute moet bestaan uit :digits cijfers.',
@@ -40,22 +39,9 @@ return [
     'dimensions'           => ':attribute heeft geen geldige afmetingen voor afbeeldingen.',
     'distinct'             => ':attribute heeft een dubbele waarde.',
     'email'                => ':attribute is geen geldig e-mailadres.',
-    'ends_with'            => ':attribute moet eindigen op een van de volgende waarden: :values.',
     'exists'               => ':attribute bestaat niet.',
     'file'                 => ':attribute moet een bestand zijn.',
     'filled'               => ':attribute is verplicht.',
-    'gt'                   => [
-        'numeric' => ':attribute moet groter zijn dan :value.',
-        'file'    => ':attribute moet groter zijn dan :value kilobyte.',
-        'string'  => ':attribute moet langer zijn dan :value karakters.',
-        'array'   => ':attribute moet meer dan :value items bevatten.',
-    ],
-    'gte'                  => [
-        'numeric' => ':attribute moet groter of gelijk zijn aan :value.',
-        'file'    => ':attribute moet minstens :value kilobyte groot zijn.',
-        'string'  => ':attribute moet minstens :value karakters lang zijn.',
-        'array'   => ':attribute moet minstens :value items bevatten.',
-    ],
     'image'                => ':attribute moet een afbeelding zijn.',
     'in'                   => ':attribute is ongeldig.',
     'in_array'             => ':attribute bestaat niet in :other.',
@@ -64,18 +50,6 @@ return [
     'ipv4'                 => ':attribute moet een geldig IPv4-adres zijn.',
     'ipv6'                 => ':attribute moet een geldig IPv6-adres zijn.',
     'json'                 => ':attribute moet een geldige JSON-string zijn.',
-    'lt'                   => [
-        'numeric' => ':attribute moet kleiner zijn dan :value.',
-        'file'    => ':attribute moet kleiner zijn dan :value kilobyte.',
-        'string'  => ':attribute moet korter zijn dan :value karakters.',
-        'array'   => ':attribute moet minder dan :value items bevatten.',
-    ],
-    'lte'                  => [
-        'numeric' => ':attribute moet kleiner of gelijk zijn aan :value.',
-        'file'    => ':attribute mag hoogstens :value kilobyte groot zijn.',
-        'string'  => ':attribute mag hoogstens :value karakters lang zijn.',
-        'array'   => ':attribute mag hoogstens :value items bevatten.',
-    ],
     'max'                  => [
         'numeric' => ':attribute mag niet hoger dan :max zijn.',
         'file'    => ':attribute mag niet meer dan :max kilobytes zijn.',
@@ -90,8 +64,7 @@ return [
         'string'  => ':attribute moet minimaal :min karakters zijn.',
         'array'   => ':attribute moet minimaal :min items bevatten.',
     ],
-    'not_in'               => 'De gekozen waarde van :attribute is ongeldig.',
-    'not_regex'            => 'Het formaat van :attribute is ongeldig.',
+    'not_in'               => 'Het formaat van :attribute is ongeldig.',
     'numeric'              => ':attribute moet een nummer zijn.',
     'present'              => ':attribute moet bestaan.',
     'regex'                => ':attribute formaat is ongeldig.',
@@ -109,13 +82,11 @@ return [
         'string'  => ':attribute moet :size karakters zijn.',
         'array'   => ':attribute moet :size items bevatten.',
     ],
-    'starts_with'          => ':attribute moet beginnen met een van de volgende waarden: :values.',
     'string'               => ':attribute moet een tekenreeks zijn.',
     'timezone'             => ':attribute moet een geldige tijdzone zijn.',
     'unique'               => ':attribute is al in gebruik.',
     'uploaded'             => 'Het uploaden van :attribute is mislukt.',
     'url'                  => ':attribute is geen geldige URL.',
-    'uuid'                 => ':attribute moet een geldig UUID zijn.',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/lang/ru/client.php b/modules/system/lang/ru/client.php
index 2344f1e0d..aac460c57 100644
--- a/modules/system/lang/ru/client.php
+++ b/modules/system/lang/ru/client.php
@@ -31,7 +31,7 @@ return [
         'link' => 'Ссылка',
         'horizontalrule' => 'Вставить горизонтальную черту',
         'fullscreen' => 'Полный экран',
-        'preview' => 'Предпросмотр',
+        'preview' => 'Предпросмотр'
     ],
     'mediamanager' => [
         'insert_link' => "Вставить медиа-ссылку",
@@ -47,7 +47,7 @@ return [
     'alert' => [
         'confirm_button_text' => 'Ок',
         'cancel_button_text' => 'Отмена',
-        'widget_remove_confirm' => 'Удалить этот виджет?',
+        'widget_remove_confirm' => 'Удалить этот виджет?'
     ],
     'datepicker' => [
         'previousMonth' => 'Предыдущий месяц',
@@ -61,11 +61,11 @@ return [
     ],
     'filter' => [
         'group' => [
-            'all' => 'все',
+            'all' => 'все'
         ],
         'scopes' => [
             'apply_button_text' => 'Применить',
-            'clear_button_text'  => 'Очистить',
+            'clear_button_text'  => 'Очистить'
         ],
         'dates' => [
             'all' => 'все',
@@ -73,22 +73,22 @@ return [
             'reset_button_text' => 'Сбросить',
             'date_placeholder' => 'Дата',
             'after_placeholder' => 'После',
-            'before_placeholder' => 'До',
+            'before_placeholder' => 'До'
         ],
         'numbers' => [
             'all' => 'все',
             'filter_button_text' => 'Фильтр',
             'reset_button_text'  => 'Сброс',
             'min_placeholder' => 'Min',
-            'max_placeholder' => 'Max',
-        ],
+            'max_placeholder' => 'Max'
+        ]
     ],
     'eventlog' => [
         'show_stacktrace' => 'Показать трассировку стека',
         'hide_stacktrace' => 'Скрыть трассировку стека',
         'tabs' => [
             'formatted' => 'Форматированный',
-            'raw' => 'Исходный',
+            'raw' => 'Исходный'
         ],
         'editor' => [
             'title' => 'Редактор исходного кода',
@@ -96,7 +96,7 @@ return [
             'openWith' => 'Открыть с помощью',
             'remember_choice' => 'Запомнить выбранный вариант для этой сессии',
             'open' => 'Открыть',
-            'cancel' => 'Отмена',
+            'cancel' => 'Отмена'
         ],
     ],
 ];
diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php
index 9b4f54c07..3d6fffa89 100644
--- a/modules/system/lang/ru/lang.php
+++ b/modules/system/lang/ru/lang.php
@@ -166,18 +166,18 @@ return [
     'mail_templates' => [
         'menu_label'            => 'Шаблоны почты',
         'menu_description'      => 'Изменение шаблонов писем, отправляемых пользователям и администраторам.',
-        'new_template'          => 'Новая тема',
-        'new_layout'            => 'Новый шаблон',
+        'new_template'          => 'Новый шаблон',
+        'new_layout'            => 'Новый макет',
         'new_partial'           => 'Новый фрагмент',
         'template'              => 'Шаблон',
         'templates'             => 'Шаблоны',
         'partial'               => 'Фрагмент',
         'partials'              => 'Фрагменты',
-        'menu_layouts_label'    => 'Шаблоны почты',
+        'menu_layouts_label'    => 'Макеты почты',
         'menu_partials_label'   => 'Фрагменты почты',
-        'layout'                => 'Шаблон',
-        'layouts'               => 'Шаблоны',
-        'no_layout'             => '-- Нет шаблона --',
+        'layout'                => 'Макет',
+        'layouts'               => 'Макеты',
+        'no_layout'             => '-- Нет макета --',
         'name'                  => 'Название',
         'name_comment'          => 'Уникальное имя, используемое для обозначения этого шаблона',
         'code'                  => 'Код',
@@ -191,14 +191,14 @@ return [
         'test_send'             => 'Отправить тестовое сообщение',
         'test_success'          => 'Тестовое сообщение было успешно отправлено.',
         'test_confirm'          => 'Тестовое сообщение будет отправлено на :email. Продолжить?',
-        'creating'              => 'Создание...',
-        'creating_layout'       => 'Создание шаблона...',
-        'saving'                => 'Сохранение...',
-        'saving_layout'         => 'Сохранение шаблона...',
-        'delete_confirm'        => 'Вы действительно хотите это удалить?',
-        'delete_layout_confirm' => 'Вы действительно хотите удалить этот шаблон?',
-        'deleting'              => 'Удаление...',
-        'deleting_layout'       => 'Удаление шаблона...',
+        'creating'              => 'Создание шаблона...',
+        'creating_layout'       => 'Создание макета...',
+        'saving'                => 'Сохранение шаблона...',
+        'saving_layout'         => 'Сохранение макета...',
+        'delete_confirm'        => 'Вы действительно хотите удалить этот шаблон?',
+        'delete_layout_confirm' => 'Вы действительно хотите удалить этот макет?',
+        'deleting'              => 'Удаление шаблона...',
+        'deleting_layout'       => 'Удаление макета...',
         'sending'               => 'Отправка тестового сообщения...',
         'return'                => 'Вернуться к списку шаблонов',
         'options'               => 'Опции',
diff --git a/modules/system/lang/ru/validation.php b/modules/system/lang/ru/validation.php
index ece8c3dd9..6ba1cc79f 100644
--- a/modules/system/lang/ru/validation.php
+++ b/modules/system/lang/ru/validation.php
@@ -4,81 +4,56 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Языковые строки для валидации
+    | Языковые ресурсы для проверки значений
     |--------------------------------------------------------------------------
     |
-    | Следующие языковые строки содержат сообщения по умолчанию об ошибках, используемые
-    | классом валидатора. Некоторые из этих правил имеют несколько версий, например
-    | для правила size. Не стесняйтесь здесь настраивать каждое из этих сообщений.
+    | Последующие языковые строки содержат сообщения по-умолчанию, используемые
+    | классом, проверяющим значения (валидатором).Некоторые из правил имеют
+    | несколько версий, например, size. Вы можете поменять их на любые
+    | другие, которые лучше подходят для вашего приложения.
     |
     */
 
     "accepted"             => "Вы должны принять :attribute.",
     "active_url"           => "Поле :attribute недействительный URL.",
     "after"                => "Поле :attribute должно быть датой после :date.",
-    'after_or_equal'       => 'Поле :attribute должно быть датой после или равной :date.',
+    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
     "alpha"                => "Поле :attribute может содержать только буквы.",
     "alpha_dash"           => "Поле :attribute может содержать только буквы, цифры и дефис.",
     "alpha_num"            => "Поле :attribute может содержать только буквы и цифры.",
     "array"                => "Поле :attribute должно быть массивом.",
     "before"               => "Поле :attribute должно быть датой перед :date.",
-    'before_or_equal'      => 'Поле :attribute должно быть датой перед или равной :date.',
+    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
     "between"              => [
         "numeric" => "Поле :attribute должно быть между :min и :max.",
         "file"    => "Размер :attribute должен быть от :min до :max Килобайт.",
         "string"  => "Длина :attribute должна быть от :min до :max символов.",
         "array"   => "Поле :attribute должно содержать :min - :max элементов.",
     ],
-    'boolean'              => 'Поле :attribute должно быть true или false.',
+    'boolean'              => 'The :attribute field must be true or false.',
     "confirmed"            => "Поле :attribute не совпадает с подтверждением.",
     "date"                 => "Поле :attribute не является датой.",
-    'date_equals'          => 'Поле :attribute должно быть датой равной :date.',
     "date_format"          => "Поле :attribute не соответствует формату :format.",
     "different"            => "Поля :attribute и :other должны различаться.",
     "digits"               => "Длина цифрового поля :attribute должна быть :digits.",
     "digits_between"       => "Длина цифрового поля :attribute должна быть между :min и :max.",
-    'dimensions'           => ':attribute имеет недопустимые размеры изображения.',
-    'distinct'             => 'Поле :attribute имеет повторяющееся значение.',
+    'dimensions'           => 'The :attribute has invalid image dimensions.',
+    'distinct'             => 'The :attribute field has a duplicate value.',
     "email"                => "Поле :attribute имеет ошибочный формат.",
-    'ends_with'            => 'Поле :attribute должно заканчиваться одним из значений: :values.',
     "exists"               => "Выбранное значение для :attribute отсутствует.",
-    'file'                 => ':attribute должен быть файлом.',
-    'filled'               => 'Поле :attribute должно иметь значение.',
-    'gt'                   => [
-        'numeric' => 'Поле :attribute должно быть больше чем :value.',
-        'file'    => 'Файл :attribute должен быть больше :value килобайт.',
-        'string'  => 'Поле :attribute должно быть больше :value символов.',
-        'array'   => 'Поле :attribute должно содержать больше :value элементов.',
-    ],
-    'gte'                  => [
-        'numeric' => 'Поле :attribute должно быть больше или равно :value.',
-        'file'    => 'Файл :attribute должен быть больше или равен :value килобайт.',
-        'string'  => 'Поле :attribute должен быть больше or equal :value символов.',
-        'array'   => 'Поле :attribute должно содержать :value элементов или больше.',
-    ],
+    'file'                 => 'The :attribute must be a file.',
+    'filled'               => 'The :attribute field must have a value.',
     "image"                => "Поле :attribute должно быть изображением.",
     "in"                   => "Выбранное значение для :attribute ошибочно.",
-    'in_array'             => 'Поле :attribute не существует в :other.',
+    'in_array'             => 'The :attribute field does not exist in :other.',
     "integer"              => "Поле :attribute должно быть целым числом.",
     "ip"                   => "Поле :attribute должно быть действительным IP-адресом.",
-    'ipv4'                 => 'Поле :attribute должно быть IPv4 адресом.',
-    'ipv6'                 => 'Поле :attribute должно быть IPv6 адресом.',
-    'json'                 => 'Поле :attribute должно быть JSON строкою.',
-    'lt'                   => [
-        'numeric' => 'Поле :attribute должно быть меньше :value.',
-        'file'    => 'Файл :attribute должен быть меньше :value килобайт.',
-        'string'  => 'Поле :attribute должно быть меньше :value символов.',
-        'array'   => 'Поле :attribute должно содержать меньше :value элементов.',
-    ],
-    'lte'                  => [
-        'numeric' => 'Поле :attribute должно быть меньше или равно :value.',
-        'file'    => 'Файл :attribute должен быть меньше или равен :value килобайт.',
-        'string'  => 'Поле :attribute должно быть меньше или равно :value символов.',
-        'array'   => 'Поле :attribute не должно содержать больше чем :value элементов.',
-    ],
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
     "max"                  => [
         "numeric" => "Поле :attribute должно быть не больше :max.",
-        "file"    => "Поле :attribute должно быть не больше :max килобайт.",
+        "file"    => "Поле :attribute должно быть не больше :max Килобайт.",
         "string"  => "Поле :attribute должно быть не длиннее :max символов.",
         "array"   => "Поле :attribute должно содержать не более :max элементов.",
     ],
@@ -86,40 +61,37 @@ return [
     "mimetypes"            => "Поле :attribute должно иметь одно из расширений: :values.",
     "min"                  => [
         "numeric" => "Поле :attribute должно быть не менее :min.",
-        "file"    => "Поле :attribute должно быть не менее :min килобайт.",
+        "file"    => "Поле :attribute должно быть не менее :min Килобайт.",
         "string"  => "Поле :attribute должно быть не короче :min символов.",
         "array"   => "Поле :attribute должно содержать не менее :min элементов.",
     ],
     "not_in"               => "Выбранное значение для :attribute ошибочно.",
-    'not_regex'            => 'Поле :attribute имеет ошибочный формат.',
     "numeric"              => "Поле :attribute должно быть числом.",
-    'present'              => 'Поле :attribute должно присутствовать.',
+    'present'              => 'The :attribute field must be present.',
     "regex"                => "Поле :attribute имеет ошибочный формат.",
     "required"             => "Поле :attribute обязательно для заполнения.",
     "required_if"          => "Поле :attribute обязательно для заполнения, когда :other равно :value.",
-    'required_unless'      => 'Поле :attribute обязательно если :other нет среди :values.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
     "required_with"        => "Поле :attribute обязательно для заполнения, когда :values указано.",
-    'required_with_all'    => 'Поле :attribute обязательно для заполнения когда одно из :values присутствует.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
     "required_without"     => "Поле :attribute обязательно для заполнения, когда :values не указано.",
-    'required_without_all' => 'Поле :attribute обязательно для заполнения когда нет ни одного из :values.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
     "same"                 => "Значение :attribute должно совпадать с :other.",
     "size"                 => [
         "numeric" => "Поле :attribute должно быть :size.",
-        "file"    => "Поле :attribute должно быть :size килобайт.",
+        "file"    => "Поле :attribute должно быть :size Килобайт.",
         "string"  => "Поле :attribute должно быть длиной :size символов.",
         "array"   => "Количество элементов в поле :attribute должно быть :size.",
     ],
-    'starts_with'          => 'Поле :attribute должно начинаться одним из значений: :values.',
-    'string'               => 'Поле :attribute должно быть строкой.',
+    'string'               => 'The :attribute must be a string.',
     'timezone'             => 'The :attribute must be a valid zone.',
     "unique"               => "Такое значение поля :attribute уже существует.",
-    'uploaded'             => ':attribute не удалось загрузить.',
+    'uploaded'             => 'The :attribute failed to upload.',
     "url"                  => "Поле :attribute имеет ошибочный формат.",
-    'uuid'                 => 'Поле :attribute должно быть действительным UUID.',
 
     /*
     |--------------------------------------------------------------------------
-    | Пользовательские языковые строки для валидации
+    | Собственные языковые ресурсы для проверки значений
     |--------------------------------------------------------------------------
     |
     | Здесь Вы можете указать собственные сообщения для атрибутов, используя
diff --git a/modules/system/lang/sl/lang.php b/modules/system/lang/sl/lang.php
index 7aec2800e..12f62a43b 100644
--- a/modules/system/lang/sl/lang.php
+++ b/modules/system/lang/sl/lang.php
@@ -106,7 +106,7 @@ return [
     ],
     'plugins'        => [
         'manage'             => 'Upravljanje vtičnikov',
-        'install'            => 'Namesti vtičnike',
+        'install'            => 'Namesti vtičnike in teme',
         'install_products'   => 'Namesti produkte',
         'search'             => 'išči vtičnike za namestitev...',
         'installed'          => 'Nameščeni vtičniki',
@@ -310,77 +310,74 @@ return [
         'install_success'     => 'Produkt je bil uspešno nameščen.',
     ],
     'updates'        => [
-        'title'                          => 'Upravljanje posodobitev',
-        'name'                           => 'Posodobitev programske opreme',
-        'menu_label'                     => 'Posodobitve in vtičniki',
-        'menu_description'               => 'Posodobitev sistema, upravljanje in nameščanje vtičnikov in tem.',
-        'return_link'                    => 'Vrni se na sistemske posodobitve',
-        'check_label'                    => 'Preveri za nove posodobitve',
-        'retry_label'                    => 'Poskusi ponovno',
-        'plugin_name'                    => 'Ime',
-        'plugin_code'                    => 'Koda',
-        'plugin_description'             => 'Opis',
-        'plugin_version'                 => 'Različica',
-        'plugin_author'                  => 'Avtor',
-        'plugin_not_found'               => 'Vtičnika ni mogoče najti',
-        'plugin_version_not_found'       => 'Različice vtičnika ni mogoče najti',
-        'core_current_build'             => 'Trenutna različica',
-        'core_view_changelog'            => 'Pokaži dnevnik sprememb',
-        'core_build'                     => 'Različica :build',
-        'core_build_help'                => 'Na voljo je najnovejša različica.',
-        'core_downloading'               => 'Prenašanje datotek aplikacije',
-        'core_extracting'                => 'Ekstrahiranje datotek aplikacije',
-        'core_set_build'                 => 'Nastavljanje številke različice',
-        'update_warnings_title'          => 'Odkrite so bile nekatere težave, ki zahtevajo pozornost:',
-        'update_warnings_plugin_missing' => 'Vtičnik :parent_code zahteva za pravilno delovanje namestitev :code.',
-        'changelog'                      => 'Dnevnik sprememb',
-        'changelog_view_details'         => 'Prikaži podrobnosti',
-        'plugins'                        => 'Vtičniki',
-        'themes'                         => 'Teme',
-        'disabled'                       => 'Onemogočeno',
-        'plugin_downloading'             => 'Prenašanje vtičnika :name',
-        'plugin_extracting'              => 'Ekstrahiranje vtičnika :name',
-        'plugin_version_none'            => 'Nov vtičnik',
-        'plugin_current_version'         => 'Trenutna verzija',
-        'theme_new_install'              => 'Namestitev nove teme.',
-        'theme_downloading'              => 'Prenašanje teme :name',
-        'theme_extracting'               => 'Ekstrahiranje teme :name',
-        'update_label'                   => 'Posodobitev programske opreme',
-        'update_completing'              => 'Zaključevanje posodabljanja',
-        'update_loading'                 => 'Nalaganje razpoložljivih posodobitev...',
-        'update_success'                 => 'Posodabljanje končano.',
-        'update_failed_label'            => 'Posodabljanje ni bilo uspešno.',
-        'force_label'                    => 'Vsili posodobitev',
-        'found'                          => [
+        'title'                        => 'Upravljanje posodobitev',
+        'name'                         => 'Posodobitev programske opreme',
+        'menu_label'                   => 'Posodobitve in vtičniki',
+        'menu_description'             => 'Posodobitev sistema, upravljanje in nameščanje vtičnikov in tem.',
+        'return_link'                  => 'Vrni se na sistemske posodobitve',
+        'check_label'                  => 'Preveri za nove posodobitve',
+        'retry_label'                  => 'Poskusi ponovno',
+        'plugin_name'                  => 'Ime',
+        'plugin_code'                  => 'Koda',
+        'plugin_description'           => 'Opis',
+        'plugin_version'               => 'Različica',
+        'plugin_author'                => 'Avtor',
+        'plugin_not_found'             => 'Vtičnika ni mogoče najti',
+        'core_current_build'           => 'Trenutna različica',
+        'core_view_changelog'          => 'Pokaži dnevnik sprememb',
+        'core_build'                   => 'Različica :build',
+        'core_build_help'              => 'Na voljo je najnovejša različica.',
+        'core_downloading'             => 'Prenašanje datotek aplikacije',
+        'core_extracting'              => 'Ekstrahiranje datotek aplikacije',
+        'core_set_build'               => 'Nastavljanje številke različice',
+        'changelog'                    => 'Dnevnik sprememb',
+        'changelog_view_details'       => 'Pokaži podrobnosti',
+        'plugins'                      => 'Vtičniki',
+        'themes'                       => 'Teme',
+        'disabled'                     => 'Onemogočeno',
+        'plugin_downloading'           => 'Prenašanje vtičnika :name',
+        'plugin_extracting'            => 'Ekstrahiranje vtičnika :name',
+        'plugin_version_none'          => 'Nov vtičnik',
+        'plugin_current_version'       => 'Trenutna verzija',
+        'theme_new_install'            => 'Namestitev nove teme.',
+        'theme_downloading'            => 'Prenašanje teme :name',
+        'theme_extracting'             => 'Ekstrahiranje teme :name',
+        'update_label'                 => 'Posodobitev programske opreme',
+        'update_completing'            => 'Zaključevanje posodabljanja',
+        'update_loading'               => 'Nalaganje razpoložljivih posodobitev...',
+        'update_success'               => 'Posodabljanje končano.',
+        'update_failed_label'          => 'Posodabljanje ni bilo uspešno.',
+        'force_label'                  => 'Vsili posodobitev',
+        'found'                        => [
             'label' => 'Nove posodobitve so na voljo!',
-            'help'  => 'Kliknite "Posodobitev programske opreme" za začetek posodabljanja.',
+            'help'  => "Kliknite 'Posodobitev programske opreme' za začetek posodabljanja.",
         ],
-        'none'                           => [
+        'none'                         => [
             'label' => 'Ni posodobitev',
             'help'  => 'Nove posodobitve niso na voljo.',
         ],
-        'important_action'               => [
+        'important_action'             => [
             'empty'   => 'Izberite dejanje',
             'confirm' => 'Potrdi posodobitev',
             'skip'    => 'Preskoči to posodobitev (le tokrat)',
             'ignore'  => 'Preskoči to posodobitev (vedno)',
         ],
-        'important_action_required'      => 'Potrebno je ukrepanje',
-        'important_view_guide'           => 'Oglejte si navodila za nadgradnjo',
-        'important_view_release_notes'   => 'Oglejte si opombe ob izdaji',
-        'important_alert_text'           => 'Nekatere posodobitve potrebujejo vašo pozornost.',
-        'details_title'                  => 'Podrobnosti vtičnika',
-        'details_view_homepage'          => 'Odpri spletno stran',
-        'details_readme'                 => 'Dokumentacija',
-        'details_readme_missing'         => 'Dokumentacija ni na voljo.',
-        'details_changelog'              => 'Dnevnik sprememb',
-        'details_changelog_missing'      => 'Dnevnik sprememb ni na voljo.',
-        'details_upgrades'               => 'Navodila za nadgradnjo',
-        'details_upgrades_missing'       => 'Navodila za nadgradnjo niso na voljo.',
-        'details_licence'                => 'Licenca',
-        'details_licence_missing'        => 'Licenca ni na voljo.',
-        'details_current_version'        => 'Trenutna različica',
-        'details_author'                 => 'Avtor',
+        'important_action_required'    => 'Potrebno je ukrepanje',
+        'important_view_guide'         => 'Oglejte si navodila za nadgradnjo',
+        'important_view_release_notes' => 'Oglejte si opombe ob izdaji',
+        'important_alert_text'         => 'Nekatere posodobitve potrebujejo vašo pozornost.',
+        'details_title'                => 'Podrobnosti vtičnika',
+        'details_view_homepage'        => 'Odpri spletno stran',
+        'details_readme'               => 'Dokumentacija',
+        'details_readme_missing'       => 'Dokumentacija ni na voljo.',
+        'details_changelog'            => 'Dnevnik sprememb',
+        'details_changelog_missing'    => 'Dnevnik sprememb ni na voljo.',
+        'details_upgrades'             => 'Navodila za nadgradnjo',
+        'details_upgrades_missing'     => 'Navodila za nadgradnjo niso na voljo.',
+        'details_licence'              => 'Licenca',
+        'details_licence_missing'      => 'Licenca ni na voljo.',
+        'details_current_version'      => 'Trenutna različica',
+        'details_author'               => 'Avtor',
     ],
     'server'         => [
         'connect_error'      => 'Napaka pri povezavi s strežnikom.',
diff --git a/modules/system/lang/sl/validation.php b/modules/system/lang/sl/validation.php
index 14752296c..0a934db29 100644
--- a/modules/system/lang/sl/validation.php
+++ b/modules/system/lang/sl/validation.php
@@ -32,7 +32,6 @@ return [
     'boolean'              => '":attribute" mora biti Da (true) ali Ne (false).',
     'confirmed'            => 'Potrditev polja ":attribute" se ne ujema.',
     'date'                 => '":attribute" ni veljaven datum.',
-    'date_equals'          => '":attribute" mora biti datum enak :date.',
     'date_format'          => '":attribute" se ne ujema s formatom :format.',
     'different'            => '":attribute" in :other morata biti različna.',
     'digits'               => '":attribute" mora vsebovati :digits številk.',
@@ -40,22 +39,9 @@ return [
     'dimensions'           => '":attribute" vsebuje neveljavne dimenzije slike.',
     'distinct'             => '":attribute" polje ima podvojeno vrednost.',
     'email'                => '":attribute" mora biti veljaven e-poštni naslov.',
-    'ends_with'            => '":attribute" se mora končati z eno od naslednjih vrednosti: :values.',
     'exists'               => 'Izbran element ":attribute" je neveljaven.',
     'file'                 => '":attribute" mora biti datoteka.',
     'filled'               => '":attribute" polje mora vsebovati vrednost.',
-    'gt'                   => [
-        'numeric' => ':attribute mora biti večji od :value.',
-        'file'    => ':attribute mora biti večji od :value kB.',
-        'string'  => ':attribute mora vsebovati več kot :value znakov.',
-        'array'   => ':attribute mora vsebovati več kot :value elementov.',
-    ],
-    'gte'                  => [
-        'numeric' => ':attribute mora biti večji ali enak kot :value.',
-        'file'    => ':attribute mora biti večji ali enak kot :value kB.',
-        'string'  => ':attribute mora vsebovati vsaj ali več kot :value znakov.',
-        'array'   => ':attribute mora vsebovati vsaj :value elementov ali več.',
-    ],
     'image'                => '":attribute" mora biti slika.',
     'in'                   => 'Izbran element ":attribute" je neveljaven.',
     'in_array'             => 'Element ":attribute" ne obstaja v ":other".',
@@ -64,18 +50,6 @@ return [
     'ipv4'                 => '":attribute" mora biti veljaven IPv4 naslov.',
     'ipv6'                 => '":attribute" mora biti veljaven IPv6 naslov.',
     'json'                 => '":attribute" mora biti veljaven JSON format.',
-    'lt'                   => [
-        'numeric' => ':attribute mora biti manjši od :value.',
-        'file'    => ':attribute mora biti manjši od :value kB.',
-        'string'  => ':attribute mora vsebovati manj kot :value znakov.',
-        'array'   => ':attribute mora vsebovati manj kot :value elementov.',
-    ],
-    'lte'                  => [
-        'numeric' => ':attribute mora biti manjši ali enak kot :value.',
-        'file'    => ':attribute mora biti manjši ali enak kot :value kB.',
-        'string'  => ':attribute mora vsebovati manj ali enako kot :value znakov.',
-        'array'   => ':attribute ne sme vsebovati več kot :value elementov.',
-    ],
     'max'                  => [
         'numeric' => ':attribute ne sme biti večji od :max.',
         'file'    => ':attribute ne sme biti večji od :max kB.',
@@ -91,7 +65,6 @@ return [
         'array'   => ':attribute mora vsebovati vsaj :min elementov.',
     ],
     'not_in'               => 'Izbrani element ":attribute" je neveljaven.',
-    'not_regex'            => 'Format za ":attribute" je neveljaven.',
     'numeric'              => '":attribute" mora biti število.',
     'present'              => 'Polje za ":attribute" mora obstajati.',
     'regex'                => 'Format za ":attribute" je neveljaven.',
@@ -101,7 +74,7 @@ return [
     'required_with'        => 'Polje za ":attribute" je obvezno, kadar :values obstaja.',
     'required_with_all'    => 'Polje za ":attribute" je obvezno, kadar :values obstaja.',
     'required_without'     => 'Polje za ":attribute" je obvezno, kadar :values ne obstaja.',
-    'required_without_all' => 'Polje za ":attribute" je obvezno, kadar nobeden od :values ne obstaja.',
+    'required_without_all' => 'Polje za ":attribute" je obvezno, kadar :values ne obstaja.',
     'same'                 => '":attribute" in ":other" se morata ujemati.',
     'size'                 => [
         'numeric' => ':attribute mora biti :size.',
@@ -109,13 +82,11 @@ return [
         'string'  => ':attribute mora vsebovati :size znakov.',
         'array'   => ':attribute mora vsebovati :size elementov.',
     ],
-    'starts_with'          => '":attribute" se mora začeti z eno od naslednjih vrednosti: :values.',
-    'string'               => '":attribute" mora biti veljaven znakovni niz.',
-    'timezone'             => '":attribute" mora biti veljavno območje.',
-    'unique'               => 'Element ":attribute" je že zaseden.',
-    'uploaded'             => 'Elementa ":attribute" ni bilo mogoče naložiti.',
-    'url'                  => 'Format za ":attribute" je neveljaven.',
-    'uuid'                 => '":attribute" mora biti veljaven UUID.',
+    'string'               => ':attribute mora biti veljaven znakovni niz.',
+    'timezone'             => ':attribute mora biti veljavno območje.',
+    'unique'               => 'Element :attribute je že uporabljen.',
+    'uploaded'             => 'Elementa :attribute ni bilo mogoče naložiti.',
+    'url'                  => 'Format elementa :attribute je neveljaven.',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/models/File.php b/modules/system/models/File.php
index 980da0312..ffca84afb 100644
--- a/modules/system/models/File.php
+++ b/modules/system/models/File.php
@@ -26,9 +26,6 @@ class File extends FileBase
     public function getThumb($width, $height, $options = [])
     {
         $url = '';
-        $width = !empty($width) ? $width : 0;
-        $height = !empty($height) ? $height : 0;
-
         if (!$this->isPublic() && class_exists(Files::class)) {
             $options = $this->getDefaultThumbOptions($options);
             // Ensure that the thumb exists first
@@ -97,6 +94,15 @@ class File extends FileBase
         return $uploadsFolder . '/protected/';
     }
 
+    /**
+     * Returns true if storage.uploads.disk in config/cms.php is "local".
+     * @return bool
+     */
+    protected function isLocalStorage()
+    {
+        return Config::get('cms.storage.uploads.disk') == 'local';
+    }
+
     /**
      * Returns the storage disk the file is stored on
      * @return FilesystemAdapter
diff --git a/modules/system/models/MailLayout.php b/modules/system/models/MailLayout.php
index 48018e39d..42b410fe2 100644
--- a/modules/system/models/MailLayout.php
+++ b/modules/system/models/MailLayout.php
@@ -50,12 +50,6 @@ class MailLayout extends Model
 
     public static $codeCache;
 
-    /**
-     * Fired before the model is deleted.
-     *
-     * @return void
-     * @throws ApplicationException if the template is locked
-     */
     public function beforeDelete()
     {
         if ($this->is_locked) {
@@ -63,11 +57,6 @@ class MailLayout extends Model
         }
     }
 
-    /**
-     * List MailLayouts codes keyed by ID.
-     *
-     * @return array
-     */
     public static function listCodes()
     {
         if (self::$codeCache !== null) {
@@ -77,23 +66,11 @@ class MailLayout extends Model
         return self::$codeCache = self::lists('id', 'code');
     }
 
-    /**
-     * Return the ID of a MailLayout instance from a defined code.
-     *
-     * @param string $code
-     * @return string
-     */
     public static function getIdFromCode($code)
     {
         return array_get(self::listCodes(), $code);
     }
 
-    /**
-     * Find a MailLayout instance by its code or create a new instance from the view file.
-     *
-     * @param string $code
-     * @return MailLayout
-     */
     public static function findOrMakeLayout($code)
     {
         $layout = self::whereCode($code)->first();
@@ -110,7 +87,6 @@ class MailLayout extends Model
     /**
      * Loops over each mail layout and ensures the system has a layout,
      * if the layout does not exist, it will create one.
-     *
      * @return void
      */
     public static function createLayouts()
@@ -131,13 +107,6 @@ class MailLayout extends Model
         }
     }
 
-    /**
-     * Fill model using a view file retrieved by code.
-     *
-     * @param string|null $code
-     * @return void
-     * @throws ApplicationException if a layout with the defined code is not registered.
-     */
     public function fillFromCode($code = null)
     {
         $definitions = MailManager::instance()->listRegisteredLayouts();
@@ -153,12 +122,6 @@ class MailLayout extends Model
         $this->fillFromView($definition);
     }
 
-    /**
-     * Fill model using a view file retrieved by path.
-     *
-     * @param string $path
-     * @return void
-     */
     public function fillFromView($path)
     {
         $sections = self::getTemplateSections($path);
@@ -187,18 +150,8 @@ class MailLayout extends Model
         $this->content_text = array_get($sections, 'text');
     }
 
-    /**
-     * Get section array from a view file retrieved by code.
-     *
-     * @param string $code
-     * @return array|null
-     */
     protected static function getTemplateSections($code)
     {
-        if (!View::exists($code)) {
-            return null;
-        }
-        $view = View::make($code);
-        return MailParser::parse(FileHelper::get($view->getPath()));
+        return MailParser::parse(FileHelper::get(View::make($code)->getPath()));
     }
 }
diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
index a26dc345e..ac1971690 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -42,11 +42,6 @@ class MailPartial extends Model
         'content_html'          => 'required',
     ];
 
-    /**
-     * Fired after the model has been fetched.
-     *
-     * @return void
-     */
     public function afterFetch()
     {
         if (!$this->is_custom) {
@@ -54,12 +49,6 @@ class MailPartial extends Model
         }
     }
 
-    /**
-     * Find a MailPartial instance by code or create a new instance from a view file.
-     *
-     * @param string $code
-     * @return MailTemplate
-     */
     public static function findOrMakePartial($code)
     {
         try {
@@ -79,29 +68,18 @@ class MailPartial extends Model
     /**
      * Loops over each mail layout and ensures the system has a layout,
      * if the layout does not exist, it will create one.
-     *
      * @return void
      */
     public static function createPartials()
     {
-        $partials = MailManager::instance()->listRegisteredPartials();
-        $dbPartials = self::lists('is_custom', 'code');
-        $newPartials = array_diff_key($partials, $dbPartials);
+        $dbPartials = self::lists('code', 'code');
 
-        /*
-         * Clean up non-customized partials
-         */
-        foreach ($dbPartials as $code => $isCustom) {
-            if ($isCustom) {
+        $definitions = MailManager::instance()->listRegisteredPartials();
+        foreach ($definitions as $code => $path) {
+            if (array_key_exists($code, $dbPartials)) {
                 continue;
             }
 
-            if (!array_key_exists($code, $partials)) {
-                self::whereCode($code)->delete();
-            }
-        }
-
-        foreach ($newPartials as $code => $path) {
             $partial = new static;
             $partial->code = $code;
             $partial->is_custom = 0;
@@ -110,12 +88,6 @@ class MailPartial extends Model
         }
     }
 
-    /**
-     * Fill model using a view file retrieved by code.
-     *
-     * @param string|null $code
-     * @return void
-     */
     public function fillFromCode($code = null)
     {
         $definitions = MailManager::instance()->listRegisteredPartials();
@@ -131,12 +103,6 @@ class MailPartial extends Model
         $this->fillFromView($definition);
     }
 
-    /**
-     * Fill model using a view file retrieved by path.
-     *
-     * @param string $path
-     * @return void
-     */
     public function fillFromView($path)
     {
         $sections = self::getTemplateSections($path);
@@ -146,18 +112,8 @@ class MailPartial extends Model
         $this->content_text = array_get($sections, 'text');
     }
 
-    /**
-     * Get section array from a view file retrieved by code.
-     *
-     * @param string $code
-     * @return array|null
-     */
     protected static function getTemplateSections($code)
     {
-        if (!View::exists($code)) {
-            return null;
-        }
-        $view = View::make($code);
-        return MailParser::parse(FileHelper::get($view->getPath()));
+        return MailParser::parse(FileHelper::get(View::make($code)->getPath()));
     }
 }
diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php
index beb4157f9..5be21a839 100644
--- a/modules/system/models/MailSetting.php
+++ b/modules/system/models/MailSetting.php
@@ -145,32 +145,4 @@ class MailSetting extends Model
             'ssl' => 'system::lang.mail.smtp_encryption_ssl',
         ];
     }
-
-    /**
-     * Filter fields callback.
-     *
-     * We use this to automatically set the SMTP port to the encryption type's corresponding port, if it was originally
-     * using a default port.
-     *
-     * @param array $fields
-     * @param string|null $context
-     * @return void
-     */
-    public function filterFields($fields, $context = null)
-    {
-        if (in_array($fields->smtp_port->value ?? 25, [25, 465, 587])) {
-            switch ($fields->smtp_encryption->value ?? '') {
-                case 'tls':
-                    $fields->smtp_port->value = 587;
-                    break;
-                case 'ssl':
-                    $fields->smtp_port->value = 465;
-                    break;
-                case '':
-                default:
-                    $fields->smtp_port->value = 25;
-                    break;
-            }
-        }
-    }
 }
diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
index 4cd637e29..9940b271e 100644
--- a/modules/system/models/MailTemplate.php
+++ b/modules/system/models/MailTemplate.php
@@ -47,7 +47,6 @@ class MailTemplate extends Model
 
     /**
      * Returns an array of template codes and descriptions.
-     *
      * @return array
      */
     public static function listAllTemplates()
@@ -61,7 +60,6 @@ class MailTemplate extends Model
 
     /**
      * Returns a list of all mail templates.
-     *
      * @return array Returns an array of the MailTemplate objects.
      */
     public static function allTemplates()
@@ -70,9 +68,7 @@ class MailTemplate extends Model
         $codes = array_keys(self::listAllTemplates());
 
         foreach ($codes as $code) {
-            if (View::exists($code)) {
-                $result[] = self::findOrMakeTemplate($code);
-            }
+            $result[] = self::findOrMakeTemplate($code);
         }
 
         return $result;
@@ -80,7 +76,6 @@ class MailTemplate extends Model
 
     /**
      * Syncronise all file templates to the database.
-     *
      * @return void
      */
     public static function syncAll()
@@ -122,11 +117,6 @@ class MailTemplate extends Model
         }
     }
 
-    /**
-     * Fired after the model has been fetched.
-     *
-     * @return void
-     */
     public function afterFetch()
     {
         if (!$this->is_custom) {
@@ -134,65 +124,31 @@ class MailTemplate extends Model
         }
     }
 
-    /**
-     * Fill model using provided content.
-     *
-     * @param string $content
-     * @return void
-     */
     public function fillFromContent($content)
     {
         $this->fillFromSections(MailParser::parse($content));
     }
 
-    /**
-     * Fill model using a view file path.
-     *
-     * @param string $path
-     * @return void
-     */
     public function fillFromView($path)
     {
         $this->fillFromSections(self::getTemplateSections($path));
     }
 
-    /**
-     * Fill model using provided section array.
-     *
-     * @param array $sections
-     * @return void
-     */
     protected function fillFromSections($sections)
     {
-        $this->content_html = array_get($sections, 'html');
-        $this->content_text = array_get($sections, 'text');
+        $this->content_html = $sections['html'];
+        $this->content_text = $sections['text'];
         $this->subject = array_get($sections, 'settings.subject', 'No subject');
 
         $layoutCode = array_get($sections, 'settings.layout', 'default');
         $this->layout = MailLayout::findOrMakeLayout($layoutCode);
     }
 
-    /**
-     * Get section array from a view file retrieved by code.
-     *
-     * @param string $code
-     * @return array|null
-     */
     protected static function getTemplateSections($code)
     {
-        if (!View::exists($code)) {
-            return null;
-        }
-        $view = View::make($code);
-        return MailParser::parse(FileHelper::get($view->getPath()));
+        return MailParser::parse(FileHelper::get(View::make($code)->getPath()));
     }
 
-    /**
-     * Find a MailTemplate record by code or create one from a view file.
-     *
-     * @param string $code
-     * @return MailTemplate model
-     */
     public static function findOrMakeTemplate($code)
     {
         $template = self::whereCode($code)->first();
diff --git a/modules/system/models/mailsetting/fields.yaml b/modules/system/models/mailsetting/fields.yaml
index 44c6c9a6f..c2457ec38 100644
--- a/modules/system/models/mailsetting/fields.yaml
+++ b/modules/system/models/mailsetting/fields.yaml
@@ -42,7 +42,6 @@ tabs:
             label: system::lang.mail.smtp_port
             tab: system::lang.mail.general
             span: auto
-            dependsOn: smtp_encryption
             trigger:
                 action: show
                 field: send_mode
@@ -80,7 +79,6 @@ tabs:
         smtp_password:
             label: system::lang.mail.smtp_password
             tab: system::lang.mail.general
-            type: sensitive
             span: right
             trigger:
                 action: show
@@ -109,7 +107,6 @@ tabs:
             label: system::lang.mail.mailgun_secret
             commentAbove: system::lang.mail.mailgun_secret_comment
             tab: system::lang.mail.general
-            type: sensitive
             trigger:
                 action: show
                 field: send_mode
@@ -119,7 +116,6 @@ tabs:
             label: system::lang.mail.mandrill_secret
             commentAbove: system::lang.mail.mandrill_secret_comment
             tab: system::lang.mail.general
-            type: sensitive
             trigger:
                 action: show
                 field: send_mode
@@ -139,7 +135,6 @@ tabs:
             label: system::lang.mail.ses_secret
             commentAbove: system::lang.mail.ses_secret_comment
             tab: system::lang.mail.general
-            type: sensitive
             span: right
             trigger:
                 action: show
@@ -159,7 +154,6 @@ tabs:
         sparkpost_secret:
             label: system::lang.mail.sparkpost_secret
             commentAbove: system::lang.mail.sparkpost_secret_comment
-            type: sensitive
             tab: system::lang.mail.general
             trigger:
                 action: show
diff --git a/modules/system/providers.php b/modules/system/providers.php
index 96951f747..7b63edb43 100644
--- a/modules/system/providers.php
+++ b/modules/system/providers.php
@@ -15,7 +15,9 @@ return [
     Illuminate\Pagination\PaginationServiceProvider::class,
     Illuminate\Pipeline\PipelineServiceProvider::class,
     Illuminate\Queue\QueueServiceProvider::class,
+    Illuminate\Redis\RedisServiceProvider::class,
     Illuminate\Session\SessionServiceProvider::class,
+    Illuminate\Validation\ValidationServiceProvider::class,
     Illuminate\View\ViewServiceProvider::class,
     Laravel\Tinker\TinkerServiceProvider::class,
 
@@ -34,7 +36,5 @@ return [
     October\Rain\Flash\FlashServiceProvider::class,
     October\Rain\Mail\MailServiceProvider::class,
     October\Rain\Argon\ArgonServiceProvider::class,
-    October\Rain\Redis\RedisServiceProvider::class,
-    October\Rain\Validation\ValidationServiceProvider::class,
 
 ];
diff --git a/modules/system/routes.php b/modules/system/routes.php
index eef89355d..1ab0b5e55 100644
--- a/modules/system/routes.php
+++ b/modules/system/routes.php
@@ -8,9 +8,4 @@ App::before(function ($request) {
      * Combine JavaScript and StyleSheet assets
      */
     Route::any('combine/{file}', 'System\Classes\SystemController@combine');
-
-    /*
-     * Resize image assets
-     */
-    Route::get('resizer/{identifier}/{encodedUrl}', 'System\Classes\SystemController@resizer');
 });
diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index 94fc41e7f..4918872e7 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -208,7 +208,7 @@ trait AssetMaker
              *
              * Example usage:
              *
-             *     Event::listen('system.assets.beforeAddAsset', function (string &$type, string &$path, array &$attributes) {
+             *     Event::listen('system.assets.beforeAddAsset', function (string $type, string $path, array $attributes) {
              *         if (in_array($path, $blockedAssets)) {
              *             return false;
              *         }
@@ -216,7 +216,7 @@ trait AssetMaker
              *
              * Or
              *
-             *     $this->bindEvent('assets.beforeAddAsset', function (string &$type, string &$path, array &$attributes) {
+             *     $this->bindEvent('assets.beforeAddAsset', function (string $type, string $path, array $attributes) {
              *         $attributes['special_cdn_flag'] = false;
              *     });
              *
diff --git a/modules/system/traits/PropertyContainer.php b/modules/system/traits/PropertyContainer.php
index b198bbf0d..f156549fb 100644
--- a/modules/system/traits/PropertyContainer.php
+++ b/modules/system/traits/PropertyContainer.php
@@ -86,7 +86,7 @@ trait PropertyContainer
      * Returns a defined property value or default if one is not set.
      * @param string $name The property name to look for.
      * @param string $default A default value to return if no name is found.
-     * @return mixed The property value or the default specified.
+     * @return string The property value or the default specified.
      */
     public function property($name, $default = null)
     {
diff --git a/modules/system/twig/Engine.php b/modules/system/twig/Engine.php
index 6a3cbcae3..affcab34e 100644
--- a/modules/system/twig/Engine.php
+++ b/modules/system/twig/Engine.php
@@ -1,6 +1,5 @@
 <?php namespace System\Twig;
 
-use System\Twig\Loader as TwigLoader;
 use Twig\Environment as TwigEnvironment;
 use Illuminate\Contracts\View\Engine as EngineInterface;
 
@@ -27,14 +26,7 @@ class Engine implements EngineInterface
 
     public function get($path, array $vars = [])
     {
-        $previousAllow = TwigLoader::$allowInclude;
-
-        TwigLoader::$allowInclude = true;
-
         $template = $this->environment->loadTemplate($path);
-
-        TwigLoader::$allowInclude = $previousAllow;
-
         return $template->render($vars);
     }
 }
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 04bf73b7b..71e1e6fed 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -1,11 +1,10 @@
 <?php namespace System\Twig;
 
 use Url;
-use System\Classes\ImageResizer;
+use Twig\Extension\AbstractExtension as TwigExtension;
+use Twig\TwigFilter as TwigSimpleFilter;
 use System\Classes\MediaLibrary;
 use System\Classes\MarkupManager;
-use Twig\TwigFilter as TwigSimpleFilter;
-use Twig\Extension\AbstractExtension as TwigExtension;
 
 /**
  * The System Twig extension class implements common Twig functions and filters.
@@ -55,9 +54,6 @@ class Extension extends TwigExtension
         $filters = [
             new TwigSimpleFilter('app', [$this, 'appFilter'], ['is_safe' => ['html']]),
             new TwigSimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]),
-            new TwigSimpleFilter('resize', [$this, 'resizeFilter'], ['is_safe' => ['html']]),
-            new TwigSimpleFilter('imageWidth', [$this, 'imageWidthFilter'], ['is_safe' => ['html']]),
-            new TwigSimpleFilter('imageHeight', [$this, 'imageHeightFilter'], ['is_safe' => ['html']]),
         ];
 
         /*
@@ -104,50 +100,4 @@ class Extension extends TwigExtension
     {
         return MediaLibrary::url($file);
     }
-
-    /**
-     * Converts supplied input into a URL that will return the desired resized image
-     *
-     * @param mixed $image Supported values below:
-     *              ['disk' => Illuminate\Filesystem\FilesystemAdapter, 'path' => string, 'source' => string, 'fileModel' => FileModel|void],
-     *              instance of October\Rain\Database\Attach\File,
-     *              string containing URL or path accessible to the application's filesystem manager
-     * @param integer|bool|null $width Desired width of the resized image
-     * @param integer|bool|null $height Desired height of the resized image
-     * @param array|null $options Array of options to pass to the resizer
-     * @throws Exception If the provided image was unable to be processed
-     * @return string
-     */
-    public function resizeFilter($image, $width = null, $height = null, $options = [])
-    {
-        return ImageResizer::filterGetUrl($image, $width, $height, $options);
-    }
-
-    /**
-     * Gets the width in pixels of the provided image source
-     *
-     * @param mixed $image Supported values below:
-     *              ['disk' => Illuminate\Filesystem\FilesystemAdapter, 'path' => string, 'source' => string, 'fileModel' => FileModel|void],
-     *              instance of October\Rain\Database\Attach\File,
-     *              string containing URL or path accessible to the application's filesystem manager
-     * @return int
-     */
-    public function imageWidthFilter($image)
-    {
-        return @ImageResizer::filterGetDimensions($image)['width'];
-    }
-
-    /**
-     * Gets the height in pixels of the provided image source
-     *
-     * @param mixed $image Supported values below:
-     *              ['disk' => Illuminate\Filesystem\FilesystemAdapter, 'path' => string, 'source' => string, 'fileModel' => FileModel|void],
-     *              instance of October\Rain\Database\Attach\File,
-     *              string containing URL or path accessible to the application's filesystem manager
-     * @return int
-     */
-    public function imageHeightFilter($image)
-    {
-        return @ImageResizer::filterGetDimensions($image)['height'];
-    }
 }
diff --git a/modules/system/twig/Loader.php b/modules/system/twig/Loader.php
index baafc7773..341d08959 100644
--- a/modules/system/twig/Loader.php
+++ b/modules/system/twig/Loader.php
@@ -15,9 +15,9 @@ use Exception;
 class Loader implements TwigLoaderInterface
 {
     /**
-     * @var bool Allow any local file
+     * @var string Expected file extension
      */
-    public static $allowInclude = false;
+    protected $extension = 'htm';
 
     /**
      * @var array Cache
@@ -37,11 +37,16 @@ class Loader implements TwigLoaderInterface
             return $this->cache[$name];
         }
 
-        if (static::$allowInclude === true && File::isFile($name)) {
+        if (File::isFile($name)) {
             return $this->cache[$name] = $name;
         }
 
-        $path = $finder->find($name);
+        $view = $name;
+        if (File::extension($view) === $this->extension) {
+            $view = substr($view, 0, -strlen($this->extension));
+        }
+
+        $path = $finder->find($view);
         return $this->cache[$name] = $path;
     }
 
diff --git a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm
index 1f7589ac8..cfcc3aa13 100644
--- a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm
+++ b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm
@@ -6,17 +6,16 @@
 
 	{{ form_open(__SELF__.getFormAttributes) }}
 
-        <div class="form__row">
 		{% for field in __SELF__.fields %}
 
 			{{ __SELF__.getFieldHtmlCode(field)|raw }}
-            {% if loop.index == 2 %}</div>{% endif %}
+
 		{% endfor %}
 
 		{{ __SELF__.getAntispamFieldHtmlCode({})|raw }}
 
 		{{ __SELF__.getDescriptionFieldHtmlCode({})|raw }}
-
+		
 		{{ __SELF__.getRedirectFieldHtmlCode({})|raw }}
 
 		{% if (settingsGet('google_recaptcha_version') is null or settingsGet('google_recaptcha_version') == 'v2checkbox') and settingsGet('add_google_recaptcha') and settingsGet('google_recaptcha_site_key') %}
@@ -34,16 +33,16 @@
 	{{ form_close() }}
 
 	{% if settingsGet('add_google_recaptcha') and settingsGet('google_recaptcha_scripts_allow') %}
-
+	
 		<script src='https://www.google.com/recaptcha/api.js{{ settingsGet("google_recaptcha_locale_allow") and currentLocale ? ("?hl="~currentLocale) }}' async defer></script>
 
 		{% if settingsGet('google_recaptcha_version') == 'v2invisible' %}
 
 			<script>
-
+				
 				function onSubmit_{{ __SELF__.alias }}(token) {
 
-					return new Promise(function(resolve, reject) {
+					return new Promise(function(resolve, reject) { 
 
 						//Your code logic goes here
 
diff --git a/plugins/janvince/smallcontactform/models/Message.php b/plugins/janvince/smallcontactform/models/Message.php
index 4a99c7513..0e8f02288 100644
--- a/plugins/janvince/smallcontactform/models/Message.php
+++ b/plugins/janvince/smallcontactform/models/Message.php
@@ -229,7 +229,6 @@ class Message extends Model
 
         $output['form_description'] = $formDescription;
         $output['form_alias'] = $formAlias;
-        $output['uploads'] = $messageObject->uploads();
 
         $template = Settings::getTranslatedTemplates('en', App::getLocale(), 'autoreply');
 
diff --git a/plugins/janvince/smallcontactform/updates/version.yaml b/plugins/janvince/smallcontactform/updates/version.yaml
index f498420c6..65e2b4082 100644
--- a/plugins/janvince/smallcontactform/updates/version.yaml
+++ b/plugins/janvince/smallcontactform/updates/version.yaml
@@ -228,4 +228,6 @@
 1.51.0:
     - Added support for (one or many) file uploads
     - Fixed AJAX validation
-    - Updated README
\ No newline at end of file
+    - Updated README
+1.51.1:
+    - Removed uploads array from default fields sent to autoreply template
\ No newline at end of file
diff --git a/plugins/janvince/smallcontactform/vendor/autoload.php b/plugins/janvince/smallcontactform/vendor/autoload.php
index f0b54ed70..4a06a75ed 100644
--- a/plugins/janvince/smallcontactform/vendor/autoload.php
+++ b/plugins/janvince/smallcontactform/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit2d4cb6e3c511ba81e82a8c2c9437f4fd::getLoader();
+return ComposerAutoloaderInit72036f1eda87e289ce9c6a3db2183e92::getLoader();
diff --git a/plugins/janvince/smallcontactform/vendor/composer/autoload_real.php b/plugins/janvince/smallcontactform/vendor/composer/autoload_real.php
index d7a0faf9b..d677f5ac7 100644
--- a/plugins/janvince/smallcontactform/vendor/composer/autoload_real.php
+++ b/plugins/janvince/smallcontactform/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit2d4cb6e3c511ba81e82a8c2c9437f4fd
+class ComposerAutoloaderInit72036f1eda87e289ce9c6a3db2183e92
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit2d4cb6e3c511ba81e82a8c2c9437f4fd
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit2d4cb6e3c511ba81e82a8c2c9437f4fd', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit72036f1eda87e289ce9c6a3db2183e92', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit2d4cb6e3c511ba81e82a8c2c9437f4fd', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit72036f1eda87e289ce9c6a3db2183e92', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit2d4cb6e3c511ba81e82a8c2c9437f4fd::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit72036f1eda87e289ce9c6a3db2183e92::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
diff --git a/plugins/janvince/smallcontactform/vendor/composer/autoload_static.php b/plugins/janvince/smallcontactform/vendor/composer/autoload_static.php
index 56b191e08..d464c5619 100644
--- a/plugins/janvince/smallcontactform/vendor/composer/autoload_static.php
+++ b/plugins/janvince/smallcontactform/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit2d4cb6e3c511ba81e82a8c2c9437f4fd
+class ComposerStaticInit72036f1eda87e289ce9c6a3db2183e92
 {
     public static $prefixLengthsPsr4 = array (
         'C' => 
@@ -23,8 +23,8 @@ class ComposerStaticInit2d4cb6e3c511ba81e82a8c2c9437f4fd
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit2d4cb6e3c511ba81e82a8c2c9437f4fd::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit2d4cb6e3c511ba81e82a8c2c9437f4fd::$prefixDirsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit72036f1eda87e289ce9c6a3db2183e92::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit72036f1eda87e289ce9c6a3db2183e92::$prefixDirsPsr4;
 
         }, null, ClassLoader::class);
     }
diff --git a/plugins/rainlab/pages/classes/Page.php b/plugins/rainlab/pages/classes/Page.php
index 18660429d..142da5364 100644
--- a/plugins/rainlab/pages/classes/Page.php
+++ b/plugins/rainlab/pages/classes/Page.php
@@ -85,6 +85,7 @@ class Page extends ContentBase
         'viewBag[title]',
         'viewBag[meta_title]',
         'viewBag[meta_description]',
+        'viewBag[meta_keywords]',
     ];
 
     /**
@@ -244,14 +245,14 @@ class Page extends ContentBase
         foreach ($this->getChildren() as $subPage) {
             $result = array_merge($result, $subPage->delete());
         }
-        
+
         /*
          * Delete the object
          */
         $result = array_merge($result, [$this->getBaseFileName()]);
 
         parent::delete();
-        
+
         /*
          * Remove from meta
          */
diff --git a/plugins/rainlab/pages/classes/page/fields.yaml b/plugins/rainlab/pages/classes/page/fields.yaml
index d25124a81..ed1064bd7 100644
--- a/plugins/rainlab/pages/classes/page/fields.yaml
+++ b/plugins/rainlab/pages/classes/page/fields.yaml
@@ -57,6 +57,10 @@ tabs:
             type: textarea
             size: tiny
 
+        viewBag[meta_keywords]:
+            tab: cms::lang.editor.meta
+            label: 'Meta keywords'
+
 secondaryTabs:
     stretch: true
     fields:
diff --git a/plugins/suresoftware/powerseo/LICENSE b/plugins/suresoftware/powerseo/LICENSE
new file mode 100644
index 000000000..f152e8d47
--- /dev/null
+++ b/plugins/suresoftware/powerseo/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Sure Software Limited, Te Anau New Zealand
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/plugins/suresoftware/powerseo/Plugin.php b/plugins/suresoftware/powerseo/Plugin.php
new file mode 100644
index 000000000..b79ef9770
--- /dev/null
+++ b/plugins/suresoftware/powerseo/Plugin.php
@@ -0,0 +1,288 @@
+<?php namespace SureSoftware\PowerSEO;
+
+use SureSoftware\PowerSEO\classes\Helper;
+use Cms\Classes\Page;
+use Cms\Classes\Theme;
+use System\Classes\PluginBase;
+use System\Classes\PluginManager;
+use System\Classes\SettingsManager;
+
+/**
+ * PowerSEO Plugin Information File
+ */
+class Plugin extends PluginBase
+{
+
+    /**
+     * Returns information about this plugin.
+     *
+     * @return array
+     */
+    public function pluginDetails()
+    {
+        return [
+            'name' => 'suresoftware.powerseo::lang.plugin.name',
+            'description' => 'suresoftware.powerseo::lang.plugin.description',
+            'author' => 'Sure Software',
+            'icon' => 'icon-search'
+        ];
+    }
+
+
+    public function registerComponents()
+    {
+        return [
+            'SureSoftware\PowerSEO\Components\BlogPost' => 'SeoBlogPost',
+            'SureSoftware\PowerSEO\Components\StaticPage' => 'SeoStaticPage',
+            'SureSoftware\PowerSEO\Components\CmsPage' => 'SeoCmsPage',
+        ];
+    }
+
+    public function registerSettings()
+    {
+        return [
+            'settings' => [
+                'label' => 'suresoftware.powerseo::lang.settings.label',
+                'description' => 'suresoftware.powerseo::lang.settings.description',
+                'icon' => 'icon-search',
+                'category' => SettingsManager::CATEGORY_MYSETTINGS,
+                'permissions' => ['suresoftware.powerseo.settings.edit'],
+                'class' => 'SureSoftware\PowerSEO\Models\Settings',
+                'order' => 100
+            ]
+        ];
+    }
+
+    public function registerMarkupTags()
+    {
+        return [
+            'filters' => [
+                'generateTitle' => [$this, 'generateTitle'],
+                'generateCanonicalUrl' => [$this, 'generateCanonicalUrl'],
+                'otherMetaTags' => [$this, 'otherMetaTags'],
+                'generateOgTags' => [$this, 'generateOgTags']
+            ]
+        ];
+    }
+
+    public function registerPermissions()
+    {
+        return [
+            'suresoftware.powerseo.settings.edit' => [
+                'label' => 'suresoftware.powerseo::lang.settings.permissions.settings_edit',
+                'tab' => 'suresoftware.powerseo::lang.plugin.name'
+            ]
+        ];
+    }
+
+    public function generateOgTags($post)
+    {
+        $helper = new Helper();
+
+        $ogMetaTags = $helper->generateOgMetaTags($post);
+        return $ogMetaTags;
+    }
+
+    public function otherMetaTags()
+    {
+        $helper = new Helper();
+
+        $otherMetaTags = $helper->otherMetaTags();
+        return $otherMetaTags;
+    }
+
+    public function generateTitle($title)
+    {
+        $helper = new Helper();
+        $title = $helper->generateTitle($title);
+        return $title;
+    }
+
+    public function generateCanonicalUrl($url)
+    {
+        $helper = new Helper();
+        $canonicalUrl = $helper->generateCanonicalUrl();
+        return $canonicalUrl;
+    }
+
+
+    public function register()
+    {
+        \Event::listen('backend.form.extendFields', function ($widget) {
+            if (PluginManager::instance()->hasPlugin('RainLab.Pages') && $widget->model instanceof \RainLab\Pages\Classes\Page) {
+                if ($widget->isNested) {
+                    return;
+                }
+                $widget->addFields([
+//                    'viewBag[seo_title]' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.meta_title',
+//                        'type' => 'text',
+//                        'tab' => 'cms::lang.editor.meta'
+//                    ],
+//                    'viewBag[seo_description]' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.meta_description',
+//                        'type' => 'textarea',
+//                        'size' => 'tiny',
+//                        'tab' => 'cms::lang.editor.meta'
+//                    ],
+//                    'viewBag[seo_keywords]' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.meta_keywords',
+//                        'type' => 'textarea',
+//                        'size' => 'tiny',
+//                        'tab' => 'cms::lang.editor.meta'
+//                    ],
+//                    'viewBag[canonical_url]' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.canonical_url',
+//                        'type' => 'text',
+//                        'tab' => 'cms::lang.editor.meta',
+//                        'span' => 'left'
+//                    ],
+//                    'viewBag[redirect_url]' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.redirect_url',
+//                        'type' => 'text',
+//                        'tab' => 'cms::lang.editor.meta',
+//                        'span' => 'right'
+//
+//                    ],
+                    'viewBag[robot_index]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.robot_index',
+                        'type' => 'dropdown',
+                        'tab' => 'cms::lang.editor.meta',
+                        'options' => $this->getIndexOptions(),
+                        'default' => 'index',
+                        'span' => 'left'
+                    ],
+                    'viewBag[robot_follow]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.robot_follow',
+                        'type' => 'dropdown',
+                        'tab' => 'cms::lang.editor.meta',
+                        'options' => $this->getFollowOptions(),
+                        'default' => 'follow',
+                        'span' => 'right'
+                    ],
+                ],
+                    'primary');
+            }
+
+            if (PluginManager::instance()->hasPlugin('RainLab.Blog') && $widget->model instanceof \RainLab\Blog\Models\Post) {
+                if ($widget->isNested) {
+                    return;
+                }
+                $widget->addFields([
+                    'powerseo_title' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.meta_title',
+                        'type' => 'text',
+                        'tab' => 'SEO'
+                    ],
+                    'powerseo_description' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.meta_description',
+                        'type' => 'textarea',
+                        'size' => 'tiny',
+                        'tab' => 'SEO'
+                    ],
+                    'powerseo_keywords' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.meta_keywords',
+                        'type' => 'textarea',
+                        'size' => 'tiny',
+                        'tab' => 'SEO'
+                    ],
+//                    'powerseo_canonical_url' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.canonical_url',
+//                        'type' => 'text',
+//                        'tab' => 'SEO',
+//                        'span' => 'left'
+//                    ],
+//                    'powerseo_redirect_url' => [
+//                        'label' => 'suresoftware.powerseo::lang.editor.redirect_url',
+//                        'type' => 'text',
+//                        'tab' => 'SEO',
+//                        'span' => 'right'
+//
+//                    ],
+                    'powerseo_robot_index' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.robot_index',
+                        'type' => 'dropdown',
+                        'tab' => 'SEO',
+                        'options' => $this->getIndexOptions(),
+                        'default' => 'index',
+                        'span' => 'left'
+                    ],
+                    'powerseo_robot_follow' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.robot_follow',
+                        'type' => 'dropdown',
+                        'tab' => 'SEO',
+                        'options' => $this->getFollowOptions(),
+                        'default' => 'follow',
+                        'span' => 'right'
+                    ],
+                ],
+                    'secondary');
+            }
+
+            if (!$widget->model instanceof \Cms\Classes\Page) {
+                return;
+            }
+
+            if (!($theme = Theme::getEditTheme())) {
+                throw new ApplicationException(Lang::get('cms::lang.theme.edit.not_found'));
+            }
+
+            if ($widget->isNested) {
+                return;
+            }
+
+            $widget->addFields(
+                [
+                    'settings[seo_keywords]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.meta_keywords',
+                        'type' => 'textarea',
+                        'tab' => 'cms::lang.editor.meta',
+                        'size' => 'tiny',
+                        'placeholder' => "hello"
+                    ],
+                    'settings[canonical_url]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.canonical_url',
+                        'type' => 'text',
+                        'tab' => 'cms::lang.editor.meta',
+                        'span' => 'left'
+                    ],
+                    'settings[redirect_url]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.redirect_url',
+                        'type' => 'text',
+                        'tab' => 'cms::lang.editor.meta',
+                        'span' => 'right'
+
+                    ],
+                    'settings[robot_index]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.robot_index',
+                        'type' => 'dropdown',
+                        'tab' => 'cms::lang.editor.meta',
+                        'options' => $this->getIndexOptions(),
+                        'default' => 'index',
+                        'span' => 'left'
+                    ],
+                    'settings[robot_follow]' => [
+                        'label' => 'suresoftware.powerseo::lang.editor.robot_follow',
+                        'type' => 'dropdown',
+                        'tab' => 'cms::lang.editor.meta',
+                        'options' => $this->getFollowOptions(),
+                        'default' => 'follow',
+                        'span' => 'right'
+                    ],
+                ],
+                'primary'
+            );
+        });
+    }
+
+
+    private function getIndexOptions()
+    {
+        return ["index" => "index", "noindex" => "noindex"];
+    }
+
+    private function getFollowOptions()
+    {
+        return ["follow" => "follow", "nofollow" => "nofollow"];
+    }
+}
diff --git a/plugins/suresoftware/powerseo/README.md b/plugins/suresoftware/powerseo/README.md
new file mode 100644
index 000000000..c1c9f5d93
--- /dev/null
+++ b/plugins/suresoftware/powerseo/README.md
@@ -0,0 +1,94 @@
+Power SEO an OctoberCMS Plugin
+=============
+
+_Please note that this plugin was originally created by AnandPatel, however after 2 years of no support and many 
+issues with the plugin, I have taken over the plugin development and maintain it under a new repository. This new 
+version fixes the server errors in the old plugin._
+
+## Migration from AnandPatel.SeoExtension
+1. Backup Blog Posts - The fields added by `AnandPatel.SeoExtension` are renamed and prefixed with `powerseo_` in the 
+migrations, which might fail on some servers if the right extensions aren't installed. 
+3. Install `SureSoftware.PowerSEO`
+4. Remove `AnandPatel.SeoExtension`
+
+As all the syntax for the components are same for the `AnandPatel.SeoExtension`, to upgrade you only need to remove the 
+`AnandPatel.SeoExtension` plugin and add `SureSoftware.PowerSEO`. All settings and component parameters should be 
+migrated across.
+
+### Inject SEO fields to CMS Pages, Static Pages and Blog.
+
+This plugin add SEO fields to CMS Pages, Static Pages and Blog, and for using it you simply need to drop component on layout/page.
+
+Current fields:
+* Meta Title
+* Meta Description
+* Meta Keywords
+* Canonical URL
+* Meta Redirect to other URL
+* Robot Index & Follow
+
+__*for more fields, please open an issue and request this on the git repository__
+
+### Features
+* Open Graph(og) Tags added for better social sharing
+* Settings added in backend to configure meta and Open Graph tags
+
+### Future Development
+* Integration of SEO optimizer to optimize pages
+
+### Like this plugin?
+If you like this plugin, plese give it a star on GitHub
+
+# Documentation
+
+## Installation
+To install this plugin you have to click on __add to project__ or need to type __SureSoftware.PowerSEO__ in Backend *System > updates > intall plugin*
+
+The plugin currently includes three components:
+* SEO CMS Page
+* SEO Blog Post
+* SEO Static Page
+
+### **SEO CMS Page**
+Put the component in the CMS Layout
+
+``````````````````
+    <html>
+        <head>
+            {% component 'SeoCmsPage' %}
+        </head>
+        <body>
+           {% page %}
+        </body>
+    </html>
+``````````````````
+
+
+### **SEO Blog Post**
+Put the component in the page with the SeoBlogPost component and pass the post as a parameter
+
+``````````````````
+    {% component 'blogPost' %}
+    {% component 'SeoBlogPost' data=post %}
+``````````````````
+
+> You must place also SeoCMSPage component on layout
+
+#### **SEO Static Page**
+Put the component in the head of the Static Pages Layout
+
+``````````````````
+    <html>
+        <head>
+            {% component 'SeoStaticPage' %}
+        </head>
+        <body>
+            {% component 'staticMenu' %}
+            {% component 'staticBreadcrumbs' %}
+            {% page %}
+        </body>
+    </html>
+``````````````````
+
+### Configuration
+To configure this Plugin goto Backend *System* then find *My Settings* in left side bar, then click on *SEO Extension*
diff --git a/plugins/suresoftware/powerseo/classes/Helper.php b/plugins/suresoftware/powerseo/classes/Helper.php
new file mode 100644
index 000000000..1b9ae625a
--- /dev/null
+++ b/plugins/suresoftware/powerseo/classes/Helper.php
@@ -0,0 +1,101 @@
+<?php namespace SureSoftware\PowerSEO\classes;
+
+use SureSoftware\PowerSEO\Models\Settings;
+use Request;
+
+class Helper
+{
+
+    public $settings;
+
+    public function __construct()
+    {
+        $this->settings = Settings::instance();
+    }
+
+
+    public function generateTitle($title)
+    {
+        $settings = $this->settings;
+
+        if ($settings->enable_title) {
+            $position = $settings->title_position;
+            $site_title = $settings->title;
+
+            if ($position == 'prefix') {
+                $new_title = $site_title . " " . $title;
+            } else {
+                $new_title = $title . " " . $site_title;
+            }
+        } else {
+            $new_title = $title;
+        }
+        return $new_title;
+    }
+
+    function generateCanonicalUrl()
+    {
+        $settings = $this->settings;
+
+        if ($settings->enable_canonical_url) {
+            return '<link rel="canonical" href="' . Request::url() . '"/>';
+        }
+
+        return "";
+    }
+
+    public function otherMetaTags()
+    {
+        $settings = $this->settings;
+
+        if ($settings->other_tags) {
+            return $settings->other_tags;
+        }
+
+        return "";
+
+    }
+
+    public function generateOgMetaTags($post)
+    {
+        $settings = $this->settings;
+
+        if ($settings->enable_og_tags) {
+            $ogTags = "";
+            if ($settings->og_fb_appid) {
+                $ogTags .= '<meta property="fb:app_id" content="' . $settings->og_fb_appid . '" />' . "\n";
+            }
+
+            if ($settings->og_sitename) {
+                $ogTags .= '<meta property="og:site_name" content="' . $settings->og_sitename . '" />' . "\n";
+            }
+
+            if ($post->powerseo_description) {
+                $ogTags .= '<meta property="og:description" content="' . $post->powerseo_description . '" />' . "\n";
+            }
+
+            $ogTitle = empty($post->powerseo_title) ? $post->title : $post->powerseo_title;
+            $ogUrl = Request::url();
+            if(!empty($post->powerseo_canonical_url)){
+                $ogUrl = $post->powerseo_canonical_url;
+            }
+            else if(!empty($this->page->powerseo_canonical_url)){
+                $ogUrl = $this->page->powerseo_canonical_url;
+            }
+
+            //Add featured images to the social tags
+            if($post->featured_images){
+                foreach($post->featured_images as $image){
+                    $ogTags .= '<meta property="og:image" content="' . $image->path . '" />' . "\n";
+                }
+            }
+
+            $ogTags .= '<meta property="og:title" content="' . $ogTitle . '" />' . "\n";
+            $ogTags .= '<meta property="og:url" content="' . $ogUrl . '" />';
+
+            return $ogTags;
+        }
+    }
+
+
+}
diff --git a/plugins/suresoftware/powerseo/components/BlogPost.php b/plugins/suresoftware/powerseo/components/BlogPost.php
new file mode 100644
index 000000000..12981c1dc
--- /dev/null
+++ b/plugins/suresoftware/powerseo/components/BlogPost.php
@@ -0,0 +1,36 @@
+<?php namespace SureSoftware\PowerSEO\Components;
+
+use Cms\Classes\ComponentBase;
+use Event;
+
+class BlogPost extends ComponentBase
+{
+
+    public $page;
+    public $seo_title;
+    public $seo_description;
+    public $seo_keywords;
+    public $canonical_url;
+    public $redirect_url;
+    public $robot_index;
+    public $robot_follow;
+
+    public function componentDetails()
+    {
+        return [
+            'name' => 'suresoftware.powerseo::lang.component.blog.name',
+            'description' => 'suresoftware.powerseo::lang.component.blog.description'
+        ];
+    }
+
+    public function defineProperties()
+    {
+        return [
+            "post" => [
+                "title" => "data",
+                "default" => "post"
+            ]
+        ];
+    }
+
+}
diff --git a/plugins/suresoftware/powerseo/components/CmsPage.php b/plugins/suresoftware/powerseo/components/CmsPage.php
new file mode 100644
index 000000000..dcf3b1a8b
--- /dev/null
+++ b/plugins/suresoftware/powerseo/components/CmsPage.php
@@ -0,0 +1,72 @@
+<?php namespace SureSoftware\PowerSEO\Components;
+
+use Cms\Classes\ComponentBase;
+use Cms\Classes\Page;
+use Cms\Classes\Theme;
+use Request;
+use SureSoftware\PowerSEO\models\Settings;
+use URL;
+
+class CmsPage extends ComponentBase
+{
+    public $page;
+    public $seo_title;
+    public $seo_description;
+    public $seo_keywords;
+    public $canonical_url;
+    public $redirect_url;
+    public $robot_index;
+    public $robot_follow;
+    public $hasBlog;
+
+    public $ogTitle;
+    public $ogUrl;
+    public $ogDescription;
+    public $ogSiteName;
+    public $ogFbAppId;
+    public $ogLocale;
+    public $ogImage;
+
+
+    public function componentDetails()
+    {
+        return [
+            'name' => 'suresoftware.powerseo::lang.component.cms.name',
+            'description' => 'suresoftware.powerseo::lang.component.cms.description'
+        ];
+    }
+
+    public function defineProperties()
+    {
+        return [];
+    }
+
+    public function onRun()
+    {
+        $this->page["hasBlog"] = false;
+
+        if (!$this->page->page->hasComponent("SeoBlogPost")) {
+            $this->seo_title = $this->page["seo_title"] = empty($this->page->meta_title) ? $this->page->title : $this->page->meta_title;
+            $this->seo_description = $this->page["seo_description"] = $this->page->meta_description;
+            $this->seo_keywords = $this->page["seo_keywords"] = $this->page->seo_keywords;
+            $this->canonical_url = $this->page["canonical_url"] = $this->page->canonical_url;
+            $this->redirect_url = $this->page["redirect_url"] = $this->page->redirect_url;
+            $this->robot_follow = $this->page["robot_follow"] = $this->page->robot_follow;
+            $this->robot_index = $this->page["robot_index"] = $this->page->robot_index;
+
+            $settings = Settings::instance();
+
+            if ($settings->enable_og_tags) {
+                $this->ogTitle = empty($this->page->meta_title) ? $this->page->title : $this->page->meta_title;
+                $this->ogDescription = $this->page->meta_description;
+                $this->ogUrl = empty($this->page->canonical_url) ? Request::url() : $this->page->canonical_url;
+                $this->ogSiteName = $settings->og_sitename;
+                $this->ogFbAppId = $settings->og_fb_appid;
+            }
+
+        } else {
+            $this->hasBlog = $this->page["hasBlog"] = true;
+        }
+    }
+
+}
diff --git a/plugins/suresoftware/powerseo/components/StaticPage.php b/plugins/suresoftware/powerseo/components/StaticPage.php
new file mode 100644
index 000000000..c50a3a835
--- /dev/null
+++ b/plugins/suresoftware/powerseo/components/StaticPage.php
@@ -0,0 +1,84 @@
+<?php namespace SureSoftware\PowerSEO\Components;
+
+use Cms\Classes\ComponentBase;
+use Illuminate\Support\Facades\App;
+use RainLab\Pages\Classes\Router;
+use Cms\Classes\Theme;
+use SureSoftware\PowerSEO\models\Settings;
+use Request;
+
+class StaticPage extends ComponentBase
+{
+    public $page;
+    public $seo_title;
+    public $seo_description;
+    public $seo_keywords;
+    public $canonical_url;
+    public $redirect_url;
+    public $robot_index;
+    public $robot_follow;
+    public $title;
+
+    public $ogTitle;
+    public $ogUrl;
+    public $ogDescription;
+    public $ogSiteName;
+    public $ogFbAppId;
+    public $ogLocale;
+    public $ogImage;
+
+
+    public function componentDetails()
+    {
+        return [
+            'name' => 'suresoftware.powerseo::lang.component.static.name',
+            'description' => 'suresoftware.powerseo::lang.component.static.description'
+        ];
+    }
+
+    public function defineProperties()
+    {
+        return [];
+    }
+
+    public function onRun()
+    {
+        $url = Request::path();
+
+        // Remove language prefix in case it exists (e.g. from "/en/my-page" to "/my-page")
+        if (class_exists('RainLab\Translate\Behaviors\TranslatableModel')) {
+//            $url = preg_replace('/\/[a-z]{2}\//', '/', $url);
+            $url = substr($url,2);
+//            dd($url);
+        }
+
+        if (!strlen($url)) {
+            $url = '/';
+        }
+        $router = new Router(Theme::getActiveTheme());
+        $this->page = $this->page['page'] = $router->findByUrl($url);
+
+        if ($this->page) {
+            $this->seo_title = $this->page['seo_title'] = $this->page->viewBag['meta_title'];
+            $this->title = $this->page['title'] = $this->page->viewBag['title'];
+            $this->seo_description = $this->page['seo_description'] = $this->page->viewBag['meta_description'];
+            $this->seo_keywords = $this->page['seo_keywords'] = $this->page->viewBag['meta_keywords'];
+//            $this->canonical_url = $this->page['canonical_url'] = $this->page->getViewBag()->property('canonical_url');
+//            $this->redirect_url = $this->page['redirect_url'] = $this->page->getViewBag()->property('redirect_url');
+            $this->robot_index = $this->page['robot_index'] = $this->page->getViewBag()->property('robot_index');
+            $this->robot_follow = $this->page['robot_follow'] = $this->page->getViewBag()->property('robot_follow');
+
+            $settings = Settings::instance();
+
+            if ($settings->enable_og_tags) {
+                $this->ogTitle = empty($this->page->meta_title) ? $this->page->title : $this->page->meta_title;
+                $this->ogDescription = $this->page->meta_description;
+                $this->ogUrl = empty($this->page->canonical_url) ? Request::url() : $this->page->canonical_url;
+                $this->ogSiteName = $settings->og_sitename;
+                $this->ogFbAppId = $settings->og_fb_appid;
+            }
+        }
+
+    }
+
+}
diff --git a/plugins/suresoftware/powerseo/components/blogpost/default.htm b/plugins/suresoftware/powerseo/components/blogpost/default.htm
new file mode 100644
index 000000000..6ac88714f
--- /dev/null
+++ b/plugins/suresoftware/powerseo/components/blogpost/default.htm
@@ -0,0 +1,32 @@
+{% put meta %}
+    {% default %}
+    {% if post.powerseo_redirect_url %}
+        <meta http-equiv="refresh" content="0; url={{post.powerseo_redirect_url}}" />
+    {% endif %}
+
+    {% if post.powerseo_title %}
+        <title>{{ post.powerseo_title | generateTitle}}</title>
+    {% else %}
+        <title>{{ post.title | generateTitle }}</title>
+    {% endif %}
+
+    {% if post.powerseo_description %}
+        <meta name="description" content="{{post.powerseo_description}}">
+    {% endif %}
+
+    {% if post.powerseo_keywords %}
+        <meta name="keywords" content="{{post.powerseo_keywords}}">
+    {% endif %}
+
+    {% if post.powerseo_canonical_url %}
+        <link rel="canonical" href="{{post.powerseo_canonical_url}}" />
+    {% else %}
+        {{ '' | generateCanonicalUrl}}
+    {% endif %}
+
+    <meta name="robots" content="{{post.powerseo_robot_index}},{{post.powerseo_robot_follow}}">
+
+    {{ ''|otherMetaTags|raw }}
+
+    {{ post|generateOgTags }}
+{% endput %}
diff --git a/plugins/suresoftware/powerseo/components/cmspage/default.htm b/plugins/suresoftware/powerseo/components/cmspage/default.htm
new file mode 100644
index 000000000..901cd0a93
--- /dev/null
+++ b/plugins/suresoftware/powerseo/components/cmspage/default.htm
@@ -0,0 +1,54 @@
+{% if hasBlog %}
+    {% placeholder meta default %}
+
+    {% endplaceholder %}
+
+{% else %}
+
+    {% if __SELF__.redirect_url %}
+        <meta http-equiv="refresh" content="0; url={{__SELF__.redirect_url}}" />
+    {% endif %}
+
+    {% if __SELF__.seo_title %}
+        <title>{{__SELF__.seo_title | generateTitle}}</title>
+    {% endif %}
+
+    {% if __SELF__.seo_description %}
+        <meta name="description" content="{{__SELF__.seo_description}}">
+    {% endif %}
+
+    {% if __SELF__.seo_keywords %}
+        <meta name="keywords" content="{{__SELF__.seo_keywords}}">
+    {% endif %}
+
+    {% if __SELF__.canonical_url %}
+        <link rel="canonical" href="{{__SELF__.canonical_url}}" />
+    {% else %}
+        {{ '' | generateCanonicalUrl}}
+    {% endif %}
+
+    <meta name="robots" content="{{__SELF__.robot_index}},{{__SELF__.robot_follow}}">
+
+    {{ ''|otherMetaTags|raw }}
+
+    {% if __SELF__.ogTitle %}
+        <meta property="og:title" content="{{ __SELF__.ogTitle }}" />
+    {% endif %}
+
+    {% if __SELF__.ogUrl %}
+        <meta property="og:url" content="{{ __SELF__.ogUrl }}" />
+    {% endif %}
+
+    {% if __SELF__.ogSiteName %}
+        <meta property="og:site_name" content="{{ __SELF__.ogSiteName }}" />
+    {% endif %}
+
+    {% if __SELF__.ogDescription %}
+        <meta property="og:description" content="{{ __SELF__.ogDescription }}" />
+    {% endif %}
+
+    {% if __SELF__.ogFbAppId %}
+        <meta property="fb:app_id" content="{{ __SELF__.ogFbAppId  }}" />
+    {% endif %}
+
+{% endif %}
diff --git a/plugins/suresoftware/powerseo/components/staticpage/default.htm b/plugins/suresoftware/powerseo/components/staticpage/default.htm
new file mode 100644
index 000000000..c8734fae6
--- /dev/null
+++ b/plugins/suresoftware/powerseo/components/staticpage/default.htm
@@ -0,0 +1,47 @@
+{% if __SELF__.redirect_url %}
+    <meta http-equiv="refresh" content="0; url={{__SELF__.redirect_url}}" />
+{% endif %}
+
+{% if __SELF__.seo_title %}
+    <title>{{__SELF__.seo_title | generateTitle }}</title>
+{% else %}
+    <title>{{ __SELF__.title | generateTitle }}</title>
+{% endif %}
+
+{% if __SELF__.seo_description %}
+    <meta name="description" content="{{__SELF__.seo_description}}">
+{% endif %}
+
+{% if __SELF__.seo_keywords %}
+    <meta name="keywords" content="{{__SELF__.seo_keywords}}">
+{% endif %}
+
+{% if __SELF__.canonical_url %}
+    <link rel="canonical" href="{{__SELF__.canonical_url}}" />
+{% else %}
+    {{ '' | generateCanonicalUrl}}
+{% endif %}
+
+    <meta name="robots" content="{{__SELF__.robot_index}},{{__SELF__.robot_follow}}">
+
+{{ ''|otherMetaTags|raw }}
+
+{% if __SELF__.ogTitle %}
+<meta property="og:title" content="{{ __SELF__.ogTitle }}" />
+{% endif %}
+
+{% if __SELF__.ogUrl %}
+<meta property="og:url" content="{{ __SELF__.ogUrl }}" />
+{% endif %}
+
+{% if __SELF__.ogSiteName %}
+<meta property="og:site_name" content="{{ __SELF__.ogSiteName }}" />
+{% endif %}
+
+{% if __SELF__.ogDescription %}
+<meta property="og:description" content="{{ __SELF__.ogDescription }}" />
+{% endif %}
+
+{% if __SELF__.ogFbAppId %}
+<meta property="fb:app_id" content="{{ __SELF__.ogFbAppId  }}" />
+{% endif %}
diff --git a/plugins/suresoftware/powerseo/lang/cs/lang.php b/plugins/suresoftware/powerseo/lang/cs/lang.php
new file mode 100644
index 000000000..81377c3e5
--- /dev/null
+++ b/plugins/suresoftware/powerseo/lang/cs/lang.php
@@ -0,0 +1,53 @@
+<?php
+
+return [
+    'plugin' => [
+        'name' => 'Napájení SEO',
+        'description' => 'Poskytuje Napájení SEO pro CMS stránky, statické stránky a blogové články',
+    ],
+    'settings' => [
+        'label' => 'Napájení SEO',
+        'description' => 'Konfigurace Napájení SEO',
+        'tab_settings' => [
+            'label' => 'Nastavení',
+            'site' => 'Použít název stránku v titulku stránky',
+            'site_comment' => 'Aktivujte pokud chcete použít název stránek v tagu <title>',
+            'sitename' => 'Název stránek',
+            'canonical' => 'Použít výchozí URL jako kanonickou URL',
+            'canonical_comment' => 'Pokud není kanonická URL zadána, poté se použije výchozí URL jako kanonická',
+            'sitename_comment_above' => 'Předpona nebo přípona názvu stránek v tagu <title>',
+            'sitename_comment' => 'Název stránek | <nadpis seo/stránky/blogu>',
+            'sitename_placeholder' => 'Název stránek |',
+            'title_position' => 'Název stránek se ukáže',
+            'title_position_comment' => 'Vyberte kde se má název stránek zobrazovat, jestli na začátku, nebo na konci',
+            'title_position_prefix' => 'Předpona (na začátku)',
+            'title_position_suffix' => 'Přípona (na konci)',
+            'other_tags' => 'Ostatní meta tagy',
+            'other_tags_comment_above' => 'Zadejte tagy které chcete přidat na všech stránkách',
+            'other_tags_comment' => 'Zadejte meta tagy jako například meta author, meta viewport a další',
+        ],
+        'tab_og' => [
+            'label' => 'Open Graph',
+            'og' => 'Použít Open Graph (og)',
+            'og_comment' => 'Aktivovat Open Graph (og) tagy',
+            'sitename' => 'Název stránek pro Open Graph',
+            'sitename_comment' => 'Název stránek. Ne URL. Například "Power SEO" ne "powerseo.com".',
+            'fb' => 'ID Facebook Aplikace',
+            'fb_comment' => 'Unikátní ID podle kterých dokáže Facebook identifikovat vaše stránky.',
+        ],
+    ],
+    'component' => [
+        'blog' => [
+            'name' => 'SEO Blogového článku',
+            'description' => 'Přidá SEO pole k blogovému článku',
+        ],
+        'cms' => [
+            'name' => 'SEO CMS stránky',
+            'description' => 'Přidá SEO pole k CMS stránce',
+        ],
+        'static' => [
+            'name' => 'SEO Statiké stránky',
+            'description' => 'Přidá SEO pole k statické stránce',
+        ],
+    ],
+];
diff --git a/plugins/suresoftware/powerseo/lang/en/lang.php b/plugins/suresoftware/powerseo/lang/en/lang.php
new file mode 100644
index 000000000..dc7e47cd3
--- /dev/null
+++ b/plugins/suresoftware/powerseo/lang/en/lang.php
@@ -0,0 +1,63 @@
+<?php return [
+    'plugin' => [
+        'name' => 'Power SEO',
+        'description' => 'Provide Power SEO to October CMS Pages, Static Pages, Blog post',
+    ],
+    'editor' => [
+        'meta_title' => 'Meta Title for Power SEO',
+        'meta_description' => 'Meta Description for Power SEO',
+        'meta_keywords' => 'Meta Keywords',
+        'canonical_url' => 'Canonical URL',
+        'redirect_url' => 'Redirect URL',
+        'robot_index' => 'Robot Index',
+        'robot_follow' => 'Robot Follow',
+    ],
+    'settings' => [
+        'label' => 'Power SEO',
+        'description' => 'Configure Power SEO',
+        'permissions' => [
+            'settings_edit' => 'Configure Power SEO'
+        ],
+        'tab_settings' => [
+            'label' => 'Settings',
+            'site' => 'Use site name in title',
+            'site_comment' => 'Enable if you want to use site name in title tag',
+            'sitename' => 'Site name',
+            'canonical' => 'Use default URL as canonical URL',
+            'canonical_comment' => 'if canonical URL is not provided then use default URL as canonical URL',
+            'sitename_comment_above' => 'Prefix or suffix site name in title tag',
+            'sitename_comment' => 'Site name | <seo/page/blog title>',
+            'sitename_placeholder' => 'Sitename |',
+            'title_position' => 'Site name appear at',
+            'title_position_comment' => 'select where site name should appear i.e. at start or at end',
+            'title_position_prefix' => 'Prefix (at start)',
+            'title_position_suffix' => 'Suffix (at end)',
+            'other_tags' => 'Other meta tags',
+            'other_tags_comment_above' => 'Insert tags that you want to insert in all pages',
+            'other_tags_comment' => 'Insert other meta tags like meta author, meta viewport etc',
+        ],
+        'tab_og' => [
+            'label' => 'Open Graph',
+            'og' => 'Use Open Graph(og)',
+            'og_comment' => 'Enable Open Graph(og) Tags',
+            'sitename' => 'Site name for Open Graph',
+            'sitename_comment' => 'The name of your website. Not the URL, but the name. (i.e. "Power SEO" not "powerseo.com".)',
+            'fb' => 'Facebook App Id',
+            'fb_comment' => 'The unique ID that lets Facebook know the identity of your site.',
+        ],
+    ],
+    'component' => [
+        'blog' => [
+            'name' => 'SEO Blog Post',
+            'description' => 'Inject SEO Fields of blog post',
+        ],
+        'cms' => [
+            'name' => 'SEO CMS Page',
+            'description' => 'Inject SEO Fields of CMS pages',
+        ],
+        'static' => [
+            'name' => 'SEO Static Page',
+            'description' => 'Inject SEO fields of Static Pages',
+        ],
+    ],
+];
\ No newline at end of file
diff --git a/plugins/suresoftware/powerseo/lang/ru/lang.php b/plugins/suresoftware/powerseo/lang/ru/lang.php
new file mode 100644
index 000000000..36dac0f26
--- /dev/null
+++ b/plugins/suresoftware/powerseo/lang/ru/lang.php
@@ -0,0 +1,53 @@
+<?php
+
+return [
+    'plugin' => [
+        'name' => 'мощность Поисковая оптимизация',
+        'description' => 'Управление SEO информацией для CMS страниц, статических страниц и постов блога'
+    ],
+    'settings' => [
+        'label' => 'мощность Поисковая оптимизация',
+        'description' => 'Настройки поисковой оптимизации',
+        'tab_settings' => [
+            'label' => 'Настройки',
+            'site' => 'Использовать название сайта в <title>',
+            'site_comment' => 'Включите, если вы хотите использовать название сайта в <title>',
+            'sitename' => 'Название сайта',
+            'canonical' => 'Использовать URL-адрес по умолчанию, как канонический',
+            'canonical_comment' => 'Если канонический URL-адрес не предоставляется, то использовать URL-адрес по умолчанию, как канонический',
+            'sitename_comment_above' => 'Префикс или суффикс название сайта в <title>',
+            'sitename_comment' => 'Название сайта | <seo/page/blog title>',
+            'sitename_placeholder' => 'Название |',
+            'title_position' => 'Название сайта представлено как',
+            'title_position_comment' => 'Выберите место, где название сайта должно отображаться, т.е. в начале или в конце',
+            'title_position_prefix' => 'Префикс (в начале)',
+            'title_position_suffix' => 'Суффикс (в конце)',
+            'other_tags' => 'Другие Мета-теги',
+            'other_tags_comment_above' => 'Введите теги, которые вы хотите вставить на все страницы',
+            'other_tags_comment' => 'Например,такие теги как author, viewport и т.д.',
+        ],
+        'tab_og' => [
+            'label' => 'Open Graph',
+            'og' => 'Использовать Open Graph(og)',
+            'og_comment' => 'Включить Open Graph(og) теги',
+            'sitename' => 'Название сайта для Open Graph',
+            'sitename_comment' => 'Название вашего сайта. Не используйте URL сайта (например, не "powerseo.com", а "Power SEO").',
+            'fb' => 'Facebook App Id',
+            'fb_comment' => 'Уникальный идентификатор, что позволяет Facebook идентифицировать ваш сайт.'
+        ],
+    ],
+    'component' => [
+        'blog' => [
+            'name' => 'SEO блога',
+            'description' => 'Инъекция SEO полей для блога'
+        ],
+        'cms' => [
+            'name' => 'SEO CMS страниц',
+            'description' => 'Инъекция SEO полей для CMS страниц'
+        ],
+        'static' => [
+            'name' => 'SEO статических страниц',
+            'description' => 'Инъекция SEO полей для статических страниц'
+        ]
+    ]
+];
diff --git a/plugins/suresoftware/powerseo/lang/sv/lang.php b/plugins/suresoftware/powerseo/lang/sv/lang.php
new file mode 100644
index 000000000..135aec502
--- /dev/null
+++ b/plugins/suresoftware/powerseo/lang/sv/lang.php
@@ -0,0 +1,60 @@
+<?php return [
+    'plugin' => [
+        'name' => 'Kraft Sökmotoroptimering',
+        'description' => 'Erbjuder Kraft Sökmotoroptimering till October CMS Pages, Static Pages och Blog',
+    ],
+    'editor' => [
+        'meta_title' => 'Meta-titel för Kraft Sökmotoroptimering',
+        'meta_description' => 'Meta-beskrivning för Kraft Sökmotoroptimering',
+        'meta_keywords' => 'Meta-nyckelord',
+        'canonical_url' => 'Kanonisk URL',
+        'redirect_url' => 'Ompeka URL',
+        'robot_index' => 'Robotindexering',
+        'robot_follow' => 'Robotföljning',
+    ],
+    'settings' => [
+        'label' => 'Kraft Sökmotoroptimering',
+        'description' => 'Konfigurera Kraft Sökmotoroptimering',
+        'tab_settings' => [
+            'label' => 'Inställningar',
+            'site' => 'Använd sajtnamn i titeln',
+            'site_comment' => 'Slå på om du vill använda sajtnamnet i titel-taggen',
+            'sitename' => 'Sajtnamn',
+            'canonical' => 'Använd ursprunglig URL som kanonisk',
+            'canonical_comment' => 'om kanonisk URL inte finns används ursprunglig URL som kanonisk',
+            'sitename_comment_above' => 'Prefixera eller suffixera sajtnamnet i titeln',
+            'sitename_comment' => 'Sajtnamn | <seo/page/blog title>',
+            'sitename_placeholder' => 'Sajtnamn |',
+            'title_position' => 'Sajtnamn används som',
+            'title_position_comment' => 'välj om sajtnamnet ska placeras i början eller i slutet',
+            'title_position_prefix' => 'Prefix (i början)',
+            'title_position_suffix' => 'Suffix (i slutet)',
+            'other_tags' => 'Övriga metataggar',
+            'other_tags_comment_above' => 'Lägg in taggar du vill antända på alla sidor',
+            'other_tags_comment' => 'Lägg in övriga metataggar såsom author, meta viewport etc',
+        ],
+        'tab_og' => [
+            'label' => 'Open Graph',
+            'og' => 'Använd Open Graph(og)',
+            'og_comment' => 'Slå på Open Graph-taggar',
+            'sitename' => 'Sajtnamn för Open Graph',
+            'sitename_comment' => 'Namnet på din hemsida. Inte URL utan snarare "Min hemsida" än "minhemsida.se"',
+            'fb' => 'Facebooks App-Id',
+            'fb_comment' => 'Det unika ID som gör att Facebook kan känna igen din sajt',
+        ],
+    ],
+    'component' => [
+        'blog' => [
+            'name' => 'SEO Blogginlägg',
+            'description' => 'Används i blogginlägg',
+        ],
+        'cms' => [
+            'name' => 'SEO CMS-sida',
+            'description' => 'Används på CMS-sidor',
+        ],
+        'static' => [
+            'name' => 'SEO Sida',
+            'description' => 'Används på Sidor-sida',
+        ],
+    ],
+];
\ No newline at end of file
diff --git a/plugins/suresoftware/powerseo/lang/tr/lang.php b/plugins/suresoftware/powerseo/lang/tr/lang.php
new file mode 100644
index 000000000..d250f26e7
--- /dev/null
+++ b/plugins/suresoftware/powerseo/lang/tr/lang.php
@@ -0,0 +1,53 @@
+<?php
+
+return [
+    'plugin' => [
+        'name' => 'Güç SEO',
+        'description' => 'Sayfalar, Sabit Sayfalar ve Blog yazıları için SEO işlemleri yapar.'
+    ],
+    'settings' => [
+        'label' => 'Güç SEO',
+        'description' => 'Güç SEO Ayarları',
+        'tab_settings' => [
+            'label' => 'Ayarlar',
+            'site' => 'Başlık site adı kullan',
+            'site_comment' => 'Başlık tag\'ında site adı kullanmak istiyorsanız aktifleştirin',
+            'sitename' => 'Site adı',
+            'canonical' => 'Varsayılan URL\'leri Kanonik URL olarak kullan',
+            'canonical_comment' => 'Kanonik URL belirtilmemişse, varsayılan URL\'yi kanonik URL olarak kullan',
+            'sitename_comment_above' => 'Başlık etiketi site adına önek veya sonek',
+            'sitename_comment' => 'Site adı | <seo/sayfa/blog başlık>',
+            'sitename_placeholder' => 'Site adı |',
+            'title_position' => 'Site adını şurada görünecek',
+            'title_position_comment' => 'site adının nerede görüneceğini seçin örneğin başta veya sonda',
+            'title_position_prefix' => 'Önek (başında)',
+            'title_position_suffix' => 'Sonek (sonunda)',
+            'other_tags' => 'Diğer meta taglar',
+            'other_tags_comment_above' => 'Tüm sayfalarda görünmesini istediğiniz etiketleri ekleyin',
+            'other_tags_comment' => 'Meta author, meta viewport gibi diğer meta etiketleri ekleyin',
+        ],
+        'tab_og' => [
+            'label' => 'Open Graph',
+            'og' => 'Open Graph(og) Kullan',
+            'og_comment' => 'Open Graph(og) Taglarını Aktifleştir',
+            'sitename' => 'Open Graph İçin Site Adı',
+            'sitename_comment' => 'Websitenizin adı. URL girmeyin, site adını girin. (örneğin "güçseo.com" yazmayın, "Güç SEO" yazın.)',
+            'fb' => 'Facebook App Id\'si',
+            'fb_comment' => 'Facebook\'un sitenizi tanımasını sağlayan benzersiz kimlik.'
+        ],
+    ],
+    'component' => [
+        'blog' => [
+            'name' => 'SEO Blog Gönderisi',
+            'description' => 'Blog yazısına SEO alanlarını enjekte et'
+        ],
+        'cms' => [
+            'name' => 'SEO CMS Sayfası',
+            'description' => 'CMS Sayfasına SEO alanlarını enjekte et'
+        ],
+        'static' => [
+            'name' => 'SEO Sabit Sayfa',
+            'description' => 'Sabit Sayfaya SEO alanlarını enjekte et'
+        ]
+    ]
+];
diff --git a/plugins/suresoftware/powerseo/models/Settings.php b/plugins/suresoftware/powerseo/models/Settings.php
new file mode 100644
index 000000000..ff433fe42
--- /dev/null
+++ b/plugins/suresoftware/powerseo/models/Settings.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace SureSoftware\PowerSEO\models;
+
+use Model;
+
+class Settings extends Model
+{
+
+    public $implement = ['System.Behaviors.SettingsModel'];
+
+    // A unique code
+    public $settingsCode = 'suresoftware_powerseo_settings';
+
+    // Reference to field configuration
+    public $settingsFields = 'fields.yaml';
+
+    protected $cache = [];
+
+    public $attachOne = [
+        'og_image' => ['System\Models\File']
+    ];
+
+} 
\ No newline at end of file
diff --git a/plugins/suresoftware/powerseo/models/settings/_og_tags_description.htm b/plugins/suresoftware/powerseo/models/settings/_og_tags_description.htm
new file mode 100644
index 000000000..85806b57c
--- /dev/null
+++ b/plugins/suresoftware/powerseo/models/settings/_og_tags_description.htm
@@ -0,0 +1,13 @@
+<b>What is Open Graph?</b>
+<br/>
+The Open Graph protocol enables any web page to become a rich object in a social graph.
+<br/>
+<br/>
+Currently included Open Graph tags are(other tags will be added soon):
+<ul>
+    <li>fb:app_id</li>
+    <li>og:site_name</li>
+    <li>og:title</li>
+    <li>og:url</li>
+    <li>og:description</li>
+</ul>
\ No newline at end of file
diff --git a/plugins/suresoftware/powerseo/models/settings/_other_tags_hint.htm b/plugins/suresoftware/powerseo/models/settings/_other_tags_hint.htm
new file mode 100644
index 000000000..79ad8331d
--- /dev/null
+++ b/plugins/suresoftware/powerseo/models/settings/_other_tags_hint.htm
@@ -0,0 +1,2 @@
+In other meta tags you can insert meta tags that is comman to all pages.
+<br>you can insert meta tags like meta author, meta view port or any tag that you want to place in head section.
\ No newline at end of file
diff --git a/plugins/suresoftware/powerseo/models/settings/fields.yaml b/plugins/suresoftware/powerseo/models/settings/fields.yaml
new file mode 100644
index 000000000..ed3679ebd
--- /dev/null
+++ b/plugins/suresoftware/powerseo/models/settings/fields.yaml
@@ -0,0 +1,76 @@
+tabs:
+  fields:
+    enable_title:
+      label: suresoftware.powerseo::lang.settings.tab_settings.site
+      comment: suresoftware.powerseo::lang.settings.tab_settings.site_comment
+      type: switch
+      span: left
+      tab: suresoftware.powerseo::lang.settings.tab_settings.label
+
+    enable_canonical_url:
+      label: suresoftware.powerseo::lang.settings.tab_settings.canonical
+      type: switch
+      comment: suresoftware.powerseo::lang.settings.tab_settings.canonical_comment
+      tab: suresoftware.powerseo::lang.settings.tab_settings.label
+      span: right
+
+    title:
+      label: suresoftware.powerseo::lang.settings.tab_settings.sitename
+      commentAbove: suresoftware.powerseo::lang.settings.tab_settings.sitename_comment_above
+      span: left
+      comment: suresoftware.powerseo::lang.settings.tab_settings.sitename_comment
+      tab: suresoftware.powerseo::lang.settings.tab_settings.label
+      placeholder: suresoftware.powerseo::lang.settings.tab_settings.sitename_placeholder
+
+    title_position:
+      label: suresoftware.powerseo::lang.settings.tab_settings.title_position
+      type: radio
+      span: right
+      tab: suresoftware.powerseo::lang.settings.tab_settings.label
+      comment: suresoftware.powerseo::lang.settings.tab_settings.title_position_comment
+      options:
+        prefix: suresoftware.powerseo::lang.settings.tab_settings.title_position_prefix
+        suffix: suresoftware.powerseo::lang.settings.tab_settings.title_position_suffix
+
+    content:
+      type: hint
+      path: $/suresoftware/powerseo/models/settings/_other_tags_hint.htm
+      tab: suresoftware.powerseo::lang.settings.tab_settings.label
+
+    other_tags:
+      label: suresoftware.powerseo::lang.settings.tab_settings.other_tags
+      type: codeeditor
+      tab: suresoftware.powerseo::lang.settings.tab_settings.label
+      commentAbove: suresoftware.powerseo::lang.settings.tab_settings.other_tags_comment_above
+      comment: suresoftware.powerseo::lang.settings.tab_settings.other_tags_comment
+
+    og_tags_description:
+      type: hint
+      path: $/suresoftware/powerseo/models/settings/_og_tags_description.htm
+      tab: suresoftware.powerseo::lang.settings.tab_og.label
+
+    enable_og_tags:
+      label: suresoftware.powerseo::lang.settings.tab_og.og
+      type: switch
+      comment: suresoftware.powerseo::lang.settings.tab_og.og_comment
+      tab: suresoftware.powerseo::lang.settings.tab_og.label
+
+    og_sitename:
+      label: suresoftware.powerseo::lang.settings.tab_og.sitename
+      type: text
+      comment: suresoftware.powerseo::lang.settings.tab_og.sitename_comment
+      tab: suresoftware.powerseo::lang.settings.tab_og.label
+
+    og_fb_appid:
+      label: suresoftware.powerseo::lang.settings.tab_og.fb
+      comment: suresoftware.powerseo::lang.settings.tab_og.fb_comment
+      type: text
+      span: left
+      tab: suresoftware.powerseo::lang.settings.tab_og.label
+
+
+
+
+
+
+
diff --git a/plugins/suresoftware/powerseo/updates/blogposts_fix.php b/plugins/suresoftware/powerseo/updates/blogposts_fix.php
new file mode 100644
index 000000000..e912b5895
--- /dev/null
+++ b/plugins/suresoftware/powerseo/updates/blogposts_fix.php
@@ -0,0 +1,55 @@
+<?php namespace SureSoftware\PowerSEO\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+use System\Classes\PluginManager;
+
+class BlogpostsFix extends Migration
+{
+
+    public function up()
+    {
+        if (PluginManager::instance()->hasPlugin('RainLab.Blog')) {
+            Schema::table('rainlab_blog_posts', function ($table) {
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_title')) {
+                    $table->string('powerseo_title')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_description')) {
+                    $table->string('powerseo_description')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_keywords')) {
+                    $table->string('powerseo_keywords')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_canonical_url')) {
+                    $table->string('powerseo_canonical_url')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_redirect_url')) {
+                    $table->string('powerseo_redirect_url')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_robot_index')) {
+                    $table->string('powerseo_robot_index')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_robot_follow')) {
+                    $table->string('powerseo_robot_follow')->nullable();
+                }
+            });
+        }
+    }
+
+    public function down()
+    {
+        if (PluginManager::instance()->hasPlugin('RainLab.Blog')) {
+            Schema::table('rainlab_blog_posts', function ($table) {
+                $table->dropColumn('powerseo_title');
+                $table->dropColumn('powerseo_description');
+                $table->dropColumn('powerseo_keywords');
+                $table->dropColumn('powerseo_canonical_url');
+                $table->dropColumn('powerseo_redirect_url');
+                $table->dropColumn('powerseo_robot_index');
+                $table->dropColumn('powerseo_robot_follow');
+            });
+        }
+
+    }
+
+}
diff --git a/plugins/suresoftware/powerseo/updates/create_blog_posts_table.php b/plugins/suresoftware/powerseo/updates/create_blog_posts_table.php
new file mode 100644
index 000000000..c4aad89fc
--- /dev/null
+++ b/plugins/suresoftware/powerseo/updates/create_blog_posts_table.php
@@ -0,0 +1,43 @@
+<?php namespace SureSoftware\PowerSEO\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+use System\Classes\PluginManager;
+
+class CreateBlogPostsTable extends Migration
+{
+
+    public function up()
+    {
+        if (PluginManager::instance()->hasPlugin('RainLab.Blog')) {
+            Schema::table('rainlab_blog_posts', function ($table) {
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_title')) {
+                    $table->string('powerseo_title')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_description')) {
+                    $table->string('powerseo_description')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_keywords')) {
+                    $table->string('powerseo_keywords')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_canonical_url')) {
+                    $table->string('powerseo_canonical_url')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_redirect_url')) {
+                    $table->string('powerseo_redirect_url')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_robot_index')) {
+                    $table->string('powerseo_robot_index')->nullable();
+                }
+                if (!Schema::hasColumn('rainlab_blog_posts', 'powerseo_robot_follow')) {
+                    $table->string('powerseo_robot_follow')->nullable();
+                }
+            });
+        }
+    }
+
+    public function down()
+    {
+        //this migration is cleaned up by create_blog_posts_table.php
+    }
+}
diff --git a/plugins/suresoftware/powerseo/updates/migrate_blogpost_seo.php b/plugins/suresoftware/powerseo/updates/migrate_blogpost_seo.php
new file mode 100644
index 000000000..8a606367f
--- /dev/null
+++ b/plugins/suresoftware/powerseo/updates/migrate_blogpost_seo.php
@@ -0,0 +1,36 @@
+<?php namespace SureSoftware\PowerSEO\Updates;
+
+use Illuminate\Support\Facades\DB;
+use Schema;
+use October\Rain\Database\Updates\Migration;
+use System\Classes\PluginManager;
+
+class MigrateSettings extends Migration
+{
+
+    public function up()
+    {
+
+        if (PluginManager::instance()->hasPlugin('RainLab.Blog') &&
+            PluginManager::instance()->hasPlugin('anandpatel.seoextension')) {
+
+            $blogs = \RainLab\Blog\Models\Post::get();
+
+            foreach($blogs as $blog){
+                $blog->powerseo_title = $blog->seo_title;
+                $blog->powerseo_description = $blog->seo_description;
+                $blog->powerseo_keywords = $blog->seo_keywords;
+                $blog->powerseo_canonical_url = $blog->canonical_url;
+                $blog->powerseo_redirect_url = $blog->redirect_url;
+                $blog->powerseo_robot_index = $blog->robot_index;
+                $blog->powerseo_robot_follow = $blog->robot_follow;
+                $blog->save();
+            }
+        }
+    }
+
+    public function down()
+    {
+        //do nothing, if rolling back there is no need to remove the settings here
+    }
+}
diff --git a/plugins/suresoftware/powerseo/updates/migrate_settings.php b/plugins/suresoftware/powerseo/updates/migrate_settings.php
new file mode 100644
index 000000000..775226e0f
--- /dev/null
+++ b/plugins/suresoftware/powerseo/updates/migrate_settings.php
@@ -0,0 +1,54 @@
+<?php namespace SureSoftware\PowerSEO\Updates;
+
+use Illuminate\Support\Facades\DB;
+use Schema;
+use October\Rain\Database\Updates\Migration;
+use System\Classes\PluginManager;
+
+class MigrateBlogpostSeo extends Migration
+{
+
+    public function up()
+    {
+        if (PluginManager::instance()->hasPlugin('RainLab.Blog') &&
+            PluginManager::instance()->hasPlugin('AnandPatel.SeoExtension')) {
+            Schema::table('rainlab_blog_posts', function ($table) {
+                $table->renameColumn('seo_title', 'powerseo_title');
+                $table->renameColumn('seo_description', 'powerseo_description');
+                $table->renameColumn('seo_keywords', 'powerseo_keywords');
+                $table->renameColumn('canonical_url', 'powerseo_canonical_url');
+                $table->renameColumn('redirect_url', 'powerseo_redirect_url');
+                $table->renameColumn('robot_index', 'powerseo_robot_index');
+                $table->renameColumn('robot_follow', 'powerseo_robot_follow');
+            });
+
+            //add in old columns to prevent anandpatel.seoextension having a seizure on uninstall
+            Schema::table('rainlab_blog_posts', function ($table) {
+                $table->string('seo_title')->nullable();
+                $table->string('seo_description')->nullable();
+                $table->string('seo_keywords')->nullable();
+                $table->string('canonical_url')->nullable();
+                $table->string('redirect_url')->nullable();
+                $table->string('robot_index')->nullable();
+                $table->string('robot_follow')->nullable();
+            });
+        }
+    }
+
+    public function down()
+    {
+        if (PluginManager::instance()->hasPlugin('RainLab.Blog') &&
+            PluginManager::instance()->hasPlugin('AnandPatel.SeoExtension')) {
+
+            Schema::table('rainlab_blog_posts', function ($table) {
+                $table->renameColumn('powerseo_seo_title', 'seo_title');
+                $table->renameColumn('powerseo_seo_description', 'seo_description');
+                $table->renameColumn('powerseo_seo_keywords', 'seo_keywords');
+                $table->renameColumn('powerseo_canonical_url', 'canonical_url');
+                $table->renameColumn('powerseo_redirect_url', 'redirect_url');
+                $table->renameColumn('powerseo_robot_index', 'robot_index');
+                $table->renameColumn('powerseo_robot_follow', 'robot_follow');
+            });
+        }
+    }
+}
diff --git a/plugins/suresoftware/powerseo/updates/version.yaml b/plugins/suresoftware/powerseo/updates/version.yaml
new file mode 100644
index 000000000..5cc61b0e0
--- /dev/null
+++ b/plugins/suresoftware/powerseo/updates/version.yaml
@@ -0,0 +1,33 @@
+1.0.1:
+      - First version of Seo Extension
+      - create_blog_posts_table.php
+1.0.2:
+      - Bug fixes
+1.0.3:
+      - Backend Settings added to configure meta tags & Open Graph tags added
+1.0.4:
+      - Code clean up and change path naming in settings model
+1.0.5:
+      - Add Turkish, Russian, cs_CZ locale
+1.0.6:
+      - Fix issue of SEO Settings Errors
+2.0.0:
+      - Changed plugin to PowerSEO, fixed server errors and included latest changes
+      - migrate_settings.php
+2.0.1:
+      - Prefixed SEO column names to ensure uniqueness and prevent plugin conflicts
+      - migrate_blogpost_seo.php
+2.0.2:
+      - Fixed issue with fresh install on non-migrated sites
+      - blogposts_fix.php
+2.0.3:
+      - Fixed bug in SeoBlogPost robots not populating
+2.0.4:
+      - Fixed bug with fields showing up in the static pages repeater
+2.0.5:
+      - Fixed bug the TranslatableModel check not working for default locale URLs
+2.1.1:
+      - Added feature to show the blog "Featured Image" on social media (using og tags)
+      - Fixed bug with blog post meta titles not being set correctly
+2.1.2: 
+      - Fixes bug with fields repeating in Rainlab.Pages repeatable sections
diff --git a/server.php b/server.php
index b0f8cf081..c42e5946c 100644
--- a/server.php
+++ b/server.php
@@ -11,7 +11,7 @@ $uri = urldecode(
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
 // built-in PHP web server. This provides a convenient way to test a Laravel
 // application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/'.$uri)) {
+if ($uri !== '/' and file_exists(__DIR__.'/'.$uri)) {
     return false;
 }
 require_once __DIR__.'/index.php';
diff --git a/themes/modern/content/static-pages-en/about.htm b/themes/modern/content/static-pages-en/about.htm
new file mode 100644
index 000000000..6650989c8
--- /dev/null
+++ b/themes/modern/content/static-pages-en/about.htm
@@ -0,0 +1,27 @@
+[viewBag]
+title = "About us"
+meta_title = "About us"
+meta_description = "english"
+meta_keywords = "en en en"
+==
+<h3><strong>Информационный портал ORIENT</strong></h3>
+
+<p class="about__para">ORIENT – ваше мнение ценно</p>
+
+<p class="about__para">Сайт ORIENT.tm – новый игрок на информационном рынке Туркменистана.</p>
+
+<p class="about__para">Индивидуальное предприятие «Media Turkmen» – первое негосударственное информационное агентство в Туркменистане, зарегистрированное в официальных органах страны в апреле 2017 года. Оно включает в себя два подразделения, работающие под одним брендом: сайт ORIENT и продакшн-студию, которые создают новостной, фото, видео и рекламный контент.</p>
+
+<p class="about__para">Команда ORIENT – это, в основном, молодые журналисты, выпускники туркменских и зарубежных вузов. Информационное агентство «Media Turkmen» также привлекает к сотрудничеству опытных журналистов, которые проводят мастер-классы и семинары для повышения квалификации команды.</p>
+
+<p class="about__para">В 2018 году ORIENT стал Генеральным медиа-партнером Чемпионата мира по тяжелой атлетике, прошедшего в Ашхабаде, и крупнейшего в регионе профильного форума «Нефть и Газ Туркменистана 2018».</p>
+
+<p class="about__para">В этом году ORIENT стал Генеральным медиа-партнером 10-го Международного Газового конгресса TGC-2019 и в мае месяце были публикации об этом форуме, участниках и спонсорах.</p>
+
+<p class="about__para">12 июля 2019 года ORIENT подписал соглашение с изданием China Daily Multimedia Co., Ltd., о сотрудничестве по взаимному обмену новостями и продвижению их на своих площадках, а также осуществлению совместных медиа проектов.</p>
+
+<p class="about__para">15 августа 2019 года ORIENT подписал Меморандум о сотрудничестве в сфере обмена новостными материалами с Австрийско-туркменским обществом.</p>
+
+<p class="about__para">11 ноября 2019 года ORIENT подписал Меморандум о сотрудничестве в сфере обмена новостными материалами с журналом «Международная жизнь» Министерства иностранных дел Российской Федерации.</p>
+
+<p class="about__para">У сайта имеются свои страницы в социальных сетях Facebook, Twitter, YouTube, LinkedIn, Instagram, Telegramm, Vkontakte, Odnoklassniki – где также есть возможность обсуждения читателями тем и статей.</p>
\ No newline at end of file
diff --git a/themes/modern/content/static-pages-en/contact.htm b/themes/modern/content/static-pages-en/contact.htm
new file mode 100644
index 000000000..eccd4e2d6
--- /dev/null
+++ b/themes/modern/content/static-pages-en/contact.htm
@@ -0,0 +1,3 @@
+[viewBag]
+title = "Contact us"
+==
\ No newline at end of file
diff --git a/themes/modern/content/static-pages-en/policy-privacy.htm b/themes/modern/content/static-pages-en/policy-privacy.htm
new file mode 100644
index 000000000..d33e7cbdc
--- /dev/null
+++ b/themes/modern/content/static-pages-en/policy-privacy.htm
@@ -0,0 +1,3 @@
+[viewBag]
+title = "Privacy policy"
+==
\ No newline at end of file
diff --git a/themes/modern/content/static-pages/about.htm b/themes/modern/content/static-pages/about.htm
index 0edadbf3c..ff7cd426f 100644
--- a/themes/modern/content/static-pages/about.htm
+++ b/themes/modern/content/static-pages/about.htm
@@ -1,9 +1,14 @@
 [viewBag]
 title = "О нас"
-url = "/about-us"
+url = "/o-nas"
 layout = "static"
 is_hidden = 0
 navigation_hidden = 0
+meta_title = "О нас"
+meta_description = "russian"
+meta_keywords = "ru ru ru"
+robot_index = "index"
+robot_follow = "nofollow"
 ==
 <h3><strong>Информационный портал ORIENT</strong></h3>
 
diff --git a/themes/modern/layouts/contacts.htm b/themes/modern/layouts/contacts.htm
index 9dd77bd28..c72dcb95f 100644
--- a/themes/modern/layouts/contacts.htm
+++ b/themes/modern/layouts/contacts.htm
@@ -1,15 +1,19 @@
 [localePicker]
 forceUrl = 1
-
+[SeoStaticPage]
 [staticPage]
 useContent = 1
 default = 0
 ==
 <!DOCTYPE html>
 <html lang="{{activeLocale}}">
-{% partial 'head' %}
+<head>
+    {% component 'SeoStaticPage' %}
+    {% partial 'head' %}
+</head>
 <body>
 {% partial 'header' %}
+
 <section class="main mr-top-bot">
     <div class="auto__container">
         <div class="main__inner contact">
diff --git a/themes/modern/layouts/master.htm b/themes/modern/layouts/master.htm
index 35573623d..a4d6183d0 100644
--- a/themes/modern/layouts/master.htm
+++ b/themes/modern/layouts/master.htm
@@ -1,9 +1,14 @@
 [localePicker]
 forceUrl = 1
+
+[SeoCmsPage]
 ==
 <!DOCTYPE html>
 <html lang="{{activeLocale}}">
-{% partial 'head' %}
+<head>
+    {% component 'SeoCmsPage' %}
+    {% partial 'head' %}
+</head>
 <body>
 {% partial 'header' %}
 {% page %}
diff --git a/themes/modern/layouts/static.htm b/themes/modern/layouts/static.htm
index e26ca5ea4..a135890a3 100644
--- a/themes/modern/layouts/static.htm
+++ b/themes/modern/layouts/static.htm
@@ -1,13 +1,17 @@
 [localePicker]
 forceUrl = 1
-
+[SeoStaticPage]
 [staticPage]
 useContent = 1
 default = 0
+
 ==
 <!DOCTYPE html>
 <html lang="{{activeLocale}}">
-{% partial 'head' %}
+<head>
+    {% component 'SeoStaticPage' %}
+    {% partial 'head' %}
+</head>
 <body>
 {% partial 'header' %}
 <section class="main mr-top-bot">
diff --git a/themes/modern/meta/menus/top-menu.yaml b/themes/modern/meta/menus/top-menu.yaml
new file mode 100644
index 000000000..d7d75a678
--- /dev/null
+++ b/themes/modern/meta/menus/top-menu.yaml
@@ -0,0 +1,49 @@
+items:
+    -
+        title: Главная
+        nesting: null
+        type: url
+        url: /
+        code: ''
+        reference: null
+        cmsPage: null
+        replace: null
+        viewBag:
+            locale:
+                en:
+                    title: Home
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
+    -
+        title: Рубрики
+        nesting: null
+        type: header
+        url: null
+        code: ''
+        reference: null
+        cmsPage: null
+        replace: null
+        viewBag:
+            locale:
+                en:
+                    title: Categories
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
+    -
+        title: 'Static Pages(About and Contact)'
+        type: all-static-pages
+        code: ''
+        replace: 1
+        viewBag:
+            locale:
+                en:
+                    title: ''
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
+name: 'top menu'
diff --git a/themes/modern/pages/category.htm b/themes/modern/pages/category.htm
index e7bd58663..b048566e9 100644
--- a/themes/modern/pages/category.htm
+++ b/themes/modern/pages/category.htm
@@ -2,6 +2,8 @@ title = "Рубрика"
 url = "/category/:slug"
 layout = "master"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
 [blogPosts]
 pageNumber = "{{ :page }}"
diff --git a/themes/modern/pages/index.htm b/themes/modern/pages/index.htm
index 5c3c3630b..092be91a4 100644
--- a/themes/modern/pages/index.htm
+++ b/themes/modern/pages/index.htm
@@ -2,6 +2,8 @@ title = "Главная"
 url = "/"
 layout = "master"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
 [viewBag]
 localeTitle[en] = "Home"
@@ -19,4 +21,4 @@ localeTitle[en] = "Home"
         field: document.getElementById('calendar')
     });
 </script>
-{% endput %}
+{% endput %}
\ No newline at end of file
diff --git a/themes/modern/partials/head.htm b/themes/modern/partials/head.htm
index 8c89c4a27..274c38d51 100644
--- a/themes/modern/partials/head.htm
+++ b/themes/modern/partials/head.htm
@@ -1,18 +1,10 @@
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="preconnect" href="https://fonts.gstatic.com">
-    <link
-        href="https://fonts.googleapis.com/css2?family=Oswald:wght@600&family=Roboto:wght@300;400;500;700;900&display=swap"
-        rel="stylesheet">
-    <link rel="preconnect" href="https://fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700;900&display=swap" rel="stylesheet">
-    <meta name="title" content="{{ this.page.meta_title | default(this.page.title)}}">
-    <meta name="description" content="{{ this.page.meta_description }}">
-    <link rel="canonical" href="{{ url_current() | lower }}" />
-    <meta name="keywords" content="{{ this.page.meta_keywords }}">
-    <title>{{ this.page.meta_title | default(this.page.title)}}</title>
-    {% styles %}
-    <link href="{{ ['assets/css/main.css']|theme }}" rel="stylesheet">
-</head>
+[viewBag]
+==
+<link rel="preconnect" href="https://fonts.gstatic.com">
+<link
+    href="https://fonts.googleapis.com/css2?family=Oswald:wght@600&family=Roboto:wght@300;400;500;700;900&display=swap"
+    rel="stylesheet">
+<link rel="preconnect" href="https://fonts.gstatic.com">
+<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700;900&display=swap" rel="stylesheet">
+{% styles %}
+<link href="{{ ['assets/css/main.css']|theme }}" rel="stylesheet">