From e7ebbb2cfb16e6b16917ec11519e9a694230c179 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 08:58:17 +0800
Subject: [PATCH 01/30] Enforce PSR-12 on Winter CMS core files

This commit changes the PHP code sniffer to use PSR-12 rules, as that ruleset will pick up a lot of the code style issues being flagged in PRs recently.

In order to set the baseline, all current core files have been reformatted to fit the ruleset.
---
 bootstrap/app.php                             |   2 +-
 bootstrap/autoload.php                        |   6 +-
 config/app.php                                |   2 +-
 modules/backend/ServiceProvider.php           |   4 +-
 modules/backend/behaviors/FormController.php  |  15 +-
 .../behaviors/ImportExportController.php      |  49 ++---
 modules/backend/behaviors/ListController.php  |  16 +-
 .../backend/behaviors/RelationController.php  | 151 ++++++-------
 .../backend/behaviors/ReorderController.php   |  27 +--
 .../behaviors/UserPreferencesModel.php        |   6 +-
 .../TranscodeFilter.php                       |   4 +-
 .../partials/_export_columns.php              |   4 +-
 .../partials/_manage_pivot.php                |   2 +-
 .../partials/_pivot_form.php                  |   4 +-
 modules/backend/classes/AuthManager.php       |   9 +-
 modules/backend/classes/BackendController.php |  34 +--
 modules/backend/classes/Controller.php        |  60 ++----
 .../backend/classes/ControllerBehavior.php    |   4 +-
 modules/backend/classes/FilterScope.php       |   8 +-
 modules/backend/classes/FormField.php         |  35 ++--
 modules/backend/classes/FormTabs.php          |   4 +-
 modules/backend/classes/FormWidgetBase.php    |   5 +-
 modules/backend/classes/ListColumn.php        |  11 +-
 modules/backend/classes/MainMenuItem.php      |   4 +-
 modules/backend/classes/NavigationManager.php |   4 +-
 modules/backend/classes/QuickActionItem.php   |   4 +-
 modules/backend/classes/ReportWidgetBase.php  |   4 +-
 modules/backend/classes/SideMenuItem.php      |   4 +-
 modules/backend/classes/Skin.php              |   6 +-
 modules/backend/classes/WidgetBase.php        |   6 +-
 modules/backend/classes/WidgetManager.php     |   4 +-
 modules/backend/console/CreateController.php  |   4 +-
 modules/backend/console/CreateFormWidget.php  |   4 +-
 .../backend/console/CreateReportWidget.php    |   4 +-
 modules/backend/console/WinterPasswd.php      |   4 +-
 modules/backend/controllers/AccessLogs.php    |   4 +-
 modules/backend/controllers/Auth.php          |   4 +-
 modules/backend/controllers/Files.php         |  10 +-
 modules/backend/controllers/Index.php         |   4 +-
 modules/backend/controllers/Media.php         |   4 +-
 modules/backend/controllers/Preferences.php   |   4 +-
 modules/backend/controllers/UserGroups.php    |   4 +-
 modules/backend/controllers/UserRoles.php     |   4 +-
 modules/backend/controllers/Users.php         |   4 +-
 modules/backend/controllers/index/index.php   |   2 +-
 modules/backend/controllers/media/index.php   |   2 +-
 .../backend/controllers/preferences/index.php |   2 +-
 .../backend/controllers/usergroups/create.php |   2 +-
 .../backend/controllers/usergroups/update.php |   2 +-
 .../backend/controllers/userroles/create.php  |   2 +-
 .../backend/controllers/userroles/update.php  |   2 +-
 modules/backend/controllers/users/create.php  |   2 +-
 .../backend/controllers/users/myaccount.php   |   2 +-
 modules/backend/controllers/users/update.php  |   2 +-
 ...017_10_01_000010_Db_Backend_User_Roles.php |   9 +-
 .../backend/database/seeds/DatabaseSeeder.php |   6 +-
 .../backend/database/seeds/SeedSetupAdmin.php |   4 +-
 modules/backend/facades/Backend.php           |   4 +-
 modules/backend/facades/BackendAuth.php       |   4 +-
 modules/backend/facades/BackendMenu.php       |   4 +-
 modules/backend/formwidgets/CodeEditor.php    |   4 +-
 modules/backend/formwidgets/ColorPicker.php   |   4 +-
 modules/backend/formwidgets/DataTable.php     |   4 +-
 modules/backend/formwidgets/DatePicker.php    |  10 +-
 modules/backend/formwidgets/FileUpload.php    |  21 +-
 modules/backend/formwidgets/IconPicker.php    |   4 +-
 .../backend/formwidgets/MarkdownEditor.php    |   4 +-
 modules/backend/formwidgets/MediaFinder.php   |   7 +-
 modules/backend/formwidgets/NestedForm.php    |   4 +-
 .../backend/formwidgets/PermissionEditor.php  |  13 +-
 modules/backend/formwidgets/RecordFinder.php  |  16 +-
 modules/backend/formwidgets/Relation.php      |   3 +-
 modules/backend/formwidgets/Repeater.php      |  14 +-
 modules/backend/formwidgets/RichEditor.php    |   8 +-
 modules/backend/formwidgets/Sensitive.php     |   4 +-
 modules/backend/formwidgets/TagList.php       |   2 +-
 .../codeeditor/partials/_codeeditor.php       |   2 +-
 .../relation/partials/_relation.php           |   2 +-
 .../repeater/partials/_repeater.php           |   8 +-
 .../repeater/partials/_repeater_item.php      |   2 +-
 .../richeditor/partials/_richeditor.php       |   2 +-
 modules/backend/helpers/Backend.php           |  18 +-
 .../helpers/exception/DecompileException.php  |   4 +-
 modules/backend/lang/be/lang.php              |  10 +-
 modules/backend/lang/ca/lang.php              |  10 +-
 modules/backend/lang/cs/lang.php              |  10 +-
 modules/backend/lang/da/lang.php              |  10 +-
 modules/backend/lang/el/lang.php              |  11 +-
 modules/backend/lang/et/lang.php              |  10 +-
 modules/backend/lang/fa/lang.php              |  11 +-
 modules/backend/lang/fi/lang.php              |  10 +-
 modules/backend/lang/fr/lang.php              |  10 +-
 modules/backend/lang/hu/lang.php              |  10 +-
 modules/backend/lang/it/lang.php              |  10 +-
 modules/backend/lang/ja/lang.php              |   2 +-
 modules/backend/lang/kr/lang.php              |  10 +-
 modules/backend/lang/lt/lang.php              |  10 +-
 modules/backend/lang/lv/lang.php              |   6 +-
 modules/backend/lang/nb-no/lang.php           |  10 +-
 modules/backend/lang/pl/lang.php              |   4 +-
 modules/backend/lang/pt-br/lang.php           |  10 +-
 modules/backend/lang/pt-pt/lang.php           |  10 +-
 modules/backend/lang/sk/lang.php              |  10 +-
 modules/backend/lang/tr/lang.php              |  10 +-
 modules/backend/lang/vn/lang.php              |  10 +-
 modules/backend/lang/zh-cn/lang.php           |  10 +-
 modules/backend/layouts/_custom_styles.php    |   2 +
 modules/backend/layouts/_head.php             |   2 +-
 modules/backend/layouts/_hint.php             |   2 +-
 modules/backend/layouts/_sidenav.php          |   2 +-
 modules/backend/layouts/auth.php              |   2 +-
 modules/backend/models/AccessLog.php          |   6 +-
 modules/backend/models/BrandSetting.php       |   9 +-
 modules/backend/models/EditorSetting.php      |  11 +-
 modules/backend/models/ExportModel.php        |  10 +-
 modules/backend/models/ImportModel.php        |  10 +-
 modules/backend/models/Preference.php         |  10 +-
 modules/backend/models/User.php               |  11 +-
 modules/backend/models/UserGroup.php          |   4 +-
 modules/backend/models/UserPreference.php     |   4 +-
 modules/backend/models/UserRole.php           |  10 +-
 modules/backend/models/UserThrottle.php       |   4 +-
 modules/backend/reportwidgets/Welcome.php     |   7 +-
 .../welcome/partials/_widget.php              |   4 +-
 modules/backend/skins/Standard.php            |   7 +-
 .../tests/formwidgets/CheckboxTest.php        |   4 +-
 .../tests/helpers/BackendHelperTest.php       |   4 +-
 .../backend/tests/models/ExportModelTest.php  |   5 +-
 .../backend/tests/models/ImportModelTest.php  |   9 +-
 .../backend/tests/traits/WidgetMakerTest.php  |   6 +-
 .../tests/widgets/FilterWidgetTest.php        |  18 +-
 modules/backend/tests/widgets/FormTest.php    |  22 +-
 modules/backend/tests/widgets/ListsTest.php   |  18 +-
 modules/backend/traits/CollapsableWidget.php  |  12 +-
 modules/backend/traits/ErrorMaker.php         |   4 +-
 modules/backend/traits/FormModelSaver.php     |  10 +-
 modules/backend/traits/FormModelWidget.php    |   7 +-
 .../backend/traits/InspectableContainer.php   |   9 +-
 modules/backend/traits/PreferenceMaker.php    |   4 +-
 modules/backend/traits/SearchableWidget.php   |   4 +-
 modules/backend/traits/SelectableWidget.php   |   4 +-
 modules/backend/traits/SessionMaker.php       |   4 +-
 modules/backend/traits/UploadableWidget.php   |  12 +-
 modules/backend/traits/WidgetMaker.php        |   7 +-
 modules/backend/widgets/Filter.php            |  94 ++-------
 modules/backend/widgets/Form.php              |  57 ++---
 modules/backend/widgets/Lists.php             | 152 +++++---------
 modules/backend/widgets/MediaManager.php      |  43 ++--
 modules/backend/widgets/ReportContainer.php   |  24 +--
 modules/backend/widgets/Search.php            |   4 +-
 modules/backend/widgets/Table.php             |   4 +-
 modules/backend/widgets/Toolbar.php           |   7 +-
 .../widgets/filter/partials/_scope_text.php   |   2 +-
 .../form/partials/_field-container.php        |   2 +-
 .../form/partials/_field_checkboxlist.php     |   4 +-
 .../widgets/form/partials/_field_dropdown.php |   2 +-
 .../form/partials/_section-container.php      |   2 +-
 .../widgets/form/partials/_section.php        |   4 +-
 .../widgets/lists/partials/_list_body_row.php |   4 +-
 .../widgets/lists/partials/_list_head_row.php |   2 +-
 .../lists/partials/_list_pagination.php       |   4 +-
 .../partials/_list_pagination_simple.php      |   4 +-
 .../widgets/lists/partials/_setup_form.php    |   4 +-
 .../mediamanager/partials/_generic-list.php   |   2 +-
 .../partials/_image-crop-popup-body.php       |   2 +-
 .../mediamanager/partials/_popup-body.php     |   2 +-
 .../mediamanager/partials/_rename-form.php    |   2 +-
 .../reportcontainer/partials/_widget.php      |   2 +-
 .../widgets/table/ClientMemoryDataSource.php  |   4 +-
 .../backend/widgets/table/DataSourceBase.php  |   4 +-
 .../widgets/table/ServerEventDataSource.php   |   4 +-
 modules/cms/ServiceProvider.php               |  10 +-
 modules/cms/classes/Asset.php                 |  14 +-
 modules/cms/classes/AutoDatasource.php        |   7 +-
 modules/cms/classes/CmsCompoundObject.php     |  14 +-
 modules/cms/classes/CmsController.php         |   4 +-
 modules/cms/classes/CmsException.php          |   7 +-
 modules/cms/classes/CmsObject.php             |  27 +--
 modules/cms/classes/CmsObjectCollection.php   |   4 +-
 modules/cms/classes/CodeBase.php              |   4 +-
 modules/cms/classes/CodeParser.php            |  35 ++--
 modules/cms/classes/ComponentBase.php         |   9 +-
 modules/cms/classes/ComponentHelpers.php      |   7 +-
 modules/cms/classes/ComponentManager.php      |   4 +-
 modules/cms/classes/ComponentPartial.php      |  14 +-
 modules/cms/classes/Content.php               |   4 +-
 modules/cms/classes/Controller.php            | 137 +++++-------
 modules/cms/classes/Layout.php                |   4 +-
 modules/cms/classes/LayoutCode.php            |   4 +-
 modules/cms/classes/MediaLibrary.php          |   4 +-
 modules/cms/classes/MediaLibraryItem.php      |   4 +-
 modules/cms/classes/MediaViewHelper.php       |   8 +-
 modules/cms/classes/Meta.php                  |   4 +-
 modules/cms/classes/ObjectMemoryCache.php     |   4 +-
 modules/cms/classes/Page.php                  |   8 +-
 modules/cms/classes/PageCode.php              |   4 +-
 modules/cms/classes/Partial.php               |   4 +-
 modules/cms/classes/PartialCode.php           |   4 +-
 modules/cms/classes/PartialStack.php          |   4 +-
 modules/cms/classes/Router.php                |  12 +-
 modules/cms/classes/Theme.php                 |  15 +-
 modules/cms/classes/ThemeManager.php          |   4 +-
 modules/cms/components/Resources.php          |  22 +-
 modules/cms/components/SoftComponent.php      |   4 +-
 modules/cms/components/UnknownComponent.php   |   4 +-
 modules/cms/components/ViewBag.php            |   4 +-
 modules/cms/console/CreateComponent.php       |   4 +-
 modules/cms/console/CreateTheme.php           |   4 +-
 modules/cms/console/ThemeInstall.php          |   8 +-
 modules/cms/console/ThemeList.php             |   8 +-
 modules/cms/console/ThemeRemove.php           |   4 +-
 modules/cms/console/ThemeSync.php             |  11 +-
 modules/cms/console/ThemeUse.php              |   4 +-
 modules/cms/contracts/CmsObject.php           |   4 +-
 modules/cms/controllers/Index.php             |  24 +--
 modules/cms/controllers/Media.php             |   4 +-
 modules/cms/controllers/ThemeLogs.php         |   7 +-
 modules/cms/controllers/ThemeOptions.php      |   9 +-
 modules/cms/controllers/Themes.php            |  41 ++--
 .../index/_concurrency_resolve_form.php       |   2 +-
 modules/cms/controllers/media/index.php       |   2 +-
 .../controllers/themelogs/_field_content.php  |   2 +-
 .../cms/controllers/themeoptions/update.php   |   2 +-
 .../controllers/themes/_theme_list_item.php   |   4 +-
 modules/cms/controllers/themes/index.php      |   2 +-
 modules/cms/facades/Cms.php                   |   4 +-
 modules/cms/formwidgets/Components.php        |   7 +-
 modules/cms/formwidgets/MediaFinder.php       |   4 +-
 .../components/partials/_component.php        |   2 +-
 modules/cms/helpers/Cms.php                   |   4 +-
 modules/cms/helpers/File.php                  |   4 +-
 modules/cms/lang/bg/lang.php                  |   3 +-
 modules/cms/lang/cs/lang.php                  |   4 +-
 modules/cms/lang/da/lang.php                  |   4 +-
 modules/cms/lang/el/lang.php                  |   5 +-
 modules/cms/lang/es-ar/lang.php               |   4 +-
 modules/cms/lang/fa/lang.php                  |   5 +-
 modules/cms/lang/fr/lang.php                  |   4 +-
 modules/cms/lang/id/lang.php                  |   4 +-
 modules/cms/lang/it/lang.php                  |   4 +-
 modules/cms/lang/ja/lang.php                  |   4 +-
 modules/cms/lang/kr/lang.php                  |   4 +-
 modules/cms/lang/pl/lang.php                  |   2 +-
 modules/cms/lang/pt-br/lang.php               |   4 +-
 modules/cms/lang/pt-pt/lang.php               |   4 +-
 modules/cms/lang/sk/lang.php                  |   1 +
 modules/cms/lang/sv/lang.php                  |   4 +-
 modules/cms/lang/tr/lang.php                  |   4 +-
 modules/cms/lang/zh-cn/lang.php               |   4 +-
 modules/cms/lang/zh-tw/lang.php               |   4 +-
 modules/cms/models/MaintenanceSetting.php     |   7 +-
 modules/cms/models/ThemeData.php              |  10 +-
 modules/cms/models/ThemeExport.php            |  21 +-
 modules/cms/models/ThemeImport.php            |  24 +--
 modules/cms/models/ThemeLog.php               |  10 +-
 modules/cms/reportwidgets/ActiveTheme.php     |   9 +-
 .../activetheme/partials/_widget.php          |   2 +-
 .../tests/classes/CmsCompoundObjectTest.php   |   2 +-
 modules/cms/tests/classes/ContentTest.php     |   1 -
 modules/cms/tests/classes/PageTest.php        |   2 +-
 .../cms/tests/classes/PartialStackTest.php    |   5 +-
 .../cms/tests/classes/TwigExtensionTest.php   |   9 +-
 modules/cms/traits/UrlMaker.php               |   8 +-
 modules/cms/twig/ComponentNode.php            |   6 +-
 modules/cms/twig/ComponentTokenParser.php     |   4 +-
 modules/cms/twig/ContentNode.php              |   6 +-
 modules/cms/twig/ContentTokenParser.php       |   4 +-
 modules/cms/twig/DebugExtension.php           |  74 +++----
 modules/cms/twig/DefaultNode.php              |   4 +-
 modules/cms/twig/DefaultTokenParser.php       |   4 +-
 modules/cms/twig/Extension.php                |  28 +--
 modules/cms/twig/FlashNode.php                |  19 +-
 modules/cms/twig/FlashTokenParser.php         |   7 +-
 modules/cms/twig/FrameworkNode.php            |   9 +-
 modules/cms/twig/FrameworkTokenParser.php     |   4 +-
 modules/cms/twig/Loader.php                   |   4 +-
 modules/cms/twig/PageNode.php                 |   4 +-
 modules/cms/twig/PageTokenParser.php          |   4 +-
 modules/cms/twig/PartialNode.php              |   6 +-
 modules/cms/twig/PartialTokenParser.php       |   4 +-
 modules/cms/twig/PlaceholderNode.php          |  22 +-
 modules/cms/twig/PlaceholderTokenParser.php   |   7 +-
 modules/cms/twig/PutNode.php                  |   6 +-
 modules/cms/twig/PutTokenParser.php           |   4 +-
 modules/cms/twig/ScriptsNode.php              |   4 +-
 modules/cms/twig/ScriptsTokenParser.php       |   4 +-
 modules/cms/twig/SnowboardNode.php            |   6 +-
 modules/cms/twig/SnowboardTokenParser.php     |   4 +-
 modules/cms/twig/StylesNode.php               |   4 +-
 modules/cms/twig/StylesTokenParser.php        |   4 +-
 modules/cms/widgets/AssetList.php             |  51 +++--
 modules/cms/widgets/ComponentList.php         |   4 +-
 modules/cms/widgets/MediaManager.php          |   4 +-
 modules/cms/widgets/TemplateList.php          |  28 +--
 .../cms/widgets/assetlist/partials/_body.php  |   2 +-
 .../cms/widgets/assetlist/partials/_files.php |   2 +-
 .../cms/widgets/assetlist/partials/_items.php |   4 +-
 .../widgets/assetlist/partials/_move_form.php |   8 +-
 .../assetlist/partials/_new_dir_form.php      |   8 +-
 .../widgets/assetlist/partials/_toolbar.php   |   4 +-
 .../widgets/componentlist/partials/_body.php  |   2 +-
 .../partials/_component_list.php              |   2 +-
 .../componentlist/partials/_components.php    |   2 +-
 .../widgets/componentlist/partials/_items.php |   2 +-
 .../widgets/templatelist/partials/_items.php  |   4 +-
 .../templatelist/partials/_toolbar.php        |   4 +-
 modules/system/ServiceProvider.php            |  15 +-
 modules/system/assets/js/lang/lang.tr.js      |   2 +-
 modules/system/behaviors/SettingsModel.php    |   6 +-
 modules/system/classes/CombineAssets.php      |  59 +++---
 modules/system/classes/ComposerManager.php    |   8 +-
 modules/system/classes/ErrorHandler.php       |   6 +-
 modules/system/classes/FileManifest.php       |   6 +-
 modules/system/classes/ImageResizer.php       |   4 +-
 modules/system/classes/MailManager.php        |  16 +-
 modules/system/classes/MarkupManager.php      |  14 +-
 modules/system/classes/MediaLibrary.php       |  34 ++-
 modules/system/classes/MediaLibraryItem.php   |   4 +-
 modules/system/classes/ModelBehavior.php      |   4 +-
 modules/system/classes/PluginBase.php         |  17 +-
 modules/system/classes/PluginManager.php      |   4 +-
 modules/system/classes/SettingsManager.php    |   9 +-
 modules/system/classes/SourceManifest.php     |   4 +-
 modules/system/classes/SystemController.php   |   8 +-
 modules/system/classes/UpdateManager.php      |  12 +-
 modules/system/classes/VersionManager.php     |  19 +-
 .../system/classes/VersionYamlProcessor.php   |   4 +-
 .../system/console/BaseScaffoldCommand.php    |   4 +-
 modules/system/console/CreateCommand.php      |   4 +-
 modules/system/console/CreateJob.php          |   4 +-
 modules/system/console/CreateMigration.php    |  11 +-
 modules/system/console/CreateModel.php        |   4 +-
 modules/system/console/CreatePlugin.php       |   4 +-
 modules/system/console/CreateSettings.php     |   4 +-
 modules/system/console/PluginDisable.php      |   4 +-
 modules/system/console/PluginEnable.php       |   4 +-
 modules/system/console/PluginInstall.php      |   4 +-
 modules/system/console/PluginList.php         |   8 +-
 modules/system/console/PluginRefresh.php      |  14 +-
 modules/system/console/PluginRemove.php       |  14 +-
 modules/system/console/PluginRollback.php     |  14 +-
 modules/system/console/WinterDown.php         |  14 +-
 modules/system/console/WinterEnv.php          |   4 +-
 modules/system/console/WinterFresh.php        |   8 +-
 modules/system/console/WinterInstall.php      |  34 ++-
 modules/system/console/WinterManifest.php     |   6 +-
 modules/system/console/WinterMirror.php       |  16 +-
 modules/system/console/WinterTest.php         |   4 +-
 modules/system/console/WinterUp.php           |   4 +-
 modules/system/console/WinterUpdate.php       |   4 +-
 modules/system/console/WinterUtil.php         |  37 ++--
 modules/system/console/WinterVersion.php      |   6 +-
 .../system/console/asset/mix/MixCreate.php    |   4 +-
 .../system/console/asset/mix/MixInstall.php   |   4 +-
 .../console/traits/HasPluginArgument.php      |   4 +-
 modules/system/controllers/EventLogs.php      |   7 +-
 .../system/controllers/MailBrandSettings.php  |   8 +-
 modules/system/controllers/MailLayouts.php    |   4 +-
 modules/system/controllers/MailPartials.php   |   4 +-
 modules/system/controllers/MailTemplates.php  |   7 +-
 modules/system/controllers/RequestLogs.php    |   7 +-
 modules/system/controllers/Settings.php       |  11 +-
 modules/system/controllers/Updates.php        |  51 ++---
 .../controllers/mailbrandsettings/index.php   |   2 +-
 .../system/controllers/maillayouts/create.php |   2 +-
 .../system/controllers/maillayouts/update.php |   2 +-
 .../controllers/mailpartials/create.php       |   2 +-
 .../controllers/mailpartials/update.php       |   2 +-
 .../controllers/mailtemplates/create.php      |   2 +-
 .../controllers/mailtemplates/update.php      |   2 +-
 .../controllers/updates/_column_code.php      |   3 +-
 .../controllers/updates/_update_list.php      |   4 +-
 .../system/controllers/updates/details.php    |  10 +-
 ...01_000014_Db_System_Mail_Layout_Rename.php |   3 +-
 .../system/database/seeds/DatabaseSeeder.php  |   5 +-
 .../database/seeds/SeedSetupMailLayouts.php   |   4 +-
 modules/system/helpers/Cache.php              |  14 +-
 modules/system/helpers/DateTime.php           |  24 +--
 modules/system/helpers/View.php               |   4 +-
 modules/system/lang/bg/client.php             |   1 +
 modules/system/lang/bg/lang.php               |   1 +
 modules/system/lang/bg/validation.php         |   1 +
 modules/system/lang/el/client.php             |   1 +
 modules/system/lang/el/lang.php               |   1 +
 modules/system/lang/el/validation.php         |   3 +-
 modules/system/lang/ru/lang.php               | 198 +++++++++---------
 modules/system/lang/sk/client.php             |   1 +
 modules/system/lang/sk/lang.php               |   1 +
 modules/system/lang/sk/validation.php         |   1 +
 modules/system/lang/zh-cn/lang.php            |   2 +-
 modules/system/models/EventLog.php            |   9 +-
 modules/system/models/File.php                |   7 +-
 modules/system/models/LogSetting.php          |   4 +-
 modules/system/models/MailBrandSetting.php    |   9 +-
 modules/system/models/MailLayout.php          |  10 +-
 modules/system/models/MailPartial.php         |  13 +-
 modules/system/models/MailSetting.php         |   7 +-
 modules/system/models/MailTemplate.php        |   6 +-
 modules/system/models/Parameter.php           |   8 +-
 modules/system/models/PluginVersion.php       |  13 +-
 modules/system/models/RequestLog.php          |   7 +-
 modules/system/models/Revision.php            |   4 +-
 .../models/mailsetting/_drivers_hint.php      |   2 +-
 modules/system/partials/_settings_menu.php    |   1 +
 modules/system/reportwidgets/Status.php       |  11 +-
 .../tests/bootstrap/PluginManagerTestCase.php |   7 +-
 .../system/tests/bootstrap/PluginTestCase.php |   2 +-
 modules/system/tests/bootstrap/app.php        |   2 +-
 .../tests/classes/CombineAssetsTest.php       |   4 +-
 modules/system/tests/classes/CoreLangTest.php |   2 +-
 .../system/tests/classes/FileManifestTest.php |   1 -
 .../tests/classes/MarkupManagerTest.php       |   3 +-
 .../tests/classes/VersionManagerTest.php      |   3 +-
 .../tests/console/CreateMigrationTest.php     |  42 ++--
 .../system/tests/console/WinterEnvTest.php    |   4 +-
 modules/system/tests/fixtures/config/app.php  |   1 +
 .../system/tests/fixtures/config/cache.php    |   1 +
 modules/system/tests/fixtures/config/cms.php  |   1 +
 .../system/tests/fixtures/config/database.php |   1 +
 modules/system/tests/fixtures/config/mail.php |   1 +
 .../system/tests/fixtures/config/queue.php    |   1 +
 .../system/tests/fixtures/config/session.php  |   1 +
 .../plugins/database/tester/Plugin.php        |   4 +-
 .../plugins/database/tester/models/Author.php |   5 +-
 .../database/tester/models/Category.php       |   6 +-
 .../database/tester/models/Country.php        |   5 +-
 .../database/tester/models/EventLog.php       |   4 +-
 .../plugins/database/tester/models/Meta.php   |   4 +-
 .../plugins/database/tester/models/Phone.php  |   5 +-
 .../plugins/database/tester/models/Post.php   |   4 +-
 .../plugins/database/tester/models/Role.php   |   4 +-
 .../plugins/database/tester/models/Tag.php    |   4 +-
 .../plugins/database/tester/models/User.php   |   4 +-
 .../tester/updates/create_authors_table.php   |   4 +-
 .../updates/create_categories_table.php       |   5 +-
 .../tester/updates/create_countries_table.php |   4 +-
 .../tester/updates/create_event_log_table.php |   5 +-
 .../tester/updates/create_meta_table.php      |   5 +-
 .../tester/updates/create_phones_table.php    |   5 +-
 .../tester/updates/create_posts_table.php     |   5 +-
 .../tester/updates/create_roles_table.php     |   5 +-
 .../tester/updates/create_tags_table.php      |   5 +-
 .../tester/updates/create_users_table.php     |   5 +-
 .../plugins/dependencytest/acme/Plugin.php    |   4 +-
 .../dependencytest/dependency/Plugin.php      |   4 +-
 .../plugins/dependencytest/found/Plugin.php   |   4 +-
 .../dependencytest/notfound/Plugin.php        |   4 +-
 .../dependencytest/wrongcase/Plugin.php       |   4 +-
 .../fixtures/plugins/mix/testa/Plugin.php     |   4 +-
 .../fixtures/plugins/mix/testb/Plugin.php     |   4 +-
 .../fixtures/plugins/mix/testc/Plugin.php     |   4 +-
 .../plugins/testvendor/test/Plugin.php        |   4 +-
 .../testvendor/test/formwidgets/Sample.php    |   4 +-
 .../winter/invalidreplacement/Plugin.php      |   4 +-
 .../plugins/winter/noupdates/Plugin.php       |   4 +-
 .../plugins/winter/original/Plugin.php        |   4 +-
 .../plugins/winter/replacement/Plugin.php     |   4 +-
 .../fixtures/plugins/winter/sample/Plugin.php |   4 +-
 .../fixtures/plugins/winter/tester/Plugin.php |   4 +-
 .../plugins/winter/tester/classes/Users.php   |   4 +-
 .../winter/tester/components/Archive.php      |   4 +-
 .../winter/tester/components/Categories.php   |   4 +-
 .../winter/tester/components/Comments.php     |   4 +-
 .../winter/tester/components/ContentBlock.php |   6 +-
 .../winter/tester/components/MainMenu.php     |   4 +-
 .../plugins/winter/tester/components/Post.php |   4 +-
 .../winter/tester/formwidgets/Preview.php     |   4 +-
 .../winter/tester/models/TestModel.php        |   4 +-
 .../winter/tester/rules/BeLikeBobRule.php     |   4 +-
 .../plugins/database/AttachManyModelTest.php  |   2 +-
 .../plugins/database/AttachOneModelTest.php   |   2 +-
 .../database/BelongsToManyModelTest.php       |   2 +-
 .../plugins/database/BelongsToModelTest.php   |   2 +-
 .../plugins/database/DeferredBindingTest.php  |   2 +-
 .../plugins/database/HasManyModelTest.php     |   2 +-
 .../database/HasManyThroughModelTest.php      |   2 +-
 .../plugins/database/HasOneModelTest.php      |   2 +-
 .../database/HasOneThroughModelTest.php       |   2 +-
 .../plugins/database/MorphManyModelTest.php   |   2 +-
 .../plugins/database/MorphOneModelTest.php    |   2 +-
 .../plugins/database/MorphToModelTest.php     |   2 +-
 .../plugins/database/NestedTreeModelTest.php  |   2 +-
 .../plugins/database/NullableModelTest.php    |   2 +-
 .../plugins/database/PluginModelTest.php      |   4 +-
 .../database/RevisionableModelTest.php        |   6 +-
 .../plugins/database/SimpleTreeModelTest.php  |   2 +-
 .../plugins/database/SluggableModelTest.php   |   8 +-
 .../plugins/database/SoftDeleteModelTest.php  |   2 +-
 .../plugins/database/ValidationModelTest.php  |   2 +-
 .../system/CustomValidatorRulesTest.php       |   2 +-
 .../system/tests/traits/AssetMakerTest.php    |  16 +-
 modules/system/tests/traits/ViewMakerTest.php |   2 +-
 modules/system/traits/ConfigMaker.php         |  31 ++-
 modules/system/traits/EventEmitter.php        |   6 +-
 modules/system/traits/LazyOwnerAlias.php      |   4 +-
 modules/system/traits/PropertyContainer.php   |   4 +-
 modules/system/traits/ResponseMaker.php       |   8 +-
 modules/system/traits/SecurityController.php  |   4 +-
 modules/system/traits/ViewMaker.php           |  10 +-
 modules/system/twig/Engine.php                |   4 +-
 modules/system/twig/Extension.php             |   8 +-
 modules/system/twig/FilterTokenParser.php     |   4 +-
 modules/system/twig/Loader.php                |   7 +-
 modules/system/twig/MailPartialNode.php       |   6 +-
 .../system/twig/MailPartialTokenParser.php    |   4 +-
 modules/system/twig/SecurityPolicy.php        |   4 +-
 modules/system/twig/SpacelessNode.php         |   4 +-
 modules/system/twig/SpacelessTokenParser.php  |   4 +-
 phpcs.xml                                     |  16 +-
 plugins/winter/demo/Plugin.php                |   5 +-
 plugins/winter/demo/components/Todo.php       |   5 +-
 511 files changed, 2334 insertions(+), 2027 deletions(-)

diff --git a/bootstrap/app.php b/bootstrap/app.php
index 10e92d3cd6..3cb4279a7f 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -12,7 +12,7 @@
 */
 
 $app = new Winter\Storm\Foundation\Application(
-    realpath(__DIR__.'/../')
+    realpath(__DIR__ . '/../')
 );
 
 /*
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 0b57e5e2f2..9e56cab1b6 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -13,10 +13,10 @@
 |
 */
 
-$helperPath = __DIR__.'/../vendor/winter/storm/src/Support/helpers.php';
+$helperPath = __DIR__ . '/../vendor/winter/storm/src/Support/helpers.php';
 
 if (!file_exists($helperPath)) {
-    echo 'Missing vendor files, try running "composer install" or use the Wizard installer.'.PHP_EOL;
+    echo 'Missing vendor files, try running "composer install" or use the Wizard installer.' . PHP_EOL;
     exit(1);
 }
 
@@ -34,4 +34,4 @@
 |
 */
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
diff --git a/config/app.php b/config/app.php
index b740d465ed..c860102a24 100644
--- a/config/app.php
+++ b/config/app.php
@@ -63,7 +63,7 @@
     */
 
     'asset_url' => env('ASSET_URL', null),
-    
+
     /*
     |--------------------------------------------------------------------------
     | Temporary Path
diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index c81552de9d..3a70003324 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Backend;
+<?php
+
+namespace Backend;
 
 use Backend;
 use BackendMenu;
diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index ae58bb475f..fc1670bbf2 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors;
+<?php
+
+namespace Backend\Behaviors;
 
 use Db;
 use Str;
@@ -218,8 +220,7 @@ public function create($context = null)
             $model = $this->controller->formExtendModel($model) ?: $model;
 
             $this->initForm($model);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->controller->handleError($ex);
         }
     }
@@ -287,8 +288,7 @@ public function update($recordId = null, $context = null)
 
             $model = $this->controller->formFindModelObject($recordId);
             $this->initForm($model);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->controller->handleError($ex);
         }
     }
@@ -384,8 +384,7 @@ public function preview($recordId = null, $context = null)
 
             $model = $this->controller->formFindModelObject($recordId);
             $this->initForm($model);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->controller->handleError($ex);
         }
     }
@@ -451,7 +450,7 @@ public function formGetContext()
     protected function createModel()
     {
         $class = $this->config->modelClass;
-        return new $class;
+        return new $class();
     }
 
     /**
diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 057a0758a3..91f61df522 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors;
+<?php
+
+namespace Backend\Behaviors;
 
 use Str;
 use Lang;
@@ -208,14 +210,12 @@ public function onImport()
 
             $this->vars['importResults'] = $model->getResultStats();
             $this->vars['returnUrl'] = $this->getRedirectUrlForType('import');
-        }
-        catch (MassAssignmentException $ex) {
+        } catch (MassAssignmentException $ex) {
             $this->controller->handleError(new ApplicationException(Lang::get(
                 'backend::lang.model.mass_assignment_failed',
                 ['attribute' => $ex->getMessage()]
             )));
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->controller->handleError($ex);
         }
 
@@ -228,8 +228,7 @@ public function onImportLoadForm()
     {
         try {
             $this->checkRequiredImportColumns();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->controller->handleError($ex);
         }
 
@@ -329,7 +328,7 @@ protected function getImportFileColumns()
 
         if (!post('first_row_titles')) {
             array_walk($firstRow, function (&$value, $key) {
-                $value = 'Column #'.($key + 1);
+                $value = 'Column #' . ($key + 1);
             });
         }
 
@@ -447,19 +446,17 @@ public function onExport()
             $reference = $model->export($columns, $exportOptions);
             $fileUrl = $this->controller->actionUrl(
                 'download',
-                $reference.'/'.$this->exportFileName
+                $reference . '/' . $this->exportFileName
             );
 
             $this->vars['fileUrl'] = $fileUrl;
             $this->vars['returnUrl'] = $this->getRedirectUrlForType('export');
-        }
-        catch (MassAssignmentException $ex) {
+        } catch (MassAssignmentException $ex) {
             $this->controller->handleError(new ApplicationException(Lang::get(
                 'backend::lang.model.mass_assignment_failed',
                 ['attribute' => $ex->getMessage()]
             )));
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->controller->handleError($ex);
         }
 
@@ -583,8 +580,7 @@ protected function checkUseListExportMode()
 
         if (is_array($useList)) {
             $listDefinition = array_get($useList, 'definition');
-        }
-        else {
+        } else {
             $listDefinition = $useList;
         }
 
@@ -620,7 +616,7 @@ public function exportFromList($definition = null, $options = [])
         /*
          * Prepare CSV
          */
-        $csv = CsvWriter::createFromFileObject(new SplTempFileObject);
+        $csv = CsvWriter::createFromFileObject(new SplTempFileObject());
         $csv->setOutputBOM(CsvWriter::BOM_UTF8);
         $csv->setDelimiter($options['delimiter']);
         $csv->setEnclosure($options['enclosure']);
@@ -687,7 +683,7 @@ public function exportFromList($definition = null, $options = [])
      */
     public function importExportMakePartial($partial, $params = [])
     {
-        $contents = $this->controller->makePartial('import_export_'.$partial, $params + $this->vars, false);
+        $contents = $this->controller->makePartial('import_export_' . $partial, $params + $this->vars, false);
 
         if (!$contents) {
             $contents = $this->makePartial($partial, $params);
@@ -704,7 +700,7 @@ public function importExportMakePartial($partial, $params = [])
     protected function checkPermissionsForType($type)
     {
         if (
-            ($permissions = $this->getConfig($type.'[permissions]')) &&
+            ($permissions = $this->getConfig($type . '[permissions]')) &&
             (!BackendAuth::getUser()->hasAnyAccess((array) $permissions))
         ) {
             return Response::make(View::make('backend::access_denied'), 403);
@@ -717,11 +713,11 @@ protected function makeOptionsFormWidgetForType($type)
             return null;
         }
 
-        if ($fieldConfig = $this->getConfig($type.'[form]')) {
+        if ($fieldConfig = $this->getConfig($type . '[form]')) {
             $widgetConfig = $this->makeConfig($fieldConfig);
             $widgetConfig->model = $this->getModelForType($type);
-            $widgetConfig->alias = $type.'OptionsForm';
-            $widgetConfig->arrayName = ucfirst($type).'Options';
+            $widgetConfig->alias = $type . 'OptionsForm';
+            $widgetConfig->arrayName = ucfirst($type) . 'Options';
 
             return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
         }
@@ -731,20 +727,20 @@ protected function makeOptionsFormWidgetForType($type)
 
     protected function getModelForType($type)
     {
-        $cacheProperty = $type.'Model';
+        $cacheProperty = $type . 'Model';
 
         if ($this->{$cacheProperty} !== null) {
             return $this->{$cacheProperty};
         }
 
-        $modelClass = $this->getConfig($type.'[modelClass]');
+        $modelClass = $this->getConfig($type . '[modelClass]');
         if (!$modelClass) {
             throw new ApplicationException(Lang::get('backend::lang.import_export.missing_model_class_error', [
                 'type' => $type
             ]));
         }
 
-        return $this->{$cacheProperty} = new $modelClass;
+        return $this->{$cacheProperty} = new $modelClass();
     }
 
     protected function makeListColumns($config)
@@ -759,8 +755,7 @@ protected function makeListColumns($config)
         foreach ($config->columns as $attribute => $column) {
             if (is_array($column)) {
                 $result[$attribute] = array_get($column, 'label', $attribute);
-            }
-            else {
+            } else {
                 $result[$attribute] = $column ?: $attribute;
             }
         }
@@ -770,7 +765,7 @@ protected function makeListColumns($config)
 
     protected function getRedirectUrlForType($type)
     {
-        $redirect = $this->getConfig($type.'[redirect]');
+        $redirect = $this->getConfig($type . '[redirect]');
 
         if ($redirect !== null) {
             return $redirect ? Backend::url($redirect) : 'javascript:;';
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index 379cf99cc1..cc3fab6137 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors;
+<?php
+
+namespace Backend\Behaviors;
 
 use Lang;
 use Event;
@@ -83,8 +85,7 @@ public function __construct($controller)
         if (is_array($config)) {
             $this->listDefinitions = $config;
             $this->primaryDefinition = key($this->listDefinitions);
-        }
-        else {
+        } else {
             $this->listDefinitions = ['list' => $config];
             $this->primaryDefinition = 'list';
         }
@@ -124,7 +125,7 @@ public function makeList($definition = null)
          * Create the model
          */
         $class = $listConfig->modelClass;
-        $model = new $class;
+        $model = new $class();
         $model = $this->controller->listExtendModel($model, $definition);
 
         /*
@@ -327,7 +328,7 @@ public function index_onDelete()
          * Create the model
          */
         $class = $listConfig->modelClass;
-        $model = new $class;
+        $model = new $class();
         $model = $this->controller->listExtendModel($model, $definition);
 
         /*
@@ -354,8 +355,7 @@ public function index_onDelete()
                     ? $listConfig->deleteMessage
                     : 'backend::lang.list.delete_selected_success'
             ));
-        }
-        else {
+        } else {
             Flash::error(Lang::get(
                 (!empty($listConfig->noRecordsDeletedMessage))
                     ? $listConfig->noRecordsDeletedMessage
@@ -409,7 +409,7 @@ public function listRender($definition = null)
      */
     public function listMakePartial($partial, $params = [])
     {
-        $contents = $this->controller->makePartial('list_'.$partial, $params + $this->vars, false);
+        $contents = $this->controller->makePartial('list_' . $partial, $params + $this->vars, false);
         if (!$contents) {
             $contents = $this->makePartial($partial, $params);
         }
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 3f8346df4e..a94cf17b6a 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors;
+<?php
+
+namespace Backend\Behaviors;
 
 use Db;
 use Lang;
@@ -475,9 +477,9 @@ public function relationRefresh($field = null)
     {
         $field = $this->validateField($field);
 
-        $result = ['#'.$this->relationGetId('view') => $this->relationRenderView($field)];
+        $result = ['#' . $this->relationGetId('view') => $this->relationRenderView($field)];
         if ($toolbar = $this->relationRenderToolbar($field)) {
-            $result['#'.$this->relationGetId('toolbar')] = $toolbar;
+            $result['#' . $this->relationGetId('toolbar')] = $toolbar;
         }
 
         if ($eventResult = $this->controller->relationExtendRefreshResults($field)) {
@@ -515,7 +517,7 @@ public function relationRenderView($field = null)
      */
     public function relationMakePartial($partial, $params = [])
     {
-        $contents = $this->controller->makePartial('relation_'.$partial, $params + $this->vars, false);
+        $contents = $this->controller->makePartial('relation_' . $partial, $params + $this->vars, false);
         if (!$contents) {
             $contents = $this->makePartial($partial, $params);
         }
@@ -658,10 +660,10 @@ protected function makeViewWidget()
     {
         $widget = null;
 
-        /*
-         * Multiple (has many, belongs to many)
-         */
         if ($this->viewMode === 'multi') {
+            /*
+             * Multiple (has many, belongs to many)
+             */
             $config = $this->makeConfigForMode('view', 'list');
             $config->model = $this->relationModel;
             $config->alias = $this->alias . 'ViewList';
@@ -684,8 +686,7 @@ protected function makeViewWidget()
 
             if ($config->recordUrl) {
                 $defaultOnClick = null;
-            }
-            elseif (
+            } elseif (
                 !$this->makeConfigForMode('manage', 'form', false) &&
                 !$this->makeConfigForMode('pivot', 'form', false)
             ) {
@@ -707,13 +708,11 @@ protected function makeViewWidget()
                 $widget->bindEvent('list.extendQueryBefore', function ($query) use ($sqlConditions) {
                     $query->whereRaw($sqlConditions);
                 });
-            }
-            elseif ($scopeMethod = $this->getConfig('view[scope]')) {
+            } elseif ($scopeMethod = $this->getConfig('view[scope]')) {
                 $widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) {
                     $query->$scopeMethod($this->model);
                 });
-            }
-            else {
+            } else {
                 $widget->bindEvent('list.extendQueryBefore', function ($query) use ($widget) {
                     $this->relationObject->addDefinedConstraintsToQuery($query);
                     if ($widget->getSortColumn()) {
@@ -732,15 +731,15 @@ protected function makeViewWidget()
 
                 if ($sessionKey) {
                     $this->relationObject->withDeferred($sessionKey);
-                }
-                elseif ($this->model->exists) {
+                } elseif ($this->model->exists) {
                     $this->relationObject->addConstraints();
                 }
 
                 /*
                  * Allows pivot data to enter the fray
                  */
-                if ($this->relationType === 'belongsToMany'
+                if (
+                    $this->relationType === 'belongsToMany'
                     || $this->relationType === 'morphToMany'
                     || $this->relationType === 'morphedByMany'
                 ) {
@@ -752,7 +751,8 @@ protected function makeViewWidget()
             /*
              * Constrain the list by the search widget, if available
              */
-            if ($this->toolbarWidget && $this->getConfig('view[showSearch]')
+            if (
+                $this->toolbarWidget && $this->getConfig('view[showSearch]')
                 && $searchWidget = $this->toolbarWidget->getSearchWidget()
             ) {
                 $searchWidget->bindEvent('search.submit', function () use ($widget, $searchWidget) {
@@ -765,8 +765,7 @@ protected function makeViewWidget()
                  */
                 if (Request::ajax()) {
                     $widget->setSearchTerm($searchWidget->getActiveTerm());
-                }
-                else {
+                } else {
                     $searchWidget->setActiveTerm(null);
                 }
             }
@@ -782,11 +781,10 @@ protected function makeViewWidget()
                 // Apply predefined filter values
                 $widget->addFilter([$this->viewFilterWidget, 'applyAllScopesToQuery']);
             }
-        }
-        /*
-         * Single (belongs to, has one)
-         */
-        elseif ($this->viewMode === 'single') {
+        } elseif ($this->viewMode === 'single') {
+            /*
+             * Single (belongs to, has one)
+             */
             $this->viewModel = $this->relationObject->getResults()
                 ?: $this->relationModel;
 
@@ -807,9 +805,6 @@ protected function makeManageWidget()
     {
         $widget = null;
 
-        /*
-         * List / Pivot
-         */
         if ($this->manageMode === 'list' || $this->manageMode === 'pivot') {
             $isPivot = $this->manageMode === 'pivot';
 
@@ -832,11 +827,9 @@ protected function makeManageWidget()
                     $this->relationGetId(),
                     $this->relationGetSessionKey()
                 );
-            }
-            elseif ($config->showCheckboxes) {
+            } elseif ($config->showCheckboxes) {
                 $config->recordOnClick = "$.wn.relationBehavior.toggleListCheckbox(this)";
-            }
-            elseif ($isPivot) {
+            } elseif ($isPivot) {
                 $config->recordOnClick = sprintf(
                     "$.wn.relationBehavior.clickManagePivotListRecord(':%s', '%s', '%s')",
                     $this->relationModel->getKeyName(),
@@ -854,13 +847,11 @@ protected function makeManageWidget()
                 $widget->bindEvent('list.extendQueryBefore', function ($query) use ($sqlConditions) {
                     $query->whereRaw($sqlConditions);
                 });
-            }
-            elseif ($scopeMethod = $this->getConfig('manage[scope]')) {
+            } elseif ($scopeMethod = $this->getConfig('manage[scope]')) {
                 $widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) {
                     $query->$scopeMethod($this->model);
                 });
-            }
-            else {
+            } else {
                 $widget->bindEvent('list.extendQueryBefore', function ($query) use ($widget) {
                     $this->relationObject->addDefinedConstraintsToQuery($query);
                     if ($widget->getSortColumn()) {
@@ -897,11 +888,7 @@ protected function makeManageWidget()
                 // Apply predefined filter values
                 $widget->addFilter([$this->manageFilterWidget, 'applyAllScopesToQuery']);
             }
-        }
-        /*
-         * Form
-         */
-        elseif ($this->manageMode === 'form') {
+        } elseif ($this->manageMode === 'form') {
             if (!$config = $this->makeConfigForMode('manage', 'form', false)) {
                 return null;
             }
@@ -975,11 +962,10 @@ protected function makePivotWidget()
                     'id' => $this->manageId,
                 ]));
             }
-        }
-        /*
-         * New record
-         */
-        else {
+        } else {
+            /*
+            * New record
+            */
             if ($this->foreignId) {
                 $foreignModel = $this->relationModel
                     ->whereIn($foreignKeyName, (array) $this->foreignId)
@@ -1195,8 +1181,7 @@ public function onRelationManageUpdate()
             foreach ($modelsToSave as $modelToSave) {
                 $modelToSave->save(null, $this->manageWidget->getSessionKey());
             }
-        }
-        elseif ($this->viewMode === 'single') {
+        } 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
@@ -1217,10 +1202,10 @@ public function onRelationManageDelete()
     {
         $this->beforeAjax();
 
-        /*
-         * Multiple (has many, belongs to many)
-         */
         if ($this->viewMode === 'multi') {
+            /*
+             * Multiple (has many, belongs to many)
+             */
             if (($checkedIds = post('checked')) && is_array($checkedIds)) {
                 foreach ($checkedIds as $relationId) {
                     if (!$obj = $this->relationModel->find($relationId)) {
@@ -1230,11 +1215,10 @@ public function onRelationManageDelete()
                     $obj->delete();
                 }
             }
-        }
-        /*
-         * Single (belongs to, has one)
-         */
-        elseif ($this->viewMode === 'single') {
+        } elseif ($this->viewMode === 'single') {
+            /*
+             * Single (belongs to, has one)
+             */
             $relatedModel = $this->viewModel;
             if ($relatedModel->exists) {
                 $relatedModel->delete();
@@ -1260,10 +1244,10 @@ public function onRelationManageAdd()
         $recordId = post('record_id');
         $sessionKey = $this->deferredBinding ? $this->relationGetSessionKey() : null;
 
-        /*
-         * Add
-         */
         if ($this->viewMode === 'multi') {
+            /*
+             * Add
+             */
             $checkedIds = $recordId ? [$recordId] : post('checked');
 
             if (is_array($checkedIds)) {
@@ -1279,11 +1263,10 @@ public function onRelationManageAdd()
                     $this->relationObject->add($model, $sessionKey);
                 }
             }
-        }
-        /*
-         * Link
-         */
-        elseif ($this->viewMode === 'single') {
+        } elseif ($this->viewMode === 'single') {
+            /*
+             * Link
+             */
             if ($recordId && ($model = $this->relationModel->find($recordId))) {
                 if ($this->relationType === 'hasOne') {
                     // Unassign previous relation if one is already assigned
@@ -1324,10 +1307,10 @@ public function onRelationManageRemove()
         $sessionKey = $this->deferredBinding ? $this->relationGetSessionKey() : null;
         $relatedModel = $this->relationModel;
 
-        /*
-         * Remove
-         */
         if ($this->viewMode === 'multi') {
+            /*
+             * Remove
+             */
             $checkedIds = $recordId ? [$recordId] : post('checked');
 
             if (is_array($checkedIds)) {
@@ -1338,11 +1321,10 @@ public function onRelationManageRemove()
                     $this->relationObject->remove($model, $sessionKey);
                 }
             }
-        }
-        /*
-         * Unlink
-         */
-        elseif ($this->viewMode === 'single') {
+        } elseif ($this->viewMode === 'single') {
+            /*
+             * Unlink
+             */
             if ($this->relationType === 'belongsTo') {
                 $this->relationObject->dissociate();
                 $this->relationObject->getParent()->save();
@@ -1352,12 +1334,10 @@ public function onRelationManageRemove()
                     $this->model->refresh();
                     $this->initRelation($this->model);
                 }
-            }
-            elseif ($this->relationType === 'hasOne' || $this->relationType === 'morphOne') {
+            } elseif ($this->relationType === 'hasOne' || $this->relationType === 'morphOne') {
                 if ($obj = $relatedModel->find($recordId)) {
                     $this->relationObject->remove($obj, $sessionKey);
-                }
-                elseif ($this->viewModel->exists) {
+                } elseif ($this->viewModel->exists) {
                     $this->relationObject->remove($this->viewModel, $sessionKey);
                 }
             }
@@ -1419,7 +1399,7 @@ public function onRelationManagePivotCreate()
             }
         });
 
-        return ['#'.$this->relationGetId('view') => $this->relationRenderView()];
+        return ['#' . $this->relationGetId('view') => $this->relationRenderView()];
     }
 
     public function onRelationManagePivotUpdate()
@@ -1435,7 +1415,7 @@ public function onRelationManagePivotUpdate()
             $modelToSave->save(null, $this->pivotWidget->getSessionKey());
         }
 
-        return ['#'.$this->relationGetId('view') => $this->relationRenderView()];
+        return ['#' . $this->relationGetId('view') => $this->relationRenderView()];
     }
 
     //
@@ -1722,11 +1702,9 @@ protected function evalManageMode()
             case 'belongsToMany':
                 if (isset($this->config->pivot)) {
                     return 'pivot';
-                }
-                elseif ($this->eventTarget === 'list') {
+                } elseif ($this->eventTarget === 'list') {
                     return 'form';
-                }
-                else {
+                } else {
                     return 'list';
                 }
 
@@ -1799,19 +1777,12 @@ protected function makeConfigForMode($mode = 'view', $type = 'list', $throwExcep
     {
         $config = null;
 
-        /*
-         * Look for $this->config->view['list']
-         */
         if (
             isset($this->config->{$mode}) &&
             array_key_exists($type, $this->config->{$mode})
         ) {
             $config = $this->config->{$mode}[$type];
-        }
-        /*
-         * Look for $this->config->list
-         */
-        elseif (isset($this->config->{$type})) {
+        } elseif (isset($this->config->{$type})) {
             $config = $this->config->{$type};
         }
 
@@ -1826,7 +1797,7 @@ protected function makeConfigForMode($mode = 'view', $type = 'list', $throwExcep
             }
 
             if ($throwException) {
-                throw new ApplicationException('Missing configuration for '.$mode.'.'.$type.' in RelationController definition '.$this->field);
+                throw new ApplicationException('Missing configuration for ' . $mode . '.' . $type . ' in RelationController definition ' . $this->field);
             }
 
             return false;
diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index 20cd3460ff..47adc7cf20 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors;
+<?php
+
+namespace Backend\Behaviors;
 
 use Lang;
 use Backend;
@@ -116,9 +118,6 @@ public function onReorder()
     {
         $model = $this->validateModel();
 
-        /*
-         * Simple
-         */
         if ($this->sortMode == 'simple') {
             if (
                 (!$ids = post('record_ids')) ||
@@ -128,11 +127,7 @@ public function onReorder()
             }
 
             $model->setSortableOrder($ids, $orders);
-        }
-        /*
-         * Nested set
-         */
-        elseif ($this->sortMode == 'nested') {
+        } elseif ($this->sortMode == 'nested') {
             $sourceNode = $model->find(post('sourceNode'));
             $targetNode = post('targetNode') ? $model->find(post('targetNode')) : null;
 
@@ -193,7 +188,7 @@ public function reorderGetModel()
             throw new ApplicationException('Please specify the modelClass property for reordering');
         }
 
-        return $this->model = new $modelClass;
+        return $this->model = new $modelClass();
     }
 
     /**
@@ -221,15 +216,13 @@ protected function validateModel()
             $model->isClassExtendedWith(\October\Rain\Database\Behaviors\Sortable::class)
         ) {
             $this->sortMode = 'simple';
-        }
-        elseif (
+        } elseif (
             isset($modelTraits[\Winter\Storm\Database\Traits\NestedTree::class]) ||
             isset($modelTraits[\October\Rain\Database\Traits\NestedTree::class])
         ) {
             $this->sortMode = 'nested';
             $this->showTree = true;
-        }
-        else {
+        } else {
             throw new ApplicationException('The model must implement the Sortable trait/behavior or the NestedTree trait.');
         }
 
@@ -253,8 +246,7 @@ protected function getRecords()
                 ->orderBy($model->getSortOrderColumn())
                 ->get()
             ;
-        }
-        elseif ($this->sortMode == 'nested') {
+        } elseif ($this->sortMode == 'nested') {
             $records = $query->getNested();
         }
 
@@ -280,8 +272,7 @@ protected function makeToolbarWidget()
         if ($toolbarConfig = $this->getConfig('toolbar')) {
             $toolbarConfig = $this->makeConfig($toolbarConfig);
             $toolbarWidget = $this->makeWidget('Backend\Widgets\Toolbar', $toolbarConfig);
-        }
-        else {
+        } else {
             $toolbarWidget = null;
         }
 
diff --git a/modules/backend/behaviors/UserPreferencesModel.php b/modules/backend/behaviors/UserPreferencesModel.php
index 52e2cd7575..c3984eb56c 100644
--- a/modules/backend/behaviors/UserPreferencesModel.php
+++ b/modules/backend/behaviors/UserPreferencesModel.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors;
+<?php
+
+namespace Backend\Behaviors;
 
 use System\Behaviors\SettingsModel;
 use Backend\Models\UserPreference;
@@ -112,6 +114,6 @@ protected function getCacheKey()
     {
         $item = UserPreference::forUser();
         $userId = $item->userContext ? $item->userContext->id : 0;
-        return $this->recordCode.'-userpreference-'.$userId;
+        return $this->recordCode . '-userpreference-' . $userId;
     }
 }
diff --git a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
index bc683d600f..f32248befe 100644
--- a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
+++ b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Behaviors\ImportExportController;
+<?php
+
+namespace Backend\Behaviors\ImportExportController;
 
 use php_user_filter;
 
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_columns.php b/modules/backend/behaviors/importexportcontroller/partials/_export_columns.php
index 5896796242..62dc344d3f 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_export_columns.php
+++ b/modules/backend/behaviors/importexportcontroller/partials/_export_columns.php
@@ -9,14 +9,14 @@
                             name="export_columns[]"
                             value="<?= $key ?>" />
                         <input
-                            id="<?= $this->getId('exportCheckbox-'.$key) ?>"
+                            id="<?= $this->getId('exportCheckbox-' . $key) ?>"
                             name="visible_columns[<?= $key ?>]"
                             value="1"
                             checked="checked"
                             type="checkbox" />
                         <label
                             class="choice"
-                            for="<?= $this->getId('exportCheckbox-'.$key) ?>">
+                            for="<?= $this->getId('exportCheckbox-' . $key) ?>">
                                 <?= e(trans($column)) ?>
                         </label>
                     </div>
diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.php b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.php
index 6ac2419bfc..c08647d911 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.php
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.php
@@ -2,7 +2,7 @@
     <?= Form::open() ?>
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
-            <h4 class="modal-title"><?= e(trans($relationManageTitle, ['name'=>trans($relationLabel)])) ?></h4>
+            <h4 class="modal-title"><?= e(trans($relationManageTitle, ['name' => trans($relationLabel)])) ?></h4>
         </div>
         <?php if (!$relationSearchWidget): ?>
             <div class="modal-body">
diff --git a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php
index f93cbd7f88..fd055a2a21 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php
+++ b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php
@@ -8,7 +8,7 @@
 
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
-            <h4 class="modal-title"><?= e(trans('backend::lang.relation.related_data', ['name'=>trans($relationLabel)])) ?></h4>
+            <h4 class="modal-title"><?= e(trans('backend::lang.relation.related_data', ['name' => trans($relationLabel)])) ?></h4>
         </div>
         <div class="modal-body">
             <?= $relationPivotWidget->render(['preview' => $this->readOnly]) ?>
@@ -29,7 +29,7 @@
 
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
-            <h4 class="modal-title"><?= e(trans('backend::lang.relation.related_data', ['name'=>trans($relationLabel)])) ?></h4>
+            <h4 class="modal-title"><?= e(trans('backend::lang.relation.related_data', ['name' => trans($relationLabel)])) ?></h4>
         </div>
         <div class="modal-body">
             <?= $relationPivotWidget->render() ?>
diff --git a/modules/backend/classes/AuthManager.php b/modules/backend/classes/AuthManager.php
index deb56cc9a5..22bae8513e 100644
--- a/modules/backend/classes/AuthManager.php
+++ b/modules/backend/classes/AuthManager.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Config;
 use System\Classes\PluginManager;
@@ -236,7 +238,7 @@ protected function createUserModelQuery()
      */
     protected function validateUserModel($user)
     {
-        if ( ! $user instanceof $this->userModel) {
+        if (!$user instanceof $this->userModel) {
             return false;
         }
 
@@ -266,8 +268,7 @@ public function listPermissionsForRole($role, $includeOrphans = true)
                     foreach ((array) $permission->roles as $_role) {
                         $this->permissionRoles[$_role][$permission->code] = 1;
                     }
-                }
-                else {
+                } else {
                     $this->permissionRoles['*'][$permission->code] = 1;
                 }
             }
diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php
index 1dfb370d4e..075005d2b3 100644
--- a/modules/backend/classes/BackendController.php
+++ b/modules/backend/classes/BackendController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use App;
 use Closure;
@@ -191,12 +193,14 @@ protected function getRequestedController($url)
         $controller = $params[1] ?? 'index';
         self::$action = $action = isset($params[2]) ? $this->parseAction($params[2]) : 'index';
         self::$params = $controllerParams = array_slice($params, 3);
-        $controllerClass = '\\'.$module.'\Controllers\\'.$controller;
-        if ($controllerObj = $this->findController(
-            $controllerClass,
-            $action,
-            base_path().'/modules'
-        )) {
+        $controllerClass = '\\' . $module . '\Controllers\\' . $controller;
+        if (
+            $controllerObj = $this->findController(
+                $controllerClass,
+                $action,
+                base_path() . '/modules'
+            )
+        ) {
             return [
                 'controller' => $controllerObj,
                 'action' => $action,
@@ -218,12 +222,14 @@ protected function getRequestedController($url)
             $controller = $params[2] ?? 'index';
             self::$action = $action = isset($params[3]) ? $this->parseAction($params[3]) : 'index';
             self::$params = $controllerParams = array_slice($params, 4);
-            $controllerClass = '\\'.$author.'\\'.$plugin.'\Controllers\\'.$controller;
-            if ($controllerObj = $this->findController(
-                $controllerClass,
-                $action,
-                plugins_path()
-            )) {
+            $controllerClass = '\\' . $author . '\\' . $plugin . '\Controllers\\' . $controller;
+            if (
+                $controllerObj = $this->findController(
+                    $controllerClass,
+                    $action,
+                    plugins_path()
+                )
+            ) {
                 return [
                     'controller' => $controllerObj,
                     'action' => $action,
@@ -254,7 +260,7 @@ protected function findController($controller, $action, $inPath)
          */
         if (!class_exists($controller)) {
             $controller = Str::normalizeClassName($controller);
-            $controllerFile = $inPath.strtolower(str_replace('\\', '/', $controller)) . '.php';
+            $controllerFile = $inPath . strtolower(str_replace('\\', '/', $controller)) . '.php';
             if ($controllerFile = File::existsInsensitive($controllerFile)) {
                 include_once $controllerFile;
             }
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index bb413249fe..04ec44def6 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -281,29 +281,19 @@ public function run($action = null, $params = [])
         BackendPreference::setAppLocale();
         BackendPreference::setAppFallbackLocale();
 
-        /*
-         * Execute AJAX event
-         */
         if ($ajaxResponse = $this->execAjaxHandlers()) {
+            // Execute AJAX event
             $result = $ajaxResponse;
-        }
-
-        /*
-         * Execute postback handler
-         */
-        elseif (
+        } elseif (
             ($handler = post('_handler')) &&
             $this->verifyCsrfToken() &&
             ($handlerResponse = $this->runAjaxHandler($handler)) &&
             $handlerResponse !== true
         ) {
+            // Execute AJAX handler
             $result = $handlerResponse;
-        }
-
-        /*
-         * Execute page action
-         */
-        else {
+        } else {
+            // Execute page action
             $result = $this->execPageAction($action, $params);
         }
 
@@ -368,9 +358,9 @@ public function actionUrl($action = null, $path = null)
         $uriPath = dirname(dirname(strtolower(str_replace('\\', '/', $class))));
         $controllerName = strtolower(class_basename($class));
 
-        $url = $uriPath.'/'.$controllerName.'/'.$action;
+        $url = $uriPath . '/' . $controllerName . '/' . $action;
         if ($path) {
-            $url .= '/'.$path;
+            $url .= '/' . $path;
         }
 
         return Backend::url($url);
@@ -462,7 +452,7 @@ protected function execAjaxHandlers()
                  * Validate the handler name
                  */
                 if (!preg_match('/^(?:\w+\:{2})?on[A-Z]{1}[\w+]*$/', $handler)) {
-                    throw new SystemException(Lang::get('backend::lang.ajax_handler.invalid_name', ['name'=>$handler]));
+                    throw new SystemException(Lang::get('backend::lang.ajax_handler.invalid_name', ['name' => $handler]));
                 }
 
                 /*
@@ -473,11 +463,10 @@ protected function execAjaxHandlers()
 
                     foreach ($partialList as $partial) {
                         if (!preg_match('/^(?!.*\/\/)[a-z0-9\_][a-z0-9\_\-\/]*$/i', $partial)) {
-                            throw new SystemException(Lang::get('backend::lang.partial.invalid_name', ['name'=>$partial]));
+                            throw new SystemException(Lang::get('backend::lang.partial.invalid_name', ['name' => $partial]));
                         }
                     }
-                }
-                else {
+                } else {
                     $partialList = [];
                 }
 
@@ -487,7 +476,7 @@ protected function execAjaxHandlers()
                  * Execute the handler
                  */
                 if (!$result = $this->runAjaxHandler($handler)) {
-                    throw new SystemException(Lang::get('backend::lang.ajax_handler.not_found', ['name'=>$handler]));
+                    throw new SystemException(Lang::get('backend::lang.ajax_handler.not_found', ['name' => $handler]));
                 }
 
                 /*
@@ -504,11 +493,8 @@ protected function execAjaxHandlers()
                 if ($result instanceof RedirectResponse) {
                     $responseContents['X_WINTER_REDIRECT'] = $result->getTargetUrl();
                     $result = null;
-                }
-                /*
-                 * No redirect is used, look for any flash messages
-                 */
-                elseif (Flash::check()) {
+                } elseif (Flash::check()) {
+                    // No redirect is used, look for any flash messages
                     $responseContents['#layout-flash-messages'] = $this->makeLayoutPartial('flash_messages');
                 }
 
@@ -526,17 +512,14 @@ protected function execAjaxHandlers()
                  */
                 if (is_array($result)) {
                     $responseContents = array_merge($responseContents, $result);
-                }
-                elseif (is_string($result)) {
+                } elseif (is_string($result)) {
                     $responseContents['result'] = $result;
-                }
-                elseif (is_object($result)) {
+                } elseif (is_object($result)) {
                     return $result;
                 }
 
                 return Response::make()->setContent($responseContents);
-            }
-            catch (ValidationException $ex) {
+            } catch (ValidationException $ex) {
                 /*
                  * Handle validation error gracefully
                  */
@@ -545,11 +528,9 @@ protected function execAjaxHandlers()
                 $responseContents['#layout-flash-messages'] = $this->makeLayoutPartial('flash_messages');
                 $responseContents['X_WINTER_ERROR_FIELDS'] = $ex->getFields();
                 throw new AjaxException($responseContents);
-            }
-            catch (MassAssignmentException $ex) {
+            } catch (MassAssignmentException $ex) {
                 throw new ApplicationException(Lang::get('backend::lang.model.mass_assignment_failed', ['attribute' => $ex->getMessage()]));
-            }
-            catch (Exception $ex) {
+            } catch (Exception $ex) {
                 throw $ex;
             }
         }
@@ -613,15 +594,14 @@ protected function runAjaxHandler($handler)
             }
 
             if (!isset($this->widget->{$widgetName})) {
-                throw new SystemException(Lang::get('backend::lang.widget.not_bound', ['name'=>$widgetName]));
+                throw new SystemException(Lang::get('backend::lang.widget.not_bound', ['name' => $widgetName]));
             }
 
             if (($widget = $this->widget->{$widgetName}) && $widget->methodExists($handlerName)) {
                 $result = $this->runAjaxHandlerForWidget($widget, $handlerName);
                 return $result ?: true;
             }
-        }
-        else {
+        } else {
             /*
              * Process page specific handler (index_onSomething)
              */
diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php
index 9b7dbee165..df4f134f89 100644
--- a/modules/backend/classes/ControllerBehavior.php
+++ b/modules/backend/classes/ControllerBehavior.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Lang;
 use ApplicationException;
diff --git a/modules/backend/classes/FilterScope.php b/modules/backend/classes/FilterScope.php
index 6a58852ae5..5fb1a29af0 100644
--- a/modules/backend/classes/FilterScope.php
+++ b/modules/backend/classes/FilterScope.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Winter\Storm\Html\Helper as HtmlHelper;
 
@@ -153,10 +155,10 @@ protected function evalConfig($config)
     public function getId($suffix = null)
     {
         $id = 'scope';
-        $id .= '-'.$this->scopeName;
+        $id .= '-' . $this->scopeName;
 
         if ($suffix) {
-            $id .= '-'.$suffix;
+            $id .= '-' . $suffix;
         }
 
         if ($this->idPrefix) {
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index 39bd8addc6..cd0824024d 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -229,8 +229,7 @@ public function options($value = null)
         if ($value === null) {
             if (is_array($this->options)) {
                 return $this->options;
-            }
-            elseif (is_callable($this->options)) {
+            } elseif (is_callable($this->options)) {
                 $callable = $this->options;
                 return $callable();
             }
@@ -335,8 +334,7 @@ protected function evalConfig($config)
 
         if (isset($config['valueFrom'])) {
             $this->valueFrom = $config['valueFrom'];
-        }
-        else {
+        } else {
             $this->valueFrom = $this->fieldName;
         }
 
@@ -431,12 +429,9 @@ public function getAttributes($position = 'field', $htmlBuild = true)
         $result = array_get($this->attributes, $position, []);
         $result = $this->filterAttributes($result, $position);
 
-        // Field is required, so add the "required" attribute
         if ($position === 'field' && $this->required && (!isset($result['required']) || $result['required'])) {
             $result['required'] = '';
-        }
-        // The "required" attribute is set and falsy, so unset it
-        elseif ($position === 'field' && isset($result['required']) && !$result['required']) {
+        } elseif ($position === 'field' && isset($result['required']) && !$result['required']) {
             unset($result['required']);
         }
 
@@ -516,14 +511,13 @@ protected function filterTriggerAttributes($attributes, $position = 'field')
 
         // Final compilation
         if ($this->arrayName) {
-            $fullTriggerField = $triggerForm.'['.implode('][', HtmlHelper::nameToArray($triggerField)).']'.$triggerMulti;
-        }
-        else {
-            $fullTriggerField = $triggerField.$triggerMulti;
+            $fullTriggerField = $triggerForm . '[' . implode('][', HtmlHelper::nameToArray($triggerField)) . ']' . $triggerMulti;
+        } else {
+            $fullTriggerField = $triggerField . $triggerMulti;
         }
 
         $newAttributes = [
-            'data-trigger' => '[name="'.$fullTriggerField.'"]',
+            'data-trigger' => '[name="' . $fullTriggerField . '"]',
             'data-trigger-action' => $triggerAction,
             'data-trigger-condition' => $triggerCondition,
             'data-trigger-closest-parent' => 'form, div[data-control="formwidget"]'
@@ -552,14 +546,13 @@ protected function filterPresetAttributes($attributes, $position = 'field')
         $presetType = array_get($this->preset, 'type');
 
         if ($this->arrayName) {
-            $fullPresetField = $this->arrayName.'['.implode('][', HtmlHelper::nameToArray($presetField)).']';
-        }
-        else {
+            $fullPresetField = $this->arrayName . '[' . implode('][', HtmlHelper::nameToArray($presetField)) . ']';
+        } else {
             $fullPresetField = $presetField;
         }
 
         $newAttributes = [
-            'data-input-preset' => '[name="'.$fullPresetField.'"]',
+            'data-input-preset' => '[name="' . $fullPresetField . '"]',
             'data-input-preset-type' => $presetType,
             'data-input-preset-closest-parent' => 'form'
         ];
@@ -583,7 +576,7 @@ public function getName($arrayName = null)
         }
 
         if ($arrayName) {
-            return $arrayName.'['.implode('][', HtmlHelper::nameToArray($this->fieldName)).']';
+            return $arrayName . '[' . implode('][', HtmlHelper::nameToArray($this->fieldName)) . ']';
         }
 
         return $this->fieldName;
@@ -598,13 +591,13 @@ public function getId($suffix = null)
     {
         $id = 'field';
         if ($this->arrayName) {
-            $id .= '-'.$this->arrayName;
+            $id .= '-' . $this->arrayName;
         }
 
-        $id .= '-'.$this->fieldName;
+        $id .= '-' . $this->fieldName;
 
         if ($suffix) {
-            $id .= '-'.$suffix;
+            $id .= '-' . $suffix;
         }
 
         if ($this->idPrefix) {
diff --git a/modules/backend/classes/FormTabs.php b/modules/backend/classes/FormTabs.php
index e14ae0f2a3..8e3755a891 100644
--- a/modules/backend/classes/FormTabs.php
+++ b/modules/backend/classes/FormTabs.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use IteratorAggregate;
 use ArrayIterator;
diff --git a/modules/backend/classes/FormWidgetBase.php b/modules/backend/classes/FormWidgetBase.php
index 9d06e12b4c..d575737c3e 100644
--- a/modules/backend/classes/FormWidgetBase.php
+++ b/modules/backend/classes/FormWidgetBase.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Winter\Storm\Html\Helper as HtmlHelper;
 
@@ -11,7 +13,6 @@
  */
 abstract class FormWidgetBase extends WidgetBase
 {
-
     //
     // Configurable properties
     //
diff --git a/modules/backend/classes/ListColumn.php b/modules/backend/classes/ListColumn.php
index 58614abed9..0b3f99079b 100644
--- a/modules/backend/classes/ListColumn.php
+++ b/modules/backend/classes/ListColumn.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Winter\Storm\Database\Model;
 use Winter\Storm\Html\Helper as HtmlHelper;
@@ -201,10 +203,10 @@ public function getId($suffix = null)
     {
         $id = 'column';
 
-        $id .= '-'.$this->columnName;
+        $id .= '-' . $this->columnName;
 
         if ($suffix) {
-            $id .= '-'.$suffix;
+            $id .= '-' . $suffix;
         }
 
         return HtmlHelper::nameToId($id);
@@ -266,8 +268,7 @@ protected function getColumnNameFromData($columnName, $data, $default = null)
         foreach ($keyParts as $key) {
             if ($result instanceof Model && $result->hasRelation($key)) {
                 $result = $result->{$key};
-            }
-            else {
+            } else {
                 if (is_array($result) && array_key_exists($key, $result)) {
                     $result = $result[$key];
                 } elseif (!isset($result->{$key})) {
diff --git a/modules/backend/classes/MainMenuItem.php b/modules/backend/classes/MainMenuItem.php
index ef64f562b6..0d6bae1d0c 100644
--- a/modules/backend/classes/MainMenuItem.php
+++ b/modules/backend/classes/MainMenuItem.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Winter\Storm\Exception\SystemException;
 
diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php
index d06d7db4e5..a56205a21d 100644
--- a/modules/backend/classes/NavigationManager.php
+++ b/modules/backend/classes/NavigationManager.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Event;
 use BackendAuth;
diff --git a/modules/backend/classes/QuickActionItem.php b/modules/backend/classes/QuickActionItem.php
index 8dab2e7251..9250d3c898 100644
--- a/modules/backend/classes/QuickActionItem.php
+++ b/modules/backend/classes/QuickActionItem.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 /**
  * Class QuickActionItem
diff --git a/modules/backend/classes/ReportWidgetBase.php b/modules/backend/classes/ReportWidgetBase.php
index ac7b091d84..0679923fb9 100644
--- a/modules/backend/classes/ReportWidgetBase.php
+++ b/modules/backend/classes/ReportWidgetBase.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 /**
  * Report Widget base class
diff --git a/modules/backend/classes/SideMenuItem.php b/modules/backend/classes/SideMenuItem.php
index a7fd9b647d..14e46976c3 100644
--- a/modules/backend/classes/SideMenuItem.php
+++ b/modules/backend/classes/SideMenuItem.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 /**
  * Class SideMenuItem
diff --git a/modules/backend/classes/Skin.php b/modules/backend/classes/Skin.php
index b64b83c0d4..3290b668e9 100644
--- a/modules/backend/classes/Skin.php
+++ b/modules/backend/classes/Skin.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use File;
 use Config;
@@ -92,7 +94,7 @@ public function getPath($path = null, $isPublic = false)
      */
     public function getLayoutPaths()
     {
-        return [$this->skinPath.'/layouts', $this->defaultSkinPath.'/layouts'];
+        return [$this->skinPath . '/layouts', $this->defaultSkinPath . '/layouts'];
     }
 
     /**
diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php
index 91f1ec57ae..e88021f485 100644
--- a/modules/backend/classes/WidgetBase.php
+++ b/modules/backend/classes/WidgetBase.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Winter\Storm\Html\Helper as HtmlHelper;
 use Winter\Storm\Extension\Extendable;
@@ -113,7 +115,7 @@ protected function loadAssets()
     public function bindToController()
     {
         if ($this->controller->widget === null) {
-            $this->controller->widget = new stdClass;
+            $this->controller->widget = new stdClass();
         }
 
         $this->controller->widget->{$this->alias} = $this;
diff --git a/modules/backend/classes/WidgetManager.php b/modules/backend/classes/WidgetManager.php
index 302ef4b6ee..13e90a6b74 100644
--- a/modules/backend/classes/WidgetManager.php
+++ b/modules/backend/classes/WidgetManager.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
 use Str;
 use BackendAuth;
diff --git a/modules/backend/console/CreateController.php b/modules/backend/console/CreateController.php
index bb89184938..e0f7e3ccee 100644
--- a/modules/backend/console/CreateController.php
+++ b/modules/backend/console/CreateController.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Console;
+<?php
+
+namespace Backend\Console;
 
 use System\Console\BaseScaffoldCommand;
 use Winter\Storm\Support\Str;
diff --git a/modules/backend/console/CreateFormWidget.php b/modules/backend/console/CreateFormWidget.php
index d5ba0f4c25..59207abb6e 100644
--- a/modules/backend/console/CreateFormWidget.php
+++ b/modules/backend/console/CreateFormWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Console;
+<?php
+
+namespace Backend\Console;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/backend/console/CreateReportWidget.php b/modules/backend/console/CreateReportWidget.php
index 33e329a6c9..2e581ddc46 100644
--- a/modules/backend/console/CreateReportWidget.php
+++ b/modules/backend/console/CreateReportWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Console;
+<?php
+
+namespace Backend\Console;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/backend/console/WinterPasswd.php b/modules/backend/console/WinterPasswd.php
index 42da7c872f..3cb83e831b 100644
--- a/modules/backend/console/WinterPasswd.php
+++ b/modules/backend/console/WinterPasswd.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Console;
+<?php
+
+namespace Backend\Console;
 
 use Backend\Models\User;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
diff --git a/modules/backend/controllers/AccessLogs.php b/modules/backend/controllers/AccessLogs.php
index 05391cb7b2..558b490519 100644
--- a/modules/backend/controllers/AccessLogs.php
+++ b/modules/backend/controllers/AccessLogs.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use Backend;
 use BackendMenu;
diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php
index 82a39dec65..66a322c023 100644
--- a/modules/backend/controllers/Auth.php
+++ b/modules/backend/controllers/Auth.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use ApplicationException;
 use Backend;
diff --git a/modules/backend/controllers/Files.php b/modules/backend/controllers/Files.php
index 37ad192faf..9b8dd44f19 100644
--- a/modules/backend/controllers/Files.php
+++ b/modules/backend/controllers/Files.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use View;
 use Cache;
@@ -30,8 +32,7 @@ public function get($code = null)
     {
         try {
             return $this->findFileObject($code)->output('inline', true);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
         }
 
         return Response::make(View::make('backend::404'), 404);
@@ -49,8 +50,7 @@ public function thumb($code = null, $width = 100, $height = 100, $mode = 'auto',
                 compact('mode', 'extension'),
                 true
             );
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
         }
 
         return Response::make(View::make('backend::404'), 404);
diff --git a/modules/backend/controllers/Index.php b/modules/backend/controllers/Index.php
index 8b6abed758..749b76a4af 100644
--- a/modules/backend/controllers/Index.php
+++ b/modules/backend/controllers/Index.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use Backend;
 use Redirect;
diff --git a/modules/backend/controllers/Media.php b/modules/backend/controllers/Media.php
index 7a3a743e0c..4073340f60 100644
--- a/modules/backend/controllers/Media.php
+++ b/modules/backend/controllers/Media.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use BackendMenu;
 use Backend\Classes\Controller;
diff --git a/modules/backend/controllers/Preferences.php b/modules/backend/controllers/Preferences.php
index 262c1059cd..9015762922 100644
--- a/modules/backend/controllers/Preferences.php
+++ b/modules/backend/controllers/Preferences.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use Lang;
 use Flash;
diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php
index 10bc25725d..a372c86747 100644
--- a/modules/backend/controllers/UserGroups.php
+++ b/modules/backend/controllers/UserGroups.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use BackendMenu;
 use Backend\Classes\Controller;
diff --git a/modules/backend/controllers/UserRoles.php b/modules/backend/controllers/UserRoles.php
index 7aa23d0458..7afe98c394 100644
--- a/modules/backend/controllers/UserRoles.php
+++ b/modules/backend/controllers/UserRoles.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use View;
 use Response;
diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php
index 9151933e76..315350ec6e 100644
--- a/modules/backend/controllers/Users.php
+++ b/modules/backend/controllers/Users.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
 use Mail;
 use Lang;
diff --git a/modules/backend/controllers/index/index.php b/modules/backend/controllers/index/index.php
index 971d2d67d2..503be44031 100644
--- a/modules/backend/controllers/index/index.php
+++ b/modules/backend/controllers/index/index.php
@@ -1,4 +1,4 @@
-<?= Form::open(['class'=>'layout-relative dashboard-container']) ?>
+<?= Form::open(['class' => 'layout-relative dashboard-container']) ?>
     <div id="dashReportContainer" class="report-container loading">
         <!-- Loading -->
         <div class="loading-indicator-container">
diff --git a/modules/backend/controllers/media/index.php b/modules/backend/controllers/media/index.php
index 7ff071ee65..73e8a9b6b8 100644
--- a/modules/backend/controllers/media/index.php
+++ b/modules/backend/controllers/media/index.php
@@ -1,5 +1,5 @@
 <?= Block::put('body') ?>
-    <?= Form::open(['class'=>'layout', 'onsubmit'=>'return false']) ?>
+    <?= Form::open(['class' => 'layout', 'onsubmit' => 'return false']) ?>
         <?= $this->widget->manager->render() ?>
     <?= Form::close() ?>
 <?= Block::endPut() ?>
diff --git a/modules/backend/controllers/preferences/index.php b/modules/backend/controllers/preferences/index.php
index 1266aba635..947408399d 100644
--- a/modules/backend/controllers/preferences/index.php
+++ b/modules/backend/controllers/preferences/index.php
@@ -1,6 +1,6 @@
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/backend/controllers/usergroups/create.php b/modules/backend/controllers/usergroups/create.php
index 34012411fd..11cde69134 100644
--- a/modules/backend/controllers/usergroups/create.php
+++ b/modules/backend/controllers/usergroups/create.php
@@ -8,7 +8,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/backend/controllers/usergroups/update.php b/modules/backend/controllers/usergroups/update.php
index fa1462dd3c..88bdc69888 100644
--- a/modules/backend/controllers/usergroups/update.php
+++ b/modules/backend/controllers/usergroups/update.php
@@ -8,7 +8,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/backend/controllers/userroles/create.php b/modules/backend/controllers/userroles/create.php
index 0ba5e3099b..f7e239eb45 100644
--- a/modules/backend/controllers/userroles/create.php
+++ b/modules/backend/controllers/userroles/create.php
@@ -8,7 +8,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/backend/controllers/userroles/update.php b/modules/backend/controllers/userroles/update.php
index 888c15e53b..48e6effc9d 100644
--- a/modules/backend/controllers/userroles/update.php
+++ b/modules/backend/controllers/userroles/update.php
@@ -8,7 +8,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/backend/controllers/users/create.php b/modules/backend/controllers/users/create.php
index 4638a6a2d9..6489c9db2b 100644
--- a/modules/backend/controllers/users/create.php
+++ b/modules/backend/controllers/users/create.php
@@ -50,7 +50,7 @@ class="btn btn-default">
     <?php Block::endPut() ?>
 
     <?php Block::put('body') ?>
-        <?= Form::open(['class'=>'layout stretch']) ?>
+        <?= Form::open(['class' => 'layout stretch']) ?>
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
diff --git a/modules/backend/controllers/users/myaccount.php b/modules/backend/controllers/users/myaccount.php
index 9c91187d18..58b3bdeb39 100644
--- a/modules/backend/controllers/users/myaccount.php
+++ b/modules/backend/controllers/users/myaccount.php
@@ -52,7 +52,7 @@ class="btn btn-default">
     <?php Block::endPut() ?>
 
     <?php Block::put('body') ?>
-        <?= Form::open(['class'=>'layout stretch']) ?>
+        <?= Form::open(['class' => 'layout stretch']) ?>
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
diff --git a/modules/backend/controllers/users/update.php b/modules/backend/controllers/users/update.php
index 6317998ea4..a38496a3ec 100644
--- a/modules/backend/controllers/users/update.php
+++ b/modules/backend/controllers/users/update.php
@@ -72,7 +72,7 @@ class="wn-icon-trash-o btn-icon danger pull-right"
     <?php Block::endPut() ?>
 
     <?php Block::put('body') ?>
-        <?= Form::open(['class'=>'layout stretch']) ?>
+        <?= Form::open(['class' => 'layout stretch']) ?>
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
diff --git a/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php b/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php
index fe6f15bc5f..bb41c86b13 100644
--- a/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php
+++ b/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php
@@ -87,8 +87,7 @@ protected function migratePermissionsFromGroupsToRoles()
                     'description' => $group->description,
                     'permissions' => $group->permissions ?? null
                 ]);
-            }
-            catch (Exception $ex) {
+            } catch (Exception $ex) {
             }
 
             $permissions[$group->id] = $group->permissions ?? null;
@@ -130,8 +129,7 @@ protected function migratePermissionsFromGroupsToRoles()
                 try {
                     $perms = json_decode($permString, true);
                     $userPerms = array_merge($userPerms, $perms);
-                }
-                catch (Exception $ex) {
+                } catch (Exception $ex) {
                 }
             }
 
@@ -158,8 +156,7 @@ protected function splicePermissionsForUser($userId, $permissions)
             Db::table('backend_users')->where('id', $userId)->update([
                 'permissions' => json_encode($newPerms)
             ]);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
         }
     }
 }
diff --git a/modules/backend/database/seeds/DatabaseSeeder.php b/modules/backend/database/seeds/DatabaseSeeder.php
index 3a8d6d7468..59d43fdd6c 100644
--- a/modules/backend/database/seeds/DatabaseSeeder.php
+++ b/modules/backend/database/seeds/DatabaseSeeder.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Database\Seeds;
+<?php
+
+namespace Backend\Database\Seeds;
 
 use Str;
 use Seeder;
@@ -19,7 +21,7 @@ public function run()
 
         Eloquent::unguarded(function () use ($adminPassword) {
             // Generate a random password for the seeded admin account
-            $adminSeeder = new \Backend\Database\Seeds\SeedSetupAdmin;
+            $adminSeeder = new \Backend\Database\Seeds\SeedSetupAdmin();
             $adminSeeder->setDefaults([
                 'password' => $adminPassword
             ]);
diff --git a/modules/backend/database/seeds/SeedSetupAdmin.php b/modules/backend/database/seeds/SeedSetupAdmin.php
index 77967382d6..0d4ff93a6a 100644
--- a/modules/backend/database/seeds/SeedSetupAdmin.php
+++ b/modules/backend/database/seeds/SeedSetupAdmin.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Database\Seeds;
+<?php
+
+namespace Backend\Database\Seeds;
 
 use Seeder;
 use Backend\Models\User;
diff --git a/modules/backend/facades/Backend.php b/modules/backend/facades/Backend.php
index 99cb59b76f..9798243afa 100644
--- a/modules/backend/facades/Backend.php
+++ b/modules/backend/facades/Backend.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Facades;
+<?php
+
+namespace Backend\Facades;
 
 use Winter\Storm\Support\Facade;
 
diff --git a/modules/backend/facades/BackendAuth.php b/modules/backend/facades/BackendAuth.php
index d392913771..2890b24288 100644
--- a/modules/backend/facades/BackendAuth.php
+++ b/modules/backend/facades/BackendAuth.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Facades;
+<?php
+
+namespace Backend\Facades;
 
 use Winter\Storm\Support\Facade;
 
diff --git a/modules/backend/facades/BackendMenu.php b/modules/backend/facades/BackendMenu.php
index c4d480bc5c..3cc6244900 100644
--- a/modules/backend/facades/BackendMenu.php
+++ b/modules/backend/facades/BackendMenu.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Facades;
+<?php
+
+namespace Backend\Facades;
 
 use Winter\Storm\Support\Facade;
 
diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php
index 2a360e01d3..658449de4f 100644
--- a/modules/backend/formwidgets/CodeEditor.php
+++ b/modules/backend/formwidgets/CodeEditor.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Backend\Models\Preference as BackendPreference;
 use Backend\Classes\FormWidgetBase;
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
index 247271f798..62a830ff42 100644
--- a/modules/backend/formwidgets/ColorPicker.php
+++ b/modules/backend/formwidgets/ColorPicker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Lang;
 use Backend\Classes\FormWidgetBase;
diff --git a/modules/backend/formwidgets/DataTable.php b/modules/backend/formwidgets/DataTable.php
index 3a5c26c089..6cefc7637e 100644
--- a/modules/backend/formwidgets/DataTable.php
+++ b/modules/backend/formwidgets/DataTable.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Lang;
 use Backend\Widgets\Table;
diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php
index 893c9612ce..6a98d2ad78 100644
--- a/modules/backend/formwidgets/DatePicker.php
+++ b/modules/backend/formwidgets/DatePicker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Config;
 use Carbon\Carbon;
@@ -196,11 +198,9 @@ protected function getDateFormatAlias()
 
         if ($this->mode == 'time') {
             return 'time';
-        }
-        elseif ($this->mode == 'date') {
+        } elseif ($this->mode == 'date') {
             return 'dateLong';
-        }
-        else {
+        } else {
             return 'dateTimeLong';
         }
     }
diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index fea3b72400..a4ee6aa311 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Db;
 use Input;
@@ -314,7 +316,7 @@ public function getAcceptedFileTypes($includeDot = false)
             }
 
             if ($includeDot) {
-                $value = '.'.$value;
+                $value = '.' . $value;
             }
 
             return $value;
@@ -389,8 +391,7 @@ public function onSaveAttachmentConfig()
             }
 
             throw new ApplicationException('Unable to find file, it may no longer exist');
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             return json_encode(['error' => $ex->getMessage()]);
         }
     }
@@ -433,7 +434,7 @@ public function onUpload()
                     throw new ApplicationException('File missing from request');
                 }
 
-                $validationRules = ['max:'.$file::getMaxFilesize()];
+                $validationRules = ['max:' . $file::getMaxFilesize()];
                 $data = Input::file('file_data');
 
                 if (!$data->isValid()) {
@@ -441,11 +442,11 @@ public function onUpload()
                 }
 
                 if ($fileTypes = $this->getAcceptedFileTypes()) {
-                    $validationRules[] = 'extensions:'.$fileTypes;
+                    $validationRules[] = 'extensions:' . $fileTypes;
                 }
 
                 if ($this->mimeTypes) {
-                    $validationRules[] = 'mimes:'.$this->mimeTypes;
+                    $validationRules[] = 'mimes:' . $this->mimeTypes;
                 }
 
                 $validation = Validator::make(
@@ -468,8 +469,7 @@ public function onUpload()
             $parent = $fileRelation->getParent();
             if ($this->attachOnUpload && $parent && $parent->exists) {
                 $fileRelation->add($file);
-            }
-            else {
+            } else {
                 $fileRelation->add($file, $this->sessionKey);
             }
 
@@ -482,8 +482,7 @@ public function onUpload()
             ];
 
             $response = Response::make($result, 200);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $response = Response::make($ex->getMessage(), 400);
         }
 
diff --git a/modules/backend/formwidgets/IconPicker.php b/modules/backend/formwidgets/IconPicker.php
index 33eafc611e..0e941f96ca 100644
--- a/modules/backend/formwidgets/IconPicker.php
+++ b/modules/backend/formwidgets/IconPicker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 use File;
diff --git a/modules/backend/formwidgets/MarkdownEditor.php b/modules/backend/formwidgets/MarkdownEditor.php
index a884fe5c1c..2253270566 100644
--- a/modules/backend/formwidgets/MarkdownEditor.php
+++ b/modules/backend/formwidgets/MarkdownEditor.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Html;
 use Markdown;
diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
index ee3b70705c..d1eed96e5e 100644
--- a/modules/backend/formwidgets/MediaFinder.php
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use BackendAuth;
 use Backend\Classes\FormField;
@@ -66,7 +68,8 @@ public function init()
 
         $user = BackendAuth::getUser();
 
-        if ($this->formField->disabled
+        if (
+            $this->formField->disabled
             || $this->formField->readOnly
             || !$user
             || !$user->hasAccess('media.manage_media')
diff --git a/modules/backend/formwidgets/NestedForm.php b/modules/backend/formwidgets/NestedForm.php
index c4479f5fc4..01931a92c4 100644
--- a/modules/backend/formwidgets/NestedForm.php
+++ b/modules/backend/formwidgets/NestedForm.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 use Backend\Widgets\Form;
diff --git a/modules/backend/formwidgets/PermissionEditor.php b/modules/backend/formwidgets/PermissionEditor.php
index 86edc6b4b6..be0b6b9afb 100644
--- a/modules/backend/formwidgets/PermissionEditor.php
+++ b/modules/backend/formwidgets/PermissionEditor.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 use BackendAuth;
@@ -149,19 +151,20 @@ protected function getFilteredPermissions()
 
         foreach ($permissions as $tab => $permissionsArray) {
             foreach ($permissionsArray as $index => $permission) {
-                if (!$this->user->hasAccess($permission->code) ||
+                if (
+                    !$this->user->hasAccess($permission->code) ||
                     (
                         is_array($this->availablePermissions) &&
                         !in_array($permission->code, $this->availablePermissions)
-                    )) {
+                    )
+                ) {
                     unset($permissionsArray[$index]);
                 }
             }
 
             if (empty($permissionsArray)) {
                 unset($permissions[$tab]);
-            }
-            else {
+            } else {
                 $permissions[$tab] = $permissionsArray;
             }
         }
diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index 982e12dc01..27ef97a214 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Lang;
 use ApplicationException;
@@ -192,7 +194,7 @@ public function onRefresh()
         }
 
         $this->prepareVars();
-        return ['#'.$this->getId('container') => $this->makePartial('recordfinder')];
+        return ['#' . $this->getId('container') => $this->makePartial('recordfinder')];
     }
 
     public function onClearRecord()
@@ -205,7 +207,7 @@ public function onClearRecord()
         }
 
         $this->prepareVars();
-        return ['#'.$this->getId('container') => $this->makePartial('recordfinder')];
+        return ['#' . $this->getId('container') => $this->makePartial('recordfinder')];
     }
 
     /**
@@ -320,7 +322,7 @@ protected function getRecordModel(): Model
         if ($this->useRelation) {
             $model = $this->getRelationModel();
         } else {
-            $model = new $this->modelClass;
+            $model = new $this->modelClass();
         }
         return $model;
     }
@@ -346,13 +348,11 @@ protected function makeListWidget()
             $widget->bindEvent('list.extendQueryBefore', function ($query) use ($sqlConditions) {
                 $query->whereRaw($sqlConditions);
             });
-        }
-        elseif ($scopeMethod = $this->scope) {
+        } elseif ($scopeMethod = $this->scope) {
             $widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) {
                 $query->$scopeMethod($this->model);
             });
-        }
-        else {
+        } else {
             if ($this->useRelation) {
                 $widget->bindEvent('list.extendQueryBefore', function ($query) {
                     $this->getRelationObject()->addDefinedConstraintsToQuery($query);
diff --git a/modules/backend/formwidgets/Relation.php b/modules/backend/formwidgets/Relation.php
index 830af3b492..767941eab1 100644
--- a/modules/backend/formwidgets/Relation.php
+++ b/modules/backend/formwidgets/Relation.php
@@ -156,8 +156,7 @@ protected function makeRenderFormField()
                 $nameFrom = 'selection';
                 $selectColumn = $usesTree ? '*' : $relationModel->getKeyName();
                 $result = $query->select($selectColumn, Db::raw($this->sqlSelect . ' AS ' . $nameFrom));
-            }
-            else {
+            } else {
                 $nameFrom = $this->nameFrom;
                 $result = $query->getQuery()->get();
             }
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index d0d9b41972..92d38e3db1 100644
--- a/modules/backend/formwidgets/Repeater.php
+++ b/modules/backend/formwidgets/Repeater.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Lang;
 use ApplicationException;
@@ -327,7 +329,7 @@ protected function makeItemFormWidget($index = 0, $groupCode = null)
         $config->model = $this->model;
         $config->data = $this->getValueFromIndex($index);
         $config->alias = $this->alias . 'Form' . $index;
-        $config->arrayName = $this->getFieldName().'['.$index.']';
+        $config->arrayName = $this->getFieldName() . '[' . $index . ']';
         $config->isNested = true;
         if (self::$onAddItemCalled || $this->minItems > 0) {
             $config->enableDefaults = true;
@@ -446,7 +448,7 @@ protected function checkAddItemRequest()
         if ($this->alias === $widgetName) {
             // This repeater has made the AJAX request
             self::$onAddItemCalled = true;
-        } else if (strpos($widgetName, $this->alias . 'Form') === 0) {
+        } elseif (strpos($widgetName, $this->alias . 'Form') === 0) {
             // A child repeater has made the AJAX request
 
             // Get index from AJAX handler
@@ -473,7 +475,7 @@ protected function getGroupFormFieldConfig($code)
             return null;
         }
 
-        $fields = array_get($this->groupDefinitions, $code.'.fields');
+        $fields = array_get($this->groupDefinitions, $code . '.fields');
 
         if (!$fields) {
             return null;
@@ -520,7 +522,7 @@ protected function processGroupMode()
      */
     public function getGroupCodeFromIndex($index)
     {
-        return array_get($this->indexMeta, $index.'.groupCode');
+        return array_get($this->indexMeta, $index . '.groupCode');
     }
 
     /**
@@ -530,6 +532,6 @@ public function getGroupCodeFromIndex($index)
      */
     public function getGroupTitle($groupCode)
     {
-        return array_get($this->groupDefinitions, $groupCode.'.name');
+        return array_get($this->groupDefinitions, $groupCode . '.name');
     }
 }
diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php
index 15b7f8b1a1..a1c0726adf 100644
--- a/modules/backend/formwidgets/RichEditor.php
+++ b/modules/backend/formwidgets/RichEditor.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use App;
 use File;
@@ -155,7 +157,7 @@ protected function loadAssets()
         $this->addJs('/modules/backend/formwidgets/codeeditor/assets/js/build-min.js', 'core');
 
         if ($lang = $this->getValidEditorLang()) {
-            $this->addJs('vendor/froala/js/languages/'.$lang.'.js', 'core');
+            $this->addJs('vendor/froala/js/languages/' . $lang . '.js', 'core');
         }
     }
 
@@ -173,7 +175,7 @@ protected function getValidEditorLang()
         }
 
         $locale = str_replace('-', '_', strtolower($locale));
-        $path = base_path('modules/backend/formwidgets/richeditor/assets/vendor/froala/js/languages/'.$locale.'.js');
+        $path = base_path('modules/backend/formwidgets/richeditor/assets/vendor/froala/js/languages/' . $locale . '.js');
 
         return File::exists($path) ? $locale : false;
     }
diff --git a/modules/backend/formwidgets/Sensitive.php b/modules/backend/formwidgets/Sensitive.php
index 8ab91b87f9..4d34c6f54f 100644
--- a/modules/backend/formwidgets/Sensitive.php
+++ b/modules/backend/formwidgets/Sensitive.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\FormWidgets;
+<?php
+
+namespace Backend\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 
diff --git a/modules/backend/formwidgets/TagList.php b/modules/backend/formwidgets/TagList.php
index 7159fbb161..2f82e4f633 100644
--- a/modules/backend/formwidgets/TagList.php
+++ b/modules/backend/formwidgets/TagList.php
@@ -142,7 +142,7 @@ protected function hydrateRelationSaveValue($names): ?array
         $newTags = $this->customTags ? array_diff($names, $existingTags) : [];
 
         foreach ($newTags as $newTag) {
-            $newModel = new $relationModel;
+            $newModel = new $relationModel();
             $newModel->{$this->nameFrom} = $newTag;
             $newModel->save();
             $existingTags[$newModel->getKey()] = $newTag;
diff --git a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.php b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.php
index f01dc78ee4..099d532e36 100644
--- a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.php
+++ b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.php
@@ -5,7 +5,7 @@
 <?php else: ?>
     <div
         id="<?= $this->getId() ?>"
-        class="field-codeeditor size-<?= $size ?> <?= $stretch?'layout-relative':'' ?>"
+        class="field-codeeditor size-<?= $size ?> <?= $stretch ? 'layout-relative' : '' ?>"
         data-control="codeeditor"
         data-font-size="<?= $fontSize ?>"
         data-word-wrap="<?= $wordWrap ?>"
diff --git a/modules/backend/formwidgets/relation/partials/_relation.php b/modules/backend/formwidgets/relation/partials/_relation.php
index 9c6d13db3d..ba4a87bc83 100644
--- a/modules/backend/formwidgets/relation/partials/_relation.php
+++ b/modules/backend/formwidgets/relation/partials/_relation.php
@@ -1,3 +1,3 @@
 <div class="relation-widget" id="<?= $this->getId() ?>">
-    <?= $this->makePartial('~/modules/backend/widgets/form/partials/_field_'.$field->type.'.php', ['field' => $field]) ?>
+    <?= $this->makePartial('~/modules/backend/widgets/form/partials/_field_' . $field->type . '.php', ['field' => $field]) ?>
 </div>
\ No newline at end of file
diff --git a/modules/backend/formwidgets/repeater/partials/_repeater.php b/modules/backend/formwidgets/repeater/partials/_repeater.php
index 0faf7e6a6d..c323702f8f 100644
--- a/modules/backend/formwidgets/repeater/partials/_repeater.php
+++ b/modules/backend/formwidgets/repeater/partials/_repeater.php
@@ -1,9 +1,9 @@
 <div class="field-repeater"
     data-control="fieldrepeater"
-    <?= $titleFrom ? 'data-title-from="'.$titleFrom.'"' : '' ?>
-    <?= $minItems ? 'data-min-items="'.$minItems.'"' : '' ?>
-    <?= $maxItems ? 'data-max-items="'.$maxItems.'"' : '' ?>
-    <?= $style ? 'data-style="'.$style.'"' : '' ?>
+    <?= $titleFrom ? 'data-title-from="' . $titleFrom . '"' : '' ?>
+    <?= $minItems ? 'data-min-items="' . $minItems . '"' : '' ?>
+    <?= $maxItems ? 'data-max-items="' . $maxItems . '"' : '' ?>
+    <?= $style ? 'data-style="' . $style . '"' : '' ?>
     data-mode="<?= $mode ?>"
     <?php if ($mode === 'grid'): ?>
     data-columns="<?= $columns ?>"
diff --git a/modules/backend/formwidgets/repeater/partials/_repeater_item.php b/modules/backend/formwidgets/repeater/partials/_repeater_item.php
index e18f189a45..656c30e5ec 100644
--- a/modules/backend/formwidgets/repeater/partials/_repeater_item.php
+++ b/modules/backend/formwidgets/repeater/partials/_repeater_item.php
@@ -3,7 +3,7 @@
     $itemTitle = $useGroups ? $this->getGroupTitle($groupCode) : null;
 ?>
 <li
-    <?= $itemTitle ? 'data-collapse-title="'.e(trans($itemTitle)).'"' : '' ?>
+    <?= $itemTitle ? 'data-collapse-title="' . e(trans($itemTitle)) . '"' : '' ?>
     class="field-repeater-item"
     <?php if ($mode === 'grid'): ?>
     style="min-height: <?= $rowHeight ?>px"
diff --git a/modules/backend/formwidgets/richeditor/partials/_richeditor.php b/modules/backend/formwidgets/richeditor/partials/_richeditor.php
index 102ab9555a..af9b8a81b3 100755
--- a/modules/backend/formwidgets/richeditor/partials/_richeditor.php
+++ b/modules/backend/formwidgets/richeditor/partials/_richeditor.php
@@ -4,7 +4,7 @@
 <?php else: ?>
     <div
         id="<?= $this->getId() ?>"
-        class="field-richeditor size-<?= $size ?> <?= $stretch?'layout-relative stretch':'' ?>"
+        class="field-richeditor size-<?= $size ?> <?= $stretch ? 'layout-relative stretch' : '' ?>"
         <?php if ($fullPage): ?>
             data-fullpage="true"
         <?php endif ?>
diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php
index 83b530ec2a..81abcef049 100644
--- a/modules/backend/helpers/Backend.php
+++ b/modules/backend/helpers/Backend.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Helpers;
+<?php
+
+namespace Backend\Helpers;
 
 use Url;
 use File;
@@ -150,8 +152,7 @@ public function dateTime($dateTime, $options = [])
 
         if ($jsFormat !== null) {
             $format = $jsFormat;
-        }
-        else {
+        } else {
             $format = DateTimeHelper::momentFormat($format);
         }
 
@@ -166,18 +167,15 @@ public function dateTime($dateTime, $options = [])
 
         if ($timeTense) {
             $attributes['data-time-tense'] = 1;
-        }
-        elseif ($timeSince) {
+        } elseif ($timeSince) {
             $attributes['data-time-since'] = 1;
-        }
-        elseif ($format) {
+        } elseif ($format) {
             $attributes['data-format'] = $format;
-        }
-        elseif ($formatAlias) {
+        } elseif ($formatAlias) {
             $attributes['data-format-alias'] = $formatAlias;
         }
 
-        return '<time'.Html::attributes($attributes).'>'.e($defaultValue).'</time>'.PHP_EOL;
+        return '<time' . Html::attributes($attributes) . '>' . e($defaultValue) . '</time>' . PHP_EOL;
     }
 
     /**
diff --git a/modules/backend/helpers/exception/DecompileException.php b/modules/backend/helpers/exception/DecompileException.php
index 08e620c205..a95252656c 100644
--- a/modules/backend/helpers/exception/DecompileException.php
+++ b/modules/backend/helpers/exception/DecompileException.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Helpers\Exception;
+<?php
+
+namespace Backend\Helpers\Exception;
 
 use ApplicationException;
 
diff --git a/modules/backend/lang/be/lang.php b/modules/backend/lang/be/lang.php
index eda54467d8..c01b45f2d0 100644
--- a/modules/backend/lang/be/lang.php
+++ b/modules/backend/lang/be/lang.php
@@ -320,11 +320,11 @@
         'auto_closing' => "Аўтаматычна зачыняць тэгі",
         'show_invisibles' => "Паказваць нябачныя сімвалы",
         'show_gutter' => "Паказваць нумерацыю радкоў",
-        'basic_autocompletion'=> "Простае аўтазавяршэнне (Ctrl + Space)",
-        'live_autocompletion'=> "Жывое аўтазавяршэнне",
-        'enable_snippets'=> "Уключыць фрагменты кода (Tab)",
-        'display_indent_guides'=> "Паказываць водступы",
-        'show_print_margin'=> "Паказываць палі для друку",
+        'basic_autocompletion' => "Простае аўтазавяршэнне (Ctrl + Space)",
+        'live_autocompletion' => "Жывое аўтазавяршэнне",
+        'enable_snippets' => "Уключыць фрагменты кода (Tab)",
+        'display_indent_guides' => "Паказываць водступы",
+        'show_print_margin' => "Паказываць палі для друку",
         'mode_off' => "Выкл",
         'mode_fluid' => "Вадкі",
         '40_characters' => "40 сімвалаў",
diff --git a/modules/backend/lang/ca/lang.php b/modules/backend/lang/ca/lang.php
index e230ae14b9..ee7e60bbe3 100644
--- a/modules/backend/lang/ca/lang.php
+++ b/modules/backend/lang/ca/lang.php
@@ -353,11 +353,11 @@
         'auto_closing' => 'Tancar les etiquetes automàticament',
         'show_invisibles' => 'Mostrar els caràcters invisibles',
         'show_gutter' => 'Mostrar números de línia',
-        'basic_autocompletion'=> 'Autompletat bàsic (Ctrl + Espai)',
-        'live_autocompletion'=> 'Autompletat en viu',
-        'enable_snippets'=> 'Activar snippets de codi (Tab)',
-        'display_indent_guides'=> "Mostrar guies d'indentació",
-        'show_print_margin'=> "Mostrar marge d'impressió",
+        'basic_autocompletion' => 'Autompletat bàsic (Ctrl + Espai)',
+        'live_autocompletion' => 'Autompletat en viu',
+        'enable_snippets' => 'Activar snippets de codi (Tab)',
+        'display_indent_guides' => "Mostrar guies d'indentació",
+        'show_print_margin' => "Mostrar marge d'impressió",
         'mode_off' => 'Off',
         'mode_fluid' => 'Fluit',
         '40_characters' => '40 caràcters',
diff --git a/modules/backend/lang/cs/lang.php b/modules/backend/lang/cs/lang.php
index 38eface17b..8c0f03f165 100644
--- a/modules/backend/lang/cs/lang.php
+++ b/modules/backend/lang/cs/lang.php
@@ -344,11 +344,11 @@
         'auto_closing' => 'Automaticky uzavírat značky',
         'show_invisibles' => 'Zobrazit neviditelné znaky',
         'show_gutter' => 'Zobrazit kurzor',
-        'basic_autocompletion'=> 'Základní automatické doplňování (Ctrl + Space)',
-        'live_autocompletion'=> 'Živé automatické doplňování',
-        'enable_snippets'=> 'Povolte úryvky (snippets) kódu (Tab)',
-        'display_indent_guides'=> 'Zobrazit vodítka odsazení',
-        'show_print_margin'=> 'Zobrazit okraje tisku',
+        'basic_autocompletion' => 'Základní automatické doplňování (Ctrl + Space)',
+        'live_autocompletion' => 'Živé automatické doplňování',
+        'enable_snippets' => 'Povolte úryvky (snippets) kódu (Tab)',
+        'display_indent_guides' => 'Zobrazit vodítka odsazení',
+        'show_print_margin' => 'Zobrazit okraje tisku',
         'mode_off' => 'Vypnout',
         'mode_fluid' => 'Plynulý (fluid)',
         '40_characters' => '40 znaků',
diff --git a/modules/backend/lang/da/lang.php b/modules/backend/lang/da/lang.php
index c13d0075c0..20a20c1b49 100644
--- a/modules/backend/lang/da/lang.php
+++ b/modules/backend/lang/da/lang.php
@@ -311,11 +311,11 @@
         'auto_closing' => 'Luk automatisk tags',
         'show_invisibles' => 'Vis usynlige karakterer',
         'show_gutter' => 'Vis gutter',
-        'basic_autocompletion'=> 'Basic Autocompletion (Ctrl + Space)',
-        'live_autocompletion'=> 'Live Autocompletion',
-        'enable_snippets'=> 'Aktiver kode snippets (Tab)',
-        'display_indent_guides'=> 'Vis indrykningsguides',
-        'show_print_margin'=> 'Vis print margin',
+        'basic_autocompletion' => 'Basic Autocompletion (Ctrl + Space)',
+        'live_autocompletion' => 'Live Autocompletion',
+        'enable_snippets' => 'Aktiver kode snippets (Tab)',
+        'display_indent_guides' => 'Vis indrykningsguides',
+        'show_print_margin' => 'Vis print margin',
         'mode_off' => 'Fra',
         'mode_fluid' => 'Fluid',
         '40_characters' => '40 Karakterer',
diff --git a/modules/backend/lang/el/lang.php b/modules/backend/lang/el/lang.php
index c8bd4e778a..d06f96fbe6 100644
--- a/modules/backend/lang/el/lang.php
+++ b/modules/backend/lang/el/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Greek Language Updated on 2016-07-16 v1.06 */
 return [
     'auth' => [
@@ -315,11 +316,11 @@
         'auto_closing' => 'Automatically close tags',
         'show_invisibles' => 'Show invisible characters',
         'show_gutter' => 'Show gutter',
-        'basic_autocompletion'=> 'Basic Autocompletion (Ctrl + Space)',
-        'live_autocompletion'=> 'Live Autocompletion',
-        'enable_snippets'=> 'Enable code snippets (Tab)',
-        'display_indent_guides'=> 'Show indent guides',
-        'show_print_margin'=> 'Show print margin',
+        'basic_autocompletion' => 'Basic Autocompletion (Ctrl + Space)',
+        'live_autocompletion' => 'Live Autocompletion',
+        'enable_snippets' => 'Enable code snippets (Tab)',
+        'display_indent_guides' => 'Show indent guides',
+        'show_print_margin' => 'Show print margin',
         'mode_off' => 'Off',
         'mode_fluid' => 'Fluid',
         '40_characters' => '40 Characters',
diff --git a/modules/backend/lang/et/lang.php b/modules/backend/lang/et/lang.php
index 9c65b9c72f..ef037bf6bc 100644
--- a/modules/backend/lang/et/lang.php
+++ b/modules/backend/lang/et/lang.php
@@ -327,11 +327,11 @@
         'auto_closing' => 'Automaatselt sulge HTML tägid',
         'show_invisibles' => 'Näita peidetu märke',
         'show_gutter' => 'Näita jalust',
-        'basic_autocompletion'=> 'Lihtne automaattäitmine (Ctrl + Space)',
-        'live_autocompletion'=> 'Live automaattäitmine',
-        'enable_snippets'=> 'Kasuta eeldefineeritud koodijuppe (Tab)',
-        'display_indent_guides'=> 'Näide taande juhtjooni',
-        'show_print_margin'=> 'Näita printimise juhtjooni',
+        'basic_autocompletion' => 'Lihtne automaattäitmine (Ctrl + Space)',
+        'live_autocompletion' => 'Live automaattäitmine',
+        'enable_snippets' => 'Kasuta eeldefineeritud koodijuppe (Tab)',
+        'display_indent_guides' => 'Näide taande juhtjooni',
+        'show_print_margin' => 'Näita printimise juhtjooni',
         'mode_off' => 'Väljas',
         'mode_fluid' => 'Voolav',
         '40_characters' => '40 tähemärki',
diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php
index 7eba40918a..b169560b8e 100644
--- a/modules/backend/lang/fa/lang.php
+++ b/modules/backend/lang/fa/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'auth' => [
         'title' => 'بخش مدیریت',
@@ -386,11 +387,11 @@
         'auto_closing' => 'نشانه ها و کاراکترهای خاص بصورت خودکار بسته شوند',
         'show_invisibles' => 'نمایش کاراکتر های مخفی',
         'show_gutter' => 'نمایش نشانگر',
-        'basic_autocompletion'=> 'تکمیل خودکار عمومی (Ctrl + Space)',
-        'live_autocompletion'=> 'تکمیل خودکار زنده',
-        'enable_snippets'=> 'فعال سازی قطعه کد ها (Tab)',
-        'display_indent_guides'=> 'نمایش راهنمای تو رفتگی',
-        'show_print_margin'=> 'نمایش حاشیه چاپ',
+        'basic_autocompletion' => 'تکمیل خودکار عمومی (Ctrl + Space)',
+        'live_autocompletion' => 'تکمیل خودکار زنده',
+        'enable_snippets' => 'فعال سازی قطعه کد ها (Tab)',
+        'display_indent_guides' => 'نمایش راهنمای تو رفتگی',
+        'show_print_margin' => 'نمایش حاشیه چاپ',
         'mode_off' => 'خاموش',
         'mode_fluid' => 'سیال',
         '40_characters' => '40 کاراکتر',
diff --git a/modules/backend/lang/fi/lang.php b/modules/backend/lang/fi/lang.php
index 3e0daeccbf..ee697f4eca 100644
--- a/modules/backend/lang/fi/lang.php
+++ b/modules/backend/lang/fi/lang.php
@@ -345,11 +345,11 @@
         'auto_closing' => 'Sulje tagit automaattisesti',
         'show_invisibles' => 'Näytä piilomerkit',
         'show_gutter' => 'Näytä palstojen väli',
-        'basic_autocompletion'=> 'Perus automaattinen täydennys (Ctrl + Space)',
-        'live_autocompletion'=> 'Reaaliaikainen automaattinen täydennys',
-        'enable_snippets'=> 'Ota koodinpätkät käyttöön (Sarkain)',
-        'display_indent_guides'=> 'Näytä sisennyslinjat',
-        'show_print_margin'=> 'Näytä tulostusmarginaali',
+        'basic_autocompletion' => 'Perus automaattinen täydennys (Ctrl + Space)',
+        'live_autocompletion' => 'Reaaliaikainen automaattinen täydennys',
+        'enable_snippets' => 'Ota koodinpätkät käyttöön (Sarkain)',
+        'display_indent_guides' => 'Näytä sisennyslinjat',
+        'show_print_margin' => 'Näytä tulostusmarginaali',
         'mode_off' => 'Pois pältä',
         'mode_fluid' => 'Venyvä',
         '40_characters' => '40 merkkiä',
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index fbcebe778d..54403cbc75 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -391,11 +391,11 @@
         'auto_closing' => 'Fermer automatiquement les tags',
         'show_invisibles' => 'Afficher les caractères invisibles',
         'show_gutter' => 'Afficher les numéros de ligne',
-        'basic_autocompletion'=> 'Auto-complétion basique (Ctrl + Espace)',
-        'live_autocompletion'=> 'Auto-complétion en temps réel',
-        'enable_snippets'=> 'Activer les extraits de code (Tab)',
-        'display_indent_guides'=> 'Afficher les guides d\'indentation',
-        'show_print_margin'=> 'Afficher les marges d\'impression',
+        'basic_autocompletion' => 'Auto-complétion basique (Ctrl + Espace)',
+        'live_autocompletion' => 'Auto-complétion en temps réel',
+        'enable_snippets' => 'Activer les extraits de code (Tab)',
+        'display_indent_guides' => 'Afficher les guides d\'indentation',
+        'show_print_margin' => 'Afficher les marges d\'impression',
         'mode_off' => 'Désactivé',
         'mode_fluid' => 'Fluide',
         '40_characters' => '40 caractères',
diff --git a/modules/backend/lang/hu/lang.php b/modules/backend/lang/hu/lang.php
index 1de66bd2c4..f90bd56413 100644
--- a/modules/backend/lang/hu/lang.php
+++ b/modules/backend/lang/hu/lang.php
@@ -391,11 +391,11 @@
         'auto_closing' => 'Automatikus kódlezárás',
         'show_invisibles' => 'Láthatatlan karakterek mutatása',
         'show_gutter' => 'Margó megjelenítése',
-        'basic_autocompletion'=> 'Egyszerű mód (Ctrl + Szóköz)',
-        'live_autocompletion'=> 'Intelligens mód',
-        'enable_snippets'=> 'Kódrészletek engedélyezése (Tab)',
-        'display_indent_guides'=> 'Bekezdés megjelenítése',
-        'show_print_margin'=> 'Nyomtatási margó mutatása',
+        'basic_autocompletion' => 'Egyszerű mód (Ctrl + Szóköz)',
+        'live_autocompletion' => 'Intelligens mód',
+        'enable_snippets' => 'Kódrészletek engedélyezése (Tab)',
+        'display_indent_guides' => 'Bekezdés megjelenítése',
+        'show_print_margin' => 'Nyomtatási margó mutatása',
         'mode_off' => 'Nincs',
         'mode_fluid' => 'Folytonos',
         '40_characters' => '40 karakter',
diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php
index eaf62e66c7..97a1d1bb4b 100644
--- a/modules/backend/lang/it/lang.php
+++ b/modules/backend/lang/it/lang.php
@@ -348,11 +348,11 @@
         'auto_closing' => 'Chiudi automaticamente i tag',
         'show_invisibles' => 'Mostra caratteri invisibili',
         'show_gutter' => 'Visualizza numeri di linea',
-        'basic_autocompletion'=> 'Completamento automatico di base (Ctrl + Spazio)',
-        'live_autocompletion'=> 'Completamento automatico in tempo reale',
-        'enable_snippets'=> 'Abilita frammenti di codice (Tab)',
-        'display_indent_guides'=> 'Visualizza guide di indentazione',
-        'show_print_margin'=> 'Visualizza margini di stampa',
+        'basic_autocompletion' => 'Completamento automatico di base (Ctrl + Spazio)',
+        'live_autocompletion' => 'Completamento automatico in tempo reale',
+        'enable_snippets' => 'Abilita frammenti di codice (Tab)',
+        'display_indent_guides' => 'Visualizza guide di indentazione',
+        'show_print_margin' => 'Visualizza margini di stampa',
         'mode_off' => 'No',
         'mode_fluid' => 'Fluido',
         '40_characters' => '40 Caratteri',
diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php
index 63d66eebe2..c795233d98 100644
--- a/modules/backend/lang/ja/lang.php
+++ b/modules/backend/lang/ja/lang.php
@@ -38,7 +38,7 @@
         'not_found_name' => "':name'パーシャルは見つかりません。",
         'invalid_name' => "無効なパーシャル名: :name",
     ],
-    'ajax_handler' =>[
+    'ajax_handler' => [
         'invalid_name' => "無効なAJAXハンドラ名: :name",
         'not_found' => "AJAXハンドラ ':name' が見つかりませんでした。",
     ],
diff --git a/modules/backend/lang/kr/lang.php b/modules/backend/lang/kr/lang.php
index 4d02bdc13c..f5797d3b8a 100644
--- a/modules/backend/lang/kr/lang.php
+++ b/modules/backend/lang/kr/lang.php
@@ -326,11 +326,11 @@
         'auto_closing' => '자동 테그닫기',
         'show_invisibles' => '보이지않는 문자 보기',
         'show_gutter' => '라인넘버보기',
-        'basic_autocompletion'=> '기본 자동완성 (Ctrl + Space)',
-        'live_autocompletion'=> '라이브 자동완성',
-        'enable_snippets'=> '코드 스니핏 사용 (Tab)',
-        'display_indent_guides'=> '들여쓰기 가이드 표시',
-        'show_print_margin'=> '출력마진 보기',
+        'basic_autocompletion' => '기본 자동완성 (Ctrl + Space)',
+        'live_autocompletion' => '라이브 자동완성',
+        'enable_snippets' => '코드 스니핏 사용 (Tab)',
+        'display_indent_guides' => '들여쓰기 가이드 표시',
+        'show_print_margin' => '출력마진 보기',
         'mode_off' => 'Off',
         'mode_fluid' => 'Fluid',
         '40_characters' => '40 문자',
diff --git a/modules/backend/lang/lt/lang.php b/modules/backend/lang/lt/lang.php
index 4371a7a3cb..aeaf776bc4 100644
--- a/modules/backend/lang/lt/lang.php
+++ b/modules/backend/lang/lt/lang.php
@@ -324,11 +324,11 @@
         'auto_closing' => 'Automatiškai uždaryti žymas',
         'show_invisibles' => 'Rodyti nematomus simbolius',
         'show_gutter' => 'Rodyti paraštę',
-        'basic_autocompletion'=> 'Paprastas autopildymas (Ctrl + Space)',
-        'live_autocompletion'=> 'Autopildymas gyvai',
-        'enable_snippets'=> 'Įjungti kodo fragmentus (Tab)',
-        'display_indent_guides'=> 'Rodyti pastūmimo gidą',
-        'show_print_margin'=> 'Rodyti spausdinimo ribą',
+        'basic_autocompletion' => 'Paprastas autopildymas (Ctrl + Space)',
+        'live_autocompletion' => 'Autopildymas gyvai',
+        'enable_snippets' => 'Įjungti kodo fragmentus (Tab)',
+        'display_indent_guides' => 'Rodyti pastūmimo gidą',
+        'show_print_margin' => 'Rodyti spausdinimo ribą',
         'mode_off' => 'Išjungta',
         'mode_fluid' => 'Paslankus',
         '40_characters' => '40 Simbolių',
diff --git a/modules/backend/lang/lv/lang.php b/modules/backend/lang/lv/lang.php
index 96cb8dfd84..093ee9b94a 100644
--- a/modules/backend/lang/lv/lang.php
+++ b/modules/backend/lang/lv/lang.php
@@ -396,9 +396,9 @@
         'show_gutter' => 'Rādīt līniju numurus',
         'basic_autocompletion' => 'Pamata automātiskā pabeigšana (Ctrl + Space)',
         'live_autocompletion' => 'Reāllaika automātiskā pabeigšana',
-        'enable_snippets'=> 'Ieslēgt koda fragmentus (Tab)',
-        'display_indent_guides'=> 'Rādīt atkāpju vadlīnijas',
-        'show_print_margin'=> 'Rādīt drukas piemali',
+        'enable_snippets' => 'Ieslēgt koda fragmentus (Tab)',
+        'display_indent_guides' => 'Rādīt atkāpju vadlīnijas',
+        'show_print_margin' => 'Rādīt drukas piemali',
         'mode_off' => 'Izslēgta',
         'mode_fluid' => 'Plūstoša',
         '40_characters' => '40 simboli',
diff --git a/modules/backend/lang/nb-no/lang.php b/modules/backend/lang/nb-no/lang.php
index 2db1d5d77e..e6aa336979 100644
--- a/modules/backend/lang/nb-no/lang.php
+++ b/modules/backend/lang/nb-no/lang.php
@@ -315,11 +315,11 @@
         'auto_closing' => 'Lukk tager automatisk',
         'show_invisibles' => 'Vis usynlige tegn',
         'show_gutter' => 'Vis linjenummer',
-        'basic_autocompletion'=> 'Enkel autofullføring (Ctrl + Space)',
-        'live_autocompletion'=> 'Live autofullføring',
-        'enable_snippets'=> 'Aktivér kodesnippets (Tab)',
-        'display_indent_guides'=> 'Vis innrykk',
-        'show_print_margin'=> 'Vis utskriftsmargin',
+        'basic_autocompletion' => 'Enkel autofullføring (Ctrl + Space)',
+        'live_autocompletion' => 'Live autofullføring',
+        'enable_snippets' => 'Aktivér kodesnippets (Tab)',
+        'display_indent_guides' => 'Vis innrykk',
+        'show_print_margin' => 'Vis utskriftsmargin',
         'mode_off' => 'Av',
         'mode_fluid' => 'Flytende',
         '40_characters' => '40 tegn',
diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php
index 1e9a18a5d0..98bb2e7a7e 100644
--- a/modules/backend/lang/pl/lang.php
+++ b/modules/backend/lang/pl/lang.php
@@ -1,4 +1,6 @@
-<?php return [
+<?php
+
+return [
     'auth' => [
         'title' => 'Panel Administracyjny',
         'invalid_login' => 'Podane dane logowania są niepoprawne. Sprawdź je i spróbuj ponownie.',
diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php
index 166b9ca03a..d71bec0e4b 100644
--- a/modules/backend/lang/pt-br/lang.php
+++ b/modules/backend/lang/pt-br/lang.php
@@ -385,11 +385,11 @@
         'auto_closing' => 'Auto completar tags e caracteres especiais',
         'show_invisibles' => 'Mostrar caracteres invisíveis',
         'show_gutter' => 'Mostrar numeração de linhas',
-        'basic_autocompletion'=> 'Autocompletar básico (Ctrl + Espaço)',
-        'live_autocompletion'=> 'Autocompletar em tempo real',
-        'enable_snippets'=> 'Habilitar trechos de códigos (Tab)',
-        'display_indent_guides'=> 'Exibir guias de indentação',
-        'show_print_margin'=> 'Exibir margem de impressão',
+        'basic_autocompletion' => 'Autocompletar básico (Ctrl + Espaço)',
+        'live_autocompletion' => 'Autocompletar em tempo real',
+        'enable_snippets' => 'Habilitar trechos de códigos (Tab)',
+        'display_indent_guides' => 'Exibir guias de indentação',
+        'show_print_margin' => 'Exibir margem de impressão',
         'mode_off' => 'Desligado',
         'mode_fluid' => 'Fluido',
         '40_characters' => '40 caracteres',
diff --git a/modules/backend/lang/pt-pt/lang.php b/modules/backend/lang/pt-pt/lang.php
index 1129f64105..aa526cfb05 100644
--- a/modules/backend/lang/pt-pt/lang.php
+++ b/modules/backend/lang/pt-pt/lang.php
@@ -378,11 +378,11 @@
         'auto_closing' => 'Fechar etiquetas automáticamente',
         'show_invisibles' => 'Mostrar caracteres invisíveis',
         'show_gutter' => 'Mostrar guias',
-        'basic_autocompletion'=> 'Autocompletar básico (Ctrl + Espaço)',
-        'live_autocompletion'=> 'Autocompletar em tempo real',
-        'enable_snippets'=> 'Activar trechos de códigos (Tab)',
-        'display_indent_guides'=> 'Mostrar guias de indentação',
-        'show_print_margin'=> 'Mostrar margem de impressão',
+        'basic_autocompletion' => 'Autocompletar básico (Ctrl + Espaço)',
+        'live_autocompletion' => 'Autocompletar em tempo real',
+        'enable_snippets' => 'Activar trechos de códigos (Tab)',
+        'display_indent_guides' => 'Mostrar guias de indentação',
+        'show_print_margin' => 'Mostrar margem de impressão',
         'mode_off' => 'Desligado',
         'mode_fluid' => 'Fluido',
         '40_characters' => '40 caracteres',
diff --git a/modules/backend/lang/sk/lang.php b/modules/backend/lang/sk/lang.php
index e52b57055f..da20152937 100644
--- a/modules/backend/lang/sk/lang.php
+++ b/modules/backend/lang/sk/lang.php
@@ -391,11 +391,11 @@
         'auto_closing' => 'Automaticky uzatvárať značky',
         'show_invisibles' => 'Zobraziť neviditeľné znaky',
         'show_gutter' => 'Zobraziť kurzor',
-        'basic_autocompletion'=> 'Základné automatické doplňovanie (Ctrl + Space)',
-        'live_autocompletion'=> 'Živé automatické doplňovanie',
-        'enable_snippets'=> 'Povoliť úryvky (snippets) kódu (Tab)',
-        'display_indent_guides'=> 'Zobraziť vodítka odsadenia',
-        'show_print_margin'=> 'Zobraziť okraje tlače',
+        'basic_autocompletion' => 'Základné automatické doplňovanie (Ctrl + Space)',
+        'live_autocompletion' => 'Živé automatické doplňovanie',
+        'enable_snippets' => 'Povoliť úryvky (snippets) kódu (Tab)',
+        'display_indent_guides' => 'Zobraziť vodítka odsadenia',
+        'show_print_margin' => 'Zobraziť okraje tlače',
         'mode_off' => 'Vyp',
         'mode_fluid' => 'Plynulý',
         '40_characters' => '40 znakov',
diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
index d7719a9b9a..ed3a764916 100644
--- a/modules/backend/lang/tr/lang.php
+++ b/modules/backend/lang/tr/lang.php
@@ -393,11 +393,11 @@
         'auto_closing' => 'Etiketleri ve özel karakterleri otomatik kapat',
         'show_invisibles' => 'Gizli karakterleri göster',
         'show_gutter' => 'Satır numarasını göster',
-        'basic_autocompletion'=> 'Otomatik tamamlama (Temel) (Ctrl + Boşluk)',
-        'live_autocompletion'=> 'Anlık Otomatik tamamlama',
-        'enable_snippets'=> 'Kod snippetlerini aktifleştir (Tab)',
-        'display_indent_guides'=> 'İçeri girintileri göster',
-        'show_print_margin'=> 'Yazdırma boşluklarını göster',
+        'basic_autocompletion' => 'Otomatik tamamlama (Temel) (Ctrl + Boşluk)',
+        'live_autocompletion' => 'Anlık Otomatik tamamlama',
+        'enable_snippets' => 'Kod snippetlerini aktifleştir (Tab)',
+        'display_indent_guides' => 'İçeri girintileri göster',
+        'show_print_margin' => 'Yazdırma boşluklarını göster',
         'mode_off' => 'Kapalı',
         'mode_fluid' => 'Akışkan',
         '40_characters' => '40 Karakter',
diff --git a/modules/backend/lang/vn/lang.php b/modules/backend/lang/vn/lang.php
index 7d66ebceb5..3d1671fa05 100644
--- a/modules/backend/lang/vn/lang.php
+++ b/modules/backend/lang/vn/lang.php
@@ -345,11 +345,11 @@
         'auto_closing' => 'Tự động đóng thẻ',
         'show_invisibles' => 'Hiển thị các ký tự ẩn',
         'show_gutter' => 'Hiện lề bên trong',
-        'basic_autocompletion'=> 'Basic Autocompletion (Ctrl + Space)',
-        'live_autocompletion'=> 'Live Autocompletion',
-        'enable_snippets'=> 'Kích hoạt snippets (Tab)',
-        'display_indent_guides'=> 'Hiển thị hướng dẫn căn lề',
-        'show_print_margin'=> 'Hiện lề in',
+        'basic_autocompletion' => 'Basic Autocompletion (Ctrl + Space)',
+        'live_autocompletion' => 'Live Autocompletion',
+        'enable_snippets' => 'Kích hoạt snippets (Tab)',
+        'display_indent_guides' => 'Hiển thị hướng dẫn căn lề',
+        'show_print_margin' => 'Hiện lề in',
         'mode_off' => 'Off',
         'mode_fluid' => 'Fluid',
         '40_characters' => '40 ký tự',
diff --git a/modules/backend/lang/zh-cn/lang.php b/modules/backend/lang/zh-cn/lang.php
index 68cb11ed9d..913bc8988a 100644
--- a/modules/backend/lang/zh-cn/lang.php
+++ b/modules/backend/lang/zh-cn/lang.php
@@ -370,11 +370,11 @@
         'auto_closing' => '自动关闭标签',
         'show_invisibles' => '显示隐藏字符',
         'show_gutter' => '显示侧边栏',
-        'basic_autocompletion'=> '基本自动完成 (Ctrl + Space)',
-        'live_autocompletion'=> '实时自动完成',
-        'enable_snippets'=> '开启代码片段 (Tab)',
-        'display_indent_guides'=> '显示缩进指南',
-        'show_print_margin'=> '显示打印边距',
+        'basic_autocompletion' => '基本自动完成 (Ctrl + Space)',
+        'live_autocompletion' => '实时自动完成',
+        'enable_snippets' => '开启代码片段 (Tab)',
+        'display_indent_guides' => '显示缩进指南',
+        'show_print_margin' => '显示打印边距',
         'mode_off' => '关闭',
         'mode_fluid' => '流体',
         '40_characters' => '40字符',
diff --git a/modules/backend/layouts/_custom_styles.php b/modules/backend/layouts/_custom_styles.php
index cb4e3ad823..c908ac31da 100644
--- a/modules/backend/layouts/_custom_styles.php
+++ b/modules/backend/layouts/_custom_styles.php
@@ -1,6 +1,8 @@
 <?php
+
     use Backend\Models\BrandSetting;
     use Backend\Models\EditorSetting;
+
 ?>
 <?php if (BrandSetting::isConfigured() || BrandSetting::isBaseConfigured()): ?>
     <style>
diff --git a/modules/backend/layouts/_head.php b/modules/backend/layouts/_head.php
index 0ff93ceb75..5b73f2706b 100644
--- a/modules/backend/layouts/_head.php
+++ b/modules/backend/layouts/_head.php
@@ -49,7 +49,7 @@
     $scripts = array_merge($scripts, [Backend::skinAsset('assets/js/winter-min.js')]);
 }
 $scripts = array_merge($scripts, [
-    Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js'),
+    Url::asset('modules/system/assets/js/lang/lang.' . App::getLocale() . '.js'),
     Backend::skinAsset('assets/js/winter.flyout.js'),
     Backend::skinAsset('assets/js/winter.tabformexpandcontrols.js'),
 ]);
diff --git a/modules/backend/layouts/_hint.php b/modules/backend/layouts/_hint.php
index c261cafc03..97f22c6800 100644
--- a/modules/backend/layouts/_hint.php
+++ b/modules/backend/layouts/_hint.php
@@ -2,7 +2,7 @@
     <?php
     $type = !empty($type) ? $type : 'info';
     $cssClasses = ['callout fade in'];
-    $cssClasses[] = 'callout-'.$type;
+    $cssClasses[] = 'callout-' . $type;
     if (empty($icon)) {
         $cssClasses[] = 'no-icon';
     }
diff --git a/modules/backend/layouts/_sidenav.php b/modules/backend/layouts/_sidenav.php
index e7de4051c7..6e4fcc9f1b 100644
--- a/modules/backend/layouts/_sidenav.php
+++ b/modules/backend/layouts/_sidenav.php
@@ -34,7 +34,7 @@ class="<?= BackendMenu::isSideMenuItemActive($item) ? 'active' : null ?>"
                                 </a>
                                 <span
                                     class="counter <?= $item->counter === null ? 'empty' : null ?>"
-                                    data-menu-id="<?= e($context->mainMenuCode.'/'.$sideItemCode) ?>"
+                                    data-menu-id="<?= e($context->mainMenuCode . '/' . $sideItemCode) ?>"
                                     <?php if ($item->counterLabel): ?>
                                         title="<?= e(trans($item->counterLabel)) ?>"
                                     <?php endif ?>
diff --git a/modules/backend/layouts/auth.php b/modules/backend/layouts/auth.php
index ec65941199..fbf2cdc4f0 100644
--- a/modules/backend/layouts/auth.php
+++ b/modules/backend/layouts/auth.php
@@ -30,7 +30,7 @@
             Url::asset('modules/system/assets/ui/storm-min.js'),
             Backend::skinAsset('assets/js/winter-min.js'),
             Url::asset('modules/backend/assets/js/auth/auth.js'),
-            Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js'),
+            Url::asset('modules/system/assets/js/lang/lang.' . App::getLocale() . '.js'),
         ];
         foreach ($scripts as $script) {
             $this->addJs($script, [
diff --git a/modules/backend/models/AccessLog.php b/modules/backend/models/AccessLog.php
index 92e39c31b6..49ea1e2d3c 100644
--- a/modules/backend/models/AccessLog.php
+++ b/modules/backend/models/AccessLog.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use Model;
 use Request;
@@ -30,7 +32,7 @@ class AccessLog extends Model
      */
     public static function add($user)
     {
-        $record = new static;
+        $record = new static();
         $record->user = $user;
         $record->ip_address = Request::getClientIp();
         $record->save();
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index c1be659895..c3a4a87210 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use App;
 use Backend;
@@ -188,8 +190,7 @@ public static function renderCss()
         try {
             $customCss = self::compileCss();
             Cache::forever($cacheKey, $customCss);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $customCss = '/* ' . $ex->getMessage() . ' */';
         }
 
@@ -206,7 +207,7 @@ public static function compileCss()
         $accentColor = self::get('accent_color', self::ACCENT_COLOR);
 
         $parser->ModifyVars([
-            'logo-image'      => "'".self::getLogo()."'",
+            'logo-image'      => "'" . self::getLogo() . "'",
             'brand-primary'   => $primaryColor,
             'brand-secondary' => $secondaryColor,
             'brand-accent'    => $accentColor,
diff --git a/modules/backend/models/EditorSetting.php b/modules/backend/models/EditorSetting.php
index ed5a47f1db..768033f619 100644
--- a/modules/backend/models/EditorSetting.php
+++ b/modules/backend/models/EditorSetting.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use File;
 use Cache;
@@ -119,7 +121,7 @@ public function initSettingsData()
         $this->html_no_wrap_tags = $this->defaultHtmlNoWrapTags;
         $this->html_remove_tags = $this->defaultHtmlRemoveTags;
         $this->html_line_breaker_tags = $this->defaultHtmlLineBreakerTags;
-        $this->html_custom_styles = File::get(base_path().'/modules/backend/models/editorsetting/default_styles.less');
+        $this->html_custom_styles = File::get(base_path() . '/modules/backend/models/editorsetting/default_styles.less');
         $this->html_style_image = $this->makeStylesForTable($this->defaultHtmlStyleImage);
         $this->html_style_link = $this->makeStylesForTable($this->defaultHtmlStyleLink);
         $this->html_style_paragraph = $this->makeStylesForTable($this->defaultHtmlStyleParagraph);
@@ -223,7 +225,7 @@ public static function getConfigured($key, $default = null)
 
     public function getDefaultValue($attribute)
     {
-        $property = 'default'.studly_case($attribute);
+        $property = 'default' . studly_case($attribute);
 
         return $this->$property;
     }
@@ -249,8 +251,7 @@ public static function renderCss()
         try {
             $customCss = self::compileCss();
             Cache::forever($cacheKey, $customCss);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $customCss = '/* ' . $ex->getMessage() . ' */';
         }
 
diff --git a/modules/backend/models/ExportModel.php b/modules/backend/models/ExportModel.php
index 7a1b457889..643a66aa31 100644
--- a/modules/backend/models/ExportModel.php
+++ b/modules/backend/models/ExportModel.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use File;
 use Lang;
@@ -96,7 +98,7 @@ protected function processExportData($columns, $results, $options)
         /*
          * Prepare CSV
          */
-        $csv = CsvWriter::createFromFileObject(new SplTempFileObject);
+        $csv = CsvWriter::createFromFileObject(new SplTempFileObject());
 
         $csv->setOutputBOM(CsvWriter::BOM_UTF8);
 
@@ -141,7 +143,7 @@ protected function processExportData($columns, $results, $options)
          * Save for download
          */
         $csvName = uniqid('oc');
-        $csvPath = temp_path().'/'.$csvName;
+        $csvPath = temp_path() . '/' . $csvName;
         $output = $csv->__toString();
 
         File::put($csvPath, $output);
@@ -197,7 +199,7 @@ protected function encodeArrayValue($data, $delimeter = '|')
             if (is_array($value)) {
                 $newData[] = 'Array';
             } else {
-                $newData[] = str_replace($delimeter, '\\'.$delimeter, $value);
+                $newData[] = str_replace($delimeter, '\\' . $delimeter, $value);
             }
         }
 
diff --git a/modules/backend/models/ImportModel.php b/modules/backend/models/ImportModel.php
index 8552d08b4d..7fac6582c9 100644
--- a/modules/backend/models/ImportModel.php
+++ b/modules/backend/models/ImportModel.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use Backend\Behaviors\ImportExportController\TranscodeFilter;
 use Str;
@@ -134,7 +136,7 @@ protected function processImportData($filePath, $matches, $options)
         }
 
         // Create reader statement
-        $stmt = (new CsvStatement)
+        $stmt = (new CsvStatement())
             ->where(function (array $row) {
                 // Filter out empty rows
                 return count($row) > 1 || reset($row) !== null;
@@ -185,7 +187,7 @@ protected function decodeArrayValue($value, $delimeter = '|')
         $newData = [];
 
         foreach ($data as $_value) {
-            $newData[] = str_replace('\\'.$delimeter, $delimeter, $_value);
+            $newData[] = str_replace('\\' . $delimeter, $delimeter, $_value);
         }
 
         return $newData;
@@ -240,7 +242,7 @@ public function getFormatEncodingOptions()
         ];
 
         $translated = array_map(function ($option) {
-            return Lang::get('backend::lang.import_export.encodings.'.Str::slug($option, '_'));
+            return Lang::get('backend::lang.import_export.encodings.' . Str::slug($option, '_'));
         }, $options);
 
         return array_combine($options, $translated);
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index 2a133afef4..d63ec13007 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use App;
 use Lang;
@@ -80,8 +82,7 @@ public static function setAppLocale()
     {
         if (Session::has('locale')) {
             App::setLocale(Session::get('locale'));
-        }
-        elseif (
+        } elseif (
             ($user = BackendAuth::getUser()) &&
             ($locale = static::get('locale'))
         ) {
@@ -98,8 +99,7 @@ public static function setAppFallbackLocale()
     {
         if (Session::has('fallback_locale')) {
             Lang::setFallback(Session::get('fallback_locale'));
-        }
-        elseif (
+        } elseif (
             ($user = BackendAuth::getUser()) &&
             ($locale = static::get('fallback_locale'))
         ) {
diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php
index 4063c716c2..deb800c909 100644
--- a/modules/backend/models/User.php
+++ b/modules/backend/models/User.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use Mail;
 use Event;
@@ -104,8 +106,7 @@ public function getAvatarThumb($size = 25, $options = null)
     {
         if (is_string($options)) {
             $options = ['default' => $options];
-        }
-        elseif (!is_array($options)) {
+        } elseif (!is_array($options)) {
             $options = [];
         }
 
@@ -118,8 +119,8 @@ public function getAvatarThumb($size = 25, $options = null)
 
         return '//www.gravatar.com/avatar/' .
             md5(strtolower(trim($this->email))) .
-            '?s='. $size .
-            '&d='. urlencode($default);
+            '?s=' . $size .
+            '&d=' . urlencode($default);
     }
 
     /**
diff --git a/modules/backend/models/UserGroup.php b/modules/backend/models/UserGroup.php
index 88dc67eeee..c923ec8d8f 100644
--- a/modules/backend/models/UserGroup.php
+++ b/modules/backend/models/UserGroup.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use Winter\Storm\Auth\Models\Group as GroupBase;
 
diff --git a/modules/backend/models/UserPreference.php b/modules/backend/models/UserPreference.php
index be97c62dc4..405929b227 100644
--- a/modules/backend/models/UserPreference.php
+++ b/modules/backend/models/UserPreference.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use BackendAuth;
 use SystemException;
diff --git a/modules/backend/models/UserRole.php b/modules/backend/models/UserRole.php
index f80e6ea49a..9f8bcc62ec 100644
--- a/modules/backend/models/UserRole.php
+++ b/modules/backend/models/UserRole.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use Backend\Classes\AuthManager;
 use Winter\Storm\Auth\Models\Role as RoleBase;
@@ -73,10 +75,12 @@ public function isSystemRole()
         }
 
         // Winter default system roles
-        if ($this->is_system || in_array($this->code, [
+        if (
+            $this->is_system || in_array($this->code, [
             self::CODE_DEVELOPER,
             self::CODE_PUBLISHER
-        ])) {
+            ])
+        ) {
             return true;
         }
 
diff --git a/modules/backend/models/UserThrottle.php b/modules/backend/models/UserThrottle.php
index 6d3690e9fd..5537e4a880 100644
--- a/modules/backend/models/UserThrottle.php
+++ b/modules/backend/models/UserThrottle.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Models;
+<?php
+
+namespace Backend\Models;
 
 use Config;
 use Winter\Storm\Auth\Models\Throttle as ThrottleBase;
diff --git a/modules/backend/reportwidgets/Welcome.php b/modules/backend/reportwidgets/Welcome.php
index 57641bec6d..602e21a044 100644
--- a/modules/backend/reportwidgets/Welcome.php
+++ b/modules/backend/reportwidgets/Welcome.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\ReportWidgets;
+<?php
+
+namespace Backend\ReportWidgets;
 
 use BackendAuth;
 use Backend\Models\AccessLog;
@@ -26,8 +28,7 @@ public function render()
     {
         try {
             $this->loadData();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->vars['error'] = $ex->getMessage();
         }
 
diff --git a/modules/backend/reportwidgets/welcome/partials/_widget.php b/modules/backend/reportwidgets/welcome/partials/_widget.php
index d05eec358b..1c870f44df 100644
--- a/modules/backend/reportwidgets/welcome/partials/_widget.php
+++ b/modules/backend/reportwidgets/welcome/partials/_widget.php
@@ -9,7 +9,7 @@
             <div class="welcome-message">
                 <?php if ($lastSeen): ?>
                     <p>
-                        <?= e(trans('backend::lang.dashboard.welcome.welcome_back_name', ['app'=>$appName, 'name'=>$user->first_name])) ?>
+                        <?= e(trans('backend::lang.dashboard.welcome.welcome_back_name', ['app' => $appName, 'name' => $user->first_name])) ?>
                         <?= e(trans('backend::lang.dashboard.welcome.last_sign_in')) ?>
                     </p>
                     <p>
@@ -22,7 +22,7 @@
                     <?php endif ?>
                 <?php else: ?>
                     <p>
-                        <?= e(trans('backend::lang.dashboard.welcome.welcome_to_name', ['app'=>$appName, 'name'=>$user->first_name])) ?>
+                        <?= e(trans('backend::lang.dashboard.welcome.welcome_to_name', ['app' => $appName, 'name' => $user->first_name])) ?>
                     </p>
                     <p>
                         <?= e(trans('backend::lang.dashboard.welcome.first_sign_in')) ?>
diff --git a/modules/backend/skins/Standard.php b/modules/backend/skins/Standard.php
index 7d17f153b9..2fb72cd9a4 100644
--- a/modules/backend/skins/Standard.php
+++ b/modules/backend/skins/Standard.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Skins;
+<?php
+
+namespace Backend\Skins;
 
 use File;
 use Backend\Classes\Skin;
@@ -15,7 +17,6 @@
 
 class Standard extends Skin
 {
-
     /**
      * @inheritDoc
      */
@@ -52,6 +53,6 @@ public function getPath($path = null, $isPublic = false)
      */
     public function getLayoutPaths()
     {
-        return [$this->skinPath.'/layouts'];
+        return [$this->skinPath . '/layouts'];
     }
 }
diff --git a/modules/backend/tests/formwidgets/CheckboxTest.php b/modules/backend/tests/formwidgets/CheckboxTest.php
index 14bda47af9..c214633eb5 100644
--- a/modules/backend/tests/formwidgets/CheckboxTest.php
+++ b/modules/backend/tests/formwidgets/CheckboxTest.php
@@ -15,7 +15,7 @@ public function setUp(): void
         parent::setUp();
 
         $this->form = new Form(null, [
-            'model' => new Model,
+            'model' => new Model(),
             'arrayName' => 'array',
             'fields' => [
                 'unchecked' => [
@@ -34,7 +34,7 @@ public function setUp(): void
                 ],
             ],
         ]);
-        
+
         $this->form->render();
     }
 
diff --git a/modules/backend/tests/helpers/BackendHelperTest.php b/modules/backend/tests/helpers/BackendHelperTest.php
index b6a120d942..c5db01d21c 100644
--- a/modules/backend/tests/helpers/BackendHelperTest.php
+++ b/modules/backend/tests/helpers/BackendHelperTest.php
@@ -10,7 +10,7 @@ class BackendHelperTest extends TestCase
 {
     public function testDecompileAssets()
     {
-        $backendHelper = new Backend;
+        $backendHelper = new Backend();
         $assets = $backendHelper->decompileAsset('modules/backend/tests/fixtures/assets/compilation.js');
 
         $this->assertCount(2, $assets);
@@ -22,7 +22,7 @@ public function testDecompileMissingFile()
     {
         $this->expectException(DecompileException::class);
 
-        $backendHelper = new Backend;
+        $backendHelper = new Backend();
         $assets = $backendHelper->decompileAsset('modules/backend/tests/fixtures/assets/missing.js');
     }
 }
diff --git a/modules/backend/tests/models/ExportModelTest.php b/modules/backend/tests/models/ExportModelTest.php
index 1c110eccad..4101cb98d8 100644
--- a/modules/backend/tests/models/ExportModelTest.php
+++ b/modules/backend/tests/models/ExportModelTest.php
@@ -31,14 +31,13 @@ public function exportData($columns, $sessionKey = null)
 
 class ExportModelTest extends TestCase
 {
-
     //
     // Tests
     //
 
     public function testEncodeArrayValue()
     {
-        $model = new ExampleExportModel;
+        $model = new ExampleExportModel();
         $data = ['foo', 'bar'];
         $result = self::callProtectedMethod($model, 'encodeArrayValue', [$data]);
         $this->assertEquals('foo|bar', $result);
@@ -54,7 +53,7 @@ public function testEncodeArrayValue()
 
     public function testDownload()
     {
-        $model = new ExampleExportModel;
+        $model = new ExampleExportModel();
 
         $csvName = $model->export(['foo' => 'title', 'bar' => 'title2'], []);
 
diff --git a/modules/backend/tests/models/ImportModelTest.php b/modules/backend/tests/models/ImportModelTest.php
index 23a089393c..bc3239c606 100644
--- a/modules/backend/tests/models/ImportModelTest.php
+++ b/modules/backend/tests/models/ImportModelTest.php
@@ -22,14 +22,13 @@ public function importData($results, $sessionKey = null)
 
 class ImportModelTest extends PluginTestCase
 {
-
     //
     // Tests
     //
 
     public function testDecodeArrayValue()
     {
-        $model = new ExampleImportModel;
+        $model = new ExampleImportModel();
         $data = 'foo|bar';
         $result = self::callProtectedMethod($model, 'decodeArrayValue', [$data]);
         $this->assertEquals(['foo', 'bar'], $result);
@@ -45,16 +44,16 @@ public function testDecodeArrayValue()
 
     public function testGetImportFilePath()
     {
-        $model = new ExampleImportModel;
+        $model = new ExampleImportModel();
         $sessionKey = uniqid('session_key', true);
 
         $file1 = FileModel::create([
-            'data' => base_path().'/modules/backend/tests/fixtures/reference/file1.txt',
+            'data' => base_path() . '/modules/backend/tests/fixtures/reference/file1.txt',
             'is_public' => false,
         ]);
 
         $file2 = FileModel::create([
-            'data' => base_path().'/modules/backend/tests/fixtures/reference/file2.txt',
+            'data' => base_path() . '/modules/backend/tests/fixtures/reference/file2.txt',
             'is_public' => false,
         ]);
 
diff --git a/modules/backend/tests/traits/WidgetMakerTest.php b/modules/backend/tests/traits/WidgetMakerTest.php
index 4d1caf2df9..1acea76a6d 100644
--- a/modules/backend/tests/traits/WidgetMakerTest.php
+++ b/modules/backend/tests/traits/WidgetMakerTest.php
@@ -11,7 +11,7 @@ class ExampleTraitClass
 
     public function __construct()
     {
-        $this->controller = new Controller;
+        $this->controller = new Controller();
     }
 }
 
@@ -49,9 +49,9 @@ public function testTraitObject()
 
     public function testMakeWidget()
     {
-        $manager = new ExampleTraitClass;
+        $manager = new ExampleTraitClass();
 
-        $controller = new Controller;
+        $controller = new Controller();
         $widget = $manager->makeWidget('Backend\Widgets\Search');
         $this->assertInstanceOf('Backend\Widgets\Search', $widget);
         $this->assertInstanceOf('Backend\Classes\Controller', $widget->getController());
diff --git a/modules/backend/tests/widgets/FilterWidgetTest.php b/modules/backend/tests/widgets/FilterWidgetTest.php
index 7848cd657d..9623c4eeb7 100644
--- a/modules/backend/tests/widgets/FilterWidgetTest.php
+++ b/modules/backend/tests/widgets/FilterWidgetTest.php
@@ -12,7 +12,7 @@ class FilterWidgetTest extends PluginTestCase
 {
     public function testRestrictedScopeWithUserWithNoPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user);
 
         $filter = $this->restrictedFilterFixture();
@@ -28,7 +28,7 @@ public function testRestrictedScopeWithUserWithNoPermissions()
 
     public function testRestrictedScopeWithUserWithWrongPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.wrong_permission', true));
 
         $filter = $this->restrictedFilterFixture();
@@ -44,7 +44,7 @@ public function testRestrictedScopeWithUserWithWrongPermissions()
 
     public function testRestrictedScopeWithUserWithRightPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.access_field', true));
 
         $filter = $this->restrictedFilterFixture();
@@ -56,11 +56,11 @@ public function testRestrictedScopeWithUserWithRightPermissions()
 
     public function testRestrictedScopeWithUserWithRightWildcardPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.access_field', true));
 
         $filter = new Filter(null, [
-            'model' => new User,
+            'model' => new User(),
             'arrayName' => 'array',
             'scopes' => [
                 'id' => [
@@ -82,7 +82,7 @@ public function testRestrictedScopeWithUserWithRightWildcardPermissions()
 
     public function testRestrictedScopeWithSuperuser()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->asSuperUser());
 
         $filter = $this->restrictedFilterFixture();
@@ -94,7 +94,7 @@ public function testRestrictedScopeWithSuperuser()
 
     public function testRestrictedScopeSinglePermissionWithUserWithWrongPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.wrong_permission', true));
 
         $filter = $this->restrictedFilterFixture(true);
@@ -110,7 +110,7 @@ public function testRestrictedScopeSinglePermissionWithUserWithWrongPermissions(
 
     public function testRestrictedScopeSinglePermissionWithUserWithRightPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.access_field', true));
 
         $filter = $this->restrictedFilterFixture(true);
@@ -123,7 +123,7 @@ public function testRestrictedScopeSinglePermissionWithUserWithRightPermissions(
     protected function restrictedFilterFixture(bool $singlePermission = false)
     {
         return new Filter(null, [
-            'model' => new User,
+            'model' => new User(),
             'arrayName' => 'array',
             'scopes' => [
                 'id' => [
diff --git a/modules/backend/tests/widgets/FormTest.php b/modules/backend/tests/widgets/FormTest.php
index 048a374ef3..5fe5abd878 100644
--- a/modules/backend/tests/widgets/FormTest.php
+++ b/modules/backend/tests/widgets/FormTest.php
@@ -34,7 +34,7 @@ class FormTest extends PluginTestCase
     {
         public function testRestrictedFieldWithUserWithNoPermissions()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user);
 
             $form = $this->restrictedFormFixture();
@@ -45,7 +45,7 @@ public function testRestrictedFieldWithUserWithNoPermissions()
 
         public function testRestrictedFieldWithUserWithWrongPermissions()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user->withPermission('test.wrong_permission', true));
 
             $form = $this->restrictedFormFixture();
@@ -56,7 +56,7 @@ public function testRestrictedFieldWithUserWithWrongPermissions()
 
         public function testRestrictedFieldWithUserWithRightPermissions()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user->withPermission('test.access_field', true));
 
             $form = $this->restrictedFormFixture();
@@ -67,11 +67,11 @@ public function testRestrictedFieldWithUserWithRightPermissions()
 
         public function testRestrictedFieldWithUserWithRightWildcardPermissions()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user->withPermission('test.access_field', true));
 
             $form = new Form(null, [
-                'model' => new FormTestModel,
+                'model' => new FormTestModel(),
                 'arrayName' => 'array',
                 'fields' => [
                     'testField' => [
@@ -92,7 +92,7 @@ public function testRestrictedFieldWithUserWithRightWildcardPermissions()
 
         public function testRestrictedFieldWithSuperuser()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user->asSuperUser());
 
             $form = $this->restrictedFormFixture();
@@ -103,7 +103,7 @@ public function testRestrictedFieldWithSuperuser()
 
         public function testRestrictedFieldSinglePermissionWithUserWithWrongPermissions()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user->withPermission('test.wrong_permission', true));
 
             $form = $this->restrictedFormFixture(true);
@@ -114,7 +114,7 @@ public function testRestrictedFieldSinglePermissionWithUserWithWrongPermissions(
 
         public function testRestrictedFieldSinglePermissionWithUserWithRightPermissions()
         {
-            $user = new UserFixture;
+            $user = new UserFixture();
             $this->actingAs($user->withPermission('test.access_field', true));
 
             $form = $this->restrictedFormFixture(true);
@@ -126,7 +126,7 @@ public function testRestrictedFieldSinglePermissionWithUserWithRightPermissions(
         public function testCheckboxlistTrigger()
         {
             $form = new Form(null, [
-                'model' => new FormTestModel,
+                'model' => new FormTestModel(),
                 'arrayName' => 'array',
                 'fields' => [
                     'trigger' => [
@@ -155,7 +155,7 @@ public function testCheckboxlistTrigger()
         public function testOptionsGeneration()
         {
             $form = new Form(null, [
-                'model' => new FormTestModel,
+                'model' => new FormTestModel(),
                 'arrayName' => 'array',
                 'fields' => [
                     'static_method_options' => [
@@ -210,7 +210,7 @@ public function testOptionsGeneration()
         protected function restrictedFormFixture(bool $singlePermission = false)
         {
             return new Form(null, [
-                'model' => new FormTestModel,
+                'model' => new FormTestModel(),
                 'arrayName' => 'array',
                 'fields' => [
                     'testField' => [
diff --git a/modules/backend/tests/widgets/ListsTest.php b/modules/backend/tests/widgets/ListsTest.php
index 43e194d332..511b635c4a 100644
--- a/modules/backend/tests/widgets/ListsTest.php
+++ b/modules/backend/tests/widgets/ListsTest.php
@@ -12,7 +12,7 @@ class ListsTest extends PluginTestCase
 {
     public function testRestrictedColumnWithUserWithNoPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user);
 
         $list = $this->restrictedListsFixture();
@@ -28,7 +28,7 @@ public function testRestrictedColumnWithUserWithNoPermissions()
 
     public function testRestrictedColumnWithUserWithWrongPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.wrong_permission', true));
 
         $list = $this->restrictedListsFixture();
@@ -44,7 +44,7 @@ public function testRestrictedColumnWithUserWithWrongPermissions()
 
     public function testRestrictedColumnWithUserWithRightPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.access_field', true));
 
         $list = $this->restrictedListsFixture();
@@ -56,11 +56,11 @@ public function testRestrictedColumnWithUserWithRightPermissions()
 
     public function testRestrictedColumnWithUserWithRightWildcardPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.access_field', true));
 
         $list = new Lists(null, [
-            'model' => new User,
+            'model' => new User(),
             'arrayName' => 'array',
             'columns' => [
                 'id' => [
@@ -82,7 +82,7 @@ public function testRestrictedColumnWithUserWithRightWildcardPermissions()
 
     public function testRestrictedColumnWithSuperuser()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->asSuperUser());
 
         $list = $this->restrictedListsFixture();
@@ -94,7 +94,7 @@ public function testRestrictedColumnWithSuperuser()
 
     public function testRestrictedColumnSinglePermissionWithUserWithWrongPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.wrong_permission', true));
 
         $list = $this->restrictedListsFixture(true);
@@ -110,7 +110,7 @@ public function testRestrictedColumnSinglePermissionWithUserWithWrongPermissions
 
     public function testRestrictedColumnSinglePermissionWithUserWithRightPermissions()
     {
-        $user = new UserFixture;
+        $user = new UserFixture();
         $this->actingAs($user->withPermission('test.access_field', true));
 
         $list = $this->restrictedListsFixture(true);
@@ -123,7 +123,7 @@ public function testRestrictedColumnSinglePermissionWithUserWithRightPermissions
     protected function restrictedListsFixture(bool $singlePermission = false)
     {
         return new Lists(null, [
-            'model' => new User,
+            'model' => new User(),
             'arrayName' => 'array',
             'columns' => [
                 'id' => [
diff --git a/modules/backend/traits/CollapsableWidget.php b/modules/backend/traits/CollapsableWidget.php
index 31a22db37a..8c60afbdee 100644
--- a/modules/backend/traits/CollapsableWidget.php
+++ b/modules/backend/traits/CollapsableWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 /**
  * Collapsable Widget Trait
@@ -96,7 +98,7 @@ protected function getCollapseStatus($group, $default = true)
      */
     public function onGroupStatusUpdate()
     {
-        traceLog('onGroupStatusUpdate is deprecated. Please update onSetCollapseStatus instead. Class: '.get_class($this));
+        traceLog('onGroupStatusUpdate is deprecated. Please update onSetCollapseStatus instead. Class: ' . get_class($this));
         $this->onSetCollapseStatus();
     }
 
@@ -105,7 +107,7 @@ public function onGroupStatusUpdate()
      */
     protected function getGroupStatuses()
     {
-        traceLog('getGroupStatuses is deprecated. Please update getCollapseStatuses instead. Class: '.get_class($this));
+        traceLog('getGroupStatuses is deprecated. Please update getCollapseStatuses instead. Class: ' . get_class($this));
         return $this->getCollapseStatuses();
     }
 
@@ -114,7 +116,7 @@ protected function getGroupStatuses()
      */
     protected function setGroupStatus($group, $status)
     {
-        traceLog('setGroupStatus is deprecated. Please update setCollapseStatus instead. Class: '.get_class($this));
+        traceLog('setGroupStatus is deprecated. Please update setCollapseStatus instead. Class: ' . get_class($this));
         return $this->setCollapseStatus($group, $status);
     }
 
@@ -123,7 +125,7 @@ protected function setGroupStatus($group, $status)
      */
     protected function getGroupStatus($group, $default = true)
     {
-        traceLog('getGroupStatus is deprecated. Please update getCollapseStatus instead. Class: '.get_class($this));
+        traceLog('getGroupStatus is deprecated. Please update getCollapseStatus instead. Class: ' . get_class($this));
         return $this->getCollapseStatus($group, $default);
     }
 }
diff --git a/modules/backend/traits/ErrorMaker.php b/modules/backend/traits/ErrorMaker.php
index d5099c85fd..218df0bbce 100644
--- a/modules/backend/traits/ErrorMaker.php
+++ b/modules/backend/traits/ErrorMaker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use System\Classes\ErrorHandler;
 
diff --git a/modules/backend/traits/FormModelSaver.php b/modules/backend/traits/FormModelSaver.php
index b377249e6d..06ef540a11 100644
--- a/modules/backend/traits/FormModelSaver.php
+++ b/modules/backend/traits/FormModelSaver.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Str;
 use Backend\Classes\FormField;
@@ -77,8 +79,7 @@ protected function setModelAttributes($model, $saveData)
                     $model->{$attribute} = $model->{$attribute}()->getRelated();
                 }
                 $this->setModelAttributes($model->{$attribute}, $value);
-            }
-            elseif ($value !== FormField::NO_SAVE_DATA) {
+            } elseif ($value !== FormField::NO_SAVE_DATA) {
                 if (Str::startsWith($attribute, '_')) {
                     $attributesToPurge[] = $attribute;
                 }
@@ -112,8 +113,7 @@ protected function deferPurgedSaveAttributes($model, $attributesToPurge)
          */
         if (method_exists($model, 'getPurgeableAttributes')) {
             $model->addPurgeable($attributesToPurge);
-        }
-        else {
+        } else {
             $model->bindEventOnce('model.saveInternal', function () use ($model, $attributesToPurge) {
                 foreach ($attributesToPurge as $attribute) {
                     unset($model->attributes[$attribute]);
diff --git a/modules/backend/traits/FormModelWidget.php b/modules/backend/traits/FormModelWidget.php
index fc099cf00b..5530cc3d5c 100644
--- a/modules/backend/traits/FormModelWidget.php
+++ b/modules/backend/traits/FormModelWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Lang;
 use ApplicationException;
@@ -25,8 +27,7 @@ public function resolveModelAttribute(string $attribute): array
     {
         try {
             return $this->formField->resolveModelAttribute($this->model, $attribute);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             throw new ApplicationException(Lang::get('backend::lang.model.missing_relation', [
                 'class' => get_class($this->model),
                 'relation' => $attribute
diff --git a/modules/backend/traits/InspectableContainer.php b/modules/backend/traits/InspectableContainer.php
index 5beabba5df..00d85c1dc9 100644
--- a/modules/backend/traits/InspectableContainer.php
+++ b/modules/backend/traits/InspectableContainer.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Lang;
 use Request;
@@ -66,11 +68,10 @@ public function onInspectableGetOptions()
             $propertyMethodName .= ucfirst($part);
         }
 
-        $methodName = 'get'.$propertyMethodName.'Options';
+        $methodName = 'get' . $propertyMethodName . 'Options';
         if (method_exists($obj, $methodName)) {
             $options = $obj->$methodName();
-        }
-        else {
+        } else {
             $options = $obj->getPropertyOptions($property);
         }
 
diff --git a/modules/backend/traits/PreferenceMaker.php b/modules/backend/traits/PreferenceMaker.php
index fe6e8d331d..ff5d48143d 100644
--- a/modules/backend/traits/PreferenceMaker.php
+++ b/modules/backend/traits/PreferenceMaker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Str;
 use Backend\Models\UserPreference;
diff --git a/modules/backend/traits/SearchableWidget.php b/modules/backend/traits/SearchableWidget.php
index e63bf7ed22..2992175796 100644
--- a/modules/backend/traits/SearchableWidget.php
+++ b/modules/backend/traits/SearchableWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Str;
 
diff --git a/modules/backend/traits/SelectableWidget.php b/modules/backend/traits/SelectableWidget.php
index 5cefb5210d..6cb14998e4 100644
--- a/modules/backend/traits/SelectableWidget.php
+++ b/modules/backend/traits/SelectableWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Input;
 
diff --git a/modules/backend/traits/SessionMaker.php b/modules/backend/traits/SessionMaker.php
index 2ca8340e66..b516b35b56 100644
--- a/modules/backend/traits/SessionMaker.php
+++ b/modules/backend/traits/SessionMaker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Str;
 use Session;
diff --git a/modules/backend/traits/UploadableWidget.php b/modules/backend/traits/UploadableWidget.php
index 1f6c28eda2..e6b559449f 100644
--- a/modules/backend/traits/UploadableWidget.php
+++ b/modules/backend/traits/UploadableWidget.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use ApplicationException;
 use Event;
@@ -166,7 +168,7 @@ public function validateMediaFileName(string $fileName, string $extension): stri
          * Convert uppcare case file extensions to lower case
          */
         $extension = strtolower($extension);
-        $fileName = File::name($fileName).'.'.$extension;
+        $fileName = File::name($fileName) . '.' . $extension;
 
         /*
          * File name contains non-latin characters, attempt to slug the value
@@ -236,13 +238,13 @@ protected function cleanFileName($name)
 
         // Convert all dashes/underscores into separator
         $flip = $separator = '-';
-        $title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
+        $title = preg_replace('![' . preg_quote($flip) . ']+!u', $separator, $title);
 
         // Remove all characters that are not the separator, letters, numbers, whitespace or @.
-        $title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s@]+!u', '', mb_strtolower($title));
+        $title = preg_replace('![^' . preg_quote($separator) . '\pL\pN\s@]+!u', '', mb_strtolower($title));
 
         // Replace all separator characters and whitespace by a single separator
-        $title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
+        $title = preg_replace('![' . preg_quote($separator) . '\s]+!u', $separator, $title);
 
         return trim($title, $separator);
     }
diff --git a/modules/backend/traits/WidgetMaker.php b/modules/backend/traits/WidgetMaker.php
index 4a36f85a3b..e6f9fd2271 100644
--- a/modules/backend/traits/WidgetMaker.php
+++ b/modules/backend/traits/WidgetMaker.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Traits;
+<?php
+
+namespace Backend\Traits;
 
 use Lang;
 use Backend\Classes\FormField;
@@ -65,8 +67,7 @@ public function makeFormWidget($class, $fieldConfig = [], $widgetConfig = [])
                 array_get($fieldConfig, 'label')
             );
             $formField->displayAs('widget', $fieldConfig);
-        }
-        else {
+        } else {
             $formField = $fieldConfig;
         }
 
diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php
index c37561a3f2..2920350987 100644
--- a/modules/backend/widgets/Filter.php
+++ b/modules/backend/widgets/Filter.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use Db;
 use Str;
@@ -110,7 +112,8 @@ public function renderScopeElement($scope)
 
                 break;
             case 'daterange':
-                if ($scope->value && is_array($scope->value) && count($scope->value) === 2 &&
+                if (
+                    $scope->value && is_array($scope->value) && count($scope->value) === 2 &&
                     $scope->value[0] && $scope->value[0] instanceof Carbon &&
                     $scope->value[1] && $scope->value[1] instanceof Carbon
                 ) {
@@ -120,8 +123,7 @@ public function renderScopeElement($scope)
                     if (strcasecmp($after, '0000-01-01 00:00:00') > 0) {
                         $params['afterStr'] = Backend::dateTime($scope->value[0], ['formatAlias' => 'dateMin']);
                         $params['after']    = $after;
-                    }
-                    else {
+                    } else {
                         $params['afterStr'] = '-∞';
                         $params['after']    = null;
                     }
@@ -129,8 +131,7 @@ public function renderScopeElement($scope)
                     if (strcasecmp($before, '2999-12-31 23:59:59') < 0) {
                         $params['beforeStr'] = Backend::dateTime($scope->value[1], ['formatAlias' => 'dateMin']);
                         $params['before']    = $before;
-                    }
-                    else {
+                    } else {
                         $params['beforeStr'] = '∞';
                         $params['before']    = null;
                     }
@@ -185,7 +186,7 @@ public function renderScopeElement($scope)
                 break;
         }
 
-        return $this->makePartial('scope_'.$scope->type, $params);
+        return $this->makePartial('scope_' . $scope->type, $params);
     }
 
     /**
@@ -245,8 +246,7 @@ public function onFilterUpdate()
 
                 if (!empty($dates)) {
                     list($date) = $dates;
-                }
-                else {
+                } else {
                     $date = null;
                 }
 
@@ -261,8 +261,7 @@ public function onFilterUpdate()
                     list($after, $before) = $dates;
 
                     $dates = [$after, $before];
-                }
-                else {
+                } else {
                     $dates = null;
                 }
 
@@ -275,8 +274,7 @@ public function onFilterUpdate()
 
                 if (!empty($numbers)) {
                     list($number) = $numbers;
-                }
-                else {
+                } else {
                     $number = null;
                 }
 
@@ -291,8 +289,7 @@ public function onFilterUpdate()
                     list($min, $max) = $numbers;
 
                     $numbers = [$min, $max];
-                }
-                else {
+                } else {
                     $numbers = null;
                 }
 
@@ -479,8 +476,7 @@ protected function getOptionsFromArray($scope, $searchQuery = null)
             } else {
                 $options = $model->$methodName();
             }
-        }
-        elseif (!is_array($options)) {
+        } elseif (!is_array($options)) {
             $options = [];
         }
 
@@ -637,7 +633,7 @@ public function addScopes(array $scopes)
              */
             if (isset($config['modelClass'])) {
                 $class = $config['modelClass'];
-                $model = new $class;
+                $model = new $class();
                 $this->scopeModels[$name] = $model;
             }
 
@@ -752,20 +748,13 @@ public function applyScopeToQuery($scope, $query)
                 if ($scope->value instanceof Carbon) {
                     $value = $scope->value;
 
-                    /*
-                     * Condition
-                     */
                     if ($scopeConditions = $scope->conditions) {
                         $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                             ':filtered' => $value->format('Y-m-d'),
                             ':after'    => $value->format('Y-m-d H:i:s'),
                             ':before'   => $value->copy()->addDay()->addMinutes(-1)->format('Y-m-d H:i:s')
                         ])));
-                    }
-                    /*
-                     * Scope
-                     */
-                    elseif ($scopeMethod = $scope->scope) {
+                    } elseif ($scopeMethod = $scope->scope) {
                         $query->$scopeMethod($value);
                     }
                 }
@@ -777,9 +766,6 @@ public function applyScopeToQuery($scope, $query)
                     list($after, $before) = array_values($scope->value);
 
                     if ($after && $after instanceof Carbon && $before && $before instanceof Carbon) {
-                        /*
-                         * Condition
-                         */
                         if ($scopeConditions = $scope->conditions) {
                             $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                                 ':afterDate'  => $after->format('Y-m-d'),
@@ -787,11 +773,7 @@ public function applyScopeToQuery($scope, $query)
                                 ':beforeDate' => $before->format('Y-m-d'),
                                 ':before'     => $before->format('Y-m-d H:i:s')
                             ])));
-                        }
-                        /*
-                         * Scope
-                         */
-                        elseif ($scopeMethod = $scope->scope) {
+                        } elseif ($scopeMethod = $scope->scope) {
                             $query->$scopeMethod($after, $before);
                         }
                     }
@@ -801,18 +783,11 @@ public function applyScopeToQuery($scope, $query)
 
             case 'number':
                 if (is_numeric($scope->value)) {
-                    /*
-                     * Condition
-                     */
                     if ($scopeConditions = $scope->conditions) {
                         $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                             ':filtered' => $scope->value,
                         ])));
-                    }
-                    /*
-                     * Scope
-                     */
-                    elseif ($scopeMethod = $scope->scope) {
+                    } elseif ($scopeMethod = $scope->scope) {
                         $query->$scopeMethod($scope->value);
                     }
                 }
@@ -824,19 +799,12 @@ public function applyScopeToQuery($scope, $query)
                     list($min, $max) = array_values($scope->value);
 
                     if (isset($min) || isset($max)) {
-                        /*
-                         * Condition
-                         */
                         if ($scopeConditions = $scope->conditions) {
                             $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                                 ':min'  => $min === null ? -2147483647 : $min,
                                 ':max'  => $max === null ? 2147483647 : $max
                             ])));
-                        }
-                        /*
-                         * Scope
-                         */
-                        elseif ($scopeMethod = $scope->scope) {
+                        } elseif ($scopeMethod = $scope->scope) {
                             $query->$scopeMethod($min, $max);
                         }
                     }
@@ -845,19 +813,11 @@ public function applyScopeToQuery($scope, $query)
                 break;
 
             case 'text':
-                /*
-                 * Condition
-                 */
                 if ($scopeConditions = $scope->conditions) {
                     $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                         ':value' => Db::getPdo()->quote($scope->value),
                     ])));
-                }
-
-                /*
-                 * Scope
-                 */
-                elseif ($scopeMethod = $scope->scope) {
+                } elseif ($scopeMethod = $scope->scope) {
                     $query->$scopeMethod($scope->value);
                 }
 
@@ -870,9 +830,6 @@ public function applyScopeToQuery($scope, $query)
                     break;
                 }
 
-                /*
-                 * Condition
-                 */
                 if ($scopeConditions = $scope->conditions) {
                     /*
                      * Switch scope: multiple conditions, value either 1 or 2
@@ -886,17 +843,12 @@ public function applyScopeToQuery($scope, $query)
                         $filtered = implode(',', array_build($value, function ($key, $_value) {
                             return [$key, Db::getPdo()->quote($_value)];
                         }));
-                    }
-                    else {
+                    } else {
                         $filtered = Db::getPdo()->quote($value);
                     }
 
                     $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [':filtered' => $filtered])));
-                }
-                /*
-                 * Scope
-                 */
-                elseif ($scopeMethod = $scope->scope) {
+                } elseif ($scopeMethod = $scope->scope) {
                     $query->$scopeMethod($value);
                 }
 
@@ -919,7 +871,7 @@ public function getScopeValue($scope, $default = null)
             $scope = $this->getScope($scope);
         }
 
-        $cacheKey = 'scope-'.$scope->scopeName;
+        $cacheKey = 'scope-' . $scope->scopeName;
         return $this->getSession($cacheKey, $default);
     }
 
@@ -932,7 +884,7 @@ public function setScopeValue($scope, $value)
             $scope = $this->getScope($scope);
         }
 
-        $cacheKey = 'scope-'.$scope->scopeName;
+        $cacheKey = 'scope-' . $scope->scopeName;
         $this->putSession($cacheKey, $value);
 
         $scope->value = $value;
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 59ec24e033..9d049aa71c 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use ApplicationException;
 use Backend\Classes\FormField;
@@ -287,7 +289,7 @@ protected function validateModel()
         if (!$this->model) {
             throw new ApplicationException(Lang::get(
                 'backend::lang.form.missing_model',
-                ['class'=>get_class($this->controller)]
+                ['class' => get_class($this->controller)]
             ));
         }
 
@@ -416,7 +418,7 @@ public function onRefresh()
          * Update the whole form
          */
         if (empty($result)) {
-            $result = ['#'.$this->getId() => $this->makePartial('form')];
+            $result = ['#' . $this->getId() => $this->makePartial('form')];
         }
 
         /**
@@ -656,11 +658,9 @@ protected function defineFormFields()
         ) {
             if ($this->allTabs->secondary->hasFields()) {
                 $this->allTabs->secondary->stretch = true;
-            }
-            elseif ($this->allTabs->primary->hasFields()) {
+            } elseif ($this->allTabs->primary->hasFields()) {
                 $this->allTabs->primary->stretch = true;
-            }
-            else {
+            } else {
                 $this->allTabs->outside->stretch = true;
             }
         }
@@ -694,8 +694,7 @@ protected function processAutoSpan($fields)
             if (strtolower($field->span) === 'auto') {
                 if ($prevSpan === 'left') {
                     $field->span = 'right';
-                }
-                else {
+                } else {
                     $field->span = 'left';
                 }
             }
@@ -838,21 +837,15 @@ protected function makeFormField($name, $config = [])
         $field->arrayName = $this->arrayName;
         $field->idPrefix = $this->getId();
 
-        /*
-         * Simple field type
-         */
         if (is_string($config)) {
+            // Simple field type
             if ($this->isFormWidget($config) !== false) {
                 $field->displayAs('widget', ['widget' => $config]);
-            }
-            else {
+            } else {
                 $field->displayAs($config);
             }
-        }
-        /*
-         * Defined field type
-         */
-        else {
+        } else {
+            // Defined field type
             $fieldType = $config['type'] ?? null;
             if (!is_string($fieldType) && $fieldType !== null) {
                 throw new ApplicationException(Lang::get(
@@ -1220,8 +1213,10 @@ public function getSaveData(bool $includeAllFields = false): array
         foreach ($this->formWidgets as $field => $widget) {
             $parts = HtmlHelper::nameToArray($field);
 
-            if ((isset($widget->config->disabled) && $widget->config->disabled)
-                || (isset($widget->config->hidden) && $widget->config->hidden)) {
+            if (
+                (isset($widget->config->disabled) && $widget->config->disabled)
+                || (isset($widget->config->hidden) && $widget->config->hidden)
+            ) {
                 continue;
             }
 
@@ -1299,24 +1294,21 @@ public function getOptionsFromModel($field, $fieldOptions)
             $fieldOptions = call_user_func($fieldOptions, $this, $field);
         }
 
-        /*
-         * Refer to the model method or any of its behaviors
-         */
         if (!is_array($fieldOptions) && !$fieldOptions) {
+            // Refer to the model method or any of its behaviors
             try {
                 list($model, $attribute) = $field->resolveModelAttribute($this->model, $field->fieldName);
                 if (!$model) {
                     throw new Exception();
                 }
-            }
-            catch (Exception $ex) {
+            } catch (Exception $ex) {
                 throw new ApplicationException(Lang::get('backend::lang.field.options_method_invalid_model', [
                     'model' => get_class($this->model),
                     'field' => $field->fieldName
                 ]));
             }
 
-            $methodName = 'get'.studly_case($attribute).'Options';
+            $methodName = 'get' . studly_case($attribute) . 'Options';
             if (
                 !$this->objectMethodExists($model, $methodName) &&
                 !$this->objectMethodExists($model, 'getDropdownOptions')
@@ -1330,15 +1322,12 @@ public function getOptionsFromModel($field, $fieldOptions)
 
             if ($this->objectMethodExists($model, $methodName)) {
                 $fieldOptions = $model->$methodName($field->value, $this->data);
-            }
-            else {
+            } else {
                 $fieldOptions = $model->getDropdownOptions($attribute, $field->value, $this->data);
             }
-        }
-        /*
-         * Field options are an explicit method reference
-         */
-        elseif (is_string($fieldOptions)) {
+        } elseif (is_string($fieldOptions)) {
+            // Field options are an explicit method reference
+
             // \Path\To\Class::staticMethodOptions
             if (str_contains($fieldOptions, '::')) {
                 $options = explode('::', $fieldOptions);
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 85bec9b108..cd9ce8dffa 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use Db;
 use Str;
@@ -282,12 +284,10 @@ public function prepareVars()
                 $this->vars['pageLast'] = $this->records->lastPage();
                 $this->vars['pageFrom'] = $this->records->firstItem();
                 $this->vars['pageTo'] = $this->records->lastItem();
-            }
-            else {
+            } else {
                 $this->vars['hasMorePages'] = $this->records->hasMorePages();
             }
-        }
-        else {
+        } else {
             $this->vars['recordTotal'] = $this->records->count();
             $this->vars['pageCurrent'] = 1;
         }
@@ -299,7 +299,7 @@ public function prepareVars()
     public function onRefresh()
     {
         $this->prepareVars();
-        return ['#'.$this->getId() => $this->makePartial('list')];
+        return ['#' . $this->getId() => $this->makePartial('list')];
     }
 
     /**
@@ -329,14 +329,14 @@ protected function validateModel()
         if (!$this->model) {
             throw new ApplicationException(Lang::get(
                 'backend::lang.list.missing_model',
-                ['class'=>get_class($this->controller)]
+                ['class' => get_class($this->controller)]
             ));
         }
 
         if (!$this->model instanceof Model) {
             throw new ApplicationException(Lang::get(
                 'backend::lang.model.invalid_class',
-                ['model'=>get_class($this->model), 'class'=>get_class($this->controller)]
+                ['model' => get_class($this->model), 'class' => get_class($this->controller)]
             ));
         }
 
@@ -351,7 +351,7 @@ protected function validateModel()
      */
     protected function parseTableName($sql, $table)
     {
-        return str_replace('@', $table.'.', $sql);
+        return str_replace('@', $table . '.', $sql);
     }
 
     /**
@@ -361,7 +361,7 @@ public function prepareQuery()
     {
         $query = $this->model->newQuery();
         $primaryTable = $this->model->getTable();
-        $selects = [$primaryTable.'.*'];
+        $selects = [$primaryTable . '.*'];
         $joins = [];
         $withs = [];
         $bindings = [];
@@ -398,9 +398,6 @@ public function prepareQuery()
             && ($searchableColumns = $this->getSearchableColumns())
         ) {
             foreach ($searchableColumns as $column) {
-                /*
-                 * Related
-                 */
                 if ($this->isColumnRelated($column)) {
                     $table = $this->model->makeRelation($column->relation)->getTable();
                     $columnName = isset($column->sqlSelect)
@@ -408,11 +405,7 @@ public function prepareQuery()
                         : $table . '.' . $column->valueFrom;
 
                     $relationSearchable[$column->relation][] = $columnName;
-                }
-                /*
-                 * Primary
-                 */
-                else {
+                } else {
                     $columnName = isset($column->sqlSelect)
                         ? DbDongle::raw($this->parseTableName($column->sqlSelect, $primaryTable))
                         : DbDongle::cast(Db::getTablePrefix() . $primaryTable . '.' . $column->columnName, 'TEXT');
@@ -491,10 +484,9 @@ public function prepareQuery()
 
             $alias = $query->getQuery()->getGrammar()->wrap($column->columnName);
 
-            /*
-             * Relation column
-             */
             if (isset($column->relation)) {
+                // Relation column
+
                 // @todo Find a way...
                 $relationType = $this->model->getRelationType($column->relation);
                 if ($relationType == 'morphTo') {
@@ -528,19 +520,16 @@ public function prepareQuery()
 
                 $joinSql = $joinQuery->toSql();
 
-                $selects[] = Db::raw("(".$joinSql.") as ".$alias);
+                $selects[] = Db::raw("(" . $joinSql . ") as " . $alias);
 
                 /*
                  * If this is a polymorphic relation there will be bindings that need to be added to the query
                  */
                 $bindings = array_merge($bindings, $countQuery->getBindings());
-            }
-            /*
-             * Primary column
-             */
-            else {
+            } else {
+                // Primary column
                 $sqlSelect = $this->parseTableName($column->sqlSelect, $primaryTable);
-                $selects[] = DbDongle::raw($sqlSelect . ' as '. $alias);
+                $selects[] = DbDongle::raw($sqlSelect . ' as ' . $alias);
             }
         }
 
@@ -620,13 +609,11 @@ protected function getRecords()
 
         if ($this->showTree) {
             $records = $query->getNested();
-        }
-        elseif ($this->showPagination) {
+        } elseif ($this->showPagination) {
             $method            = $this->showPageNumbers ? 'paginate' : 'simplePaginate';
             $currentPageNumber = $this->getCurrentPageNumber($query);
             $records = $query->{$method}($this->recordsPerPage, $currentPageNumber);
-        }
-        else {
+        } else {
             $records = $query->get();
         }
 
@@ -762,7 +749,7 @@ public function getVisibleColumns()
             if (!count($definitions)) {
                 throw new ApplicationException(Lang::get(
                     'backend::lang.list.missing_column',
-                    ['columns'=>implode(',', $invalidColumns)]
+                    ['columns' => implode(',', $invalidColumns)]
                 ));
             }
 
@@ -771,11 +758,7 @@ public function getVisibleColumns()
                 $definitions[$columnName]->invisible = false;
                 $columns[$columnName] = $definitions[$columnName];
             }
-        }
-        /*
-         * Use default column list
-         */
-        else {
+        } else {
             foreach ($definitions as $columnName => $column) {
                 if ($column->invisible) {
                     continue;
@@ -961,34 +944,27 @@ protected function makeListColumn($name, $config)
     {
         if (is_string($config)) {
             $label = $config;
-        }
-        elseif (isset($config['label'])) {
+        } elseif (isset($config['label'])) {
             $label = $config['label'];
-        }
-        else {
+        } else {
             $label = studly_case($name);
         }
 
-        /*
-         * Auto configure pivot relation
-         */
         if (starts_with($name, 'pivot[') && strpos($name, ']') !== false) {
+            // Auto configure pivot relation
             $_name = HtmlHelper::nameToArray($name);
             $relationName = array_shift($_name);
             $valueFrom = array_shift($_name);
 
             if (count($_name) > 0) {
-                $valueFrom  .= '['.implode('][', $_name).']';
+                $valueFrom  .= '[' . implode('][', $_name) . ']';
             }
 
             $config['relation'] = $relationName;
             $config['valueFrom'] = $valueFrom;
             $config['searchable'] = false;
-        }
-        /*
-         * Auto configure standard relation
-         */
-        elseif (strpos($name, '[') !== false && strpos($name, ']') !== false) {
+        } elseif (strpos($name, '[') !== false && strpos($name, ']') !== false) {
+            // Auto configure standard relation
             $config['valueFrom'] = $name;
             $config['sortable'] = false;
             $config['searchable'] = false;
@@ -1066,39 +1042,30 @@ public function getColumnValueRaw($record, $column)
     {
         $columnName = $column->columnName;
 
-        /*
-         * Handle taking value from model relation.
-         */
         if ($column->valueFrom && $column->relation) {
+            // Handle taking value from model relation.
             $columnName = $column->relation;
 
             if (!array_key_exists($columnName, $record->getRelations())) {
                 $value = null;
-            }
-            elseif ($this->isColumnRelated($column, true)) {
+            } elseif ($this->isColumnRelated($column, true)) {
                 $value = $record->{$columnName}->lists($column->valueFrom);
-            }
-            elseif ($this->isColumnRelated($column) || $this->isColumnPivot($column)) {
+            } elseif ($this->isColumnRelated($column) || $this->isColumnPivot($column)) {
                 $value = $record->{$columnName}
                     ? $column->getValueFromData($record->{$columnName})
                     : null;
-            }
-            else {
+            } else {
                 $value = null;
             }
-        }
-        /*
-         * Handle taking value from model attribute.
-         */
-        elseif ($column->valueFrom) {
+        } elseif ($column->valueFrom) {
+            // Handle taking value from model attribute.
             $value = $column->getValueFromData($record);
-        }
-        /*
-         * Otherwise, if the column is a relation, it will be a custom select,
-         * so prevent the Model from attempting to load the relation
-         * if the value is NULL.
-         */
-        else {
+        } else {
+            /*
+            Otherwise, if the column is a relation, it will be a custom select,
+            so prevent the Model from attempting to load the relation
+            if the value is NULL.
+            */
             if ($record->hasRelation($columnName) && array_key_exists($columnName, $record->attributes)) {
                 $value = $record->attributes[$columnName];
             // Load the value from the relationship counter if useRelationCount is specified
@@ -1147,10 +1114,9 @@ public function getColumnValue($record, $column)
     {
         $value = $this->getColumnValueRaw($record, $column);
 
-        if (method_exists($this, 'eval'. studly_case($column->type) .'TypeValue')) {
-            $value = $this->{'eval'. studly_case($column->type) .'TypeValue'}($record, $column, $value);
-        }
-        else {
+        if (method_exists($this, 'eval' . studly_case($column->type) . 'TypeValue')) {
+            $value = $this->{'eval' . studly_case($column->type) . 'TypeValue'}($record, $column, $value);
+        } else {
             $value = $this->evalCustomListType($column->type, $record, $column, $value);
         }
 
@@ -1347,8 +1313,7 @@ protected function evalSwitchTypeValue($record, $column, $value)
 
         if ($value) {
             $contents = Lang::get('backend::lang.list.column_switch_true');
-        }
-        else {
+        } else {
             $contents = Lang::get('backend::lang.list.column_switch_false');
         }
 
@@ -1368,8 +1333,7 @@ protected function evalDatetimeTypeValue($record, $column, $value)
 
         if ($column->format !== null) {
             $value = $dateTime->format($column->format);
-        }
-        else {
+        } else {
             $value = $dateTime->toDayDateTimeString();
         }
 
@@ -1427,8 +1391,7 @@ protected function evalDateTypeValue($record, $column, $value)
 
         if ($column->format !== null) {
             $value = $dateTime->format($column->format);
-        }
-        else {
+        } else {
             $value = $dateTime->toFormattedDateString();
         }
 
@@ -1499,7 +1462,7 @@ protected function evalTimetenseTypeValue($record, $column, $value)
      */
     protected function evalColorPickerTypeValue($record, $column, $value)
     {
-        return  '<span style="width:30px; height:30px; display:inline-block; background:'.e($value).'; padding:10px"><span>';
+        return  '<span style="width:30px; height:30px; display:inline-block; background:' . e($value) . '; padding:10px"><span>';
     }
     /**
      * Validates a column type as a date
@@ -1609,8 +1572,7 @@ protected function applySearchToQuery($query, $columns, $boolean = 'and')
             $query->$searchMethod(function ($q) use ($term, $columns, $scopeMethod) {
                 $q->$scopeMethod($term, $columns);
             });
-        }
-        else {
+        } else {
             $searchMethod = $boolean == 'and' ? 'searchWhere' : 'orSearchWhere';
             $query->$searchMethod($term, $columns, $this->searchMode);
         }
@@ -1633,8 +1595,7 @@ public function onSort()
 
             if ($column != $sortOptions['column'] || $sortOptions['direction'] == 'asc') {
                 $this->sortDirection = $sortOptions['direction'] = 'desc';
-            }
-            else {
+            } else {
                 $this->sortDirection = $sortOptions['direction'] = 'asc';
             }
 
@@ -1670,23 +1631,16 @@ public function getSortColumn()
             return $this->sortColumn;
         }
 
-        /*
-         * User preference
-         */
         if ($this->showSorting && ($sortOptions = $this->getSession('sort'))) {
+            // User preference
             $this->sortColumn = $sortOptions['column'];
             $this->sortDirection = $sortOptions['direction'];
-        }
-
-        /*
-         * Supplied default
-         */
-        else {
+        } else {
+            // Supplied default
             if (is_string($this->defaultSort)) {
                 $this->sortColumn = $this->defaultSort;
                 $this->sortDirection = 'desc';
-            }
-            elseif (is_array($this->defaultSort) && isset($this->defaultSort['column'])) {
+            } elseif (is_array($this->defaultSort) && isset($this->defaultSort['column'])) {
                 $this->sortColumn = $this->defaultSort['column'];
                 $this->sortDirection = $this->defaultSort['direction'] ?? 'desc';
             }
@@ -1884,7 +1838,7 @@ protected function isColumnRelated(ListColumn $column, bool $multi = false): boo
         if (!$this->model->hasRelation($column->relation)) {
             throw new ApplicationException(Lang::get(
                 'backend::lang.model.missing_relation',
-                ['class'=>get_class($this->model), 'relation'=>$column->relation]
+                ['class' => get_class($this->model), 'relation' => $column->relation]
             ));
         }
 
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index 067d53a50d..1b1f26842f 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use Str;
 use Lang;
@@ -854,8 +856,7 @@ protected function prepareVars()
 
         if (!$searchMode) {
             $this->vars['items'] = $this->listFolderItems($folder, $filter, ['by' => $sortBy, 'direction' => $sortDirection]);
-        }
-        else {
+        } else {
             $this->vars['items'] = $this->findFiles($searchTerm, $filter, ['by' => $sortBy, 'direction' => $sortDirection]);
         }
 
@@ -926,13 +927,15 @@ protected function getCurrentFolder(): string
      */
     protected function setFilter(string $filter): void
     {
-        if (!in_array($filter, [
+        if (
+            !in_array($filter, [
             self::FILTER_ALL,
             MediaLibraryItem::FILE_TYPE_IMAGE,
             MediaLibraryItem::FILE_TYPE_AUDIO,
             MediaLibraryItem::FILE_TYPE_DOCUMENT,
             MediaLibraryItem::FILE_TYPE_VIDEO
-        ])) {
+            ])
+        ) {
             throw new ApplicationException('Invalid input data');
         }
 
@@ -988,11 +991,13 @@ protected function getSearchTerm(): ?string
      */
     protected function setSortBy(string $sortBy): void
     {
-        if (!in_array($sortBy, [
+        if (
+            !in_array($sortBy, [
             MediaLibrary::SORT_BY_TITLE,
             MediaLibrary::SORT_BY_SIZE,
             MediaLibrary::SORT_BY_MODIFIED
-        ])) {
+            ])
+        ) {
             throw new ApplicationException('Invalid input data');
         }
 
@@ -1017,10 +1022,12 @@ protected function getSortBy(): string
      */
     protected function setSortDirection($sortDirection): void
     {
-        if (!in_array($sortDirection, [
+        if (
+            !in_array($sortDirection, [
             MediaLibrary::SORT_DIRECTION_ASC,
             MediaLibrary::SORT_DIRECTION_DESC
-        ])) {
+            ])
+        ) {
             throw new ApplicationException('Invalid input data');
         }
 
@@ -1077,11 +1084,13 @@ protected function getSelectionParams(): array
      */
     protected function setSelectionParams($selectionMode, $selectionWidth, $selectionHeight): void
     {
-        if (!in_array($selectionMode, [
+        if (
+            !in_array($selectionMode, [
             self::SELECTION_MODE_NORMAL,
             self::SELECTION_MODE_FIXED_RATIO,
             self::SELECTION_MODE_FIXED_SIZE
-        ])) {
+            ])
+        ) {
             throw new ApplicationException('Invalid input data');
         }
 
@@ -1151,9 +1160,9 @@ protected function splitPathToSegments($path): array
         while (count($path) > 0) {
             $folder = array_pop($path);
 
-            $result[$folder] = implode('/', $path).'/'.$folder;
+            $result[$folder] = implode('/', $path) . '/' . $folder;
             if (substr($result[$folder], 0, 1) != '/') {
-                $result[$folder] = '/'.$result[$folder];
+                $result[$folder] = '/' . $result[$folder];
             }
         }
 
@@ -1167,11 +1176,13 @@ protected function splitPathToSegments($path): array
      */
     protected function setViewMode(string $viewMode): void
     {
-        if (!in_array($viewMode, [
+        if (
+            !in_array($viewMode, [
             self::VIEW_MODE_GRID,
             self::VIEW_MODE_LIST,
             self::VIEW_MODE_TILES
-        ])) {
+            ])
+        ) {
             throw new ApplicationException('Invalid input data');
         }
 
@@ -1223,7 +1234,7 @@ protected function getThumbnailParams(string $viewMode = null): array
      */
     protected function getPlaceholderId($item)
     {
-        return 'placeholder'.md5($item->path.'-'.$item->lastModified.uniqid(microtime()));
+        return 'placeholder' . md5($item->path . '-' . $item->lastModified . uniqid(microtime()));
     }
 
     /**
diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php
index 848d27f038..92a6d77d26 100644
--- a/modules/backend/widgets/ReportContainer.php
+++ b/modules/backend/widgets/ReportContainer.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use File;
 use Lang;
@@ -86,8 +88,7 @@ public function __construct($controller, $configuration = null)
             $path = $controller->getConfigPath($configuration);
             if (File::isFile($path)) {
                 $configuration = $this->makeConfig($path);
-            }
-            else {
+            } else {
                 $configuration = [];
             }
         }
@@ -141,7 +142,7 @@ public function onResetWidgets()
 
         Flash::success(Lang::get('backend::lang.dashboard.reset_layout_success'));
 
-        return ['#'.$this->getId('container-list') => $this->makePartial('widget_list')];
+        return ['#' . $this->getId('container-list') => $this->makePartial('widget_list')];
     }
 
     public function onMakeLayoutDefault()
@@ -168,7 +169,7 @@ public function onUpdateWidget()
         $this->saveWidgetProperties($alias, $widget->getProperties());
 
         return [
-            '#'.$alias => $widget->render()
+            '#' . $alias => $widget->render()
         ];
     }
 
@@ -183,7 +184,7 @@ public function onLoadAddPopup()
     {
         $sizes = [];
         for ($i = 1; $i <= 12; $i++) {
-            $sizes[$i] = $i < 12 ? $i : $i.' (' . Lang::get('backend::lang.dashboard.full_width') . ')';
+            $sizes[$i] = $i < 12 ? $i : $i . ' (' . Lang::get('backend::lang.dashboard.full_width') . ')';
         }
 
         $this->vars['sizes'] = $sizes;
@@ -213,7 +214,7 @@ public function onAddWidget()
         $widgetInfo = $this->addWidget($widget, $size);
 
         return [
-            '@#'.$this->getId('container-list') => $this->makePartial('widget', [
+            '@#' . $this->getId('container-list') => $this->makePartial('widget', [
                 'widget'      => $widget,
                 'widgetAlias' => $widgetInfo['alias'],
                 'sortOrder'   => $widgetInfo['sortOrder']
@@ -232,9 +233,8 @@ public function addWidget($widget, $size)
         $num = count($widgets);
         do {
             $num++;
-            $alias = 'report_container_'.$this->context.'_'.$num;
-        }
-        while (array_key_exists($alias, $widgets));
+            $alias = 'report_container_' . $this->context . '_' . $num;
+        } while (array_key_exists($alias, $widgets));
 
         // Ensure that the widget's alias is correctly set for this request
         $widget->alias = $alias;
@@ -503,11 +503,11 @@ protected function saveWidgetProperties($alias, $properties)
 
     protected function getUserPreferencesKey()
     {
-        return 'backend::reportwidgets.'.$this->context;
+        return 'backend::reportwidgets.' . $this->context;
     }
 
     protected function getSystemParametersKey()
     {
-        return 'backend::reportwidgets.default.'.$this->context;
+        return 'backend::reportwidgets.default.' . $this->context;
     }
 }
diff --git a/modules/backend/widgets/Search.php b/modules/backend/widgets/Search.php
index 1f0e5d9ecd..e46261d738 100644
--- a/modules/backend/widgets/Search.php
+++ b/modules/backend/widgets/Search.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use Lang;
 use Backend\Classes\WidgetBase;
diff --git a/modules/backend/widgets/Table.php b/modules/backend/widgets/Table.php
index 0d4d8f4800..750cd10086 100644
--- a/modules/backend/widgets/Table.php
+++ b/modules/backend/widgets/Table.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use Config;
 use Backend;
diff --git a/modules/backend/widgets/Toolbar.php b/modules/backend/widgets/Toolbar.php
index 58c2aa55f6..19833cf442 100644
--- a/modules/backend/widgets/Toolbar.php
+++ b/modules/backend/widgets/Toolbar.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets;
+<?php
+
+namespace Backend\Widgets;
 
 use Backend\Classes\WidgetBase;
 
@@ -60,8 +62,7 @@ public function init()
         if (isset($this->search)) {
             if (is_string($this->search)) {
                 $searchConfig = $this->makeConfig(['partial' => $this->search]);
-            }
-            else {
+            } else {
                 $searchConfig = $this->makeConfig($this->search);
             }
 
diff --git a/modules/backend/widgets/filter/partials/_scope_text.php b/modules/backend/widgets/filter/partials/_scope_text.php
index c1dcdab5e2..a6ec814fae 100644
--- a/modules/backend/widgets/filter/partials/_scope_text.php
+++ b/modules/backend/widgets/filter/partials/_scope_text.php
@@ -9,7 +9,7 @@
                data-load-indicator
                data-load-indicator-opaque
                size="<?= $size ?>"
-               value="<?= isset($value) ? e($value):''; ?>"
+               value="<?= isset($value) ? e($value) : ''; ?>"
                class="form-control"/>
     </label>
 </div>
diff --git a/modules/backend/widgets/form/partials/_field-container.php b/modules/backend/widgets/form/partials/_field-container.php
index e846722b06..6f881cbde7 100644
--- a/modules/backend/widgets/form/partials/_field-container.php
+++ b/modules/backend/widgets/form/partials/_field-container.php
@@ -1,5 +1,5 @@
 <div
-    class="form-group <?= $this->previewMode ? 'form-group-preview' : '' ?> <?= $field->type ?>-field span-<?= $field->span ?> <?= $field->required?'is-required':'' ?> <?= $field->stretch?'layout-relative':'' ?> <?= $field->cssClass ?>"
+    class="form-group <?= $this->previewMode ? 'form-group-preview' : '' ?> <?= $field->type ?>-field span-<?= $field->span ?> <?= $field->required ? 'is-required' : '' ?> <?= $field->stretch ? 'layout-relative' : '' ?> <?= $field->cssClass ?>"
     <?php if ($depends = $this->getFieldDepends($field)): ?>
         data-field-depends="<?= $depends ?>"
     <?php endif ?>
diff --git a/modules/backend/widgets/form/partials/_field_checkboxlist.php b/modules/backend/widgets/form/partials/_field_checkboxlist.php
index a910a64c3f..b40c0a62bf 100644
--- a/modules/backend/widgets/form/partials/_field_checkboxlist.php
+++ b/modules/backend/widgets/form/partials/_field_checkboxlist.php
@@ -13,7 +13,7 @@
         $index = 0;
         foreach ($fieldOptions as $value => $option):
             $index++;
-            $checkboxId = 'checkbox_'.$field->getId().'_'.$index;
+            $checkboxId = 'checkbox_' . $field->getId() . '_' . $index;
             if (!in_array($value, $checkedValues)) {
                 continue;
             }
@@ -77,7 +77,7 @@
             $index = 0;
             foreach ($fieldOptions as $value => $option):
                 $index++;
-                $checkboxId = 'checkbox_'.$field->getId().'_'.$index;
+                $checkboxId = 'checkbox_' . $field->getId() . '_' . $index;
                 if (!is_array($option)) {
                     $option = [$option];
                 }
diff --git a/modules/backend/widgets/form/partials/_field_dropdown.php b/modules/backend/widgets/form/partials/_field_dropdown.php
index eecb194ed7..6e131f193d 100644
--- a/modules/backend/widgets/form/partials/_field_dropdown.php
+++ b/modules/backend/widgets/form/partials/_field_dropdown.php
@@ -17,7 +17,7 @@
         name="<?= $field->getName() ?>"
         class="form-control custom-select <?= $useSearch ? '' : 'select-no-search' ?> <?= $allowCustom ? 'select-modifiable' : '' ?>"
         <?= $field->getAttributes() ?>
-        <?= $field->placeholder ? 'data-placeholder="'.e(trans($field->placeholder)).'"' : '' ?>
+        <?= $field->placeholder ? 'data-placeholder="' . e(trans($field->placeholder)) . '"' : '' ?>
         >
         <?php if ($emptyOption): ?>
             <option value=""><?= e(trans($emptyOption)) ?></option>
diff --git a/modules/backend/widgets/form/partials/_section-container.php b/modules/backend/widgets/form/partials/_section-container.php
index 40ee61f0b3..ed6b98c390 100644
--- a/modules/backend/widgets/form/partials/_section-container.php
+++ b/modules/backend/widgets/form/partials/_section-container.php
@@ -3,7 +3,7 @@
     data-refresh-handler="<?= $this->getEventHandler('onRefresh') ?>"
     class="layout-row"
     role="form"
-    id="<?= $this->getId($renderSection.'Container') ?>">
+    id="<?= $this->getId($renderSection . 'Container') ?>">
 
     <?php if ($renderSection == 'outside'): ?>
         <?= $this->makePartial('section', ['tabs' => $outsideTabs]) ?>
diff --git a/modules/backend/widgets/form/partials/_section.php b/modules/backend/widgets/form/partials/_section.php
index 3ee73597ef..133e25cc19 100644
--- a/modules/backend/widgets/form/partials/_section.php
+++ b/modules/backend/widgets/form/partials/_section.php
@@ -12,7 +12,7 @@
     <?php if ($tabs->suppressTabs): ?>
 
         <div
-            id="<?= $this->getId($type.'Tabs') ?>"
+            id="<?= $this->getId($type . 'Tabs') ?>"
             class="form-tabless-fields <?= $tabs->cssClass ?>">
             <?= $this->makePartial('form_fields', ['fields' => $tabs]) ?>
         </div>
@@ -20,7 +20,7 @@ class="form-tabless-fields <?= $tabs->cssClass ?>">
     <?php else: ?>
 
         <div
-            id="<?= $this->getId($type.'Tabs') ?>"
+            id="<?= $this->getId($type . 'Tabs') ?>"
             class="control-tabs <?= $type ?>-tabs layout <?= $tabs->cssClass ?>"
             data-control="tab">
             <?= $this->makePartial('form_tabs', ['tabs' => $tabs]) ?>
diff --git a/modules/backend/widgets/lists/partials/_list_body_row.php b/modules/backend/widgets/lists/partials/_list_body_row.php
index 8341f1c4ff..9c94c1c49f 100644
--- a/modules/backend/widgets/lists/partials/_list_body_row.php
+++ b/modules/backend/widgets/lists/partials/_list_body_row.php
@@ -1,7 +1,7 @@
 <?php
 $expanded = $showTree ? $this->isTreeNodeExpanded($record) : null;
 $childRecords = $showTree ? $record->getChildren() : null;
-$treeLevelClass = $showTree ? 'list-tree-level-'.$treeLevel : '';
+$treeLevelClass = $showTree ? 'list-tree-level-' . $treeLevel : '';
 ?>
 <tr class="<?= $treeLevelClass ?> <?= $this->getRowClass($record) ?>">
     <?php if ($showCheckboxes): ?>
@@ -35,5 +35,5 @@
 </tr>
 
 <?php if ($showTree && $expanded): ?>
-    <?= $this->makePartial('list_body_rows', ['records' => $childRecords, 'treeLevel' => $treeLevel+1]) ?>
+    <?= $this->makePartial('list_body_rows', ['records' => $childRecords, 'treeLevel' => $treeLevel + 1]) ?>
 <?php endif ?>
diff --git a/modules/backend/widgets/lists/partials/_list_head_row.php b/modules/backend/widgets/lists/partials/_list_head_row.php
index 8907ca99e7..df2b0cbb3d 100644
--- a/modules/backend/widgets/lists/partials/_list_head_row.php
+++ b/modules/backend/widgets/lists/partials/_list_head_row.php
@@ -20,7 +20,7 @@
                 <?php if ($column->width): ?>
                     style="width: <?= $column->width ?>"
                 <?php endif ?>
-                class="<?= $this->sortColumn==$column->columnName?'sort-'.$this->sortDirection.' active':'sort-desc' ?> list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?> <?= $column->getAlignClass() ?> <?= $column->headCssClass ?>"
+                class="<?= $this->sortColumn == $column->columnName ? 'sort-' . $this->sortDirection . ' active' : 'sort-desc' ?> list-cell-name-<?= $column->getName() ?> list-cell-type-<?= $column->type ?> <?= $column->getAlignClass() ?> <?= $column->headCssClass ?>"
                 >
                 <a
                     href="javascript:;"
diff --git a/modules/backend/widgets/lists/partials/_list_pagination.php b/modules/backend/widgets/lists/partials/_list_pagination.php
index c8fe08ccd5..7282d345a6 100644
--- a/modules/backend/widgets/lists/partials/_list_pagination.php
+++ b/modules/backend/widgets/lists/partials/_list_pagination.php
@@ -22,7 +22,7 @@ class="page-first"
                     href="javascript:;"
                     class="page-back"
                     data-request="<?= $this->getEventHandler('onPaginate') ?>"
-                    data-request-data="page: <?= $pageCurrent-1 ?>"
+                    data-request-data="page: <?= $pageCurrent - 1 ?>"
                     data-load-indicator="<?= e(trans('backend::lang.list.loading')) ?>"
                     title="<?= e(trans('backend::lang.list.prev_page')) ?>"></a>
             <?php else: ?>
@@ -44,7 +44,7 @@ class="form-control input-sm custom-select select-no-search"
                 <a
                     href="javascript:;"
                     class="page-next"
-                    data-request-data="page: <?= $pageCurrent+1 ?>"
+                    data-request-data="page: <?= $pageCurrent + 1 ?>"
                     data-request="<?= $this->getEventHandler('onPaginate') ?>"
                     data-load-indicator="<?= e(trans('backend::lang.list.loading')) ?>"
                     title="<?= e(trans('backend::lang.list.next_page')) ?>"></a>
diff --git a/modules/backend/widgets/lists/partials/_list_pagination_simple.php b/modules/backend/widgets/lists/partials/_list_pagination_simple.php
index 1735143fae..4d210c5cf9 100644
--- a/modules/backend/widgets/lists/partials/_list_pagination_simple.php
+++ b/modules/backend/widgets/lists/partials/_list_pagination_simple.php
@@ -18,7 +18,7 @@ class="page-first"
                 href="javascript:;"
                 class="page-back"
                 data-request="<?= $this->getEventHandler('onPaginate') ?>"
-                data-request-data="page: <?= $pageCurrent-1 ?>"
+                data-request-data="page: <?= $pageCurrent - 1 ?>"
                 data-load-indicator="<?= e(trans('backend::lang.list.loading')) ?>"
                 title="<?= e(trans('backend::lang.list.prev_page')) ?>"></a>
         <?php else: ?>
@@ -37,7 +37,7 @@ class="form-control input-sm custom-select select-no-search"
             <a
                 href="javascript:;"
                 class="page-next"
-                data-request-data="page: <?= $pageCurrent+1 ?>"
+                data-request-data="page: <?= $pageCurrent + 1 ?>"
                 data-request="<?= $this->getEventHandler('onPaginate') ?>"
                 data-load-indicator="<?= e(trans('backend::lang.list.loading')) ?>"
                 title="<?= e(trans('backend::lang.list.next_page')) ?>"></a>
diff --git a/modules/backend/widgets/lists/partials/_setup_form.php b/modules/backend/widgets/lists/partials/_setup_form.php
index b32de4412d..fcfdf74d4b 100644
--- a/modules/backend/widgets/lists/partials/_setup_form.php
+++ b/modules/backend/widgets/lists/partials/_setup_form.php
@@ -16,14 +16,14 @@
                                 name="column_order[]"
                                 value="<?= e($column->columnName) ?>" />
                             <input
-                                id="<?= $this->getId('setupCheckbox-'.$column->columnName) ?>"
+                                id="<?= $this->getId('setupCheckbox-' . $column->columnName) ?>"
                                 name="visible_columns[]"
                                 value="<?= e($column->columnName) ?>"
                                 <?= $column->invisible ? '' : 'checked="checked"' ?>
                                 type="checkbox" />
                             <label
                                 class="choice"
-                                for="<?= $this->getId('setupCheckbox-'.$column->columnName) ?>">
+                                for="<?= $this->getId('setupCheckbox-' . $column->columnName) ?>">
                                     <?= e(trans($column->label)) ?>
                             </label>
                         </div>
diff --git a/modules/backend/widgets/mediamanager/partials/_generic-list.php b/modules/backend/widgets/mediamanager/partials/_generic-list.php
index a8d01dd518..3b081a45a1 100644
--- a/modules/backend/widgets/mediamanager/partials/_generic-list.php
+++ b/modules/backend/widgets/mediamanager/partials/_generic-list.php
@@ -32,7 +32,7 @@
                 data-folder="<?= e(dirname($item->path)) ?>"
                 tabindex="0"
             >
-                <?= $this->makePartial('item-icon', ['itemType'=>$itemType, 'item'=>$item]) ?>
+                <?= $this->makePartial('item-icon', ['itemType' => $itemType, 'item' => $item]) ?>
 
                 <div class="info">
                     <h4 title="<?= e(basename($item->path)) ?>">
diff --git a/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.php b/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.php
index 95f4ee4d4a..4f5f9d127b 100644
--- a/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.php
+++ b/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.php
@@ -1,4 +1,4 @@
-<?= Form::open(['class'=>'layout', 'onsubmit'=>'return false']) ?>
+<?= Form::open(['class' => 'layout', 'onsubmit' => 'return false']) ?>
     <div class="layout-row min-size">
         <?= $this->makePartial('crop-toolbar') ?>
     </div>
diff --git a/modules/backend/widgets/mediamanager/partials/_popup-body.php b/modules/backend/widgets/mediamanager/partials/_popup-body.php
index e083db5d4f..2fd4df74dd 100644
--- a/modules/backend/widgets/mediamanager/partials/_popup-body.php
+++ b/modules/backend/widgets/mediamanager/partials/_popup-body.php
@@ -1,3 +1,3 @@
-<?= Form::open(['class'=>'layout', 'onsubmit'=>'return false']) ?>
+<?= Form::open(['class' => 'layout', 'onsubmit' => 'return false']) ?>
     <?= $this->render() ?>
 <?= Form::close() ?>
\ No newline at end of file
diff --git a/modules/backend/widgets/mediamanager/partials/_rename-form.php b/modules/backend/widgets/mediamanager/partials/_rename-form.php
index 29c42464f4..5e73ac5d58 100644
--- a/modules/backend/widgets/mediamanager/partials/_rename-form.php
+++ b/modules/backend/widgets/mediamanager/partials/_rename-form.php
@@ -1,5 +1,5 @@
 <?= Form::ajax($this->getEventHandler('onApplyName'), [
-    'success' => "\$el.trigger('close.oc.popup'); \$('#".$listId."').trigger('mediarefresh');",
+    'success' => "\$el.trigger('close.oc.popup'); \$('#" . $listId . "').trigger('mediarefresh');",
     'data-stripe-load-indicator' => 1,
     'id' => 'media-rename-popup-form'
 ]) ?>
diff --git a/modules/backend/widgets/reportcontainer/partials/_widget.php b/modules/backend/widgets/reportcontainer/partials/_widget.php
index 6b08f9f549..537075a25f 100644
--- a/modules/backend/widgets/reportcontainer/partials/_widget.php
+++ b/modules/backend/widgets/reportcontainer/partials/_widget.php
@@ -2,7 +2,7 @@
     <li class="item separator"></li>
 <?php endif ?>
 
-<li class="item <?= 'width-'.$widget->property('ocWidgetWidth') ?> <?= $widget->property('ocWidgetNewRow') ? 'new-line' : null ?>">
+<li class="item <?= 'width-' . $widget->property('ocWidgetWidth') ?> <?= $widget->property('ocWidgetNewRow') ? 'new-line' : null ?>">
     <div class="content">
         <div class="drag-handle"></div>
 
diff --git a/modules/backend/widgets/table/ClientMemoryDataSource.php b/modules/backend/widgets/table/ClientMemoryDataSource.php
index 790ca625d9..c360ec67b3 100644
--- a/modules/backend/widgets/table/ClientMemoryDataSource.php
+++ b/modules/backend/widgets/table/ClientMemoryDataSource.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets\Table;
+<?php
+
+namespace Backend\Widgets\Table;
 
 /**
  * The client-memory data source for the Table widget.
diff --git a/modules/backend/widgets/table/DataSourceBase.php b/modules/backend/widgets/table/DataSourceBase.php
index b404183c91..cd8fb15cfd 100644
--- a/modules/backend/widgets/table/DataSourceBase.php
+++ b/modules/backend/widgets/table/DataSourceBase.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets\Table;
+<?php
+
+namespace Backend\Widgets\Table;
 
 /**
  * Base class for the Table widget data sources.
diff --git a/modules/backend/widgets/table/ServerEventDataSource.php b/modules/backend/widgets/table/ServerEventDataSource.php
index 800a758eb5..ee41d1d4f5 100644
--- a/modules/backend/widgets/table/ServerEventDataSource.php
+++ b/modules/backend/widgets/table/ServerEventDataSource.php
@@ -1,4 +1,6 @@
-<?php namespace Backend\Widgets\Table;
+<?php
+
+namespace Backend\Widgets\Table;
 
 /**
  * The server-event data source for the Table widget.
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index d774f5c191..b410024f9c 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Cms;
+<?php
+
+namespace Cms;
 
 use Backend;
 use Backend\Classes\WidgetManager;
@@ -121,10 +123,10 @@ protected function registerTwigParser()
                 );
             }
 
-            $twig = MarkupManager::makeBaseTwigEnvironment(new CmsTwigLoader, $options);
-            $twig->addExtension(new CmsTwigExtension);
+            $twig = MarkupManager::makeBaseTwigEnvironment(new CmsTwigLoader(), $options);
+            $twig->addExtension(new CmsTwigExtension());
             if ($isDebugMode) {
-                $twig->addExtension(new DebugExtension);
+                $twig->addExtension(new DebugExtension());
             }
 
             return $twig;
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index bb14e1d8a7..843156438c 100644
--- a/modules/cms/classes/Asset.php
+++ b/modules/cms/classes/Asset.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use File;
 use Lang;
@@ -162,16 +164,16 @@ public function save()
         if (File::isFile($fullPath) && $this->originalFileName !== $this->fileName) {
             throw new ApplicationException(Lang::get(
                 'cms::lang.cms_object.file_already_exists',
-                ['name'=>$this->fileName]
+                ['name' => $this->fileName]
             ));
         }
 
-        $dirPath = $this->theme->getPath().'/'.$this->dirName;
+        $dirPath = $this->theme->getPath() . '/' . $this->dirName;
         if (!file_exists($dirPath) || !is_dir($dirPath)) {
             if (!File::makeDirectory($dirPath, 0777, true, true)) {
                 throw new ApplicationException(Lang::get(
                     'cms::lang.cms_object.error_creating_directory',
-                    ['name'=>$dirPath]
+                    ['name' => $dirPath]
                 ));
             }
         }
@@ -182,7 +184,7 @@ public function save()
             if (!is_dir($dirPath) && !File::makeDirectory($dirPath, 0777, true, true)) {
                 throw new ApplicationException(Lang::get(
                     'cms::lang.cms_object.error_creating_directory',
-                    ['name'=>$dirPath]
+                    ['name' => $dirPath]
                 ));
             }
         }
@@ -191,7 +193,7 @@ public function save()
         if (@File::put($fullPath, $this->content) === false) {
             throw new ApplicationException(Lang::get(
                 'cms::lang.cms_object.error_saving',
-                ['name'=>$this->fileName]
+                ['name' => $this->fileName]
             ));
         }
 
diff --git a/modules/cms/classes/AutoDatasource.php b/modules/cms/classes/AutoDatasource.php
index f68fb1861c..9264392727 100644
--- a/modules/cms/classes/AutoDatasource.php
+++ b/modules/cms/classes/AutoDatasource.php
@@ -67,7 +67,7 @@ public function __construct(array $datasources, ?string $cacheKey = null)
 
         $this->populateCache();
 
-        $this->postProcessor = new Processor;
+        $this->postProcessor = new Processor();
     }
 
     /**
@@ -471,8 +471,7 @@ public function delete(string $dirName, string $fileName, string $extension): bo
             } else {
                 $success = $this->getActiveDatasource()->delete($dirName, $fileName, $extension);
             }
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             // Only attempt to do an insert-delete when not force deleting the record
             if (!$this->forceDeleting) {
                 // Check to see if this is a valid path to delete
@@ -488,7 +487,7 @@ public function delete(string $dirName, string $fileName, string $extension): bo
                     // Perform the deletion on the newly inserted record
                     $success = $this->delete($dirName, $fileName, $extension);
                 } else {
-                    throw (new DeleteFileException)->setInvalidPath($path);
+                    throw (new DeleteFileException())->setInvalidPath($path);
                 }
             }
         }
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index 33a516d0a4..d838bae6ee 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use App;
 use Ini;
@@ -272,12 +274,11 @@ public function hasComponent($componentName)
      */
     public function getComponentProperties($componentName)
     {
-        $key = md5($this->theme->getPath()).'component-properties';
+        $key = md5($this->theme->getPath()) . 'component-properties';
 
         if (self::$objectComponentPropertyMap !== null) {
             $objectComponentMap = self::$objectComponentPropertyMap;
-        }
-        else {
+        } else {
             $cached = Cache::get($key, false);
             $unserialized = $cached ? @unserialize(@base64_decode($cached)) : false;
             $objectComponentMap = $unserialized ?: [];
@@ -300,8 +301,7 @@ public function getComponentProperties($componentName)
 
         if (!isset($this->settings['components'])) {
             $objectComponentMap[$objectCode] = [];
-        }
-        else {
+        } else {
             foreach ($this->settings['components'] as $name => $settings) {
                 $nameParts = explode(' ', $name);
                 if (count($nameParts) > 1) {
@@ -342,7 +342,7 @@ public function getComponentProperties($componentName)
      */
     public static function clearCache($theme)
     {
-        $key = md5($theme->getPath()).'component-properties';
+        $key = md5($theme->getPath()) . 'component-properties';
         Cache::forget($key);
     }
 
diff --git a/modules/cms/classes/CmsController.php b/modules/cms/classes/CmsController.php
index 949535a414..931dda54c6 100644
--- a/modules/cms/classes/CmsController.php
+++ b/modules/cms/classes/CmsController.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use App;
 use Closure;
diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php
index 0c75176127..9045832856 100644
--- a/modules/cms/classes/CmsException.php
+++ b/modules/cms/classes/CmsException.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use File;
 use Twig\Error\Error as TwigError;
@@ -164,8 +166,7 @@ protected function processPhp(Throwable $exception)
         /*
          * Errors occurring the PHP code base class (Cms\Classes\CodeBase)
          */
-        }
-        else {
+        } else {
             $trace = $exception->getTrace();
             if (isset($trace[1]['class'])) {
                 $class = $trace[1]['class'];
diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index e1ce327278..333b5ca541 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use App;
 use Lang;
@@ -206,8 +208,7 @@ public function save(array $options = null)
     {
         try {
             parent::save($options);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->throwHalcyonSaveException($ex);
         }
     }
@@ -330,36 +331,30 @@ protected function throwHalcyonSaveException(Exception $ex)
             throw new ValidationException([
                 'fileName' => Lang::get('cms::lang.cms_object.file_name_required')
             ]);
-        }
-        elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidExtensionException) {
+        } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidExtensionException) {
             throw new ValidationException(['fileName' =>
                 Lang::get('cms::lang.cms_object.invalid_file_extension', [
                     'allowed' => implode(', ', $ex->getAllowedExtensions()),
                     'invalid' => $ex->getInvalidExtension()
                 ])
             ]);
-        }
-        elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidFileNameException) {
+        } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidFileNameException) {
             throw new ValidationException([
-               'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name'=>$ex->getInvalidFileName()])
+               'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name' => $ex->getInvalidFileName()])
             ]);
-        }
-        elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\FileExistsException) {
+        } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\FileExistsException) {
             throw new ApplicationException(
                 Lang::get('cms::lang.cms_object.file_already_exists', ['name' => $ex->getInvalidPath()])
             );
-        }
-        elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\CreateDirectoryException) {
+        } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\CreateDirectoryException) {
             throw new ApplicationException(
                 Lang::get('cms::lang.cms_object.error_creating_directory', ['name' => $ex->getInvalidPath()])
             );
-        }
-        elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\CreateFileException) {
+        } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\CreateFileException) {
             throw new ApplicationException(
                 Lang::get('cms::lang.cms_object.error_saving', ['name' => $ex->getInvalidPath()])
             );
-        }
-        else {
+        } else {
             throw $ex;
         }
     }
diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
index 78355bd02b..cc4dd71b1c 100644
--- a/modules/cms/classes/CmsObjectCollection.php
+++ b/modules/cms/classes/CmsObjectCollection.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use ApplicationException;
 use Winter\Storm\Support\Collection as CollectionBase;
diff --git a/modules/cms/classes/CodeBase.php b/modules/cms/classes/CodeBase.php
index 28d2585f5a..e58e267943 100644
--- a/modules/cms/classes/CodeBase.php
+++ b/modules/cms/classes/CodeBase.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use ArrayAccess;
 use Winter\Storm\Extension\Extendable;
diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php
index 5bb672133a..bd67b45667 100644
--- a/modules/cms/classes/CodeParser.php
+++ b/modules/cms/classes/CodeParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use File;
 use Lang;
@@ -123,8 +125,8 @@ public function parse()
     */
     protected function rebuild($path)
     {
-        $uniqueName = str_replace('.', '', uniqid('', true)).'_'.md5(mt_rand());
-        $className = 'Cms'.$uniqueName.'Class';
+        $uniqueName = str_replace('.', '', uniqid('', true)) . '_' . md5(mt_rand());
+        $className = 'Cms' . $uniqueName . 'Class';
 
         $body = $this->object->code;
         $body = preg_replace('/^\s*function/m', 'public function', $body);
@@ -136,22 +138,22 @@ protected function rebuild($path)
 
         $parentClass = $this->object->getCodeClassParent();
         if ($parentClass !== null) {
-            $parentClass = ' extends '.$parentClass;
+            $parentClass = ' extends ' . $parentClass;
         }
 
-        $fileContents = '<?php '.PHP_EOL;
+        $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;
+                $fileContents .= trim($namespace) . PHP_EOL;
             }
         }
 
-        $fileContents .= 'class '.$className.$parentClass.PHP_EOL;
-        $fileContents .= '{'.PHP_EOL;
-        $fileContents .= trim($body).PHP_EOL;
-        $fileContents .= '}'.PHP_EOL;
+        $fileContents .= 'class ' . $className . $parentClass . PHP_EOL;
+        $fileContents .= '{' . PHP_EOL;
+        $fileContents .= trim($body) . PHP_EOL;
+        $fileContents .= '}' . PHP_EOL;
 
         $this->validate($fileContents);
 
@@ -295,7 +297,7 @@ protected function getCachedFileInfo()
      */
     protected function validate($php)
     {
-        eval('?>'.$php);
+        eval('?>' . $php);
     }
 
     /**
@@ -326,14 +328,14 @@ protected function writeContentSafe($path, $content)
         $tmpFile = tempnam(dirname($path), basename($path));
 
         if (@file_put_contents($tmpFile, $content) === false) {
-            throw new SystemException(Lang::get('system::lang.file.create_fail', ['name'=>$tmpFile]));
+            throw new SystemException(Lang::get('system::lang.file.create_fail', ['name' => $tmpFile]));
         }
 
         while (!@rename($tmpFile, $path)) {
             usleep(rand(50000, 200000));
 
             if ($count++ > 10) {
-                throw new SystemException(Lang::get('system::lang.file.create_fail', ['name'=>$path]));
+                throw new SystemException(Lang::get('system::lang.file.create_fail', ['name' => $path]));
             }
         }
 
@@ -352,8 +354,7 @@ protected function writeContentSafe($path, $content)
 
             if (function_exists('opcache_invalidate') && $opcache_enabled) {
                 opcache_invalidate($path, true);
-            }
-            elseif (function_exists('apc_compile_file')) {
+            } elseif (function_exists('apc_compile_file')) {
                 apc_compile_file($path);
             }
         }
@@ -368,7 +369,7 @@ protected function makeDirectorySafe($dir)
 
         if (is_dir($dir)) {
             if (!is_writable($dir)) {
-                throw new SystemException(Lang::get('system::lang.directory.create_fail', ['name'=>$dir]));
+                throw new SystemException(Lang::get('system::lang.directory.create_fail', ['name' => $dir]));
             }
 
             return;
@@ -378,7 +379,7 @@ protected function makeDirectorySafe($dir)
             usleep(rand(50000, 200000));
 
             if ($count++ > 10) {
-                throw new SystemException(Lang::get('system::lang.directory.create_fail', ['name'=>$dir]));
+                throw new SystemException(Lang::get('system::lang.directory.create_fail', ['name' => $dir]));
             }
         }
 
diff --git a/modules/cms/classes/ComponentBase.php b/modules/cms/classes/ComponentBase.php
index 5d959438da..c20a4f6ea2 100644
--- a/modules/cms/classes/ComponentBase.php
+++ b/modules/cms/classes/ComponentBase.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use Str;
 use Lang;
@@ -93,7 +95,7 @@ public function __construct(CodeBase $cmsObject = null, $properties = [])
 
         $className = Str::normalizeClassName(get_called_class());
         $this->dirName = strtolower(str_replace('\\', '/', $className));
-        $this->assetPath = Config::get('cms.pluginsPath', '/plugins').dirname(dirname($this->dirName));
+        $this->assetPath = Config::get('cms.pluginsPath', '/plugins') . dirname(dirname($this->dirName));
 
         parent::__construct();
     }
@@ -312,8 +314,7 @@ public function __call($method, $parameters)
     {
         try {
             return parent::__call($method, $parameters);
-        }
-        catch (BadMethodCallException $ex) {
+        } catch (BadMethodCallException $ex) {
         }
 
         if (isset($this->controller) && method_exists($this->controller, $method)) {
diff --git a/modules/cms/classes/ComponentHelpers.php b/modules/cms/classes/ComponentHelpers.php
index 17c051790d..a3e9273b91 100644
--- a/modules/cms/classes/ComponentHelpers.php
+++ b/modules/cms/classes/ComponentHelpers.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use Lang;
 
@@ -65,8 +67,7 @@ public static function getComponentsPropertyConfig($component, $addAliasProperty
                         array_walk($property[$name], function (&$_value, $key) {
                             $_value = Lang::get($_value);
                         });
-                    }
-                    else {
+                    } else {
                         $property[$name] = Lang::get($value);
                     }
                 }
diff --git a/modules/cms/classes/ComponentManager.php b/modules/cms/classes/ComponentManager.php
index 5388c53ac4..419d40f171 100644
--- a/modules/cms/classes/ComponentManager.php
+++ b/modules/cms/classes/ComponentManager.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use Str;
 use System\Classes\PluginManager;
diff --git a/modules/cms/classes/ComponentPartial.php b/modules/cms/classes/ComponentPartial.php
index 3df5200011..9b06bf3afa 100644
--- a/modules/cms/classes/ComponentPartial.php
+++ b/modules/cms/classes/ComponentPartial.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use File;
 use Lang;
@@ -147,7 +149,7 @@ public static function check(ComponentBase $component, $fileName)
         $partial = new static($component);
         $filePath = $partial->getFilePath($fileName);
         if (!strlen(File::extension($filePath))) {
-            $filePath .= '.'.$partial->getDefaultExtension();
+            $filePath .= '.' . $partial->getDefaultExtension();
         }
 
         return File::isFile($filePath);
@@ -167,7 +169,7 @@ protected function validateFileName($fileName)
         }
 
         if (!strlen(File::extension($fileName))) {
-            $fileName .= '.'.$this->defaultExtension;
+            $fileName .= '.' . $this->defaultExtension;
         }
 
         return $fileName;
@@ -244,14 +246,14 @@ public function getFilePath($fileName = null)
         }
 
         $component = $this->component;
-        $path = $component->getPath().'/'.$fileName;
+        $path = $component->getPath() . '/' . $fileName;
 
         /*
          * Check the shared "/partials" directory for the partial
          */
         if (!File::isFile($path)) {
-            $sharedDir = dirname($component->getPath()).'/partials';
-            $sharedPath = $sharedDir.'/'.$fileName;
+            $sharedDir = dirname($component->getPath()) . '/partials';
+            $sharedPath = $sharedDir . '/' . $fileName;
             if (File::isFile($sharedPath)) {
                 return $sharedPath;
             }
diff --git a/modules/cms/classes/Content.php b/modules/cms/classes/Content.php
index 41d3a845e7..48b06bd2b5 100644
--- a/modules/cms/classes/Content.php
+++ b/modules/cms/classes/Content.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use File;
 use Markdown;
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index dd67cc728c..250348a200 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -1,30 +1,32 @@
-<?php namespace Cms\Classes;
-
-use Cms;
-use Url;
-use App;
-use View;
-use File;
-use Lang;
-use Log;
-use Flash;
-use Cache;
-use Config;
-use Session;
-use Request;
-use Response;
+<?php
+
+namespace Cms\Classes;
+
 use Exception;
-use SystemException;
-use BackendAuth;
-use Twig\Environment as TwigEnvironment;
+use Backend\Facades\BackendAuth;
+use Cms\Facades\Cms;
 use Cms\Models\MaintenanceSetting;
 use System\Models\RequestLog;
 use System\Helpers\View as ViewHelper;
 use System\Classes\CombineAssets;
+use Twig\Environment as TwigEnvironment;
 use Winter\Storm\Exception\AjaxException;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Exception\ValidationException;
 use Winter\Storm\Parse\Bracket as TextParser;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Url;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\View;
 
 /**
  * The CMS controller class.
@@ -117,7 +119,7 @@ public function __construct($theme = null)
 
         $this->assetPath = Config::get('cms.themesPath', '/themes') . '/' . $this->theme->getDirName();
         $this->router = new Router($this->theme);
-        $this->partialStack = new PartialStack;
+        $this->partialStack = new PartialStack();
         $this->initTwigEnvironment();
 
         self::$instance = $this;
@@ -276,7 +278,7 @@ public static function render($pageFile, $parameters = [], $theme = null)
         $controller->getRouter()->setParameters($parameters);
 
         if (($page = Page::load($theme, $pageFile)) === null) {
-            throw new SystemException(Lang::get('cms::lang.page.not_found_name', ['name'=>$pageFile]));
+            throw new SystemException(Lang::get('cms::lang.page.not_found_name', ['name' => $pageFile]));
         }
 
         return $controller->runPage($page, false);
@@ -299,9 +301,8 @@ public function runPage($page, $useAjax = true)
          */
         if (!$page->layout) {
             $layout = Layout::initFallback($this->theme);
-        }
-        elseif (($layout = Layout::loadCached($this->theme, $page->layout)) === null) {
-            throw new SystemException(Lang::get('cms::lang.layout.not_found_name', ['name'=>$page->layout]));
+        } elseif (($layout = Layout::loadCached($this->theme, $page->layout)) === null) {
+            throw new SystemException(Lang::get('cms::lang.layout.not_found_name', ['name' => $page->layout]));
         }
 
         $this->layout = $layout;
@@ -337,7 +338,7 @@ public function runPage($page, $useAjax = true)
          */
         $this->vars['errors'] = (Config::get('session.driver') && Session::has('errors'))
             ? Session::get('errors')
-            : new \Illuminate\Support\ViewErrorBag;
+            : new \Illuminate\Support\ViewErrorBag();
 
         /*
          * Handle AJAX requests and execute the life cycle functions
@@ -427,8 +428,7 @@ public function runPage($page, $useAjax = true)
          */
         if ($event = $this->fireSystemEvent('cms.page.beforeRenderPage', [$page])) {
             $this->pageContents = $event;
-        }
-        else {
+        } else {
             /*
              * Render the page
              */
@@ -703,7 +703,7 @@ protected function execAjaxHandlers()
                  * Validate the handler name
                  */
                 if (!preg_match('/^(?:\w+\:{2})?on[A-Z]{1}[\w+]*$/', $handler)) {
-                    throw new SystemException(Lang::get('cms::lang.ajax_handler.invalid_name', ['name'=>$handler]));
+                    throw new SystemException(Lang::get('cms::lang.ajax_handler.invalid_name', ['name' => $handler]));
                 }
 
                 /*
@@ -714,11 +714,10 @@ protected function execAjaxHandlers()
 
                     foreach ($partialList as $partial) {
                         if (!preg_match('/^(?:\w+\:{2}|@)?[a-z0-9\_\-\.\/]+$/i', $partial)) {
-                            throw new SystemException(Lang::get('cms::lang.partial.invalid_name', ['name'=>$partial]));
+                            throw new SystemException(Lang::get('cms::lang.partial.invalid_name', ['name' => $partial]));
                         }
                     }
-                }
-                else {
+                } else {
                     $partialList = [];
                 }
 
@@ -728,7 +727,7 @@ protected function execAjaxHandlers()
                  * Execute the handler
                  */
                 if (!$result = $this->runAjaxHandler($handler)) {
-                    throw new SystemException(Lang::get('cms::lang.ajax_handler.not_found', ['name'=>$handler]));
+                    throw new SystemException(Lang::get('cms::lang.ajax_handler.not_found', ['name' => $handler]));
                 }
 
                 /*
@@ -745,11 +744,8 @@ protected function execAjaxHandlers()
                 if ($result instanceof RedirectResponse) {
                     $responseContents['X_WINTER_REDIRECT'] = $result->getTargetUrl();
                     $result = null;
-                }
-                /*
-                 * No redirect is used, look for any flash messages
-                 */
-                elseif (Request::header('X_WINTER_REQUEST_FLASH') && Flash::check()) {
+                } elseif (Request::header('X_WINTER_REQUEST_FLASH') && Flash::check()) {
+                    // No redirect is used, look for any flash messages
                     $responseContents['X_WINTER_FLASH_MESSAGES'] = Flash::all();
                 }
 
@@ -760,25 +756,21 @@ protected function execAjaxHandlers()
                  */
                 if (is_array($result)) {
                     $responseContents = array_merge($responseContents, $result);
-                }
-                elseif (is_string($result)) {
+                } elseif (is_string($result)) {
                     $responseContents['result'] = $result;
-                }
-                elseif (is_object($result)) {
+                } elseif (is_object($result)) {
                     return $result;
                 }
 
                 return Response::make($responseContents, $this->statusCode);
-            }
-            catch (ValidationException $ex) {
+            } catch (ValidationException $ex) {
                 /*
                  * Handle validation errors
                  */
                 $responseContents['X_WINTER_ERROR_FIELDS'] = $ex->getFields();
                 $responseContents['X_WINTER_ERROR_MESSAGE'] = $ex->getMessage();
                 throw new AjaxException($responseContents);
-            }
-            catch (Exception $ex) {
+            } catch (Exception $ex) {
                 throw $ex;
             }
         }
@@ -827,10 +819,8 @@ protected function runAjaxHandler($handler)
             return $event;
         }
 
-        /*
-         * Process Component handler
-         */
         if (strpos($handler, '::')) {
+            // Process Component handler
             list($componentName, $handlerName) = explode('::', $handler);
             $componentObj = $this->findComponentByName($componentName);
 
@@ -839,11 +829,8 @@ protected function runAjaxHandler($handler)
                 $result = $componentObj->runAjaxHandler($handlerName);
                 return $result ?: true;
             }
-        }
-        /*
-         * Process code section handler
-         */
-        else {
+        } else {
+            // Process code section handler
             if (method_exists($this->pageObj, $handler)) {
                 $result = $this->pageObj->$handler();
                 return $result ?: true;
@@ -951,34 +938,23 @@ public function renderPartial($name, $parameters = [], $throwException = true)
          */
         if ($event = $this->fireSystemEvent('cms.page.beforeRenderPartial', [$name])) {
             $partial = $event;
-        }
-        /*
-         * Process Component partial
-         */
-        elseif (strpos($name, '::') !== false) {
+        } elseif (strpos($name, '::') !== false) {
+            // Process Component partial
             list($componentAlias, $partialName) = explode('::', $name);
 
-            /*
-             * Component alias not supplied
-             */
             if (!strlen($componentAlias)) {
                 if ($this->componentContext !== null) {
                     $componentObj = $this->componentContext;
-                }
-                elseif (($componentObj = $this->findComponentByPartial($partialName)) === null) {
+                } elseif (($componentObj = $this->findComponentByPartial($partialName)) === null) {
                     if ($throwException) {
-                        throw new SystemException(Lang::get('cms::lang.partial.not_found_name', ['name'=>$partialName]));
+                        throw new SystemException(Lang::get('cms::lang.partial.not_found_name', ['name' => $partialName]));
                     }
 
                     return false;
                 }
-            }
-            /*
-             * Component alias is supplied
-             */
-            elseif (($componentObj = $this->findComponentByName($componentAlias)) === null) {
+            } elseif (($componentObj = $this->findComponentByName($componentAlias)) === null) {
                 if ($throwException) {
-                    throw new SystemException(Lang::get('cms::lang.component.not_found', ['name'=>$componentAlias]));
+                    throw new SystemException(Lang::get('cms::lang.component.not_found', ['name' => $componentAlias]));
                 }
 
                 return false;
@@ -1001,7 +977,7 @@ public function renderPartial($name, $parameters = [], $throwException = true)
 
             if ($partial === null) {
                 if ($throwException) {
-                    throw new SystemException(Lang::get('cms::lang.partial.not_found_name', ['name'=>$name]));
+                    throw new SystemException(Lang::get('cms::lang.partial.not_found_name', ['name' => $name]));
                 }
 
                 return false;
@@ -1011,13 +987,9 @@ public function renderPartial($name, $parameters = [], $throwException = true)
              * Set context for self access
              */
             $this->vars['__SELF__'] = $componentObj;
-        }
-        /*
-         * Process theme partial
-         */
-        elseif (($partial = Partial::loadCached($this->theme, $name)) === null) {
+        } elseif (($partial = Partial::loadCached($this->theme, $name)) === null) {
             if ($throwException) {
-                throw new SystemException(Lang::get('cms::lang.partial.not_found_name', ['name'=>$name]));
+                throw new SystemException(Lang::get('cms::lang.partial.not_found_name', ['name' => $name]));
             }
 
             return false;
@@ -1045,7 +1017,7 @@ public function renderPartial($name, $parameters = [], $throwException = true)
                     : [$component, $component];
 
                 if (!$componentObj = $manager->makeComponent($name, $this->pageObj, $properties)) {
-                    throw new SystemException(Lang::get('cms::lang.component.not_found', ['name'=>$name]));
+                    throw new SystemException(Lang::get('cms::lang.component.not_found', ['name' => $name]));
                 }
 
                 $componentObj->alias = $alias;
@@ -1139,11 +1111,7 @@ public function renderContent($name, $parameters = [], $throwException = true)
          */
         if ($event = $this->fireSystemEvent('cms.page.beforeRenderContent', [$name])) {
             $content = $event;
-        }
-        /*
-         * Load content from theme
-         */
-        elseif (($content = Content::loadCached($this->theme, $name)) === null) {
+        } elseif (($content = Content::loadCached($this->theme, $name)) === null) {
             if ($throwException) {
                 throw new SystemException(Lang::get('cms::lang.content.not_found_name', ['name' => $name]));
             } else {
@@ -1211,7 +1179,7 @@ public function renderComponent($name, $parameters = [])
         }
 
         if (!$result) {
-            $result = $this->renderPartial($name.'::default', [], false);
+            $result = $this->renderPartial($name . '::default', [], false);
         }
 
         $this->componentContext = $previousContext;
@@ -1591,8 +1559,7 @@ protected function setComponentPropertiesFromParams($component, $parameters = []
                 if (substr($paramName, 0, 1) == ':') {
                     $routeParamName = substr($paramName, 1);
                     $newPropertyValue = $routerParameters[$routeParamName] ?? null;
-                }
-                else {
+                } else {
                     $newPropertyValue = array_get($parameters, $paramName, null);
                 }
 
diff --git a/modules/cms/classes/Layout.php b/modules/cms/classes/Layout.php
index b1be111dab..f2c6500198 100644
--- a/modules/cms/classes/Layout.php
+++ b/modules/cms/classes/Layout.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * The CMS layout class.
diff --git a/modules/cms/classes/LayoutCode.php b/modules/cms/classes/LayoutCode.php
index d98ea14973..77491c9f16 100644
--- a/modules/cms/classes/LayoutCode.php
+++ b/modules/cms/classes/LayoutCode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * Parent class for PHP classes created for layout PHP sections.
diff --git a/modules/cms/classes/MediaLibrary.php b/modules/cms/classes/MediaLibrary.php
index d8fb00b4f2..cb2d185b2f 100644
--- a/modules/cms/classes/MediaLibrary.php
+++ b/modules/cms/classes/MediaLibrary.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use System\Classes\MediaLibrary as SystemMediaLibrary;
 
diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index e76f009964..a9eeea4453 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use System\Classes\MediaLibraryItem as SystemMediaLibraryItem;
 
diff --git a/modules/cms/classes/MediaViewHelper.php b/modules/cms/classes/MediaViewHelper.php
index a93f865599..c5659ae1f4 100644
--- a/modules/cms/classes/MediaViewHelper.php
+++ b/modules/cms/classes/MediaViewHelper.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use ApplicationException;
 
@@ -100,11 +102,11 @@ protected function getDefaultPlayerMarkup($type, $src)
     {
         switch ($type) {
             case 'video':
-                return '<video src="'.e($src).'" controls preload="metadata"></video>';
+                return '<video src="' . e($src) . '" controls preload="metadata"></video>';
             break;
 
             case 'audio':
-                return '<audio src="'.e($src).'" controls preload="metadata"></audio>';
+                return '<audio src="' . e($src) . '" controls preload="metadata"></audio>';
             break;
         }
     }
diff --git a/modules/cms/classes/Meta.php b/modules/cms/classes/Meta.php
index 81ed84d629..5dca5183fe 100644
--- a/modules/cms/classes/Meta.php
+++ b/modules/cms/classes/Meta.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use Yaml;
 
diff --git a/modules/cms/classes/ObjectMemoryCache.php b/modules/cms/classes/ObjectMemoryCache.php
index 0e7b172230..a0e8196c2a 100644
--- a/modules/cms/classes/ObjectMemoryCache.php
+++ b/modules/cms/classes/ObjectMemoryCache.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * Provides a simple request-level cache for CMS objects.
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 7bb3ee919c..1d65fccc39 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use Lang;
 use BackendAuth;
@@ -126,7 +128,7 @@ public static function url($page, array $params = [])
          * assuming that the method is called not during the front-end
          * request processing.
          */
-        $controller = Controller::getController() ?: new Controller;
+        $controller = Controller::getController() ?: new Controller();
 
         return $controller->pageUrl($page, $params, true);
     }
@@ -201,7 +203,7 @@ public static function resolveMenuItem(object $item, string $url, Theme $theme):
                 return null;
             }
 
-            $controller = Controller::getController() ?: new Controller;
+            $controller = Controller::getController() ?: new Controller();
             $pageUrl = $controller->pageUrl($item->reference, [], false);
 
             $result = [];
diff --git a/modules/cms/classes/PageCode.php b/modules/cms/classes/PageCode.php
index 24463a2012..6d49726630 100644
--- a/modules/cms/classes/PageCode.php
+++ b/modules/cms/classes/PageCode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * Parent class for PHP classes created for page PHP sections.
diff --git a/modules/cms/classes/Partial.php b/modules/cms/classes/Partial.php
index 6a8287456f..e3b2c437de 100644
--- a/modules/cms/classes/Partial.php
+++ b/modules/cms/classes/Partial.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * The CMS partial class.
diff --git a/modules/cms/classes/PartialCode.php b/modules/cms/classes/PartialCode.php
index 0c910bf531..6f672e10d9 100644
--- a/modules/cms/classes/PartialCode.php
+++ b/modules/cms/classes/PartialCode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * Parent class for PHP classes created for partial PHP sections.
diff --git a/modules/cms/classes/PartialStack.php b/modules/cms/classes/PartialStack.php
index 019bfb17f4..7fa2ac21f8 100644
--- a/modules/cms/classes/PartialStack.php
+++ b/modules/cms/classes/PartialStack.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 /**
  * Manager class for stacking nested partials and keeping track
diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
index 04b0f429b4..b0d63e6919 100644
--- a/modules/cms/classes/Router.php
+++ b/modules/cms/classes/Router.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use Lang;
 use File;
@@ -231,8 +233,7 @@ protected function loadUrlMap()
         $cacheable = Config::get('cms.enableRoutesCache');
         if ($cacheable) {
             $cached = Cache::get($key, false);
-        }
-        else {
+        } else {
             $cached = false;
         }
 
@@ -322,7 +323,7 @@ public function getParameter($name, $default = null)
      */
     protected function getCacheKey($keyName)
     {
-        return md5($this->theme->getPath()).$keyName.Lang::getLocale();
+        return md5($this->theme->getPath()) . $keyName . Lang::getLocale();
     }
 
     /**
@@ -345,7 +346,8 @@ protected function getCachedUrlFileName($url, &$urlList)
         $key = $this->getUrlListCacheKey();
         $urlList = Cache::get($key, false);
 
-        if ($urlList
+        if (
+            $urlList
             && ($urlList = @unserialize(@base64_decode($urlList)))
             && is_array($urlList)
             && array_key_exists($url, $urlList)
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 68dfae8dd7..f172db87d5 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use App;
 use ApplicationException;
@@ -67,7 +69,7 @@ class Theme extends CmsObject
      */
     public static function load($dirName, $file = null): self
     {
-        $theme = new static;
+        $theme = new static();
         $theme->setDirName($dirName);
         $theme->registerHalcyonDatasource();
         if (App::runningInBackend()) {
@@ -482,13 +484,12 @@ public function getConfigArray(string $name): array
 
             if (File::isLocalPath($fileName)) {
                 $path = $fileName;
-            }
-            else {
-                $path = $this->getPath().'/'.$result;
+            } else {
+                $path = $this->getPath() . '/' . $result;
             }
 
             if (!File::exists($path)) {
-                throw new ApplicationException('Path does not exist: '.$path);
+                throw new ApplicationException('Path does not exist: ' . $path);
             }
 
             $result = Yaml::parseFile($path);
@@ -508,7 +509,7 @@ public function writeConfig(array $values = [], bool $overwrite = false): void
             $values = $values + (array) $this->getConfig();
         }
 
-        $path = $this->getPath().'/theme.yaml';
+        $path = $this->getPath() . '/theme.yaml';
         if (!File::exists($path)) {
             throw new ApplicationException('Path does not exist: ' . $path);
         }
diff --git a/modules/cms/classes/ThemeManager.php b/modules/cms/classes/ThemeManager.php
index e60fdcfd24..7ad3f338d6 100644
--- a/modules/cms/classes/ThemeManager.php
+++ b/modules/cms/classes/ThemeManager.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Classes;
+<?php
+
+namespace Cms\Classes;
 
 use File;
 use ApplicationException;
diff --git a/modules/cms/components/Resources.php b/modules/cms/components/Resources.php
index d5be4bbfb4..c417d8170f 100644
--- a/modules/cms/components/Resources.php
+++ b/modules/cms/components/Resources.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Components;
+<?php
+
+namespace Cms\Components;
 
 use File;
 use Cms\Classes\ComponentBase;
@@ -148,28 +150,28 @@ public function onRun()
 
     protected function prefixJs($value)
     {
-        return $this->jsDir.'/'.trim($value);
+        return $this->jsDir . '/' . trim($value);
     }
 
     protected function prefixCss($value)
     {
-        return $this->cssDir.'/'.trim($value);
+        return $this->cssDir . '/' . trim($value);
     }
 
     protected function prefixLess($value)
     {
-        return $this->lessDir.'/'.trim($value);
+        return $this->lessDir . '/' . trim($value);
     }
 
     protected function prefixSass($value)
     {
-        return $this->sassDir.'/'.trim($value);
+        return $this->sassDir . '/' . trim($value);
     }
 
     protected function guessAssetDirectory(array $possible, $default = null)
     {
         foreach ($possible as $option) {
-            if (File::isDirectory($this->assetPath.'/'.$option)) {
+            if (File::isDirectory($this->assetPath . '/' . $option)) {
                 return $option;
             }
         }
@@ -179,12 +181,12 @@ protected function guessAssetDirectory(array $possible, $default = null)
 
     protected function guessAssetPath()
     {
-        $baseTheme = themes_path().'/'.$this->getTheme()->getDirName();
+        $baseTheme = themes_path() . '/' . $this->getTheme()->getDirName();
 
-        if (File::isDirectory($baseTheme.'/assets')) {
-            return $baseTheme.'/assets';
+        if (File::isDirectory($baseTheme . '/assets')) {
+            return $baseTheme . '/assets';
         }
 
-        return $baseTheme.'/resources';
+        return $baseTheme . '/resources';
     }
 }
diff --git a/modules/cms/components/SoftComponent.php b/modules/cms/components/SoftComponent.php
index bcbb37de3c..5e70a8b82f 100644
--- a/modules/cms/components/SoftComponent.php
+++ b/modules/cms/components/SoftComponent.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Components;
+<?php
+
+namespace Cms\Components;
 
 use Cms\Classes\ComponentBase;
 
diff --git a/modules/cms/components/UnknownComponent.php b/modules/cms/components/UnknownComponent.php
index 9282216b4a..5cc6a6e066 100644
--- a/modules/cms/components/UnknownComponent.php
+++ b/modules/cms/components/UnknownComponent.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Components;
+<?php
+
+namespace Cms\Components;
 
 use Cms\Classes\ComponentBase;
 
diff --git a/modules/cms/components/ViewBag.php b/modules/cms/components/ViewBag.php
index ef109e1b0a..2b2250fe8e 100644
--- a/modules/cms/components/ViewBag.php
+++ b/modules/cms/components/ViewBag.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Components;
+<?php
+
+namespace Cms\Components;
 
 use Cms\Classes\ComponentBase;
 
diff --git a/modules/cms/console/CreateComponent.php b/modules/cms/console/CreateComponent.php
index c159055fed..ecce811180 100644
--- a/modules/cms/console/CreateComponent.php
+++ b/modules/cms/console/CreateComponent.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/cms/console/CreateTheme.php b/modules/cms/console/CreateTheme.php
index 557337dd64..67a842a81c 100644
--- a/modules/cms/console/CreateTheme.php
+++ b/modules/cms/console/CreateTheme.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use InvalidArgumentException;
 use Winter\Storm\Scaffold\GeneratorCommand;
diff --git a/modules/cms/console/ThemeInstall.php b/modules/cms/console/ThemeInstall.php
index 3a1346bbb7..1aefb5010f 100644
--- a/modules/cms/console/ThemeInstall.php
+++ b/modules/cms/console/ThemeInstall.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Cms\Classes\ThemeManager;
@@ -76,7 +78,7 @@ public function handle()
             $fields = ['Name', 'Description', 'Author', 'URL', ''];
 
             $this->info(sprintf(
-                implode(': %s'.PHP_EOL, $fields),
+                implode(': %s' . PHP_EOL, $fields),
                 $themeDetails['code'],
                 $themeDetails['description'],
                 $themeDetails['author'],
@@ -100,7 +102,7 @@ public function handle()
                  * Move downloaded theme to a new directory.
                  * Basically we're renaming it.
                  */
-                File::move(themes_path().'/'.$dirName, themes_path().'/'.$argDirName);
+                File::move(themes_path() . '/' . $dirName, themes_path() . '/' . $argDirName);
 
                 /*
                  * Let's make sure to unflag the 'old' theme as
diff --git a/modules/cms/console/ThemeList.php b/modules/cms/console/ThemeList.php
index 61b3de5063..e7b9faf26d 100644
--- a/modules/cms/console/ThemeList.php
+++ b/modules/cms/console/ThemeList.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Cms\Classes\ThemeManager;
@@ -44,7 +46,7 @@ public function handle()
         foreach (Theme::all() as $theme) {
             $results[] = [
                 'code' => $theme->getId(),
-                'is_active' => $theme->isActiveTheme() ? '<info>Yes</info>': '<fg=red>No</>',
+                'is_active' => $theme->isActiveTheme() ? '<info>Yes</info>' : '<fg=red>No</>',
                 'is_installed' => '<info>Yes</info>',
             ];
         }
@@ -56,7 +58,7 @@ public function handle()
                 $results[] = [
                     'code' => $popularTheme['code'],
                     'is_active' => '<fg=red>No</>',
-                    'is_installed' => $themeManager->isInstalled($popularTheme['code']) ? '<info>Yes</info>': '<fg=red>No</>',
+                    'is_installed' => $themeManager->isInstalled($popularTheme['code']) ? '<info>Yes</info>' : '<fg=red>No</>',
                 ];
             }
         }
diff --git a/modules/cms/console/ThemeRemove.php b/modules/cms/console/ThemeRemove.php
index 9df51d7ac7..f7aeae88f0 100644
--- a/modules/cms/console/ThemeRemove.php
+++ b/modules/cms/console/ThemeRemove.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Cms\Classes\ThemeManager;
diff --git a/modules/cms/console/ThemeSync.php b/modules/cms/console/ThemeSync.php
index 1be393c001..255456896d 100644
--- a/modules/cms/console/ThemeSync.php
+++ b/modules/cms/console/ThemeSync.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Event;
@@ -150,7 +152,7 @@ public function handle()
             }
 
             foreach ($result as $modelClass) {
-                $modelObj = new $modelClass;
+                $modelObj = new $modelClass();
 
                 if ($modelObj instanceof \Winter\Storm\Halcyon\Model) {
                     $validModels[] = $modelObj;
@@ -199,8 +201,7 @@ public function handle()
             $progress->finish();
             $this->info('');
             $this->info(sprintf('The theme %s has been successfully synced from the %s to the %s.', $themeName, $source, $target));
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->error($ex->getMessage());
         }
     }
@@ -217,7 +218,7 @@ public function handle()
     protected function getModelForPath($path, $modelClass, $theme)
     {
         return $this->datasource->usingSource($this->source, function () use ($path, $modelClass, $theme) {
-            $modelObj = new $modelClass;
+            $modelObj = new $modelClass();
 
             $entity = $modelClass::load(
                 $theme,
diff --git a/modules/cms/console/ThemeUse.php b/modules/cms/console/ThemeUse.php
index 17e2334193..418f11a819 100644
--- a/modules/cms/console/ThemeUse.php
+++ b/modules/cms/console/ThemeUse.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Console;
+<?php
+
+namespace Cms\Console;
 
 use Cms\Classes\Theme;
 use Winter\Storm\Console\Command;
diff --git a/modules/cms/contracts/CmsObject.php b/modules/cms/contracts/CmsObject.php
index c6b9b67e6b..9a2379066e 100644
--- a/modules/cms/contracts/CmsObject.php
+++ b/modules/cms/contracts/CmsObject.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Contracts;
+<?php
+
+namespace Cms\Contracts;
 
 interface CmsObject
 {
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 6fb655ab49..fce5ddb1ac 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Controllers;
+<?php
+
+namespace Cms\Controllers;
 
 use Url;
 use Lang;
@@ -107,8 +109,7 @@ public function __construct()
             new ComponentList($this, 'componentList');
 
             new AssetList($this, 'assetList');
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
     }
@@ -134,7 +135,7 @@ public function index()
 
         $this->bodyClass = 'compact-container';
         $this->pageTitle = 'cms::lang.cms.menu_label';
-        $this->pageTitleTemplate = '%s '.Lang::get($this->pageTitle);
+        $this->pageTitleTemplate = '%s ' . Lang::get($this->pageTitle);
 
         if (Request::ajax() && Request::input('formWidgetAlias')) {
             $this->bindFormWidgetToController();
@@ -159,7 +160,7 @@ public function index_onOpenTemplate()
         $this->vars['canReset'] = $this->canResetTemplate($template);
 
         if ($type === 'page') {
-            $router = new StormRouter;
+            $router = new StormRouter();
             $this->vars['pageUrl'] = $router->urlFromPattern($template->url);
         }
 
@@ -202,8 +203,7 @@ public function onSave()
         foreach ($fields as $field) {
             if (array_key_exists($field, $saveData)) {
                 $templateData[$field] = $saveData[$field];
-            }
-            elseif (array_key_exists($field, $postData)) {
+            } elseif (array_key_exists($field, $postData)) {
                 $templateData[$field] = $postData[$field];
             }
         }
@@ -310,8 +310,7 @@ public function onDeleteTemplates()
                     $deleted[] = $path;
                 }
             }
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $error = $ex->getMessage();
         }
 
@@ -516,7 +515,8 @@ protected function canCommitTemplate($template)
 
         $result = false;
 
-        if (Config::get('app.debug', false) &&
+        if (
+            Config::get('app.debug', false) &&
             Theme::databaseLayerEnabled() &&
             $this->getThemeDatasource()->sourceHasModel('database', $template)
         ) {
@@ -654,7 +654,7 @@ protected function getTabTitle($type, $template)
         if ($type === 'partial' || $type === 'layout' || $type === 'content' || $type === 'asset') {
             $result = in_array($type, ['asset', 'content']) ? $template->getFileName() : $template->getBaseFileName();
             if (!$result) {
-                $result = Lang::get('cms::lang.'.$type.'.new');
+                $result = Lang::get('cms::lang.' . $type . '.new');
             }
 
             return $result;
@@ -722,7 +722,7 @@ protected function makeTemplateFormWidget($type, $template, $alias = null)
         }
 
         $widgetConfig->model = $template;
-        $widgetConfig->alias = $alias ?: 'form'.studly_case($type).md5($template->exists ? $template->getFileName() : uniqid());
+        $widgetConfig->alias = $alias ?: 'form' . studly_case($type) . md5($template->exists ? $template->getFileName() : uniqid());
 
         return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
     }
diff --git a/modules/cms/controllers/Media.php b/modules/cms/controllers/Media.php
index 525adb4e87..fb75b0cb0d 100644
--- a/modules/cms/controllers/Media.php
+++ b/modules/cms/controllers/Media.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Controllers;
+<?php
+
+namespace Cms\Controllers;
 
 use Backend\Controllers\Media as MediaController;
 
diff --git a/modules/cms/controllers/ThemeLogs.php b/modules/cms/controllers/ThemeLogs.php
index 60abff6f6e..27dc9ca1d8 100644
--- a/modules/cms/controllers/ThemeLogs.php
+++ b/modules/cms/controllers/ThemeLogs.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Controllers;
+<?php
+
+namespace Cms\Controllers;
 
 use Lang;
 use Flash;
@@ -62,8 +64,7 @@ public function index_onDelete()
             }
 
             Flash::success(Lang::get('backend::lang.list.delete_selected_success'));
-        }
-        else {
+        } else {
             Flash::error(Lang::get('backend::lang.list.delete_selected_empty'));
         }
 
diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php
index a2706215f6..00e1a8b1da 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Controllers;
+<?php
+
+namespace Cms\Controllers;
 
 use Backend;
 use BackendMenu;
@@ -53,8 +55,7 @@ public function update($dirName = null)
             $this->asExtension('FormController')->update($model->id);
 
             $this->vars['hasCustomData'] = $this->hasThemeData($dirName);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
     }
@@ -78,7 +79,7 @@ public function update_onResetDefault($dirName = null)
         $model = $this->getThemeData($this->getDirName($dirName));
         $model->delete();
 
-        return Backend::redirect('cms/themeoptions/update/'.$dirName);
+        return Backend::redirect('cms/themeoptions/update/' . $dirName);
     }
 
     /**
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index 1fdfd88fe5..789a7e20e7 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Controllers;
+<?php
+
+namespace Cms\Controllers;
 
 use ApplicationException;
 use Artisan;
@@ -110,13 +112,13 @@ public function index_onSaveFields()
         $widget = $this->makeFieldsFormWidget($theme);
         $theme->writeConfig($widget->getSaveData());
 
-        return ['#themeListItem-'.$theme->getId() => $this->makePartial('theme_list_item', ['theme' => $theme])];
+        return ['#themeListItem-' . $theme->getId() => $this->makePartial('theme_list_item', ['theme' => $theme])];
     }
 
     protected function makeFieldsFormWidget($theme)
     {
         $widgetConfig = $this->makeConfig('~/modules/cms/classes/theme/fields.yaml');
-        $widgetConfig->alias = 'form'.studly_case($theme->getDirName());
+        $widgetConfig->alias = 'form' . studly_case($theme->getDirName());
         $widgetConfig->model = $theme;
         $widgetConfig->data = $theme->getConfig();
         $widgetConfig->data['dir_name'] = $theme->getDirName();
@@ -160,12 +162,12 @@ public function index_onCreate()
         switch ($data['scaffold']) {
             case 'empty':
                 File::makeDirectory($destinationPath);
-                File::makeDirectory($destinationPath.'/assets');
-                File::makeDirectory($destinationPath.'/content');
-                File::makeDirectory($destinationPath.'/layouts');
-                File::makeDirectory($destinationPath.'/pages');
-                File::makeDirectory($destinationPath.'/partials');
-                File::put($destinationPath.'/theme.yaml', '');
+                File::makeDirectory($destinationPath . '/assets');
+                File::makeDirectory($destinationPath . '/content');
+                File::makeDirectory($destinationPath . '/layouts');
+                File::makeDirectory($destinationPath . '/pages');
+                File::makeDirectory($destinationPath . '/partials');
+                File::put($destinationPath . '/theme.yaml', '');
                 break;
             default:
                 try {
@@ -190,7 +192,7 @@ public function index_onCreate()
 
     protected function makeCreateFormWidget()
     {
-        $theme = new CmsTheme;
+        $theme = new CmsTheme();
         $theme->setDirName('newtheme');
         $widgetConfig = $this->makeConfig('~/modules/cms/classes/theme/fields.yaml');
         $widgetConfig->alias = 'formCreateTheme';
@@ -231,7 +233,7 @@ public function index_onDuplicateTheme()
         $theme = $this->findThemeObject();
         $newDirName = trim(post('new_dir_name'));
         $sourcePath = $theme->getPath();
-        $destinationPath = themes_path().'/'.$newDirName;
+        $destinationPath = themes_path() . '/' . $newDirName;
 
         if (!preg_match('/^[a-z0-9\_\-]+$/i', $newDirName)) {
             throw new ValidationException(['new_dir_name' => Lang::get('cms::lang.theme.dir_name_invalid')]);
@@ -268,10 +270,10 @@ public function index_onExport()
         $theme = $this->findThemeObject();
         $widget = $this->makeExportFormWidget($theme);
 
-        $model = new ThemeExport;
+        $model = new ThemeExport();
         $file = $model->export($theme, $widget->getSaveData());
 
-        return Backend::redirect('cms/themes/download/'.$file.'/'.$theme->getDirName().'.zip');
+        return Backend::redirect('cms/themes/download/' . $file . '/' . $theme->getDirName() . '.zip');
     }
 
     public function download($name, $outputName = null)
@@ -279,8 +281,7 @@ public function download($name, $outputName = null)
         try {
             $this->pageTitle = 'Download theme export archive';
             return ThemeExport::download($name, $outputName);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
     }
@@ -288,8 +289,8 @@ public function download($name, $outputName = null)
     protected function makeExportFormWidget($theme)
     {
         $widgetConfig = $this->makeConfig('~/modules/cms/models/themeexport/fields.yaml');
-        $widgetConfig->alias = 'form'.studly_case($theme->getDirName());
-        $widgetConfig->model = new ThemeExport;
+        $widgetConfig->alias = 'form' . studly_case($theme->getDirName());
+        $widgetConfig->model = new ThemeExport();
         $widgetConfig->model->theme = $theme;
         $widgetConfig->arrayName = 'ThemeExport';
 
@@ -322,7 +323,7 @@ public function index_onImport()
         $theme = $this->findThemeObject();
         $widget = $this->makeImportFormWidget($theme);
 
-        $model = new ThemeImport;
+        $model = new ThemeImport();
         $model->import($theme, $widget->getSaveData(), $widget->getSessionKey());
 
         Flash::success(Lang::get('cms::lang.theme.import_theme_success'));
@@ -332,8 +333,8 @@ public function index_onImport()
     protected function makeImportFormWidget($theme)
     {
         $widgetConfig = $this->makeConfig('~/modules/cms/models/themeimport/fields.yaml');
-        $widgetConfig->alias = 'form'.studly_case($theme->getDirName());
-        $widgetConfig->model = new ThemeImport;
+        $widgetConfig->alias = 'form' . studly_case($theme->getDirName());
+        $widgetConfig->model = new ThemeImport();
         $widgetConfig->model->theme = $theme;
         $widgetConfig->arrayName = 'ThemeImport';
 
diff --git a/modules/cms/controllers/index/_concurrency_resolve_form.php b/modules/cms/controllers/index/_concurrency_resolve_form.php
index 03ec6ca21c..4679c74700 100644
--- a/modules/cms/controllers/index/_concurrency_resolve_form.php
+++ b/modules/cms/controllers/index/_concurrency_resolve_form.php
@@ -1,4 +1,4 @@
-<?= Form::open(['onsubmit'=>'return false']) ?>
+<?= Form::open(['onsubmit' => 'return false']) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
         <h4 class="modal-title"><?= e(trans('backend::lang.form.concurrency_file_changed_title')) ?></h4>
diff --git a/modules/cms/controllers/media/index.php b/modules/cms/controllers/media/index.php
index d6f5048c2d..6ec990e6ca 100644
--- a/modules/cms/controllers/media/index.php
+++ b/modules/cms/controllers/media/index.php
@@ -1,7 +1,7 @@
 <?= Block::put('head') ?><?= Block::endPut() ?>
 
 <?= Block::put('body') ?>
-    <?= Form::open(['class'=>'layout', 'onsubmit'=>'return false']) ?>
+    <?= Form::open(['class' => 'layout', 'onsubmit' => 'return false']) ?>
         <?= $this->widget->manager->render() ?>
     <?= Form::close() ?>
 <?= Block::endPut() ?>
\ No newline at end of file
diff --git a/modules/cms/controllers/themelogs/_field_content.php b/modules/cms/controllers/themelogs/_field_content.php
index 3154caa3ae..05cdcd20ae 100644
--- a/modules/cms/controllers/themelogs/_field_content.php
+++ b/modules/cms/controllers/themelogs/_field_content.php
@@ -1,3 +1,3 @@
 <div class="form-control">
-    <pre><?= e($value.PHP_EOL) ?></pre>
+    <pre><?= e($value . PHP_EOL) ?></pre>
 </div>
diff --git a/modules/cms/controllers/themeoptions/update.php b/modules/cms/controllers/themeoptions/update.php
index 4bc7b58c9e..cd2c9cc2c7 100644
--- a/modules/cms/controllers/themeoptions/update.php
+++ b/modules/cms/controllers/themeoptions/update.php
@@ -8,7 +8,7 @@
 <?php if (!$this->fatalError): ?>
 
     <?php if ($hasCustomData): ?>
-        <?= Form::open(['class'=>'layout']) ?>
+        <?= Form::open(['class' => 'layout']) ?>
 
             <div class="layout-row">
                 <?= $this->formRender() ?>
diff --git a/modules/cms/controllers/themes/_theme_list_item.php b/modules/cms/controllers/themes/_theme_list_item.php
index cac10353dd..e5c7584c7c 100644
--- a/modules/cms/controllers/themes/_theme_list_item.php
+++ b/modules/cms/controllers/themes/_theme_list_item.php
@@ -8,7 +8,7 @@
 <div class="layout-cell min-height theme-description">
     <h3><?= e($theme->getConfigValue('name', $theme->getDirName())) ?></h3>
     <?php if (strlen($author)): ?>
-        <p class="author"><?= trans('cms::lang.theme.by_author', ['name' => '<a href="'.e($theme->getConfigValue('homepage', '#')).'">'.e($author).'</a>']) ?></p>
+        <p class="author"><?= trans('cms::lang.theme.by_author', ['name' => '<a href="' . e($theme->getConfigValue('homepage', '#')) . '">' . e($author) . '</a>']) ?></p>
     <?php endif ?>
     <p class="description">
         <?= e($theme->getConfigValue('description', 'The theme description is not provided.')) ?>
@@ -36,7 +36,7 @@ class="btn btn-primary">
         <?php endif ?>
         <?php if ($theme->hasCustomData()): ?>
             <a
-                href="<?= Backend::url('cms/themeoptions/update/'.$theme->getDirName()) ?>"
+                href="<?= Backend::url('cms/themeoptions/update/' . $theme->getDirName()) ?>"
                 class="btn btn-secondary<?= $theme->isActiveTheme() === false ? ' disabled' : '' ?>">
                 <i class="icon-paint-brush"></i>
                 <?= e(trans('cms::lang.theme.customize_button')) ?>
diff --git a/modules/cms/controllers/themes/index.php b/modules/cms/controllers/themes/index.php
index 5b7fe3e333..24fd35e49e 100644
--- a/modules/cms/controllers/themes/index.php
+++ b/modules/cms/controllers/themes/index.php
@@ -1,7 +1,7 @@
 <?= Block::put('body') ?>
     <div class="layout">
         <div class="layout-row">
-            <?= Form::open(['onsubmit'=>'return false']) ?>
+            <?= Form::open(['onsubmit' => 'return false']) ?>
             <div class="layout theme-selector-layout" id="theme-list">
                 <?= $this->makePartial('theme_list') ?>
             </div>
diff --git a/modules/cms/facades/Cms.php b/modules/cms/facades/Cms.php
index 8177852419..91060f3512 100644
--- a/modules/cms/facades/Cms.php
+++ b/modules/cms/facades/Cms.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Facades;
+<?php
+
+namespace Cms\Facades;
 
 use Winter\Storm\Support\Facade;
 
diff --git a/modules/cms/formwidgets/Components.php b/modules/cms/formwidgets/Components.php
index 376511dff3..fec2a8cc2c 100644
--- a/modules/cms/formwidgets/Components.php
+++ b/modules/cms/formwidgets/Components.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\FormWidgets;
+<?php
+
+namespace Cms\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 use Cms\Classes\ComponentManager;
@@ -55,8 +57,7 @@ protected function listComponents()
                         $componentObj->pluginIcon = $pluginDetails['icon'];
                     }
                 }
-            }
-            catch (Exception $ex) {
+            } catch (Exception $ex) {
                 if (starts_with($name, '@')) {
                     $componentObj = new SoftComponent($properties);
                     $componentObj->name = $name;
diff --git a/modules/cms/formwidgets/MediaFinder.php b/modules/cms/formwidgets/MediaFinder.php
index b9b81c2791..e3da90c388 100644
--- a/modules/cms/formwidgets/MediaFinder.php
+++ b/modules/cms/formwidgets/MediaFinder.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\FormWidgets;
+<?php
+
+namespace Cms\FormWidgets;
 
 use Backend\FormWidgets\MediaFinder as BackendMediaFinder;
 
diff --git a/modules/cms/formwidgets/components/partials/_component.php b/modules/cms/formwidgets/components/partials/_component.php
index 0d3b028a25..245f84c596 100644
--- a/modules/cms/formwidgets/components/partials/_component.php
+++ b/modules/cms/formwidgets/components/partials/_component.php
@@ -1,6 +1,6 @@
 <div class="layout-cell <?= e($component->componentCssClass) ?> <?= $component->isHidden ? 'hidden' : null ?>">
     <div
-        class="<?= 'wn-'.$component->pluginIcon ?> layout-relative"
+        class="<?= 'wn-' . $component->pluginIcon ?> layout-relative"
         <?php if ($component->inspectorEnabled): ?>
             data-inspectable
         <?php endif ?>
diff --git a/modules/cms/helpers/Cms.php b/modules/cms/helpers/Cms.php
index 6c1063b97a..6483c8893b 100644
--- a/modules/cms/helpers/Cms.php
+++ b/modules/cms/helpers/Cms.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Helpers;
+<?php
+
+namespace Cms\Helpers;
 
 use Url;
 use Route;
diff --git a/modules/cms/helpers/File.php b/modules/cms/helpers/File.php
index f79cd0a9a4..80653ab571 100644
--- a/modules/cms/helpers/File.php
+++ b/modules/cms/helpers/File.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Helpers;
+<?php
+
+namespace Cms\Helpers;
 
 use Config;
 use File as Filesystem;
diff --git a/modules/cms/lang/bg/lang.php b/modules/cms/lang/bg/lang.php
index 2e3258c72d..8c01e28a99 100644
--- a/modules/cms/lang/bg/lang.php
+++ b/modules/cms/lang/bg/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'cms_object' => [
         'invalid_file' => 'Невалидно име на файл: :name. Имената на файловете могат да съдържат само букви и символи, долни черти, тирета и точки. Някои примери за правилни имена на файлове: page.htm, страница, поддиректория / страница',
@@ -217,7 +218,7 @@
     'template' => [
         'invalid_type' => 'Неизвестен тип шаблон.',
         'not_found' => 'Заявения шаблон не е намерен.',
-        'saved'=> 'Шаблонът е запазен успешно.'
+        'saved' => 'Шаблонът е запазен успешно.'
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/cs/lang.php b/modules/cms/lang/cs/lang.php
index 1a1e0bc699..6398b29ccf 100644
--- a/modules/cms/lang/cs/lang.php
+++ b/modules/cms/lang/cs/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => "Soubor ':name' již existuje.",
         'error_saving' => "Chyba ukládání souboru ':name'. Zkontrolujte práva k zápisu.",
         'error_creating_directory' => 'Chyba vytváření složky :name. Zkontrolujte práva k zápisu.',
-        'invalid_file_extension'=>'Chybná přípona souboru: :invalid. Povolené přípony jsou: :allowed.',
+        'invalid_file_extension' => 'Chybná přípona souboru: :invalid. Povolené přípony jsou: :allowed.',
         'error_deleting' => "Chyba mazání souboru s šablonou ':name'. Zkontrolujte práva k zápisu.",
         'delete_success' => 'Šablony úspěšně smazány: :count.',
         'file_name_required' => 'Je nutno vyplnit Název souboru.',
@@ -244,7 +244,7 @@
     'template' => [
         'invalid_type' => 'Neznámý typ šablony.',
         'not_found' => 'Požadovaná šablona nebyla nalezena.',
-        'saved'=> 'Šablona byla úspěšně uložena.',
+        'saved' => 'Šablona byla úspěšně uložena.',
         'no_list_records' => 'Žádné záznamy nebyly nalezeny',
         'delete_confirm' => 'Smazat vybraná témata?',
         'order_by' => 'Řadit podle'
diff --git a/modules/cms/lang/da/lang.php b/modules/cms/lang/da/lang.php
index 409b4e0ef2..97228fb8d9 100644
--- a/modules/cms/lang/da/lang.php
+++ b/modules/cms/lang/da/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => "Filen ':name' eksisterer allerede.",
         'error_saving' => "Fejl under geming af filen ':name'. Kontroller venligst skriverettigheder.",
         'error_creating_directory' => 'Fejl ved opretning af mappe :name. Kontroller venligst skriverettigheder.',
-        'invalid_file_extension'=>'Ugyldig filendelse: :invalid. Tilladte endelser: :allowed.',
+        'invalid_file_extension' => 'Ugyldig filendelse: :invalid. Tilladte endelser: :allowed.',
         'error_deleting' => "Fejl under sletning af skabelonfil ':name'. Kontroller venligst skriverettigheder.",
         'delete_success' => 'Slettede skabeloner: :count.',
         'file_name_required' => 'Filnavnet er påkrævet.',
@@ -231,7 +231,7 @@
     'template' => [
         'invalid_type' => 'Ukendt skabelontype.',
         'not_found' => 'Skabelon kunne ikke findes.',
-        'saved'=> 'Skabelon blev gemt.'
+        'saved' => 'Skabelon blev gemt.'
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/el/lang.php b/modules/cms/lang/el/lang.php
index 8253c7904c..1abcc01b99 100644
--- a/modules/cms/lang/el/lang.php
+++ b/modules/cms/lang/el/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Greek Language Updated on 2017-02-19 v1.05 */
 return [
     'cms_object' => [
@@ -7,7 +8,7 @@
         'file_already_exists' => "Το αρχείο ':name' υπάρχει ήδη.",
         'error_saving' => "Σφάλμα κατά την αποθήκευση του αρχείου ':name'. Παρακαλούμε ελέγξτε τα δικαιώματα εγγραφής.",
         'error_creating_directory' => 'Σφάλμα δημιουργίας του καταλόγου :name. Παρακαλούμε ελέγξτε τα δικαιώματα εγγραφής.',
-        'invalid_file_extension'=>'Μη έγκυρη επέκταση αρχείου: :invalid. Οι επιτρεπόμενες επεκτάσεις είναι: :allowed.',
+        'invalid_file_extension' => 'Μη έγκυρη επέκταση αρχείου: :invalid. Οι επιτρεπόμενες επεκτάσεις είναι: :allowed.',
         'error_deleting' => "Σφάλμα διαγράφης του αρχείου ':name' του προτύπου. Παρακαλούμε ελέγξτε τα δικαιώματα εγγραφής.",
         'delete_success' => 'Θέματα που διαγράφηκαν: :count',
         'file_name_required' => 'Το πεδίο του Ονόματος του Αρχείου είναι υποχρεωτικό.',
@@ -231,7 +232,7 @@
     ],
     'template' => [
         'not_found' => 'Το πρότυπο δεν βρέθηκε.',
-        'saved'=> 'Το πρότυπο σώθηκε.',
+        'saved' => 'Το πρότυπο σώθηκε.',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/es-ar/lang.php b/modules/cms/lang/es-ar/lang.php
index 7c23e8c2cc..caa8eb3fdc 100644
--- a/modules/cms/lang/es-ar/lang.php
+++ b/modules/cms/lang/es-ar/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => 'Archivo ":name" ya existe.',
         'error_saving' => 'Error guardando archivo ":name". Por favor revisar los permisos de escritura.',
         'error_creating_directory' => 'Error creando el directorio :name. Por favor revisar los permisos de escritura.',
-        'invalid_file_extension'=>'Extensión de archivo inválida: :invalid. Las extensiones permitidas son: :allowed.',
+        'invalid_file_extension' => 'Extensión de archivo inválida: :invalid. Las extensiones permitidas son: :allowed.',
         'error_deleting' => 'Error borrando el archivo template ":name". Por favor revisar los permisos de escritura.',
         'delete_success' => 'Los templates fueron borrados exitosamente: :count.',
         'file_name_required' => 'Falta el nombre del campo del archivo.'
@@ -153,7 +153,7 @@
     'template' => [
         'invalid_type' => "Tipo de plantilla Desconocido.",
         'not_found' => "No se encontró la plantilla solicitada.",
-        'saved'=> "La plantilla se ha guardado correctamente."
+        'saved' => "La plantilla se ha guardado correctamente."
     ],
     'permissions' => [
         'manage_content' => 'Gestionar contenido',
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index 914a4145b0..6e9eb5b2e9 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'cms_object' => [
         'invalid_file' => 'نام :name برای فایل نام معتبر است. نام فایل میتواند شامل کاراکتر انگلیسی ، خط تیره و نقطه باشد. بعنوان مثال page.htm، page و subdirectory/page',
@@ -6,7 +7,7 @@
         'file_already_exists' => 'فایلی با نام ":name" موجود است.',
         'error_saving' => 'خطا در ذخیره فایل ":name". لطفا سطح دسترسی ها را بررسی نمایید.',
         'error_creating_directory' => 'خطا در ایجاد پوشه ی :name. لطفا سطح دسترسی ها را بررسی نمایید.',
-        'invalid_file_extension'=>'پسوند :invalid برای فایل نا معتبر است. پسوند های معتبر عبارتند از: :allowed.',
+        'invalid_file_extension' => 'پسوند :invalid برای فایل نا معتبر است. پسوند های معتبر عبارتند از: :allowed.',
         'error_deleting' => 'خطا در خذف فایل ":name". لطفا سطح دسترسی ها را بررسی نمایید.',
         'delete_success' => 'تعداد :count فایل با موفقیت حذف شد.',
         'file_name_required' => 'نام فایل را وارد نمایید.',
@@ -259,7 +260,7 @@
     'template' => [
         'invalid_type' => "نوع قالب معتبر نمی باشد.",
         'not_found' => "قالب درخواست شده یافت نشد.",
-        'saved'=> "قالب با موفقیت ذخیره شد.",
+        'saved' => "قالب با موفقیت ذخیره شد.",
         'no_list_records' => 'موردی یافت نشد',
         'delete_confirm' => 'آیا از حذف قالب های انتخاب شده اطمینان دارید؟',
         'order_by' => 'مرتب سازی با'
diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php
index f2651b97af..7febf540fc 100644
--- a/modules/cms/lang/fr/lang.php
+++ b/modules/cms/lang/fr/lang.php
@@ -260,10 +260,10 @@
     'template' => [
         'invalid_type' => 'Type de modèle inconnu.',
         'not_found' => 'Le modèle est introuvable.',
-        'saved'=> 'Le modèle a été sauvegardé avec succès.',
+        'saved' => 'Le modèle a été sauvegardé avec succès.',
         'no_list_records' => 'Aucun enregistrement trouvé',
         'delete_confirm' => 'Supprimer les modèles sélectionnés ?',
-        'order_by' =>'Trier par'
+        'order_by' => 'Trier par'
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/id/lang.php b/modules/cms/lang/id/lang.php
index c62182952b..108740fa59 100644
--- a/modules/cms/lang/id/lang.php
+++ b/modules/cms/lang/id/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => "Berkas ':name' sudah ada.",
         'error_saving' => "Galat menyimpan berkas ':name'. Silakan periksa izin tulis.",
         'error_creating_directory' => 'Galat membuat direktori :name. Silakan periksa izin tulis.',
-        'invalid_file_extension'=>'Ekstensi berkas: :invalid tidak valid. Ekstensi yang diperbolehkan: :allowed.',
+        'invalid_file_extension' => 'Ekstensi berkas: :invalid tidak valid. Ekstensi yang diperbolehkan: :allowed.',
         'error_deleting' => "Galat menghapus berkas acuan ':name'. Silakan periksa izin tulis.",
         'delete_success' => 'Acuan: :count berhasil dihapus.',
         'file_name_required' => 'Bidang nama berkas diperlukan.'
@@ -171,7 +171,7 @@
     'template' => [
         'invalid_type' => 'Jenis acuan tidak diketahui.',
         'not_found' => 'Acuan yang diminta tidak ditemukan.',
-        'saved'=> 'Acuan berhasil disimpan.'
+        'saved' => 'Acuan berhasil disimpan.'
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/it/lang.php b/modules/cms/lang/it/lang.php
index 3583848f06..5b52e826c2 100644
--- a/modules/cms/lang/it/lang.php
+++ b/modules/cms/lang/it/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => "File ':name' già esistente.",
         'error_saving' => "Errore nel salvataggio del file ':name'. Verifica le autorizzazioni di scrittura.",
         'error_creating_directory' => 'Errore nella creazione della cartella :name. Verifica le autorizzazioni di scrittura.',
-        'invalid_file_extension'=>'Estensione del file non valida: :invalid. Le estensioni consentite sono: :allowed.',
+        'invalid_file_extension' => 'Estensione del file non valida: :invalid. Le estensioni consentite sono: :allowed.',
         'error_deleting' => "Errore nella cancellazione del file ':name'. Verifica le autorizzazioni di scrittura.",
         'delete_success' => 'Template eliminati correttamente: :count.',
         'file_name_required' => 'Il campo Nome file è obbligatorio.',
@@ -231,7 +231,7 @@
     'template' => [
         'invalid_type' => 'Tipo di template sconosciuto.',
         'not_found' => 'Il template richiesto non è stato trovato.',
-        'saved'=> 'Il template è stato salvato con successo'
+        'saved' => 'Il template è stato salvato con successo'
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/ja/lang.php b/modules/cms/lang/ja/lang.php
index 34914932ad..82a2f8fbb8 100644
--- a/modules/cms/lang/ja/lang.php
+++ b/modules/cms/lang/ja/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => '":name"ファイルは既に存在しています。',
         'error_saving' => '":name"ファイル保存エラー',
         'error_creating_directory' => ':nameディレクトリー作成エラー',
-        'invalid_file_extension'=>'正しくないファイル拡張子：:invalid。許されている拡張子は、:allowedです。',
+        'invalid_file_extension' => '正しくないファイル拡張子：:invalid。許されている拡張子は、:allowedです。',
         'error_deleting' => '":name"一時ファイル削除エラー',
         'delete_success' => ':count個のテンプレートを削除しました。',
         'file_name_required' => 'ファイル名フィールドが必要です。',
@@ -259,7 +259,7 @@
     'template' => [
         'invalid_type' => '未知のテンプレートタイプ。',
         'not_found' => 'リクエストされたテンプレートが見つかりません。',
-        'saved'=> 'テンプレートを保存しました。',
+        'saved' => 'テンプレートを保存しました。',
         'no_list_records' => 'レコードが見つかりません',
         'delete_confirm' => '選択したテンプレートを削除しますか？',
         'order_by' => 'Order by',
diff --git a/modules/cms/lang/kr/lang.php b/modules/cms/lang/kr/lang.php
index 974f30a45e..e69b09670a 100644
--- a/modules/cms/lang/kr/lang.php
+++ b/modules/cms/lang/kr/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => '이미 ":name"이 존재합니다.',
         'error_saving' => '":name" 파일 저장 오류',
         'error_creating_directory' => ':name 디렉토리 작성 오류',
-        'invalid_file_extension'=>'올바르지 않은 파일 확장자: :invalid. 허가된 확장자는 :allowed 입니다.',
+        'invalid_file_extension' => '올바르지 않은 파일 확장자: :invalid. 허가된 확장자는 :allowed 입니다.',
         'error_deleting' => '":name" 파일 삭제 오류',
         'delete_success' => ':count 개의 템플릿을 삭제했습니다.',
         'file_name_required' => '파일명 필드가 필요합니다.',
@@ -242,7 +242,7 @@
     'template' => [
         'invalid_type' => "알수없는 템플릿 타입",
         'not_found' => "요청한 템플릿이 없습니다.",
-        'saved'=> "템플릿을 저장합니다.",
+        'saved' => "템플릿을 저장합니다.",
         'no_list_records' => '템플릿을 찾을 수 없습니다',
         'delete_confirm' => '선택한 템플릿을 삭제하시겠습니까?',
         'order_by' => '정렬방법'
diff --git a/modules/cms/lang/pl/lang.php b/modules/cms/lang/pl/lang.php
index c3cdf10f6f..a92f0d8585 100644
--- a/modules/cms/lang/pl/lang.php
+++ b/modules/cms/lang/pl/lang.php
@@ -232,7 +232,7 @@
     'template' => [
         'invalid_type' => 'Nieznany typ szablonu.',
         'not_found' => 'Szablon nie został znaleziony.',
-        'saved'=> 'Szablon został zapisany pomyślnie.'
+        'saved' => 'Szablon został zapisany pomyślnie.'
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/pt-br/lang.php b/modules/cms/lang/pt-br/lang.php
index ad1b889c26..1e05b84849 100644
--- a/modules/cms/lang/pt-br/lang.php
+++ b/modules/cms/lang/pt-br/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => 'Arquivo ":name" já existe.',
         'error_saving' => 'Erro ao salvar arquivo ":name". Verifique as permissões de escrita.',
         'error_creating_directory' => 'Erro ao criar o diretório :name. Verifique as permissões de escrita.',
-        'invalid_file_extension'=>'Extensão de arquivo inválida: :invalid. Extensões válidas: :allowed.',
+        'invalid_file_extension' => 'Extensão de arquivo inválida: :invalid. Extensões válidas: :allowed.',
         'error_deleting' => 'Erro ao excluir o arquivo de modelo ":name". Verifique as permissões de escrita.',
         'delete_success' => 'Modelos excluídos com sucesso: :count.',
         'file_name_required' => 'O campo de Nome do Arquivo é necessário.',
@@ -253,7 +253,7 @@
     'template' => [
         'invalid_type' => 'Tipo de modelo desconhecido.',
         'not_found' => 'O modelo solicitado não foi encontrado.',
-        'saved'=> 'O modelo foi salvo com sucesso.',
+        'saved' => 'O modelo foi salvo com sucesso.',
         'no_list_records' => 'Nenhum registro foi encontrado',
         'delete_confirm' => 'Excluir modelos selecionados?',
         'order_by' => 'Ordenar por'
diff --git a/modules/cms/lang/pt-pt/lang.php b/modules/cms/lang/pt-pt/lang.php
index b43bde8632..afa41ec204 100644
--- a/modules/cms/lang/pt-pt/lang.php
+++ b/modules/cms/lang/pt-pt/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => 'O ficheiro ":name" já existe.',
         'error_saving' => 'Erro ao guardar ficheiro ":name". Verifique as permissões de escrita.',
         'error_creating_directory' => 'Erro ao criar a diretória :name. Verifique as permissões de escrita.',
-        'invalid_file_extension'=>'Extensão de ficheiro inválida: :invalid. Extensões válidas: :allowed.',
+        'invalid_file_extension' => 'Extensão de ficheiro inválida: :invalid. Extensões válidas: :allowed.',
         'error_deleting' => 'Erro ao apagar o ficheiro de modelo ":name". Verifique as permissões de escrita.',
         'delete_success' => 'Modelos excluídos com sucesso: :count.',
         'file_name_required' => 'O campo de nome do ficheiro é necessário.',
@@ -241,7 +241,7 @@
     'template' => [
         'invalid_type' => 'Tipo de modelo desconhecido.',
         'not_found' => 'O modelo solicitado não foi encontrado.',
-        'saved'=> 'O modelo foi salvo com sucesso.',
+        'saved' => 'O modelo foi salvo com sucesso.',
         'no_list_records' => 'Não foram encontrados registos',
         'delete_confirm' => 'Apagar modelos selecionados?',
         'order_by' => 'Ordenar por'
diff --git a/modules/cms/lang/sk/lang.php b/modules/cms/lang/sk/lang.php
index 4582931b90..f6a42875ad 100644
--- a/modules/cms/lang/sk/lang.php
+++ b/modules/cms/lang/sk/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'cms_object' => [
         'invalid_file' => 'Neplatný názov súboru: :name. Názvy súboru môžu obsahovať iba alfanumerické symboly, podtržítka, pomlčky a bodky. Príklady správnych názvov súborov: stranka.htm, stranka, priecinok/stranka',
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index 5cf01ced35..1f7ee2a9f8 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => 'Filen ":name" finns redan',
         'error_saving' => 'Ett fel inträffade när ":name" skulle sparas',
         'error_creating_directory' => 'Ett fel inträffade när mappen :name skulle skapas',
-        'invalid_file_extension'=>'Felaktig filändelse: :invalid. Tillåtna filändelser är: :allowed.',
+        'invalid_file_extension' => 'Felaktig filändelse: :invalid. Tillåtna filändelser är: :allowed.',
         'error_deleting' => 'Det gick inte att radera mallfilen: ":name".',
         'delete_success' => 'Mallarna är nu raderade: :count.',
         'file_name_required' => 'Filnamnsfältet är obligatoriskt.'
@@ -224,7 +224,7 @@
     'template' => [
         'invalid_type' => "Felaktig malltyp",
         'not_found' => "Den angivna mallen kunde ej hittas",
-        'saved'=> "Mallen har sparats"
+        'saved' => "Mallen har sparats"
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
index 60b4067d11..542862c395 100644
--- a/modules/cms/lang/tr/lang.php
+++ b/modules/cms/lang/tr/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => '":name" isimli dosya mevcut.',
         'error_saving' => '":name" kaydedilirken hatayla oluştu.',
         'error_creating_directory' => ':name klasörü oluşturulurken hata oluştu',
-        'invalid_file_extension'=>'Hatalı dosya uzantısı: :invalid. İzin verilen uzantılar: :allowed.',
+        'invalid_file_extension' => 'Hatalı dosya uzantısı: :invalid. İzin verilen uzantılar: :allowed.',
         'error_deleting' => '":name" şablon dosyası silinirken hatayla karşılaşıldı.',
         'delete_success' => ':count şablon başarıyla silindi.',
         'file_name_required' => 'Dosya adı alanı gereklidir.',
@@ -267,7 +267,7 @@
     'template' => [
         'invalid_type' => "Hatalı şablon tipi.",
         'not_found' => "İstenilen şablon bulunamadı.",
-        'saved'=> "Şablon başarıyla kaydedildi.",
+        'saved' => "Şablon başarıyla kaydedildi.",
         'no_list_records' => 'Kayıt bulunamadı',
         'delete_confirm' => 'Seçilen şablonlar silinsin mi?',
         'order_by' => 'Sırala',
diff --git a/modules/cms/lang/zh-cn/lang.php b/modules/cms/lang/zh-cn/lang.php
index 2305602998..08e80d6d2c 100644
--- a/modules/cms/lang/zh-cn/lang.php
+++ b/modules/cms/lang/zh-cn/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => "文件 ':name' 已存在.",
         'error_saving' => "保存文件 ':name' 错误。请检查写权限。",
         'error_creating_directory' => '创建文件夹 :name 错误。请检查写权限。',
-        'invalid_file_extension'=>'非法文件扩展名: :invalid. 允许的扩展名: :allowed.',
+        'invalid_file_extension' => '非法文件扩展名: :invalid. 允许的扩展名: :allowed.',
         'error_deleting' => "删除模板文件 ':name' 错误. 请检查写权限.",
         'delete_success' => '成功删除模板: :count.',
         'file_name_required' => '需要文件名字段.',
@@ -250,7 +250,7 @@
     'template' => [
         'invalid_type' => '未知模板类型.',
         'not_found' => '无法找到所请求的模板',
-        'saved'=> '模板保存成功.',
+        'saved' => '模板保存成功.',
         'no_list_records' => '模板文件为空',
         'delete_confirm' => '确认删除选中的模板?',
         'order_by' => '排序方式'
diff --git a/modules/cms/lang/zh-tw/lang.php b/modules/cms/lang/zh-tw/lang.php
index 0149a60251..d2ed034fc0 100644
--- a/modules/cms/lang/zh-tw/lang.php
+++ b/modules/cms/lang/zh-tw/lang.php
@@ -7,7 +7,7 @@
         'file_already_exists' => "檔案 ':name' 已經存在.",
         'error_saving' => "保存檔案 ':name' 錯誤. 請檢查寫權限.",
         'error_creating_directory' => '建立檔案夾 :name 錯誤. 請檢查寫權限.',
-        'invalid_file_extension'=>'不合法的檔案擴展: :invalid. 允許的擴展: :allowed.',
+        'invalid_file_extension' => '不合法的檔案擴展: :invalid. 允許的擴展: :allowed.',
         'error_deleting' => "刪除模板檔案 ':name' 錯誤. 請檢查寫權限.",
         'delete_success' => '模板成功刪除: :count.',
         'file_name_required' => '需要檔案名字串.'
@@ -227,7 +227,7 @@
     'template' => [
         'invalid_type' => '未知模板類型.',
         'not_found' => '請求模板找不到.',
-        'saved'=> '模板保存成功.'
+        'saved' => '模板保存成功.'
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/models/MaintenanceSetting.php b/modules/cms/models/MaintenanceSetting.php
index 890ea014d0..f96e49e1d6 100644
--- a/modules/cms/models/MaintenanceSetting.php
+++ b/modules/cms/models/MaintenanceSetting.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Models;
+<?php
+
+namespace Cms\Models;
 
 use Model;
 use Cms\Classes\Page;
@@ -86,8 +88,7 @@ public function afterFetch()
             && ($cmsPage = array_get($themeMap, $theme->getDirName()))
         ) {
             $this->cms_page = $cmsPage;
-        }
-        else {
+        } else {
             $this->is_enabled = false;
         }
     }
diff --git a/modules/cms/models/ThemeData.php b/modules/cms/models/ThemeData.php
index ba92bad521..e76ccdf5af 100644
--- a/modules/cms/models/ThemeData.php
+++ b/modules/cms/models/ThemeData.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Models;
+<?php
+
+namespace Cms\Models;
 
 use Lang;
 use Model;
@@ -76,8 +78,7 @@ public function afterSave()
     {
         try {
             CombineAssets::resetCache();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
         }
     }
 
@@ -95,8 +96,7 @@ public static function forTheme($theme)
 
         try {
             $themeData = self::firstOrCreate(['theme' => $dirName]);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             // Database failed
             $themeData = new self(['theme' => $dirName]);
         }
diff --git a/modules/cms/models/ThemeExport.php b/modules/cms/models/ThemeExport.php
index a732b21f4b..7f235cf204 100644
--- a/modules/cms/models/ThemeExport.php
+++ b/modules/cms/models/ThemeExport.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Models;
+<?php
+
+namespace Cms\Models;
 
 use File;
 use Model;
@@ -93,33 +95,32 @@ public function export($theme, $data = [])
 
         try {
             $themePath = $this->theme->getPath();
-            $tempPath = temp_path() . '/'.uniqid('oc');
+            $tempPath = temp_path() . '/' . uniqid('oc');
             $zipName = uniqid('oc');
-            $zipPath = temp_path().'/'.$zipName;
+            $zipPath = temp_path() . '/' . $zipName;
 
             if (!File::makeDirectory($tempPath)) {
-                throw new ApplicationException('Unable to create directory '.$tempPath);
+                throw new ApplicationException('Unable to create directory ' . $tempPath);
             }
 
             if (!File::makeDirectory($metaPath = $tempPath . '/meta')) {
-                throw new ApplicationException('Unable to create directory '.$metaPath);
+                throw new ApplicationException('Unable to create directory ' . $metaPath);
             }
 
-            File::copy($themePath.'/theme.yaml', $tempPath.'/theme.yaml');
-            File::copyDirectory($themePath.'/meta', $metaPath);
+            File::copy($themePath . '/theme.yaml', $tempPath . '/theme.yaml');
+            File::copyDirectory($themePath . '/meta', $metaPath);
 
             foreach ($this->folders as $folder) {
                 if (!array_key_exists($folder, $this->getFoldersOptions())) {
                     continue;
                 }
 
-                File::copyDirectory($themePath.'/'.$folder, $tempPath.'/'.$folder);
+                File::copyDirectory($themePath . '/' . $folder, $tempPath . '/' . $folder);
             }
 
             Zip::make($zipPath, $tempPath);
             File::deleteDirectory($tempPath);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             if (strlen($tempPath) && File::isDirectory($tempPath)) {
                 File::deleteDirectory($tempPath);
             }
diff --git a/modules/cms/models/ThemeImport.php b/modules/cms/models/ThemeImport.php
index 4cfe2817ea..b4ae9eef72 100644
--- a/modules/cms/models/ThemeImport.php
+++ b/modules/cms/models/ThemeImport.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Models;
+<?php
+
+namespace Cms\Models;
 
 use File;
 use Model;
@@ -105,20 +107,20 @@ public function import($theme, $data = [], $sessionKey = null)
             }
 
             $themePath = $this->theme->getPath();
-            $tempPath = temp_path() . '/'.uniqid('oc');
+            $tempPath = temp_path() . '/' . uniqid('oc');
             $zipName = uniqid('oc');
-            $zipPath = temp_path().'/'.$zipName;
+            $zipPath = temp_path() . '/' . $zipName;
 
             File::put($zipPath, $file->getContents());
 
             if (!File::makeDirectory($tempPath)) {
-                throw new ApplicationException('Unable to create directory '.$tempPath);
+                throw new ApplicationException('Unable to create directory ' . $tempPath);
             }
 
             Zip::extract($zipPath, $tempPath);
 
-            if (File::isDirectory($tempPath.'/meta')) {
-                $this->copyDirectory($tempPath.'/meta', $themePath.'/meta');
+            if (File::isDirectory($tempPath . '/meta')) {
+                $this->copyDirectory($tempPath . '/meta', $themePath . '/meta');
             }
 
             foreach ($this->folders as $folder) {
@@ -126,14 +128,13 @@ public function import($theme, $data = [], $sessionKey = null)
                     continue;
                 }
 
-                $this->copyDirectory($tempPath.'/'.$folder, $themePath.'/'.$folder);
+                $this->copyDirectory($tempPath . '/' . $folder, $themePath . '/' . $folder);
             }
 
             File::deleteDirectory($tempPath);
             File::delete($zipPath);
             $file->delete();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             if (!empty($tempPath) && File::isDirectory($tempPath)) {
                 File::deleteDirectory($tempPath);
             }
@@ -174,7 +175,7 @@ protected function copyDirectory($directory, $destination)
         $items = new FilesystemIterator($directory, $options);
 
         foreach ($items as $item) {
-            $target = $destination.'/'.$item->getBasename();
+            $target = $destination . '/' . $item->getBasename();
 
             if ($item->isDir()) {
                 $path = $item->getPathname();
@@ -182,8 +183,7 @@ protected function copyDirectory($directory, $destination)
                 if (!$this->copyDirectory($path, $target)) {
                     return false;
                 }
-            }
-            else {
+            } else {
                 // Do not overwrite existing files
                 if (File::isFile($target)) {
                     continue;
diff --git a/modules/cms/models/ThemeLog.php b/modules/cms/models/ThemeLog.php
index 6183a1862b..fad1105143 100644
--- a/modules/cms/models/ThemeLog.php
+++ b/modules/cms/models/ThemeLog.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Models;
+<?php
+
+namespace Cms\Models;
 
 use BackendAuth;
 use Cms\Classes\Theme;
@@ -75,11 +77,11 @@ public static function add(HalcyonModel $template, ?string $type = null): ?self
             return null;
         }
 
-        $record = new self;
+        $record = new self();
         $record->type = $type;
         $record->theme = Theme::getEditThemeCode();
-        $record->template = $isDelete ? '' : $dirName.'/'.$templateName;
-        $record->old_template = $oldTemplateName ? $dirName.'/'.$oldTemplateName : '';
+        $record->template = $isDelete ? '' : $dirName . '/' . $templateName;
+        $record->old_template = $oldTemplateName ? $dirName . '/' . $oldTemplateName : '';
         $record->content = $isDelete ? '' : $newContent;
         $record->old_content = $oldContent;
 
diff --git a/modules/cms/reportwidgets/ActiveTheme.php b/modules/cms/reportwidgets/ActiveTheme.php
index afe4969b7a..d09c7091a4 100644
--- a/modules/cms/reportwidgets/ActiveTheme.php
+++ b/modules/cms/reportwidgets/ActiveTheme.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\ReportWidgets;
+<?php
+
+namespace Cms\ReportWidgets;
 
 use Lang;
 use BackendAuth;
@@ -28,8 +30,7 @@ public function render()
     {
         try {
             $this->loadData();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->vars['error'] = $ex->getMessage();
         }
 
@@ -60,7 +61,7 @@ protected function loadAssets()
     protected function loadData()
     {
         if (!$theme = Theme::getActiveTheme()) {
-            throw new ApplicationException(Lang::get('cms::lang.theme.not_found_name', ['name'=>Theme::getActiveThemeCode()]));
+            throw new ApplicationException(Lang::get('cms::lang.theme.not_found_name', ['name' => Theme::getActiveThemeCode()]));
         }
 
         $this->vars['theme'] = $theme;
diff --git a/modules/cms/reportwidgets/activetheme/partials/_widget.php b/modules/cms/reportwidgets/activetheme/partials/_widget.php
index ce3baa30ac..b34080685a 100644
--- a/modules/cms/reportwidgets/activetheme/partials/_widget.php
+++ b/modules/cms/reportwidgets/activetheme/partials/_widget.php
@@ -34,7 +34,7 @@
         <?php endif ?>
         <?php if ($canConfig && $theme->hasCustomData()): ?>
             <li>
-                <a href="<?= Backend::url('cms/themeoptions/update/'.$theme->getDirName()) ?>">
+                <a href="<?= Backend::url('cms/themeoptions/update/' . $theme->getDirName()) ?>">
                     <?= e(trans('cms::lang.dashboard.active_theme.customize_theme')) ?>
                 </a>
             </li>
diff --git a/modules/cms/tests/classes/CmsCompoundObjectTest.php b/modules/cms/tests/classes/CmsCompoundObjectTest.php
index 19b03df8cf..412ca146b9 100644
--- a/modules/cms/tests/classes/CmsCompoundObjectTest.php
+++ b/modules/cms/tests/classes/CmsCompoundObjectTest.php
@@ -194,7 +194,7 @@ public function testCache()
 
     public function testUndefinedProperty()
     {
-        $obj = new TestCmsCompoundObject;
+        $obj = new TestCmsCompoundObject();
         $this->assertNull($obj->something);
     }
 
diff --git a/modules/cms/tests/classes/ContentTest.php b/modules/cms/tests/classes/ContentTest.php
index 67acc9eff6..773d86a38a 100644
--- a/modules/cms/tests/classes/ContentTest.php
+++ b/modules/cms/tests/classes/ContentTest.php
@@ -8,7 +8,6 @@
 
 class ContentTest extends TestCase
 {
-
     public function testMarkdownContent()
     {
         $theme = Theme::load('test');
diff --git a/modules/cms/tests/classes/PageTest.php b/modules/cms/tests/classes/PageTest.php
index e2cbeebd4b..4fdf2c3e39 100644
--- a/modules/cms/tests/classes/PageTest.php
+++ b/modules/cms/tests/classes/PageTest.php
@@ -12,7 +12,7 @@ class PageTest extends TestCase
     public function testResolveMenuItem()
     {
         $theme = Theme::load('test');
-        $controller = new Controller;
+        $controller = new Controller();
 
         $item = (object) [
             'type' => 'cms-page',
diff --git a/modules/cms/tests/classes/PartialStackTest.php b/modules/cms/tests/classes/PartialStackTest.php
index e13f448bff..4376020d4d 100644
--- a/modules/cms/tests/classes/PartialStackTest.php
+++ b/modules/cms/tests/classes/PartialStackTest.php
@@ -7,10 +7,9 @@
 
 class PartialStackTest extends TestCase
 {
-
     public function testStackPartials()
     {
-        $stack = new PartialStack;
+        $stack = new PartialStack();
 
         /*
          * Stack em up
@@ -55,7 +54,7 @@ public function testStackPartials()
 
     public function testEmptyStack()
     {
-        $stack = new PartialStack;
+        $stack = new PartialStack();
         $this->assertNull($stack->getComponent('xxx'));
     }
 }
diff --git a/modules/cms/tests/classes/TwigExtensionTest.php b/modules/cms/tests/classes/TwigExtensionTest.php
index 686ab96c74..7f6efb98d1 100644
--- a/modules/cms/tests/classes/TwigExtensionTest.php
+++ b/modules/cms/tests/classes/TwigExtensionTest.php
@@ -4,7 +4,6 @@
 
 use Cms\Twig\Extension;
 use Cms\Classes\Controller;
-
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\SystemException;
 
@@ -12,8 +11,8 @@ class TwigExtensionTest extends TestCase
 {
     public function testPartialFunction()
     {
-        $extension = new Extension;
-        $controller = Controller::getController() ?: new Controller;
+        $extension = new Extension();
+        $controller = Controller::getController() ?: new Controller();
         $extension->setController($controller);
 
         $this->assertFalse($extension->partialFunction('invalid-partial-file', [], false));
@@ -25,8 +24,8 @@ public function testPartialFunction()
 
     public function testContentFunction()
     {
-        $extension = new Extension;
-        $controller = Controller::getController() ?: new Controller;
+        $extension = new Extension();
+        $controller = Controller::getController() ?: new Controller();
         $extension->setController($controller);
 
         $this->assertFalse($extension->contentFunction('invalid-content-file', [], false));
diff --git a/modules/cms/traits/UrlMaker.php b/modules/cms/traits/UrlMaker.php
index d62f4fcf0f..2cabf5e33f 100644
--- a/modules/cms/traits/UrlMaker.php
+++ b/modules/cms/traits/UrlMaker.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Traits;
+<?php
+
+namespace Cms\Traits;
 
 use File;
 use Cache;
@@ -144,7 +146,7 @@ public function getUrlPageName()
         /*
          * Cache
          */
-        $key = 'urlMaker'.$this->urlComponentName.crc32(get_class($this));
+        $key = 'urlMaker' . $this->urlComponentName . crc32(get_class($this));
 
         $cached = Cache::get($key, false);
         if ($cached !== false && ($cached = @unserialize($cached)) !== false) {
@@ -203,7 +205,7 @@ public function getUrlPageName()
      */
     protected function makeUrl()
     {
-        $controller = Controller::getController() ?: new Controller;
+        $controller = Controller::getController() ?: new Controller();
 
         return $controller->pageUrl($this->getUrlPageName(), $this->getUrlParams());
     }
diff --git a/modules/cms/twig/ComponentNode.php b/modules/cms/twig/ComponentNode.php
index 4787fe9b2d..2ffe8acbe8 100644
--- a/modules/cms/twig/ComponentNode.php
+++ b/modules/cms/twig/ComponentNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -28,7 +30,7 @@ public function compile(TwigCompiler $compiler)
         $compiler->write("\$context['__cms_component_params'] = [];\n");
 
         for ($i = 1; $i < count($this->getNode('nodes')); $i++) {
-            $compiler->write("\$context['__cms_component_params']['".$this->getAttribute('names')[$i-1]."'] = ");
+            $compiler->write("\$context['__cms_component_params']['" . $this->getAttribute('names')[$i - 1] . "'] = ");
             $compiler->subcompile($this->getNode('nodes')->getNode($i));
             $compiler->write(";\n");
         }
diff --git a/modules/cms/twig/ComponentTokenParser.php b/modules/cms/twig/ComponentTokenParser.php
index 79e98710a0..d7661749c0 100644
--- a/modules/cms/twig/ComponentTokenParser.php
+++ b/modules/cms/twig/ComponentTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
diff --git a/modules/cms/twig/ContentNode.php b/modules/cms/twig/ContentNode.php
index 663850f158..63db64eab0 100644
--- a/modules/cms/twig/ContentNode.php
+++ b/modules/cms/twig/ContentNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -28,7 +30,7 @@ public function compile(TwigCompiler $compiler)
         $compiler->write("\$context['__cms_content_params'] = [];\n");
 
         for ($i = 1; $i < count($this->getNode('nodes')); $i++) {
-            $compiler->write("\$context['__cms_content_params']['".$this->getAttribute('names')[$i-1]."'] = ");
+            $compiler->write("\$context['__cms_content_params']['" . $this->getAttribute('names')[$i - 1] . "'] = ");
             $compiler->write('twig_escape_filter($this->env, ');
             $compiler->subcompile($this->getNode('nodes')->getNode($i));
             $compiler->write(")");
diff --git a/modules/cms/twig/ContentTokenParser.php b/modules/cms/twig/ContentTokenParser.php
index 895e9327a2..aaa99a79cb 100644
--- a/modules/cms/twig/ContentTokenParser.php
+++ b/modules/cms/twig/ContentTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php
index 11aed1bd0d..cdc627858f 100644
--- a/modules/cms/twig/DebugExtension.php
+++ b/modules/cms/twig/DebugExtension.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Template as TwigTemplate;
 use Twig\Extension\AbstractExtension as TwigExtension;
@@ -87,22 +89,18 @@ public function runDump(TwigEnvironment $env, $context)
             }
 
             $result .= $this->dump($vars, static::PAGE_CAPTION);
-        }
-        else {
+        } else {
             $this->variablePrefix = false;
             for ($i = 2; $i < $count; $i++) {
                 $var = func_get_arg($i);
 
                 if ($var instanceof ComponentBase) {
                     $caption = [static::COMPONENT_CAPTION, get_class($var)];
-                }
-                elseif (is_array($var)) {
+                } elseif (is_array($var)) {
                     $caption = static::ARRAY_CAPTION;
-                }
-                elseif (is_object($var)) {
+                } elseif (is_object($var)) {
                     $caption = [static::OBJECT_CAPTION, get_class($var)];
-                }
-                else {
+                } else {
                     $caption = [static::OBJECT_CAPTION, gettype($var)];
                 }
 
@@ -127,11 +125,9 @@ public function dump($variables = null, $caption = null)
         if (!is_array($variables)) {
             if ($variables instanceof Paginator) {
                 $variables = $this->paginatorToArray($variables);
-            }
-            elseif (is_object($variables)) {
+            } elseif (is_object($variables)) {
                 $variables = $this->objectToArray($variables);
-            }
-            else {
+            } else {
                 $variables = [$variables];
             }
         }
@@ -169,11 +165,11 @@ protected function makeTableHeader($caption)
         $output = [];
         $output[] = '<thead>';
         $output[] = '<tr>';
-        $output[] = '<th colspan="3" style="'.$this->getHeaderCss().'">';
+        $output[] = '<th colspan="3" style="' . $this->getHeaderCss() . '">';
         $output[] = $caption;
 
         if (isset($subcaption)) {
-            $output[] = '<div style="'.$this->getSubheaderCss().'">'.$subcaption.'</div>';
+            $output[] = '<div style="' . $this->getSubheaderCss() . '">' . $subcaption . '</div>';
         }
 
         $output[] = '</th>';
@@ -194,12 +190,12 @@ protected function makeTableRow($key, $variable)
         $css = $this->getDataCss($variable);
         $output = [];
         $output[] = '<tr>';
-        $output[] = '<td style="'.$css.';cursor:pointer" onclick="'.$this->evalToggleDumpOnClick().'">'.$this->evalKeyLabel($key).'</td>';
-        $output[] = '<td style="'.$css.'">'.$this->evalVarLabel($variable).'</td>';
-        $output[] = '<td style="'.$css.'">'.$this->evalVarDesc($variable, $key).'</td>';
+        $output[] = '<td style="' . $css . ';cursor:pointer" onclick="' . $this->evalToggleDumpOnClick() . '">' . $this->evalKeyLabel($key) . '</td>';
+        $output[] = '<td style="' . $css . '">' . $this->evalVarLabel($variable) . '</td>';
+        $output[] = '<td style="' . $css . '">' . $this->evalVarDesc($variable, $key) . '</td>';
         $output[] = '</tr>';
         $output[] = '<tr>';
-        $output[] = '<td colspan="3">'.$this->evalVarDump($variable).'</td>';
+        $output[] = '<td colspan="3">' . $this->evalVarDump($variable) . '</td>';
         $output[] = '</tr>';
         return implode(PHP_EOL, $output);
     }
@@ -222,8 +218,8 @@ protected function evalToggleDumpOnClick()
      */
     protected function evalVarDump($variable)
     {
-        $dumper = new HtmlDumper;
-        $cloner = new VarCloner;
+        $dumper = new HtmlDumper();
+        $cloner = new VarCloner();
 
         $output = '<div style="display:none">';
         $output .= $dumper->dump($cloner->cloneVar($variable), true);
@@ -241,15 +237,12 @@ protected function evalKeyLabel($key)
     {
         if ($this->variablePrefix === true) {
             $output = '{{ <span>%s</span> }}';
-        }
-        elseif (is_array($this->variablePrefix)) {
+        } elseif (is_array($this->variablePrefix)) {
             $prefix = implode('.', $this->variablePrefix);
-            $output = '{{ <span>'.$prefix.'.%s</span> }}';
-        }
-        elseif ($this->variablePrefix) {
-            $output = '{{ <span>'.$this->variablePrefix.'.%s</span> }}';
-        }
-        else {
+            $output = '{{ <span>' . $prefix . '.%s</span> }}';
+        } elseif ($this->variablePrefix) {
+            $output = '{{ <span>' . $this->variablePrefix . '.%s</span> }}';
+        } else {
             $output = '%s';
         }
 
@@ -269,7 +262,7 @@ protected function evalVarLabel($variable)
                 return $this->evalObjLabel($variable);
 
             case 'array':
-                return $type . '('.count($variable).')';
+                return $type . '(' . count($variable) . ')';
 
             default:
                 return $type;
@@ -303,18 +296,15 @@ protected function evalObjLabel($variable)
 
         if ($variable instanceof ComponentBase) {
             $label = '<strong>Component</strong>';
-        }
-        elseif ($variable instanceof Collection) {
-            $label = 'Collection('.$variable->count().')';
-        }
-        elseif ($variable instanceof Paginator) {
-            $label = 'Paged Collection('.$variable->count().')';
-        }
-        elseif ($variable instanceof Model) {
+        } elseif ($variable instanceof Collection) {
+            $label = 'Collection(' . $variable->count() . ')';
+        } elseif ($variable instanceof Paginator) {
+            $label = 'Paged Collection(' . $variable->count() . ')';
+        } elseif ($variable instanceof Model) {
             $label = 'Model';
         }
 
-        return '<abbr title="'.e($class).'">'.$label.'</abbr>';
+        return '<abbr title="' . e($class) . '">' . $label . '</abbr>';
     }
 
     /**
@@ -370,7 +360,7 @@ protected function evalArrDesc($variable)
     {
         $output = [];
         foreach ($variable as $key => $value) {
-            $output[] = '<abbr title="'.e(gettype($value)).'">'.$key.'</abbr>';
+            $output[] = '<abbr title="' . e(gettype($value)) . '">' . $key . '</abbr>';
         }
 
         return implode(', ', $output);
@@ -386,7 +376,7 @@ protected function evalObjDesc($variable)
         $output = [];
         if ($variable instanceof ComponentBase) {
             $details = $variable->componentDetails();
-            $output[] = '<abbr title="'.array_get($details, 'description').'">';
+            $output[] = '<abbr title="' . array_get($details, 'description') . '">';
             $output[] = array_get($details, 'name');
             $output[] = '</abbr>';
         }
@@ -462,7 +452,7 @@ protected function objectToArray($object)
                 continue; // Magic/hidden method
             }
             $name .= '()';
-            $methods[$name] = '___METHOD___|'.$name;
+            $methods[$name] = '___METHOD___|' . $name;
             $this->commentMap[$name] = $this->evalDocBlock($method);
         }
 
diff --git a/modules/cms/twig/DefaultNode.php b/modules/cms/twig/DefaultNode.php
index bcf05b501d..958adbcb72 100644
--- a/modules/cms/twig/DefaultNode.php
+++ b/modules/cms/twig/DefaultNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
diff --git a/modules/cms/twig/DefaultTokenParser.php b/modules/cms/twig/DefaultTokenParser.php
index 8129a818f9..874b890365 100644
--- a/modules/cms/twig/DefaultTokenParser.php
+++ b/modules/cms/twig/DefaultTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 01ed17438e..45503baf27 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Block;
 use Cms\Classes\Controller;
@@ -77,18 +79,18 @@ public function getFilters(): array
     public function getTokenParsers(): array
     {
         return [
-            new PageTokenParser,
-            new PartialTokenParser,
-            new ContentTokenParser,
-            new PutTokenParser,
-            new PlaceholderTokenParser,
-            new DefaultTokenParser,
-            new FrameworkTokenParser,
-            new SnowboardTokenParser,
-            new ComponentTokenParser,
-            new FlashTokenParser,
-            new ScriptsTokenParser,
-            new StylesTokenParser,
+            new PageTokenParser(),
+            new PartialTokenParser(),
+            new ContentTokenParser(),
+            new PutTokenParser(),
+            new PlaceholderTokenParser(),
+            new DefaultTokenParser(),
+            new FrameworkTokenParser(),
+            new SnowboardTokenParser(),
+            new ComponentTokenParser(),
+            new FlashTokenParser(),
+            new ScriptsTokenParser(),
+            new StylesTokenParser(),
         ];
     }
 
diff --git a/modules/cms/twig/FlashNode.php b/modules/cms/twig/FlashNode.php
index 5f2136cee7..824a43ff31 100644
--- a/modules/cms/twig/FlashNode.php
+++ b/modules/cms/twig/FlashNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -33,20 +35,19 @@ public function compile(TwigCompiler $compiler)
         if ($attrib == 'all') {
             $compiler
                 ->addDebugInfo($this)
-                ->write('foreach (Flash::getMessages() as $type => $messages) {'.PHP_EOL)
+                ->write('foreach (Flash::getMessages() as $type => $messages) {' . PHP_EOL)
                 ->indent()
-                    ->write('foreach ($messages as $message) {'.PHP_EOL)
+                    ->write('foreach ($messages as $message) {' . PHP_EOL)
                     ->indent()
                         ->write('$context["type"] = $type;')
                         ->write('$context["message"] = $message;')
                         ->subcompile($this->getNode('body'))
                     ->outdent()
-                    ->write('}'.PHP_EOL)
+                    ->write('}' . PHP_EOL)
                 ->outdent()
-                ->write('}'.PHP_EOL)
+                ->write('}' . PHP_EOL)
             ;
-        }
-        else {
+        } else {
             $compiler
                 ->addDebugInfo($this)
                 ->write('$context["type"] = ')
@@ -54,12 +55,12 @@ public function compile(TwigCompiler $compiler)
                 ->write(';')
                 ->write('foreach (Flash::')
                 ->raw($attrib)
-                ->write('() as $message) {'.PHP_EOL)
+                ->write('() as $message) {' . PHP_EOL)
                 ->indent()
                     ->write('$context["message"] = $message;')
                     ->subcompile($this->getNode('body'))
                 ->outdent()
-                ->write('}'.PHP_EOL)
+                ->write('}' . PHP_EOL)
             ;
         }
 
diff --git a/modules/cms/twig/FlashTokenParser.php b/modules/cms/twig/FlashTokenParser.php
index 209aed35da..56e41e7742 100644
--- a/modules/cms/twig/FlashTokenParser.php
+++ b/modules/cms/twig/FlashTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
@@ -26,8 +28,7 @@ public function parse(TwigToken $token)
 
         if ($token = $stream->nextIf(TwigToken::NAME_TYPE)) {
             $name = $token->getValue();
-        }
-        else {
+        } else {
             $name = 'all';
         }
         $stream->expect(TwigToken::BLOCK_END_TYPE);
diff --git a/modules/cms/twig/FrameworkNode.php b/modules/cms/twig/FrameworkNode.php
index 4e3146f3c6..fe3a7061a5 100644
--- a/modules/cms/twig/FrameworkNode.php
+++ b/modules/cms/twig/FrameworkNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use System\Models\Parameter;
 use System\Classes\CombineAssets;
@@ -33,7 +35,7 @@ public function compile(TwigCompiler $compiler)
 
         $compiler
             ->addDebugInfo($this)
-            ->write("\$_minify = ".CombineAssets::class."::instance()->useMinify;" . PHP_EOL);
+            ->write("\$_minify = " . CombineAssets::class . "::instance()->useMinify;" . PHP_EOL);
 
         $basePath = rtrim(Url::asset(''), '/');
 
@@ -52,8 +54,7 @@ public function compile(TwigCompiler $compiler)
                 ->write("}" . PHP_EOL)
                 ->write("echo '<link rel=\"stylesheet\" property=\"stylesheet\" href=\"{$basePath}/modules/system/assets/css/framework.extras'.(\$_minify ? '-min' : '').'.css$cacheBust\">'.PHP_EOL;" . PHP_EOL)
             ;
-        }
-        else {
+        } else {
             $compiler->write("echo '<script src=\"{$basePath}/modules/system/assets/js/framework'.(\$_minify ? '-min' : '').'.js$cacheBust\"></script>'.PHP_EOL;" . PHP_EOL);
         }
 
diff --git a/modules/cms/twig/FrameworkTokenParser.php b/modules/cms/twig/FrameworkTokenParser.php
index 7a8e2da135..29ac38cbe9 100644
--- a/modules/cms/twig/FrameworkTokenParser.php
+++ b/modules/cms/twig/FrameworkTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/twig/Loader.php b/modules/cms/twig/Loader.php
index ca20215d26..fd33423088 100644
--- a/modules/cms/twig/Loader.php
+++ b/modules/cms/twig/Loader.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Event;
 use Twig\Source as TwigSource;
diff --git a/modules/cms/twig/PageNode.php b/modules/cms/twig/PageNode.php
index f4481c9185..c385a911b4 100644
--- a/modules/cms/twig/PageNode.php
+++ b/modules/cms/twig/PageNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
diff --git a/modules/cms/twig/PageTokenParser.php b/modules/cms/twig/PageTokenParser.php
index c346a98e8b..f7004f7358 100644
--- a/modules/cms/twig/PageTokenParser.php
+++ b/modules/cms/twig/PageTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/twig/PartialNode.php b/modules/cms/twig/PartialNode.php
index 34578dec7f..064cfa087c 100644
--- a/modules/cms/twig/PartialNode.php
+++ b/modules/cms/twig/PartialNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -28,7 +30,7 @@ public function compile(TwigCompiler $compiler)
         $compiler->write("\$context['__cms_partial_params'] = [];\n");
 
         for ($i = 1; $i < count($this->getNode('nodes')); $i++) {
-            $compiler->write("\$context['__cms_partial_params']['".$this->getAttribute('names')[$i-1]."'] = ");
+            $compiler->write("\$context['__cms_partial_params']['" . $this->getAttribute('names')[$i - 1] . "'] = ");
             $compiler->subcompile($this->getNode('nodes')->getNode($i));
             $compiler->write(";\n");
         }
diff --git a/modules/cms/twig/PartialTokenParser.php b/modules/cms/twig/PartialTokenParser.php
index 91de248c59..defa601527 100644
--- a/modules/cms/twig/PartialTokenParser.php
+++ b/modules/cms/twig/PartialTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
diff --git a/modules/cms/twig/PlaceholderNode.php b/modules/cms/twig/PlaceholderNode.php
index 46d8a809a6..c286737e85 100644
--- a/modules/cms/twig/PlaceholderNode.php
+++ b/modules/cms/twig/PlaceholderNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -33,11 +35,11 @@ public function __construct($name, $paramValues, $body, $lineno, $tag = 'placeho
     public function compile(TwigCompiler $compiler)
     {
         $hasBody = $this->hasNode('default');
-        $varId = '__placeholder_'.$this->getAttribute('name').'_default_contents';
+        $varId = '__placeholder_' . $this->getAttribute('name') . '_default_contents';
         $compiler
             ->addDebugInfo($this)
             ->write("\$context[")
-            ->raw("'".$varId."'")
+            ->raw("'" . $varId . "'")
             ->raw("] = null;");
 
         if ($hasBody) {
@@ -46,7 +48,7 @@ public function compile(TwigCompiler $compiler)
                 ->write('ob_start();')
                 ->subcompile($this->getNode('default'))
                 ->write("\$context[")
-                ->raw("'".$varId."'")
+                ->raw("'" . $varId . "'")
                 ->raw("] = ob_get_clean();");
         }
 
@@ -55,29 +57,27 @@ public function compile(TwigCompiler $compiler)
         $compiler->addDebugInfo($this);
         if (!$isText) {
             $compiler->write("echo \$this->env->getExtension('Cms\Twig\Extension')->displayBlock(");
-        }
-        else {
+        } else {
             $compiler->write("echo twig_escape_filter(\$this->env, \$this->env->getExtension('Cms\Twig\Extension')->displayBlock(");
         }
 
         $compiler
-            ->raw("'".$this->getAttribute('name')."', ")
+            ->raw("'" . $this->getAttribute('name') . "', ")
             ->raw("\$context[")
-            ->raw("'".$varId."'")
+            ->raw("'" . $varId . "'")
             ->raw("]")
             ->raw(")");
 
         if (!$isText) {
             $compiler->raw(";\n");
-        }
-        else {
+        } else {
             $compiler->raw(");\n");
         }
 
         $compiler
             ->addDebugInfo($this)
             ->write("unset(\$context[")
-            ->raw("'".$varId."'")
+            ->raw("'" . $varId . "'")
             ->raw("]);");
     }
 }
diff --git a/modules/cms/twig/PlaceholderTokenParser.php b/modules/cms/twig/PlaceholderTokenParser.php
index 863dd47482..399940af0d 100644
--- a/modules/cms/twig/PlaceholderTokenParser.php
+++ b/modules/cms/twig/PlaceholderTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
@@ -40,8 +42,7 @@ public function parse(TwigToken $token)
 
             $body = $this->parser->subparse([$this, 'decidePlaceholderEnd'], true);
             $stream->expect(TwigToken::BLOCK_END_TYPE);
-        }
-        else {
+        } else {
             $params = $this->loadParams($stream);
         }
 
diff --git a/modules/cms/twig/PutNode.php b/modules/cms/twig/PutNode.php
index 6b3927ac02..b466fa7e3d 100644
--- a/modules/cms/twig/PutNode.php
+++ b/modules/cms/twig/PutNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -26,7 +28,7 @@ public function compile(TwigCompiler $compiler)
         $compiler
             ->addDebugInfo($this)
             ->write("echo \$this->env->getExtension('Cms\Twig\Extension')->startBlock(")
-            ->raw("'".$this->getAttribute('name')."'")
+            ->raw("'" . $this->getAttribute('name') . "'")
             ->write(");\n")
         ;
 
diff --git a/modules/cms/twig/PutTokenParser.php b/modules/cms/twig/PutTokenParser.php
index 442e86ca3f..af48a6aad5 100644
--- a/modules/cms/twig/PutTokenParser.php
+++ b/modules/cms/twig/PutTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/twig/ScriptsNode.php b/modules/cms/twig/ScriptsNode.php
index 2640613547..5eeb9feeff 100644
--- a/modules/cms/twig/ScriptsNode.php
+++ b/modules/cms/twig/ScriptsNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
diff --git a/modules/cms/twig/ScriptsTokenParser.php b/modules/cms/twig/ScriptsTokenParser.php
index 8b22782039..ba72e6fad6 100644
--- a/modules/cms/twig/ScriptsTokenParser.php
+++ b/modules/cms/twig/ScriptsTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/twig/SnowboardNode.php b/modules/cms/twig/SnowboardNode.php
index 0471f9d6ab..d9247808d6 100644
--- a/modules/cms/twig/SnowboardNode.php
+++ b/modules/cms/twig/SnowboardNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Config;
 use System\Classes\CombineAssets;
@@ -38,7 +40,7 @@ public function compile(TwigCompiler $compiler)
 
         $compiler
             ->addDebugInfo($this)
-            ->write("\$_minify = ".CombineAssets::class."::instance()->useMinify;" . PHP_EOL);
+            ->write("\$_minify = " . CombineAssets::class . "::instance()->useMinify;" . PHP_EOL);
 
         $moduleMap = [
             'base' => (Config::get('develop.debugSnowboard', false) === true)
diff --git a/modules/cms/twig/SnowboardTokenParser.php b/modules/cms/twig/SnowboardTokenParser.php
index 2bfb4d34ad..ba3b008bf8 100644
--- a/modules/cms/twig/SnowboardTokenParser.php
+++ b/modules/cms/twig/SnowboardTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/twig/StylesNode.php b/modules/cms/twig/StylesNode.php
index 35a442c2f5..521088ee7e 100644
--- a/modules/cms/twig/StylesNode.php
+++ b/modules/cms/twig/StylesNode.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
diff --git a/modules/cms/twig/StylesTokenParser.php b/modules/cms/twig/StylesTokenParser.php
index 4cb7b86d4f..812296cfdd 100644
--- a/modules/cms/twig/StylesTokenParser.php
+++ b/modules/cms/twig/StylesTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Twig;
+<?php
+
+namespace Cms\Twig;
 
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index 5a1ed709f7..69c870cc5e 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Widgets;
+<?php
+
+namespace Cms\Widgets;
 
 use Str;
 use Url;
@@ -92,20 +94,20 @@ public function onOpenDirectory()
 
         $delay = Input::get('delay');
         if ($delay) {
-            usleep(1000000*$delay);
+            usleep(1000000 * $delay);
         }
 
         $this->putSession('currentPath', $path);
 
         return [
-            '#'.$this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
         ];
     }
 
     public function onRefresh()
     {
         return [
-            '#'.$this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
         ];
     }
 
@@ -133,7 +135,7 @@ public function onDeleteFiles()
                         throw new ApplicationException(Lang::get('cms::lang.asset.invalid_path'));
                     }
 
-                    $fullPath = $assetsPath.'/'.$path;
+                    $fullPath = $assetsPath . '/' . $path;
                     if (File::exists($fullPath)) {
                         if (!File::isDirectory($fullPath)) {
                             if (!@File::delete($fullPath)) {
@@ -142,8 +144,7 @@ public function onDeleteFiles()
                                     ['name' => $path]
                                 ));
                             }
-                        }
-                        else {
+                        } else {
                             $empty = File::isDirectoryEmpty($fullPath);
                             if ($empty === false) {
                                 throw new ApplicationException(Lang::get(
@@ -165,8 +166,7 @@ public function onDeleteFiles()
                     }
                 }
             }
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $error = $ex->getMessage();
         }
 
@@ -226,7 +226,7 @@ public function onApplyName()
             ));
         }
 
-        $newFullPath = $this->getFullPath(dirname($originalPath).'/'.$newName);
+        $newFullPath = $this->getFullPath(dirname($originalPath) . '/' . $newName);
         if (file_exists($newFullPath) && $newFullPath !== $originalFullPath) {
             throw new ApplicationException(Lang::get('cms::lang.asset.already_exists'));
         }
@@ -236,7 +236,7 @@ public function onApplyName()
         }
 
         return [
-            '#'.$this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
         ];
     }
 
@@ -264,7 +264,7 @@ public function onNewDirectory()
             throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
         }
 
-        $newFullPath = $this->getCurrentPath().'/'.$newName;
+        $newFullPath = $this->getCurrentPath() . '/' . $newName;
         if (file_exists($newFullPath)) {
             throw new ApplicationException(Lang::get('cms::lang.asset.already_exists'));
         }
@@ -277,7 +277,7 @@ public function onNewDirectory()
         }
 
         return [
-            '#'.$this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
         ];
     }
 
@@ -352,8 +352,7 @@ public function onMove()
                         ['file' => $basename]
                     ));
                 }
-            }
-            elseif (is_dir($originalFullPath)) {
+            } elseif (is_dir($originalFullPath)) {
                 if (!@File::copyDirectory($originalFullPath, $newFullPath)) {
                     throw new ApplicationException(Lang::get(
                         'cms::lang.asset.error_moving_directory',
@@ -385,7 +384,7 @@ public function onMove()
         }
 
         return [
-            '#'.$this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
         ];
     }
 
@@ -433,12 +432,12 @@ protected function getData()
 
     protected function getAssetsPath()
     {
-        return $this->theme->getPath().'/assets';
+        return $this->theme->getPath() . '/assets';
     }
 
     protected function getThemeFileUrl($path)
     {
-        return Url::asset('themes/'.$this->theme->getDirName().'/assets'.$path);
+        return Url::asset('themes/' . $this->theme->getDirName() . '/assets' . $path);
     }
 
     public function getCurrentRelativePath()
@@ -460,7 +459,7 @@ protected function getCurrentPath()
     {
         $assetsPath = $this->getAssetsPath();
 
-        $path = $assetsPath.'/'.$this->getCurrentRelativePath();
+        $path = $assetsPath . '/' . $this->getCurrentRelativePath();
         if (!is_dir($path)) {
             return $assetsPath;
         }
@@ -481,7 +480,7 @@ protected function getRelativePath($path)
 
     protected function getFullPath($path)
     {
-        return $this->getAssetsPath().'/'.ltrim($path, '/');
+        return $this->getAssetsPath() . '/' . ltrim($path, '/');
     }
 
     protected function validatePath($path)
@@ -529,8 +528,7 @@ protected function getDirectoryContents($dir)
                     'name'     => $node->getFilename(),
                     'editable' => false
                 ];
-            }
-            elseif ($node->isFile()) {
+            } elseif ($node->isFile()) {
                 $files[] = (object)[
                     'type'     => 'file',
                     'path'     => File::normalizePath($this->getRelativePath($node->getPathname())),
@@ -576,9 +574,9 @@ protected function listDestinationDirectories(&$result, $excludeList, $startDir
                     continue;
                 }
 
-                $result[$relativePath] = str_repeat('&nbsp;', $level*4).$node->getFilename();
+                $result[$relativePath] = str_repeat('&nbsp;', $level * 4) . $node->getFilename();
 
-                $this->listDestinationDirectories($result, $excludeList, $fullPath, $level+1);
+                $this->listDestinationDirectories($result, $excludeList, $fullPath, $level + 1);
             }
         }
     }
@@ -595,7 +593,7 @@ protected function isSearchMode()
 
     protected function getThemeSessionKey($prefix)
     {
-        return $prefix.$this->theme->getDirName();
+        return $prefix . $this->theme->getDirName();
     }
 
     protected function getUpPath()
@@ -686,8 +684,7 @@ public function onUpload()
             File::chmod($uploadedFile->getRealPath());
 
             $response = Response::make('success');
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $message = $fileName !== null
                 ? Lang::get('cms::lang.asset.error_uploading_file', ['name' => $fileName, 'error' => $ex->getMessage()])
                 : $ex->getMessage();
diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php
index 825be21186..4324aa5154 100644
--- a/modules/cms/widgets/ComponentList.php
+++ b/modules/cms/widgets/ComponentList.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Widgets;
+<?php
+
+namespace Cms\Widgets;
 
 use App;
 use Str;
diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php
index 93dc9f7843..ee4c0abb3a 100644
--- a/modules/cms/widgets/MediaManager.php
+++ b/modules/cms/widgets/MediaManager.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Widgets;
+<?php
+
+namespace Cms\Widgets;
 
 use Backend\Widgets\MediaManager as BackendMediaManager;
 
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index 5e2debd08f..65111be1d2 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -1,4 +1,6 @@
-<?php namespace Cms\Widgets;
+<?php
+
+namespace Cms\Widgets;
 
 use Str;
 use File;
@@ -16,11 +18,11 @@
  */
 class TemplateList extends WidgetBase
 {
-    const SORTING_FILENAME = 'fileName';
-
     use \Backend\Traits\SelectableWidget;
     use \Backend\Traits\CollapsableWidget;
 
+    const SORTING_FILENAME = 'fileName';
+
     protected $searchTerm = false;
 
     protected $dataSource;
@@ -93,7 +95,7 @@ public function __construct($controller, $alias, callable $dataSource)
             $this->resetSelection();
         }
 
-        $configFile = 'config_' . snake_case($alias) .'.yaml';
+        $configFile = 'config_' . snake_case($alias) . '.yaml';
         $config = $this->makeConfig($configFile);
 
         foreach ($config as $field => $value) {
@@ -144,7 +146,7 @@ public function onApplySorting()
         $this->setSortingProperty(Input::get('sortProperty'));
 
         $result = $this->updateList();
-        $result['#'.$this->getId('sorting-options')] = $this->makePartial('sorting-options');
+        $result['#' . $this->getId('sorting-options')] = $this->makePartial('sorting-options');
 
         return $result;
     }
@@ -196,8 +198,7 @@ protected function getData()
                     $filteredItems[] = $item;
                 }
             }
-        }
-        else {
+        } else {
             $filteredItems = $items;
         }
 
@@ -221,8 +222,7 @@ protected function getData()
                 }
 
                 $foundGroups[$group]->items[] = $itemData;
-            }
-            else {
+            } else {
                 $result[] = $itemData;
             }
         }
@@ -308,15 +308,15 @@ protected function normalizeItem($item)
     protected function getItemDragValue($item)
     {
         if ($item instanceof \Cms\Classes\Partial) {
-            return "{% partial '".$item->getBaseFileName()."' %}";
+            return "{% partial '" . $item->getBaseFileName() . "' %}";
         }
 
         if ($item instanceof \Cms\Classes\Content) {
-            return "{% content '".$item->getBaseFileName()."' %}";
+            return "{% content '" . $item->getBaseFileName() . "' %}";
         }
 
         if ($item instanceof \Cms\Classes\Page) {
-            return "{{ '".$item->getBaseFileName()."'|page }}";
+            return "{{ '" . $item->getBaseFileName() . "'|page }}";
         }
 
         return '';
@@ -347,7 +347,7 @@ protected function getSearchTerm()
     protected function updateList()
     {
         return [
-            '#'.$this->getId('template-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('template-list') => $this->makePartial('items', ['items' => $this->getData()])
         ];
     }
 
@@ -394,7 +394,7 @@ protected function itemContainsWord($word, $item, $exact = false)
 
     protected function getThemeSessionKey($prefix)
     {
-        return $prefix.$this->theme->getDirName();
+        return $prefix . $this->theme->getDirName();
     }
 
     protected function getSortingProperty()
diff --git a/modules/cms/widgets/assetlist/partials/_body.php b/modules/cms/widgets/assetlist/partials/_body.php
index 27ca4f6524..d74dc47085 100644
--- a/modules/cms/widgets/assetlist/partials/_body.php
+++ b/modules/cms/widgets/assetlist/partials/_body.php
@@ -2,7 +2,7 @@
 <div class="layout-row" id="asset-list-container" data-alias="<?= $this->alias ?>">
     <div class="layout-cell">
         <div class="layout-relative">
-           <?= $this->makePartial('files', ['data'=>$data]) ?>
+           <?= $this->makePartial('files', ['data' => $data]) ?>
         </div>
     </div>
 </div>
diff --git a/modules/cms/widgets/assetlist/partials/_files.php b/modules/cms/widgets/assetlist/partials/_files.php
index 24625426d4..8f91544333 100644
--- a/modules/cms/widgets/assetlist/partials/_files.php
+++ b/modules/cms/widgets/assetlist/partials/_files.php
@@ -1,7 +1,7 @@
 <div class="layout-absolute">
     <div class="control-scrollbar" data-control="scrollbar">
         <div class="control-assetlist" data-control="assetlist" id="<?= $this->getId('asset-list') ?>">
-            <?= $this->makePartial('items', ['items'=>$data]) ?>
+            <?= $this->makePartial('items', ['items' => $data]) ?>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/modules/cms/widgets/assetlist/partials/_items.php b/modules/cms/widgets/assetlist/partials/_items.php
index 8beb6bb49a..3665255f54 100644
--- a/modules/cms/widgets/assetlist/partials/_items.php
+++ b/modules/cms/widgets/assetlist/partials/_items.php
@@ -11,7 +11,7 @@
     <?php if ($items): ?>
         <ul class="list">
             <?php foreach ($items as $item):
-                $dataId = 'asset-'.$this->theme->getDirName().'-'.ltrim($item->path, '/');
+                $dataId = 'asset-' . $this->theme->getDirName() . '-' . ltrim($item->path, '/');
                 ?>
                 <li
                     class="<?= $item->type ?>"
@@ -45,7 +45,7 @@ class="control icon btn-primary wn-icon-terminal"
 
                     <input type="hidden" name="file[<?= e($item->path) ?>]" value="0"/>
                     <div class="checkbox custom-checkbox nolabel">
-                        <?php $cbId = 'cb'.md5($item->path) ?>
+                        <?php $cbId = 'cb' . md5($item->path) ?>
                         <input
                             id="<?= $cbId ?>"
                             type="checkbox"
diff --git a/modules/cms/widgets/assetlist/partials/_move_form.php b/modules/cms/widgets/assetlist/partials/_move_form.php
index 1e42eb1df3..7e009dd9b1 100644
--- a/modules/cms/widgets/assetlist/partials/_move_form.php
+++ b/modules/cms/widgets/assetlist/partials/_move_form.php
@@ -1,8 +1,8 @@
 <?= Form::open([
-    'data-request'=>$this->getEventHandler('onMove'),
-    'data-request-success'=>"\$(this).trigger('close.oc.popup')",
-    'data-stripe-load-indicator'=>1,
-    'id'=>'asset-move-popup-form'
+    'data-request' => $this->getEventHandler('onMove'),
+    'data-request-success' => "\$(this).trigger('close.oc.popup')",
+    'data-stripe-load-indicator' => 1,
+    'id' => 'asset-move-popup-form'
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/cms/widgets/assetlist/partials/_new_dir_form.php b/modules/cms/widgets/assetlist/partials/_new_dir_form.php
index 027c574a15..69be9af5fd 100644
--- a/modules/cms/widgets/assetlist/partials/_new_dir_form.php
+++ b/modules/cms/widgets/assetlist/partials/_new_dir_form.php
@@ -1,8 +1,8 @@
 <?= Form::open([
-    'data-request'=>$this->getEventHandler('onNewDirectory'),
-    'data-request-success'=>"\$(this).trigger('close.oc.popup')",
-    'data-stripe-load-indicator'=>1,
-    'id'=>'asset-new-dir-popup-form'
+    'data-request' => $this->getEventHandler('onNewDirectory'),
+    'data-request-success' => "\$(this).trigger('close.oc.popup')",
+    'data-stripe-load-indicator' => 1,
+    'id' => 'asset-new-dir-popup-form'
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/cms/widgets/assetlist/partials/_toolbar.php b/modules/cms/widgets/assetlist/partials/_toolbar.php
index b20b103b99..7d8eab763e 100644
--- a/modules/cms/widgets/assetlist/partials/_toolbar.php
+++ b/modules/cms/widgets/assetlist/partials/_toolbar.php
@@ -28,7 +28,7 @@ class="wn-icon-folder-o"
                 <div class="dropdown hide"
                     id="<?= $this->getId('tools-button') ?>"
                     data-trigger-action="show"
-                    data-trigger="<?= '#'.$this->getId('asset-list') ?> input[type=checkbox]"
+                    data-trigger="<?= '#' . $this->getId('asset-list') ?> input[type=checkbox]"
                     data-trigger-condition="checked">
                     <button type="button" class="btn btn-default empty wn-icon-wrench last"
                         data-toggle="dropdown"
@@ -69,7 +69,7 @@ class="form-control icon search" autocomplete="off"
                 data-track-input
                 data-load-indicator
                 data-load-indicator-opaque
-                data-request-success="$('<?= '#'.$this->getId('tools-button') ?>').trigger('oc.triggerOn.update')"
+                data-request-success="$('<?= '#' . $this->getId('tools-button') ?>').trigger('oc.triggerOn.update')"
                 data-request="<?= $this->getEventHandler('onSearch') ?>"
             />
         </div>
diff --git a/modules/cms/widgets/componentlist/partials/_body.php b/modules/cms/widgets/componentlist/partials/_body.php
index d917426255..5bff024c54 100644
--- a/modules/cms/widgets/componentlist/partials/_body.php
+++ b/modules/cms/widgets/componentlist/partials/_body.php
@@ -2,7 +2,7 @@
 <div class="layout-row">
     <div class="layout-cell">
         <div class="layout-relative">
-            <?= $this->makePartial('components', ['data'=>$data]) ?>
+            <?= $this->makePartial('components', ['data' => $data]) ?>
         </div>
     </div>
 </div>
diff --git a/modules/cms/widgets/componentlist/partials/_component_list.php b/modules/cms/widgets/componentlist/partials/_component_list.php
index 75817bde61..072065b797 100644
--- a/modules/cms/widgets/componentlist/partials/_component_list.php
+++ b/modules/cms/widgets/componentlist/partials/_component_list.php
@@ -24,7 +24,7 @@
                         <input type="hidden" name="component_properties[]" data-inspector-values value="<?= e($component->propertyValues) ?>">
                         <input type="hidden" data-inspector-config value="<?= e($component->propertyConfig) ?>">
                         <input type="hidden" data-inspector-class value="<?= $component->className ?>">
-                        <input type="hidden" data-component-icon value="<?= 'wn-'.e($component->pluginIcon) ?>">
+                        <input type="hidden" data-component-icon value="<?= 'wn-' . e($component->pluginIcon) ?>">
                         <input type="hidden" data-component-default-alias value="<?= e($component->alias) ?>">
                         <input type="hidden" data-component-name value="<?= e($component->name) ?>">
                         <input type="hidden" name="component_names[]" value="">
diff --git a/modules/cms/widgets/componentlist/partials/_components.php b/modules/cms/widgets/componentlist/partials/_components.php
index cf7a601c2d..61e2114eb5 100644
--- a/modules/cms/widgets/componentlist/partials/_components.php
+++ b/modules/cms/widgets/componentlist/partials/_components.php
@@ -5,7 +5,7 @@ class="control-filelist component-list"
             data-control="filelist"
             data-group-status-handler="<?= $this->getEventHandler('onSetCollapseStatus') ?>"
             id="<?= $this->getId('component-list') ?>">
-            <?= $this->makePartial('items', ['items'=>$data]) ?>
+            <?= $this->makePartial('items', ['items' => $data]) ?>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/modules/cms/widgets/componentlist/partials/_items.php b/modules/cms/widgets/componentlist/partials/_items.php
index 8abe9137bb..dc62c5459f 100644
--- a/modules/cms/widgets/componentlist/partials/_items.php
+++ b/modules/cms/widgets/componentlist/partials/_items.php
@@ -7,7 +7,7 @@
                 <i class="<?= e($item->icon) ?>"></i>
                 <span class="description"><?= e(trans($item->description)) ?></span>
             </div>
-            <?= $this->makePartial('component_list', ['components'=>$item->items]) ?>
+            <?= $this->makePartial('component_list', ['components' => $item->items]) ?>
         </li>
     <?php endforeach ?>
     </ul>
diff --git a/modules/cms/widgets/templatelist/partials/_items.php b/modules/cms/widgets/templatelist/partials/_items.php
index c5f2eee3df..be8f4d1269 100644
--- a/modules/cms/widgets/templatelist/partials/_items.php
+++ b/modules/cms/widgets/templatelist/partials/_items.php
@@ -5,12 +5,12 @@
                 <?php if ($item->items): ?>
                     <li class="group" data-status="<?= $this->getCollapseStatus($item->title, false) ? 'expanded' : 'collapsed' ?>">
                         <h4><a href="javascript:;"><?= e($item->title) ?></a></h4>
-                        <?= $this->makePartial('items', ['items'=>$item->items, 'nested'=>true]) ?>
+                        <?= $this->makePartial('items', ['items' => $item->items, 'nested' => true]) ?>
                     </li>
                 <?php endif ?>
             <?php else: ?>
                 <?php
-                $dataId = $this->itemType.'-'.$this->theme->getDirName().'-'.$item->fileName;
+                $dataId = $this->itemType . '-' . $this->theme->getDirName() . '-' . $item->fileName;
                 ?>
                 <li
                     class="item"
diff --git a/modules/cms/widgets/templatelist/partials/_toolbar.php b/modules/cms/widgets/templatelist/partials/_toolbar.php
index 6a369ccf37..4e03ea3afc 100644
--- a/modules/cms/widgets/templatelist/partials/_toolbar.php
+++ b/modules/cms/widgets/templatelist/partials/_toolbar.php
@@ -30,7 +30,7 @@ class="dropdown-menu offset-left"
                     data-control="delete-template"
                     data-confirmation="<?= e(trans($this->deleteConfirmation)) ?>"
                     data-trigger-action="show"
-                    data-trigger="<?= '#'.$this->getId('template-list') ?> input[type=checkbox]"
+                    data-trigger="<?= '#' . $this->getId('template-list') ?> input[type=checkbox]"
                     data-trigger-condition="checked"></button>
             </div>
         </div>
@@ -42,7 +42,7 @@ class="form-control icon search" autocomplete="off"
                 data-track-input
                 data-load-indicator
                 data-load-indicator-opaque
-                data-request-success="$('<?= '#'.$this->getId('delete-button') ?>').trigger('oc.triggerOn.update')"
+                data-request-success="$('<?= '#' . $this->getId('delete-button') ?>').trigger('oc.triggerOn.update')"
                 data-request="<?= $this->getEventHandler('onSearch') ?>"
             />
         </div>
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 7867a54f24..8e42329e2a 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace System;
+<?php
+
+namespace System;
 
 use Backend;
 use Backend\Classes\WidgetManager;
@@ -129,11 +131,11 @@ public function boot()
     protected function registerSingletons()
     {
         $this->app->singleton('cms.helper', function () {
-            return new \Cms\Helpers\Cms;
+            return new \Cms\Helpers\Cms();
         });
 
         $this->app->singleton('backend.helper', function () {
-            return new \Backend\Helpers\Backend;
+            return new \Backend\Helpers\Backend();
         });
 
         $this->app->singleton('backend.menu', function () {
@@ -170,7 +172,8 @@ protected function registerPrivilegedActions()
         }
 
         // CLI
-        if ($this->app->runningInConsole()
+        if (
+            $this->app->runningInConsole()
             && (
                 // Protected command
                 count(array_intersect($commands, Request::server('argv', []))) > 0
@@ -342,7 +345,7 @@ protected function registerConsole()
     protected function registerErrorHandler()
     {
         Event::listen('exception.beforeRender', function ($exception, $httpCode, $request) {
-            $handler = new ErrorHandler;
+            $handler = new ErrorHandler();
             return $handler->handleException($exception);
         });
     }
@@ -373,7 +376,7 @@ protected function registerTwigParser()
         // Register Mailer Twig environment
         $this->app->singleton('twig.environment.mailer', function ($app) {
             $twig = MarkupManager::makeBaseTwigEnvironment();
-            $twig->addTokenParser(new \System\Twig\MailPartialTokenParser);
+            $twig->addTokenParser(new \System\Twig\MailPartialTokenParser());
             return $twig;
         });
 
diff --git a/modules/system/assets/js/lang/lang.tr.js b/modules/system/assets/js/lang/lang.tr.js
index a673351ef2..c02f12288a 100644
--- a/modules/system/assets/js/lang/lang.tr.js
+++ b/modules/system/assets/js/lang/lang.tr.js
@@ -6,7 +6,7 @@ if ($.oc === undefined) $.oc = $.wn
 if ($.wn.langMessages === undefined) $.wn.langMessages = {}
 $.wn.langMessages['tr'] = $.extend(
     $.wn.langMessages['tr'] || {},
-    {"markdowneditor":{"formatting":"Formatlama","quote":"Al\u0131nt\u0131","code":"Kod","header1":"Ba\u015fl\u0131k 1","header2":"Ba\u015fl\u0131k 2","header3":"Ba\u015fl\u0131k 3","header4":"Ba\u015fl\u0131k 4","header5":"Ba\u015fl\u0131k 5","header6":"Ba\u015fl\u0131k 6","bold":"Kal\u0131n","italic":"\u0130talik","unorderedlist":"S\u0131ras\u0131z Liste","orderedlist":"S\u0131ral\u0131 Liste","video":"Video","image":"G\u00f6rsel\/Resim","link":"Link","horizontalrule":"Yatay \u00c7izgi Ekle","fullscreen":"Tam Ekran","preview":"\u00d6nizleme"},"mediamanager":{"insert_link":"Medya Linki Ekle","insert_image":"Medya Resim Ekle","insert_video":"Medya Video Ekle","insert_audio":"Medya Ses Ekle","invalid_file_empty_insert":"L\u00fctfen link verilecek dosyay\u0131 se\u00e7in.","invalid_file_single_insert":"L\u00fctfen tek bir dosya se\u00e7in.","invalid_image_empty_insert":"L\u00fctfen eklenecek resim(ler)i se\u00e7in.","invalid_video_empty_insert":"L\u00fctfen eklenecek video dosyas\u0131n\u0131 se\u00e7in.","invalid_audio_empty_insert":"L\u00fctfen eklenecek ses dosyas\u0131n\u0131 se\u00e7in."},"alert":{"confirm_button_text":"Evet","cancel_button_text":"\u0130ptal","widget_remove_confirm":"Bu eklentiyi kald\u0131rma istedi\u011finize emin misiniz?"},"datepicker":{"previousMonth":"\u00d6nceki Ay","nextMonth":"Sonraki Ay","months":["Ocak","\u015eubat","Mart","Nisan","May\u0131s","Haziran","Temmuz","A\u011fustos","Eyl\u00fcl","Ekim","Kas\u0131m","Aral\u0131k"],"weekdays":["Pazar","Pazartesi","Sal\u0131","\u00c7ar\u015famba","Per\u015fembe","Cuma","Cumartesi"],"weekdaysShort":["Paz","Pzt","Sal","\u00c7ar","Per","Cum","Cmt"]},"colorpicker":{"last_color":"Use previously selected color","aria_palette":"Color selection area","aria_hue":"Hue selection slider","aria_opacity":"Opacity selection slider","choose":"Se\u00e7"},"filter":{"group":{"all":"t\u00fcm\u00fc"},"scopes":{"apply_button_text":"Uygula","clear_button_text":"Temizle"},"dates":{"all":"t\u00fcm\u00fc","filter_button_text":"Filtrele","reset_button_text":"S\u0131f\u0131rla","date_placeholder":"Tarih","after_placeholder":"Sonra","before_placeholder":"\u00d6nce"},"numbers":{"all":"all","filter_button_text":"Filtrele","reset_button_text":"S\u0131f\u0131rla","min_placeholder":"Min","max_placeholder":"Max"}},"eventlog":{"show_stacktrace":"Veri y\u0131\u011f\u0131n\u0131n\u0131 g\u00f6ster","hide_stacktrace":"Veri y\u0131\u011f\u0131n\u0131n\u0131 gizle","tabs":{"formatted":"Formatl\u0131","raw":"Ham Veri"},"editor":{"title":"Kaynak kod edit\u00f6r\u00fc","description":"\u0130\u015fletim sisteminiz URL \u015femalar\u0131na yan\u0131t verecek \u015fekilde yap\u0131land\u0131r\u0131lmal\u0131d\u0131r.","openWith":"Birlikte a\u00e7","remember_choice":"Bu oturum i\u00e7in se\u00e7enekleri hat\u0131rla","open":"A\u00e7","cancel":"\u0130ptal"}}}
+    {"markdowneditor":{"formatting":"Formatlama","quote":"Al\u0131nt\u0131","code":"Kod","header1":"Ba\u015fl\u0131k 1","header2":"Ba\u015fl\u0131k 2","header3":"Ba\u015fl\u0131k 3","header4":"Ba\u015fl\u0131k 4","header5":"Ba\u015fl\u0131k 5","header6":"Ba\u015fl\u0131k 6","bold":"Kal\u0131n","italic":"\u0130talik","unorderedlist":"S\u0131ras\u0131z Liste","orderedlist":"S\u0131ral\u0131 Liste","video":"Video","image":"G\u00f6rsel\/Resim","link":"Link","horizontalrule":"Yatay \u00c7izgi Ekle","fullscreen":"Tam Ekran","preview":"\u00d6nizleme"},"mediamanager":{"insert_link":"Medya Linki Ekle","insert_image":"Medya Resim Ekle","insert_video":"Medya Video Ekle","insert_audio":"Medya Ses Ekle","invalid_file_empty_insert":"L\u00fctfen link verilecek dosyay\u0131 se\u00e7in.","invalid_file_single_insert":"L\u00fctfen tek bir dosya se\u00e7in.","invalid_image_empty_insert":"L\u00fctfen eklenecek resim(ler)i se\u00e7in.","invalid_video_empty_insert":"L\u00fctfen eklenecek video dosyas\u0131n\u0131 se\u00e7in.","invalid_audio_empty_insert":"L\u00fctfen eklenecek ses dosyas\u0131n\u0131 se\u00e7in."},"alert":{"confirm_button_text":"Evet","cancel_button_text":"\u0130ptal","widget_remove_confirm":"Bu eklentiyi kald\u0131rma istedi\u011finize emin misiniz?"},"datepicker":{"previousMonth":"\u00d6nceki Ay","nextMonth":"Sonraki Ay","months":["Ocak","\u015eubat","Mart","Nisan","May\u0131s","Haziran","Temmuz","A\u011fustos","Eyl\u00fcl","Ekim","Kas\u0131m","Aral\u0131k"],"weekdays":["Pazar","Pazartesi","Sal\u0131","\u00c7ar\u015famba","Per\u015fembe","Cuma","Cumartesi"],"weekdaysShort":["Paz","Pzt","Sal","\u00c7ar","Per","Cum","Cmt"]},"colorpicker":{"last_color":"\u00d6nceden se\u00e7ilen rengi kullan","aria_palette":"Renk se\u00e7im alan\u0131","aria_hue":"Renk tonu se\u00e7imi","aria_opacity":"Opakl\u0131k se\u00e7imi"},"filter":{"group":{"all":"t\u00fcm\u00fc"},"scopes":{"apply_button_text":"Uygula","clear_button_text":"Temizle"},"dates":{"all":"t\u00fcm\u00fc","filter_button_text":"Filtrele","reset_button_text":"S\u0131f\u0131rla","date_placeholder":"Tarih","after_placeholder":"Sonra","before_placeholder":"\u00d6nce"},"numbers":{"all":"all","filter_button_text":"Filtrele","reset_button_text":"S\u0131f\u0131rla","min_placeholder":"Min","max_placeholder":"Max"}},"eventlog":{"show_stacktrace":"Veri y\u0131\u011f\u0131n\u0131n\u0131 g\u00f6ster","hide_stacktrace":"Veri y\u0131\u011f\u0131n\u0131n\u0131 gizle","tabs":{"formatted":"Formatl\u0131","raw":"Ham Veri"},"editor":{"title":"Kaynak kod edit\u00f6r\u00fc","description":"\u0130\u015fletim sisteminiz URL \u015femalar\u0131na yan\u0131t verecek \u015fekilde yap\u0131land\u0131r\u0131lmal\u0131d\u0131r.","openWith":"Birlikte a\u00e7","remember_choice":"Bu oturum i\u00e7in se\u00e7enekleri hat\u0131rla","open":"A\u00e7","cancel":"\u0130ptal"}}}
 );
 
 //! moment.js locale configuration v2.22.2
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 7acd05276e..50f1fe6a88 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -1,4 +1,6 @@
-<?php namespace System\Behaviors;
+<?php
+
+namespace System\Behaviors;
 
 use App;
 use Artisan;
@@ -277,7 +279,7 @@ public function getFieldConfig()
      */
     protected function getCacheKey()
     {
-        return 'system::settings.'.$this->recordCode;
+        return 'system::settings.' . $this->recordCode;
     }
 
     /**
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 1e829ed46d..bd6cb2cc99 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use App;
 use Url;
@@ -133,23 +135,23 @@ public function init()
         /*
          * Register JavaScript filters
          */
-        $this->registerFilter('js', new JavascriptImporter);
+        $this->registerFilter('js', new JavascriptImporter());
 
         /*
          * Register CSS filters
          */
-        $this->registerFilter('css', new CssImportFilter);
-        $this->registerFilter(['css', 'less', 'scss'], new CssRewriteFilter);
+        $this->registerFilter('css', new CssImportFilter());
+        $this->registerFilter(['css', 'less', 'scss'], new CssRewriteFilter());
 
-        $this->registerFilter('less', new LessCompiler);
-        $this->registerFilter('scss', new ScssCompiler);
+        $this->registerFilter('less', new LessCompiler());
+        $this->registerFilter('scss', new ScssCompiler());
 
         /*
          * Minification filters
          */
         if ($this->useMinify) {
-            $this->registerFilter('js', new JavaScriptMinifierFilter);
-            $this->registerFilter(['css', 'less', 'scss'], new StylesheetMinifyFilter);
+            $this->registerFilter('js', new JavaScriptMinifierFilter());
+            $this->registerFilter(['css', 'less', 'scss'], new StylesheetMinifyFilter());
         }
 
         /*
@@ -227,13 +229,13 @@ public function combineToFile($assets, $destination, $localPath = null)
         // Prefix all assets
         if ($localPath) {
             if (substr($localPath, -1) !== '/') {
-                $localPath = $localPath.'/';
+                $localPath = $localPath . '/';
             }
             $assets = array_map(function ($asset) use ($localPath) {
                 if (substr($asset, 0, 1) === '@') {
                     return $asset;
                 }
-                return $localPath.$asset;
+                return $localPath . $asset;
             }, $assets);
         }
 
@@ -257,7 +259,7 @@ public function getContents($cacheKey)
     {
         $cacheInfo = $this->getCache($cacheKey);
         if (!$cacheInfo) {
-            return Response::make('/* '.e(Lang::get('system::lang.combiner.not_found', ['name' => $cacheKey])).' */', 404);
+            return Response::make('/* ' . e(Lang::get('system::lang.combiner.not_found', ['name' => $cacheKey])) . ' */', 404);
         }
 
         $this->localPath = $cacheInfo['path'];
@@ -343,8 +345,7 @@ protected function prepareAssets(array $assets)
         if (count($combineCss) > count($combineJs)) {
             $extension = 'css';
             $assets = $combineCss;
-        }
-        else {
+        } else {
             $extension = 'js';
             $assets = $combineJs;
         }
@@ -378,7 +379,7 @@ protected function prepareAssets(array $assets)
     protected function prepareRequest(array $assets, $localPath = null)
     {
         if (substr($localPath, -1) != '/') {
-            $localPath = $localPath.'/';
+            $localPath = $localPath . '/';
         }
 
         $this->localPath = $localPath;
@@ -400,13 +401,12 @@ protected function prepareRequest(array $assets, $localPath = null)
             if ($this->useDeepHashing) {
                 $factory = new AssetFactory($this->localPath);
                 $lastMod = $factory->getLastModified($combiner);
-            }
-            else {
+            } else {
                 $lastMod = $combiner->getLastModified();
             }
 
             $cacheInfo = [
-                'version'   => $cacheKey.'-'.$lastMod,
+                'version'   => $cacheKey . '-' . $lastMod,
                 'etag'      => $cacheKey,
                 'lastMod'   => $lastMod,
                 'files'     => $assets,
@@ -530,7 +530,7 @@ protected function getCombinedUrl($outputFilename = 'undefined.css')
             return Url::action($combineAction, [$outputFilename], false);
         }
 
-        return '/combine/'.$outputFilename;
+        return '/combine/' . $outputFilename;
     }
 
     /**
@@ -547,14 +547,14 @@ protected function getTargetPath($path = null)
     {
         if ($path === null) {
             $baseUri = substr(Request::getBaseUrl(), strlen(Request::getBasePath()));
-            $path = $baseUri.'/combine';
+            $path = $baseUri . '/combine';
         }
 
         if (strpos($path, '/') === 0) {
             $path = substr($path, 1);
         }
 
-        $path = str_replace('.', '-', $path).'/';
+        $path = str_replace('.', '-', $path) . '/';
         return $path;
     }
 
@@ -620,8 +620,7 @@ public function resetFilters($extension = null)
     {
         if ($extension === null) {
             $this->filters = [];
-        }
-        else {
+        } else {
             $this->filters[$extension] = [];
         }
 
@@ -677,17 +676,16 @@ public function registerBundle($files, $destination = null, $extension = null)
             $preprocessors = array_diff(self::$cssExtensions, ['css']);
 
             if (in_array($extension, $preprocessors)) {
-                $cssPath = $path.'/../css';
+                $cssPath = $path . '/../css';
                 if (
                     in_array(strtolower(basename($path)), $preprocessors) &&
                     File::isDirectory(File::symbolizePath($cssPath))
                 ) {
                     $path = $cssPath;
                 }
-                $destination = $path.'/'.$file.'.css';
-            }
-            else {
-                $destination = $path.'/'.$file.'-min.'.$extension;
+                $destination = $path . '/' . $file . '.css';
+            } else {
+                $destination = $path . '/' . $file . '-min.' . $extension;
             }
         }
 
@@ -751,8 +749,7 @@ public function resetAliases($extension = null)
     {
         if ($extension === null) {
             $this->aliases = [];
-        }
-        else {
+        } else {
             $this->aliases[$extension] = [];
         }
 
@@ -790,7 +787,7 @@ public function getAliases($extension = null)
      */
     protected function putCache($cacheKey, array $cacheInfo)
     {
-        $cacheKey = 'combiner.'.$cacheKey;
+        $cacheKey = 'combiner.' . $cacheKey;
 
         if (Cache::has($cacheKey)) {
             return false;
@@ -810,7 +807,7 @@ protected function putCache($cacheKey, array $cacheInfo)
      */
     protected function getCache($cacheKey)
     {
-        $cacheKey = 'combiner.'.$cacheKey;
+        $cacheKey = 'combiner.' . $cacheKey;
 
         if (!Cache::has($cacheKey)) {
             return false;
diff --git a/modules/system/classes/ComposerManager.php b/modules/system/classes/ComposerManager.php
index a1505a0186..af8725880b 100644
--- a/modules/system/classes/ComposerManager.php
+++ b/modules/system/classes/ComposerManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 /**
  * Composer manager
@@ -30,7 +32,7 @@ class ComposerManager
 
     public function init()
     {
-        $this->loader = include base_path() .'/vendor/autoload.php';
+        $this->loader = include base_path() . '/vendor/autoload.php';
         $this->preloadPools();
     }
 
@@ -45,7 +47,7 @@ protected function preloadPools()
     protected function preloadIncludeFilesPool()
     {
         $result = [];
-        $vendorPath = base_path() .'/vendor';
+        $vendorPath = base_path() . '/vendor';
 
         if (file_exists($file = $vendorPath . '/composer/autoload_files.php')) {
             $includeFiles = require $file;
diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php
index 290bab527b..e0cceee69f 100644
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use View;
 use Config;
@@ -76,7 +78,7 @@ public function handleCustomError()
     public function handleDetailedError($exception)
     {
         // Ensure System view path is registered
-        View::addNamespace('system', base_path().'/modules/system/views');
+        View::addNamespace('system', base_path() . '/modules/system/views');
 
         return View::make('system::exception', ['exception' => $exception]);
     }
diff --git a/modules/system/classes/FileManifest.php b/modules/system/classes/FileManifest.php
index d03e5cd038..b22a83d2d2 100644
--- a/modules/system/classes/FileManifest.php
+++ b/modules/system/classes/FileManifest.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use ApplicationException;
 use Config;
@@ -149,7 +151,7 @@ public function getModuleChecksums(): array
      */
     protected function findFiles(string $basePath): array
     {
-        $datasource = new FileDatasource($basePath, new Filesystem);
+        $datasource = new FileDatasource($basePath, new Filesystem());
 
         $files = array_map(function ($path) use ($basePath) {
             return $basePath . '/' . $path;
diff --git a/modules/system/classes/ImageResizer.php b/modules/system/classes/ImageResizer.php
index df8db2f9d3..d416b6adc1 100644
--- a/modules/system/classes/ImageResizer.php
+++ b/modules/system/classes/ImageResizer.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Url;
 use Crypt;
diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php
index e918c453ac..a5f4ec731d 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use App;
 use Markdown;
@@ -55,7 +57,7 @@ class MailManager
      */
     public function addRawContentToMailer($message, $content, $data)
     {
-        $template = new MailTemplate;
+        $template = new MailTemplate();
 
         $template->fillFromContent($content);
 
@@ -83,8 +85,7 @@ public function addContentToMailer($message, $code, $data, $plainOnly = false)
 
         if (isset($this->templateCache[$code])) {
             $template = $this->templateCache[$code];
-        }
-        else {
+        } else {
             $this->templateCache[$code] = $template = MailTemplate::findOrMakeTemplate($code);
         }
 
@@ -193,7 +194,7 @@ public function renderTemplate($template, $data = [])
         }
 
         if (!$disableAutoInlineCss) {
-            $html = (new CssToInlineStyles)->convert($html, $css);
+            $html = (new CssToInlineStyles())->convert($html, $css);
         }
 
         return $html;
@@ -242,13 +243,12 @@ public function renderTextTemplate($template, $data = [])
     public function renderPartial($code, array $params = [])
     {
         if (!$partial = MailPartial::findOrMakePartial($code)) {
-            return '<!-- Missing partial: '.$code.' -->';
+            return '<!-- Missing partial: ' . $code . ' -->';
         }
 
         if ($this->isHtmlRenderMode) {
             $content = $partial->content_html;
-        }
-        else {
+        } else {
             $content = $partial->content_text ?: $partial->content_html;
         }
 
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index 63c580aac1..cf030380df 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use System\Twig\Extension as SystemTwigExtension;
 use System\Twig\Loader as SystemTwigLoader;
@@ -63,8 +65,8 @@ public static function makeBaseTwigEnvironment(LoaderInterface $loader = null, a
         ], $options);
 
         $twig = new TwigEnvironment($loader, $options);
-        $twig->addExtension(new SystemTwigExtension);
-        $twig->addExtension(new SandboxExtension(new TwigSecurityPolicy, true));
+        $twig->addExtension(new SystemTwigExtension());
+        $twig->addExtension(new SandboxExtension(new TwigSecurityPolicy(), true));
         return $twig;
     }
 
@@ -355,8 +357,7 @@ protected function isWildCallable($callable, $replaceWith = false)
                 if ($replaceWith) {
                     $isWild = $callable;
                     $isWild[0] = str_replace('*', $replaceWith, $callable[0]);
-                }
-                else {
+                } else {
                     $isWild = true;
                 }
             }
@@ -365,8 +366,7 @@ protected function isWildCallable($callable, $replaceWith = false)
                 if ($replaceWith) {
                     $isWild = $isWild ?: $callable;
                     $isWild[1] = str_replace('*', $replaceWith, $callable[1]);
-                }
-                else {
+                } else {
                     $isWild = true;
                 }
             }
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index 0a28ea0230..f03c410a9d 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -132,8 +132,7 @@ public function listFolderContents($folder = '/', $sortBy = 'title', $filter = n
 
         if (array_key_exists($fullFolderPath, $cached)) {
             $folderContents = $cached[$fullFolderPath];
-        }
-        else {
+        } else {
             $folderContents = $this->scanFolderContents($fullFolderPath);
 
             $cached[$fullFolderPath] = $folderContents;
@@ -158,8 +157,7 @@ public function listFolderContents($folder = '/', $sortBy = 'title', $filter = n
 
         if (!$ignoreFolders) {
             $folderContents = array_merge($folderContents['folders'], $folderContents['files']);
-        }
-        else {
+        } else {
             $folderContents = $folderContents['files'];
         }
 
@@ -186,8 +184,7 @@ public function findFiles($searchTerm, $sortBy = 'title', $filter = null)
             foreach ($folderContents as $item) {
                 if ($item->type == MediaLibraryItem::TYPE_FOLDER) {
                     $findInFolder($item->path);
-                }
-                elseif ($this->pathMatchesSearch($item->path, $words)) {
+                } elseif ($this->pathMatchesSearch($item->path, $words)) {
                     $result[] = $item;
                 }
             }
@@ -384,7 +381,7 @@ public function copyFolder($originalPath, $newPath)
             $folderContents = $this->scanFolderContents($fullSrcPath);
 
             foreach ($folderContents['folders'] as $dirInfo) {
-                if (!$copyDirectory($dirInfo->path, $destPath.'/'.basename($dirInfo->path))) {
+                if (!$copyDirectory($dirInfo->path, $destPath . '/' . basename($dirInfo->path))) {
                     return false;
                 }
             }
@@ -392,7 +389,7 @@ public function copyFolder($originalPath, $newPath)
             foreach ($folderContents['files'] as $fileInfo) {
                 $fullFileSrcPath = $this->getMediaPath($fileInfo->path);
 
-                if (!$disk->copy($fullFileSrcPath, $fullDestPath.'/'.basename($fileInfo->path))) {
+                if (!$disk->copy($fullFileSrcPath, $fullDestPath . '/' . basename($fileInfo->path))) {
                     return false;
                 }
             }
@@ -422,8 +419,7 @@ public function moveFolder($originalPath, $newPath)
             }
 
             $this->deleteFolder($originalPath);
-        }
-        else {
+        } else {
             // If there's a risk that the directory name was updated
             // by changing the letter case - swap source and destination
             // using a temporary directory with random name.
@@ -480,7 +476,7 @@ public function resetCache()
     public static function validatePath($path, $normalizeOnly = false)
     {
         $path = str_replace('\\', '/', $path);
-        $path = '/'.trim($path, '/');
+        $path = '/' . trim($path, '/');
 
         if ($normalizeOnly) {
             return $path;
@@ -515,19 +511,19 @@ public static function validatePath($path, $normalizeOnly = false)
         $regexDot = preg_quote('.', '#');
         $regex = [
             // Beginning of path
-            '(^'.$regexDot.'+?'.$regexDirectorySeparator.')',
+            '(^' . $regexDot . '+?' . $regexDirectorySeparator . ')',
 
             // Middle of path
-            '('.$regexDirectorySeparator.$regexDot.'+?'.$regexDirectorySeparator.')',
+            '(' . $regexDirectorySeparator . $regexDot . '+?' . $regexDirectorySeparator . ')',
 
             // End of path
-            '('.$regexDirectorySeparator.$regexDot.'+?$)',
+            '(' . $regexDirectorySeparator . $regexDot . '+?$)',
         ];
 
         /*
          * Validate invalid paths
          */
-        $regex = '#'.implode('|', $regex).'#';
+        $regex = '#' . implode('|', $regex) . '#';
         if (preg_match($regex, $path) !== 0 || strpos($path, '://') !== false) {
             throw new ApplicationException(Lang::get('system::lang.media.invalid_path', compact('path')));
         }
@@ -570,7 +566,7 @@ public function getPathUrl($path)
      */
     public function getMediaPath($path)
     {
-        return $this->storageFolder.$path;
+        return $this->storageFolder . $path;
     }
 
     /**
@@ -603,7 +599,7 @@ protected function isVisible($path)
         }
 
         foreach ($this->ignorePatterns as $pattern) {
-            if (preg_match('/'.$pattern.'/', $baseName)) {
+            if (preg_match('/' . $pattern . '/', $baseName)) {
                 return false;
             }
         }
@@ -825,11 +821,11 @@ protected function generateRandomTmpFolderName($location)
     {
         $temporaryDirBaseName = time();
 
-        $tmpPath = $location.'/tmp-'.$temporaryDirBaseName;
+        $tmpPath = $location . '/tmp-' . $temporaryDirBaseName;
 
         while ($this->folderExists($tmpPath)) {
             $temporaryDirBaseName++;
-            $tmpPath = $location.'/tmp-'.$temporaryDirBaseName;
+            $tmpPath = $location . '/tmp-' . $temporaryDirBaseName;
         }
 
         return $tmpPath;
diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php
index 601c5987ce..f5296cdb12 100644
--- a/modules/system/classes/MediaLibraryItem.php
+++ b/modules/system/classes/MediaLibraryItem.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use File;
 use Config;
diff --git a/modules/system/classes/ModelBehavior.php b/modules/system/classes/ModelBehavior.php
index 21437edbb7..7662bf2f62 100644
--- a/modules/system/classes/ModelBehavior.php
+++ b/modules/system/classes/ModelBehavior.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Lang;
 use ApplicationException;
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index 466279660b..7831d36b98 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Str;
 use File;
@@ -63,8 +65,8 @@ public function pluginDetails()
     {
         $thisClass = get_class($this);
 
-        $configuration = $this->getConfigurationFromYaml(sprintf('Plugin configuration file plugin.yaml is not '.
-            'found for the plugin class %s. Create the file or override pluginDetails() '.
+        $configuration = $this->getConfigurationFromYaml(sprintf('Plugin configuration file plugin.yaml is not ' .
+            'found for the plugin class %s. Create the file or override pluginDetails() ' .
             'method in the plugin class.', $thisClass));
 
         if (!array_key_exists('plugin', $configuration)) {
@@ -302,7 +304,7 @@ public function registerMailPartials()
      */
     public function registerConsoleCommand($key, $command)
     {
-        $key = 'command.'.$key;
+        $key = 'command.' . $key;
         $this->app->singleton($key, $command);
         $this->commands($key);
     }
@@ -321,7 +323,7 @@ protected function getConfigurationFromYaml($exceptionMessage = null)
         }
 
         $reflection = new ReflectionClass(get_class($this));
-        $yamlFilePath = dirname($reflection->getFileName()).'/plugin.yaml';
+        $yamlFilePath = dirname($reflection->getFileName()) . '/plugin.yaml';
 
         if (!file_exists($yamlFilePath)) {
             if ($exceptionMessage) {
@@ -329,8 +331,7 @@ protected function getConfigurationFromYaml($exceptionMessage = null)
             }
 
             $this->loadedYamlConfiguration = [];
-        }
-        else {
+        } else {
             $this->loadedYamlConfiguration = Yaml::parseFile($yamlFilePath);
             if (!is_array($this->loadedYamlConfiguration)) {
                 throw new SystemException(sprintf('Invalid format of the plugin configuration file: %s. The file should define an array.', $yamlFilePath));
@@ -450,7 +451,7 @@ public function getPluginVersions(bool $includeScripts = true): array
             return [];
         }
 
-        $updates = Yaml::withProcessor(new VersionYamlProcessor, function ($yaml) use ($versionFile) {
+        $updates = Yaml::withProcessor(new VersionYamlProcessor(), function ($yaml) use ($versionFile) {
             return (array) $yaml->parseFile($versionFile);
         });
 
diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 5bc1d61fc1..2889d35536 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Db;
 use App;
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index 0f7993f8b8..ad0f52b872 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Event;
 use Backend;
@@ -300,8 +302,7 @@ public function addSettingItem($owner, $code, array $definition)
                 list($author, $plugin) = explode('.', $owner);
                 $uri[] = strtolower($author);
                 $uri[] = strtolower($plugin);
-            }
-            else {
+            } else {
                 $uri[] = strtolower($owner);
             }
 
@@ -412,6 +413,6 @@ protected function filterItemPermissions($user, array $items)
      */
     protected function makeItemKey($owner, $code)
     {
-        return strtoupper($this->aliases[strtolower($owner)] ?? $owner).'.'.strtoupper($code);
+        return strtoupper($this->aliases[strtolower($owner)] ?? $owner) . '.' . strtoupper($code);
     }
 }
diff --git a/modules/system/classes/SourceManifest.php b/modules/system/classes/SourceManifest.php
index 677de5cf94..49613b0dbc 100644
--- a/modules/system/classes/SourceManifest.php
+++ b/modules/system/classes/SourceManifest.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Http;
 use Config;
diff --git a/modules/system/classes/SystemController.php b/modules/system/classes/SystemController.php
index 4f3b0fdb37..5ededabd09 100644
--- a/modules/system/classes/SystemController.php
+++ b/modules/system/classes/SystemController.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Lang;
 use Config;
@@ -27,7 +29,7 @@ public function combine($name)
     {
         try {
             if (!strpos($name, '-')) {
-                return Response::make('/* '.e(Lang::get('system::lang.combiner.not_found', ['name' => $name])).' */', 404);
+                return Response::make('/* ' . e(Lang::get('system::lang.combiner.not_found', ['name' => $name])) . ' */', 404);
             }
 
             $parts = explode('-', $name);
@@ -38,7 +40,7 @@ public function combine($name)
 
             return $combiner->getContents($cacheId);
         } catch (Exception $ex) {
-            return Response::make('/* '.e($ex->getMessage()).' */', 500);
+            return Response::make('/* ' . e($ex->getMessage()) . ' */', 500);
         }
     }
 
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 8a9569558c..e04985199c 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use App;
 use Url;
@@ -228,7 +230,8 @@ public function check($force = false)
         /*
          * Retry period not passed, skipping.
          */
-        if (!$force
+        if (
+            !$force
             && ($retryTimestamp = Parameter::get('system::update.retry'))
             && Carbon::createFromTimeStamp($retryTimestamp)->isFuture()
         ) {
@@ -468,7 +471,7 @@ public function migrateModule($module)
         $this->out(sprintf('<info>Migrating %s module...</info>', $module), true);
         $this->out('', true);
 
-        $this->migrator->run(base_path() . '/modules/'.strtolower($module).'/database/migrations');
+        $this->migrator->run(base_path() . '/modules/' . strtolower($module) . '/database/migrations');
 
         return $this;
     }
@@ -608,7 +611,8 @@ public function rollbackPlugin(string $name, string $stopOnVersion = null)
         /*
          * Remove the plugin database and version
          */
-        if (!($plugin = $this->pluginManager->findByIdentifier($name))
+        if (
+            !($plugin = $this->pluginManager->findByIdentifier($name))
             && $this->versionManager->purgePlugin($name)
         ) {
             $this->write(Info::class, sprintf('%s purged from database', $name));
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index ea2e7735a9..a85882ea47 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use File;
 use Yaml;
@@ -64,7 +66,7 @@ class VersionManager
 
     protected function init()
     {
-        $this->updater = new Updater;
+        $this->updater = new Updater();
         $this->pluginManager = PluginManager::instance();
     }
 
@@ -374,7 +376,7 @@ protected function getFileVersions($code)
         }
 
         $versionFile = $this->getVersionFile($code);
-        $versionInfo = Yaml::withProcessor(new VersionYamlProcessor, function ($yaml) use ($versionFile) {
+        $versionInfo = Yaml::withProcessor(new VersionYamlProcessor(), function ($yaml) use ($versionFile) {
             return $yaml->parseFile($versionFile);
         });
 
@@ -455,12 +457,12 @@ protected function setDatabaseVersion($code, $version = null)
             Db::table('system_plugin_versions')->insert([
                 'code'       => $code,
                 'version'    => $version,
-                'created_at' => new Carbon
+                'created_at' => new Carbon()
             ]);
         } elseif ($version && $currentVersion) {
             Db::table('system_plugin_versions')->where('code', $code)->update([
                 'version'    => $version,
-                'created_at' => new Carbon
+                'created_at' => new Carbon()
             ]);
         } elseif ($currentVersion) {
             Db::table('system_plugin_versions')->where('code', $code)->delete();
@@ -479,7 +481,7 @@ protected function applyDatabaseComment($code, $version, $comment)
             'type'       => self::HISTORY_TYPE_COMMENT,
             'version'    => $version,
             'detail'     => $comment,
-            'created_at' => new Carbon
+            'created_at' => new Carbon()
         ]);
     }
 
@@ -517,7 +519,7 @@ protected function applyDatabaseScript($code, $version, $script)
             'type'       => self::HISTORY_TYPE_SCRIPT,
             'version'    => $version,
             'detail'     => $script,
-            'created_at' => new Carbon
+            'created_at' => new Carbon()
         ]);
     }
 
@@ -664,8 +666,7 @@ protected function extractScriptsAndComments($details): array
             $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/classes/VersionYamlProcessor.php b/modules/system/classes/VersionYamlProcessor.php
index 7779271acf..719b579b7e 100644
--- a/modules/system/classes/VersionYamlProcessor.php
+++ b/modules/system/classes/VersionYamlProcessor.php
@@ -1,4 +1,6 @@
-<?php namespace System\Classes;
+<?php
+
+namespace System\Classes;
 
 use Winter\Storm\Parse\Processor\YamlProcessor;
 
diff --git a/modules/system/console/BaseScaffoldCommand.php b/modules/system/console/BaseScaffoldCommand.php
index 5f8187d6a8..30ff61e933 100644
--- a/modules/system/console/BaseScaffoldCommand.php
+++ b/modules/system/console/BaseScaffoldCommand.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use InvalidArgumentException;
 use Winter\Storm\Parse\PHP\ArrayFile;
diff --git a/modules/system/console/CreateCommand.php b/modules/system/console/CreateCommand.php
index 70b8db7cf1..8f730b9da4 100644
--- a/modules/system/console/CreateCommand.php
+++ b/modules/system/console/CreateCommand.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use InvalidArgumentException;
 use System\Console\BaseScaffoldCommand;
diff --git a/modules/system/console/CreateJob.php b/modules/system/console/CreateJob.php
index 791da9faa5..48811a75e2 100644
--- a/modules/system/console/CreateJob.php
+++ b/modules/system/console/CreateJob.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/CreateMigration.php b/modules/system/console/CreateMigration.php
index 886cb82848..30a8057b20 100644
--- a/modules/system/console/CreateMigration.php
+++ b/modules/system/console/CreateMigration.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use File;
 use InvalidArgumentException;
@@ -152,7 +154,7 @@ protected function prepareVars(): array
         if (empty($table) && !empty($model)) {
             $modelClass = "\\{$author}\\{$plugin}\Models\\{$model}";
             if (class_exists($modelClass)) {
-                $table = (new $modelClass)->getTable();
+                $table = (new $modelClass())->getTable();
             } else {
                 throw new InvalidArgumentException("The model [{$modelClass}] does not exist.");
             }
@@ -245,7 +247,8 @@ protected function processVars(array $vars): array
 
                 $type = $config['type'] ?? 'text';
 
-                if (str_starts_with($field, '_')
+                if (
+                    str_starts_with($field, '_')
                     || $field === $model->getKeyName()
                     || str_contains($field, '[')
                     || in_array($type, ['fileupload', 'relation', 'relationmanager', 'repeater', 'section', 'hint'])
@@ -305,7 +308,7 @@ protected function getNextVersion($currentVersion): string
     /**
      * Maps model fields config to DB Schema column types.
      */
-    protected function mapFieldType(string $fieldName, array $fieldConfig, ?Model $model = null) : array
+    protected function mapFieldType(string $fieldName, array $fieldConfig, ?Model $model = null): array
     {
         switch ($fieldConfig['type'] ?? 'text') {
             case 'checkbox':
diff --git a/modules/system/console/CreateModel.php b/modules/system/console/CreateModel.php
index 7d884a8c32..e37973dbbe 100644
--- a/modules/system/console/CreateModel.php
+++ b/modules/system/console/CreateModel.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Winter\Storm\Support\Str;
 use System\Console\BaseScaffoldCommand;
diff --git a/modules/system/console/CreatePlugin.php b/modules/system/console/CreatePlugin.php
index 0366148496..c3c0c3ed5d 100644
--- a/modules/system/console/CreatePlugin.php
+++ b/modules/system/console/CreatePlugin.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/CreateSettings.php b/modules/system/console/CreateSettings.php
index 1826797e22..cc7737ae3f 100644
--- a/modules/system/console/CreateSettings.php
+++ b/modules/system/console/CreateSettings.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/PluginDisable.php b/modules/system/console/PluginDisable.php
index f531ed3112..3ed675e624 100644
--- a/modules/system/console/PluginDisable.php
+++ b/modules/system/console/PluginDisable.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Winter\Storm\Console\Command;
 use System\Classes\PluginManager;
diff --git a/modules/system/console/PluginEnable.php b/modules/system/console/PluginEnable.php
index f2ec3ae3e5..8091a1c412 100644
--- a/modules/system/console/PluginEnable.php
+++ b/modules/system/console/PluginEnable.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Winter\Storm\Console\Command;
 use System\Classes\PluginManager;
diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php
index 113fe40268..4ee3363557 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/PluginInstall.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
diff --git a/modules/system/console/PluginList.php b/modules/system/console/PluginList.php
index f7883c34d4..1daa154bf1 100644
--- a/modules/system/console/PluginList.php
+++ b/modules/system/console/PluginList.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableSeparator;
@@ -47,8 +49,8 @@ public function handle()
             $rows[] = [
                 $plugin->code,
                 $plugin->version,
-                (!$plugin->is_frozen) ? '<info>Yes</info>': '<fg=red>No</>',
-                (!$plugin->is_disabled) ? '<info>Yes</info>': '<fg=red>No</>',
+                (!$plugin->is_frozen) ? '<info>Yes</info>' : '<fg=red>No</>',
+                (!$plugin->is_disabled) ? '<info>Yes</info>' : '<fg=red>No</>',
             ];
         }
 
diff --git a/modules/system/console/PluginRefresh.php b/modules/system/console/PluginRefresh.php
index 91add6ba03..e42b137551 100644
--- a/modules/system/console/PluginRefresh.php
+++ b/modules/system/console/PluginRefresh.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
@@ -41,10 +43,12 @@ public function handle(): int
     {
         $pluginName = $this->getPluginIdentifier();
 
-        if (!$this->confirmWithInput(
-            "This will completely remove and reinstall $pluginName. This may result in potential data loss.",
-            $pluginName
-        )) {
+        if (
+            !$this->confirmWithInput(
+                "This will completely remove and reinstall $pluginName. This may result in potential data loss.",
+                $pluginName
+            )
+        ) {
             return 1;
         }
 
diff --git a/modules/system/console/PluginRemove.php b/modules/system/console/PluginRemove.php
index d442fb1514..08fa14173c 100644
--- a/modules/system/console/PluginRemove.php
+++ b/modules/system/console/PluginRemove.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use File;
 use Winter\Storm\Console\Command;
@@ -55,10 +57,12 @@ public function handle(): int
             $confirmQuestion = sprintf('This will remove the database tables and files for the "%s" plugin.', $pluginName);
         }
 
-        if (!$this->confirmWithInput(
-            $confirmQuestion,
-            $pluginName
-        )) {
+        if (
+            !$this->confirmWithInput(
+                $confirmQuestion,
+                $pluginName
+            )
+        ) {
             return 1;
         }
 
diff --git a/modules/system/console/PluginRollback.php b/modules/system/console/PluginRollback.php
index 83e9724a51..5f091a8fdd 100644
--- a/modules/system/console/PluginRollback.php
+++ b/modules/system/console/PluginRollback.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use InvalidArgumentException;
 use Winter\Storm\Console\Command;
@@ -53,10 +55,12 @@ public function handle(): int
             $confirmQuestion = "This will completely rollback $pluginName. This may result in potential data loss.";
         }
 
-        if (!$this->confirmWithInput(
-            $confirmQuestion,
-            $pluginName
-        )) {
+        if (
+            !$this->confirmWithInput(
+                $confirmQuestion,
+                $pluginName
+            )
+        ) {
             return 1;
         }
 
diff --git a/modules/system/console/WinterDown.php b/modules/system/console/WinterDown.php
index 0cf73fd96e..03e2915544 100644
--- a/modules/system/console/WinterDown.php
+++ b/modules/system/console/WinterDown.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
@@ -47,10 +49,12 @@ public function __construct()
      */
     public function handle(): int
     {
-        if (!$this->confirmWithInput(
-            "This will completely delete all database tables in use with your Winter installation.",
-            "DELETE"
-        )) {
+        if (
+            !$this->confirmWithInput(
+                "This will completely delete all database tables in use with your Winter installation.",
+                "DELETE"
+            )
+        ) {
             return 1;
         }
 
diff --git a/modules/system/console/WinterEnv.php b/modules/system/console/WinterEnv.php
index 2cafbe764d..84fa97ba06 100644
--- a/modules/system/console/WinterEnv.php
+++ b/modules/system/console/WinterEnv.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use App;
 use Winter\Storm\Parse\EnvFile;
diff --git a/modules/system/console/WinterFresh.php b/modules/system/console/WinterFresh.php
index fff3065077..019bca5fce 100644
--- a/modules/system/console/WinterFresh.php
+++ b/modules/system/console/WinterFresh.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use File;
 use Artisan;
@@ -50,13 +52,13 @@ public function handle()
         $themeRemoved = false;
         $pluginRemoved = false;
 
-        $demoThemePath = themes_path().'/demo';
+        $demoThemePath = themes_path() . '/demo';
         if (File::exists($demoThemePath)) {
             File::deleteDirectory($demoThemePath);
             $themeRemoved = true;
         }
 
-        $demoPluginPath = plugins_path().'/winter/demo';
+        $demoPluginPath = plugins_path() . '/winter/demo';
         if (File::exists($demoPluginPath)) {
             Artisan::call('plugin:remove', ['plugin' => 'Winter.Demo', '--force' => true]);
             $pluginRemoved = true;
diff --git a/modules/system/console/WinterInstall.php b/modules/system/console/WinterInstall.php
index 5f600f6402..1bd15b3441 100644
--- a/modules/system/console/WinterInstall.php
+++ b/modules/system/console/WinterInstall.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Backend\Database\Seeds\SeedSetupAdmin;
 use Config;
@@ -56,7 +58,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->configWriter = new ConfigWriter;
+        $this->configWriter = new ConfigWriter();
     }
 
     /**
@@ -87,8 +89,7 @@ public function handle()
             $this->setupEncryptionKey();
             $this->setupAdvancedValues();
             $chosenToInstall = $this->askToInstallPlugins();
-        }
-        else {
+        } else {
             $this->setupEncryptionKey(true);
         }
 
@@ -135,7 +136,7 @@ protected function setupBackendValues()
         // app.locale
         $defaultLocale = Config::get('app.locale');
         try {
-            $availableLocales = (new \Backend\Models\Preference)->getLocaleOptions();
+            $availableLocales = (new \Backend\Models\Preference())->getLocaleOptions();
             $localesByName = [];
             $i = $defaultLocaleIndex = 0;
             foreach ($availableLocales as $locale => $name) {
@@ -158,7 +159,7 @@ protected function setupBackendValues()
         // cms.backendTimezone
         $defaultTimezone = Config::get('cms.backendTimezone');
         try {
-            $availableTimezones = (new \Backend\Models\Preference)->getTimezoneOptions();
+            $availableTimezones = (new \Backend\Models\Preference())->getTimezoneOptions();
             $longestTimezone = max(array_map('strlen', $availableTimezones));
             $padTo = $longestTimezone - 13 + 1; // (UTC +10:00)
             $timezonesByName = [];
@@ -230,8 +231,7 @@ protected function setupEncryptionKey($force = false)
 
         if ($force) {
             $key = $randomKey;
-        }
-        else {
+        } else {
             $this->line(sprintf('Enter a new value of %s characters, or press ENTER to use the generated key', $keyLength));
 
             while (!$validKey) {
@@ -287,14 +287,14 @@ protected function setupDatabaseConfig()
 
         $driver = array_get($typeMap, $type, 'sqlite');
 
-        $method = 'setupDatabase'.Str::studly($driver);
+        $method = 'setupDatabase' . Str::studly($driver);
 
         $newConfig = $this->$method();
 
         $this->writeToConfig('database', ['default' => $driver]);
 
         foreach ($newConfig as $config => $value) {
-            $this->writeToConfig('database', ['connections.'.$driver.'.'.$config => $value]);
+            $this->writeToConfig('database', ['connections.' . $driver . '.' . $config => $value]);
         }
     }
 
@@ -331,10 +331,9 @@ protected function setupDatabaseSqlite()
                     mkdir($directory, 0777, true);
                 }
 
-                new PDO('sqlite:'.$filename);
+                new PDO('sqlite:' . $filename);
             }
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->error($ex->getMessage());
             $this->setupDatabaseSqlite();
         }
@@ -383,8 +382,7 @@ protected function setupMigrateDatabase()
                 ->setNotesOutput($this->output)
                 ->update()
             ;
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->error($ex->getMessage());
             $this->setupDatabaseConfig();
             $this->setupMigrateDatabase();
@@ -439,7 +437,7 @@ protected function writeToConfig($file, $values)
         $configFile = $this->getConfigFile($file);
 
         foreach ($values as $key => $value) {
-            Config::set($file.'.'.$key, $value);
+            Config::set($file . '.' . $key, $value);
         }
 
         $this->configWriter->toFile($configFile, $values);
@@ -452,11 +450,11 @@ protected function writeToConfig($file, $values)
      */
     protected function getConfigFile($name = 'app')
     {
-        $env = $this->option('env') ? $this->option('env').'/' : '';
+        $env = $this->option('env') ? $this->option('env') . '/' : '';
 
         $name .= '.php';
 
-        $contents = File::get($path = $this->laravel['path.config']."/{$env}{$name}");
+        $contents = File::get($path = $this->laravel['path.config'] . "/{$env}{$name}");
 
         return $path;
     }
diff --git a/modules/system/console/WinterManifest.php b/modules/system/console/WinterManifest.php
index e406dce476..67b0adbf18 100644
--- a/modules/system/console/WinterManifest.php
+++ b/modules/system/console/WinterManifest.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use ApplicationException;
 use Http;
@@ -159,7 +161,7 @@ public function handle()
             if (is_dir($buildDir . $build . '/')) {
                 $this->info('  - Already extracted.');
             } else {
-                $zip = new ZipArchive;
+                $zip = new ZipArchive();
                 if ($zip->open($buildDir . 'build-' . $build . '.zip')) {
                     $rootFolder = substr($zip->statIndex(0)['name'], 0, -1);
 
diff --git a/modules/system/console/WinterMirror.php b/modules/system/console/WinterMirror.php
index 9be48c8f57..2d1f802208 100644
--- a/modules/system/console/WinterMirror.php
+++ b/modules/system/console/WinterMirror.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use File;
 use Event;
@@ -146,9 +148,9 @@ protected function mirrorFile($file)
     {
         $this->output->writeln(sprintf('<info> - Mirroring: %s</info>', $file));
 
-        $src = base_path().'/'.$file;
+        $src = base_path() . '/' . $file;
 
-        $dest = $this->getDestinationPath().'/'.$file;
+        $dest = $this->getDestinationPath() . '/' . $file;
 
         if (!File::isFile($src) || File::isFile($dest)) {
             return false;
@@ -161,9 +163,9 @@ protected function mirrorDirectory($directory)
     {
         $this->output->writeln(sprintf('<info> - Mirroring: %s</info>', $directory));
 
-        $src = base_path().'/'.$directory;
+        $src = base_path() . '/' . $directory;
 
-        $dest = $this->getDestinationPath().'/'.$directory;
+        $dest = $this->getDestinationPath() . '/' . $directory;
 
         if (!File::isDirectory($src) || File::isDirectory($dest)) {
             return false;
@@ -184,14 +186,14 @@ protected function mirrorWildcard($wildcard)
 
         list($start, $end) = explode('*', $wildcard, 2);
 
-        $startDir = base_path().'/'.$start;
+        $startDir = base_path() . '/' . $start;
 
         if (!File::isDirectory($startDir)) {
             return false;
         }
 
         foreach (File::directories($startDir) as $directory) {
-            $this->mirrorWildcard($start.basename($directory).$end);
+            $this->mirrorWildcard($start . basename($directory) . $end);
         }
     }
 
diff --git a/modules/system/console/WinterTest.php b/modules/system/console/WinterTest.php
index 8a0eb2375d..8e2c7e8f02 100644
--- a/modules/system/console/WinterTest.php
+++ b/modules/system/console/WinterTest.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Config;
 use Illuminate\Console\Command;
diff --git a/modules/system/console/WinterUp.php b/modules/system/console/WinterUp.php
index 05e052f233..69b41c72cb 100644
--- a/modules/system/console/WinterUp.php
+++ b/modules/system/console/WinterUp.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
diff --git a/modules/system/console/WinterUpdate.php b/modules/system/console/WinterUpdate.php
index afef002702..7c157122d1 100644
--- a/modules/system/console/WinterUpdate.php
+++ b/modules/system/console/WinterUpdate.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Str;
 use Illuminate\Console\Command;
diff --git a/modules/system/console/WinterUtil.php b/modules/system/console/WinterUtil.php
index 28f6244c48..6404b103a8 100644
--- a/modules/system/console/WinterUtil.php
+++ b/modules/system/console/WinterUtil.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use Lang;
 use File;
@@ -65,11 +67,11 @@ public function __construct()
     public function handle()
     {
         $command = implode(' ', (array) $this->argument('name'));
-        $method = 'util'.studly_case($command);
+        $method = 'util' . studly_case($command);
 
         $methods = preg_grep('/^util/', get_class_methods(get_called_class()));
         $list = array_map(function ($item) {
-            return "winter:".snake_case($item, " ");
+            return "winter:" . snake_case($item, " ");
         }, $methods);
 
         if (!$this->argument('name')) {
@@ -194,7 +196,7 @@ protected function utilCompileLang()
              * Generate messages
              */
             $fallbackPath = base_path() . '/modules/system/lang/en/client.php';
-            $srcPath = base_path() . '/modules/system/lang/'.$locale.'/client.php';
+            $srcPath = base_path() . '/modules/system/lang/' . $locale . '/client.php';
 
             $messages = require $fallbackPath;
 
@@ -208,7 +210,7 @@ protected function utilCompileLang()
             $overrides = [];
             $parentOverrides = [];
 
-            $overridePath = base_path() . '/lang/'.$locale.'/system/client.php';
+            $overridePath = base_path() . '/lang/' . $locale . '/system/client.php';
             if (File::isFile($overridePath)) {
                 $overrides = require $overridePath;
             }
@@ -216,7 +218,7 @@ protected function utilCompileLang()
             if (str_contains($locale, '-')) {
                 list($parentLocale, $country) = explode('-', $locale);
 
-                $parentOverridePath = base_path() . '/lang/'.$parentLocale.'/system/client.php';
+                $parentOverridePath = base_path() . '/lang/' . $parentLocale . '/system/client.php';
                 if (File::isFile($parentOverridePath)) {
                     $parentOverrides = require $parentOverridePath;
                 }
@@ -227,7 +229,7 @@ protected function utilCompileLang()
             /*
              * Compile from stub and save file
              */
-            $destPath = base_path() . '/modules/system/assets/js/lang/lang.'.$locale.'.js';
+            $destPath = base_path() . '/modules/system/assets/js/lang/lang.' . $locale . '.js';
 
             $contents = str_replace(
                 ['{{locale}}', '{{messages}}'],
@@ -238,9 +240,9 @@ protected function utilCompileLang()
             /*
              * Include the moment localization data
              */
-            $momentPath = base_path() . '/modules/system/assets/ui/vendor/moment/locale/'.$locale.'.js';
+            $momentPath = base_path() . '/modules/system/assets/ui/vendor/moment/locale/' . $locale . '.js';
             if (File::exists($momentPath)) {
-                $contents .= PHP_EOL.PHP_EOL.File::get($momentPath).PHP_EOL;
+                $contents .= PHP_EOL . PHP_EOL . File::get($momentPath) . PHP_EOL;
             }
 
             File::put($destPath, $contents);
@@ -250,7 +252,7 @@ protected function utilCompileLang()
              */
             $publicDest = File::localToPublic(realpath(dirname($destPath))) . '/' . basename($destPath);
 
-            $this->comment($locale.'/'.basename($srcPath));
+            $this->comment($locale . '/' . basename($srcPath));
             $this->comment(sprintf(' -> %s', $publicDest));
         }
     }
@@ -292,9 +294,9 @@ protected function utilPurgeThumbs()
          * with "thumb_" and repeat itself on directories.
          */
         $purgeFunc = function ($targetDir) use (&$purgeFunc, &$totalCount) {
-            if ($files = File::glob($targetDir.'/thumb_*')) {
+            if ($files = File::glob($targetDir . '/thumb_*')) {
                 foreach ($files as $file) {
-                    $this->info('Purged: '. basename($file));
+                    $this->info('Purged: ' . basename($file));
                     $totalCount++;
                     @unlink($file);
                 }
@@ -311,8 +313,7 @@ protected function utilPurgeThumbs()
 
         if ($totalCount > 0) {
             $this->comment(sprintf('Successfully deleted %s thumbs', $totalCount));
-        }
-        else {
+        } else {
             $this->comment('No thumbs found to delete');
         }
     }
@@ -417,25 +418,25 @@ protected function utilGitPull()
     {
         foreach (File::directories(plugins_path()) as $authorDir) {
             foreach (File::directories($authorDir) as $pluginDir) {
-                if (!File::exists($pluginDir.'/.git')) {
+                if (!File::exists($pluginDir . '/.git')) {
                     continue;
                 }
 
                 $exec = 'cd ' . $pluginDir . ' && ';
                 $exec .= 'git pull 2>&1';
-                echo 'Updating plugin: '. basename(dirname($pluginDir)) .'.'. basename($pluginDir) . PHP_EOL;
+                echo 'Updating plugin: ' . basename(dirname($pluginDir)) . '.' . basename($pluginDir) . PHP_EOL;
                 echo shell_exec($exec);
             }
         }
 
         foreach (File::directories(themes_path()) as $themeDir) {
-            if (!File::exists($themeDir.'/.git')) {
+            if (!File::exists($themeDir . '/.git')) {
                 continue;
             }
 
             $exec = 'cd ' . $themeDir . ' && ';
             $exec .= 'git pull 2>&1';
-            echo 'Updating theme: '. basename($themeDir) . PHP_EOL;
+            echo 'Updating theme: ' . basename($themeDir) . PHP_EOL;
             echo shell_exec($exec);
         }
     }
diff --git a/modules/system/console/WinterVersion.php b/modules/system/console/WinterVersion.php
index 4f8d49e831..cbe5ab774c 100644
--- a/modules/system/console/WinterVersion.php
+++ b/modules/system/console/WinterVersion.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console;
 
 use System\Classes\UpdateManager;
 
@@ -59,7 +61,7 @@ public function handle()
 
         if (!$build['confident']) {
             $this->warn('*** We could not accurately determine your Winter CMS build due to the number of modifications. The closest detected build is Winter CMS build ' . $build['build'] . '.');
-        } else if ($build['modified']) {
+        } elseif ($build['modified']) {
             $this->info('*** Detected a modified version of Winter CMS build ' . $build['build'] . '.');
         } else {
             $this->info('*** Detected Winter CMS build ' . $build['build'] . '.');
diff --git a/modules/system/console/asset/mix/MixCreate.php b/modules/system/console/asset/mix/MixCreate.php
index 101032ca1e..bd1d010850 100644
--- a/modules/system/console/asset/mix/MixCreate.php
+++ b/modules/system/console/asset/mix/MixCreate.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console\Asset\Mix;
+<?php
+
+namespace System\Console\Asset\Mix;
 
 use System\Console\Asset\AssetCreate;
 
diff --git a/modules/system/console/asset/mix/MixInstall.php b/modules/system/console/asset/mix/MixInstall.php
index 589a25d935..ad483681a3 100644
--- a/modules/system/console/asset/mix/MixInstall.php
+++ b/modules/system/console/asset/mix/MixInstall.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console\Asset\Mix;
+<?php
+
+namespace System\Console\Asset\Mix;
 
 use System\Console\Asset\AssetInstall;
 
diff --git a/modules/system/console/traits/HasPluginArgument.php b/modules/system/console/traits/HasPluginArgument.php
index 39d5d669d1..2aaf8b1fc5 100644
--- a/modules/system/console/traits/HasPluginArgument.php
+++ b/modules/system/console/traits/HasPluginArgument.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console\Traits;
+<?php
+
+namespace System\Console\Traits;
 
 use InvalidArgumentException;
 use System\Classes\PluginBase;
diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php
index 5c870e54d0..ddd03c4b38 100644
--- a/modules/system/controllers/EventLogs.php
+++ b/modules/system/controllers/EventLogs.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use App;
 use Lang;
@@ -63,8 +65,7 @@ public function index_onDelete()
             }
 
             Flash::success(Lang::get('backend::lang.list.delete_selected_success'));
-        }
-        else {
+        } else {
             Flash::error(Lang::get('backend::lang.list.delete_selected_empty'));
         }
 
diff --git a/modules/system/controllers/MailBrandSettings.php b/modules/system/controllers/MailBrandSettings.php
index 66619c9a82..47a1d0de64 100644
--- a/modules/system/controllers/MailBrandSettings.php
+++ b/modules/system/controllers/MailBrandSettings.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use Lang;
 use File;
@@ -98,10 +100,10 @@ public function renderSampleMessage()
             'texts' => Lang::get('system::lang.mail_brand.sample_template')
         ];
 
-        $layout = new MailLayout;
+        $layout = new MailLayout();
         $layout->fillFromCode('default');
 
-        $template = new MailTemplate;
+        $template = new MailTemplate();
         $template->layout = $layout;
         $template->content_html = File::get(base_path('modules/system/models/mailbrandsetting/sample_template.php'));
 
diff --git a/modules/system/controllers/MailLayouts.php b/modules/system/controllers/MailLayouts.php
index 62045ecedf..09bba536ef 100644
--- a/modules/system/controllers/MailLayouts.php
+++ b/modules/system/controllers/MailLayouts.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use Lang;
 use Flash;
diff --git a/modules/system/controllers/MailPartials.php b/modules/system/controllers/MailPartials.php
index b1a457fd57..07696cb396 100644
--- a/modules/system/controllers/MailPartials.php
+++ b/modules/system/controllers/MailPartials.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use BackendMenu;
 use Backend\Classes\Controller;
diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php
index 8574909edc..604f63b996 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use Mail;
 use Flash;
@@ -72,8 +74,7 @@ public function onTest($recordId)
             Mail::sendTo([$user->email => $user->full_name], $model->code);
 
             Flash::success(trans('system::lang.mail_templates.test_success'));
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             Flash::error($ex->getMessage());
         }
     }
diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
index fc9fcc9064..3ea7a98519 100644
--- a/modules/system/controllers/RequestLogs.php
+++ b/modules/system/controllers/RequestLogs.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use Lang;
 use Flash;
@@ -62,8 +64,7 @@ public function index_onDelete()
             }
 
             Flash::success(Lang::get('backend::lang.list.delete_selected_success'));
-        }
-        else {
+        } else {
             Flash::error(Lang::get('backend::lang.list.delete_selected_empty'));
         }
 
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index d6d4b649f9..d417e71b5e 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use Mail;
 use Lang;
@@ -69,7 +71,7 @@ public function mysettings()
 
     public function update($author, $plugin, $code = null)
     {
-        SettingsManager::setContext($author.'.'.$plugin, $code);
+        SettingsManager::setContext($author . '.' . $plugin, $code);
 
         $this->vars['parentLink'] = Backend::url('system/settings');
         $this->vars['parentLabel'] = Lang::get('system::lang.settings.menu_label');
@@ -88,8 +90,7 @@ public function update($author, $plugin, $code = null)
 
             $model = $this->createModel($item);
             $this->initWidgets($model);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
     }
@@ -149,7 +150,7 @@ public function update_onResetDefault($author, $plugin, $code = null)
 
         Flash::success(Lang::get('backend::lang.form.reset_success'));
 
-        return Backend::redirect('system/settings/update/'.$author.'/'.$plugin.'/'.$code);
+        return Backend::redirect('system/settings/update/' . $author . '/' . $plugin . '/' . $code);
     }
 
     /**
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index f27e1e4f5d..d5cd1f0dad 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -1,4 +1,6 @@
-<?php namespace System\Controllers;
+<?php
+
+namespace System\Controllers;
 
 use ApplicationException;
 use Backend;
@@ -112,8 +114,7 @@ public function install($tab = null)
             $this->vars['activeTab'] = $tab ?: 'plugins';
             $this->vars['installedPlugins'] = $this->getInstalledPlugins();
             $this->vars['installedThemes'] = $this->getInstalledThemes();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
     }
@@ -153,8 +154,7 @@ public function details($urlCode = null, $tab = null)
                 $this->vars['pluginAuthor'] = array_get($details, 'author');
                 $this->vars['pluginIcon'] = array_get($details, 'icon', 'icon-leaf');
                 $this->vars['pluginHomepage'] = array_get($details, 'homepage');
-            }
-            else {
+            } else {
                 throw new ApplicationException(Lang::get('system::lang.updates.plugin_not_found'));
             }
 
@@ -172,8 +172,7 @@ public function details($urlCode = null, $tab = null)
             $this->vars['changelog'] = $changelog;
             $this->vars['upgrades'] = $upgrades;
             $this->vars['licence'] = $licence;
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
     }
@@ -182,11 +181,11 @@ protected function getPluginMarkdownFile($path, $filenames)
     {
         $contents = null;
         foreach ($filenames as $file) {
-            if (!File::exists($path . '/'.$file)) {
+            if (!File::exists($path . '/' . $file)) {
                 continue;
             }
 
-            $contents = File::get($path . '/'.$file);
+            $contents = File::get($path . '/' . $file);
 
             /*
              * Parse markdown, clean HTML, remove first H1 tag
@@ -352,8 +351,7 @@ public function onCheckForUpdates()
             $this->vars['hasImportantUpdates'] = array_get($result, 'hasImportantUpdates', false);
             $this->vars['pluginList'] = array_get($result, 'plugins', []);
             $this->vars['themeList'] = array_get($result, 'themes', []);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
 
@@ -401,7 +399,7 @@ protected function processImportantUpdates($result)
                 }
 
                 $isImportant = $hasImportantUpdates = true;
-                $detailsUrl = Backend::url('system/updates/details/'.PluginVersion::makeSlug($code).'/upgrades').'?fetch=1';
+                $detailsUrl = Backend::url('system/updates/details/' . PluginVersion::makeSlug($code) . '/upgrades') . '?fetch=1';
                 $description = str_replace('!!!', '', $description);
                 $result['plugins'][$code]['updates'][$version] = [$description, $detailsUrl];
             }
@@ -474,8 +472,7 @@ public function onForceUpdate($force = true)
             ];
 
             $this->vars['updateSteps'] = $updateSteps;
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
 
@@ -506,8 +503,7 @@ public function onApplyUpdates()
                 }
 
                 $plugins = array_combine($pluginCodes, $plugins);
-            }
-            else {
+            } else {
                 $plugins = [];
             }
 
@@ -522,8 +518,7 @@ public function onApplyUpdates()
                 }
 
                 $themes = array_combine($themeCodes, $themes);
-            }
-            else {
+            } else {
                 $themes = [];
             }
 
@@ -541,7 +536,7 @@ public function onApplyUpdates()
                 $pluginAction = $pluginActions[$_code];
 
                 if (!$pluginAction) {
-                    throw new ApplicationException('Please select an action for plugin '. $code);
+                    throw new ApplicationException('Please select an action for plugin ' . $code);
                 }
 
                 if ($pluginAction != 'confirm') {
@@ -569,8 +564,7 @@ public function onApplyUpdates()
             ];
 
             $this->vars['updateSteps'] = $updateSteps;
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
 
@@ -694,8 +688,7 @@ public function onAttachProject()
             ]);
 
             return $this->onForceUpdate(false);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
             return $this->makePartial('project_form');
         }
@@ -732,8 +725,7 @@ public function onLoadChangelog()
             }
 
             $this->vars['changelog'] = $changelog;
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
         }
 
@@ -782,8 +774,7 @@ public function onInstallPlugin()
             $this->vars['updateSteps'] = $updateSteps;
 
             return $this->makePartial('execute');
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
             return $this->makePartial('plugin_form');
         }
@@ -809,7 +800,8 @@ public function onRemovePlugin()
      */
     public function onBulkAction()
     {
-        if (($bulkAction = post('action')) &&
+        if (
+            ($bulkAction = post('action')) &&
             ($checkedIds = post('checked')) &&
             is_array($checkedIds) &&
             count($checkedIds)
@@ -903,8 +895,7 @@ public function onInstallTheme()
             $this->vars['updateSteps'] = $updateSteps;
 
             return $this->makePartial('execute');
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->handleError($ex);
             return $this->makePartial('theme_form');
         }
diff --git a/modules/system/controllers/mailbrandsettings/index.php b/modules/system/controllers/mailbrandsettings/index.php
index bdc65bc9de..fd40aa9219 100644
--- a/modules/system/controllers/mailbrandsettings/index.php
+++ b/modules/system/controllers/mailbrandsettings/index.php
@@ -48,7 +48,7 @@ class="btn btn-danger pull-right"
     <?php Block::endPut() ?>
 
     <?php Block::put('body') ?>
-        <?= Form::open(['id' => 'brandSettingsForm', 'class'=>'layout stretch']) ?>
+        <?= Form::open(['id' => 'brandSettingsForm', 'class' => 'layout stretch']) ?>
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
diff --git a/modules/system/controllers/maillayouts/create.php b/modules/system/controllers/maillayouts/create.php
index fcde00a9d3..f7dcfd2a19 100644
--- a/modules/system/controllers/maillayouts/create.php
+++ b/modules/system/controllers/maillayouts/create.php
@@ -7,7 +7,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/system/controllers/maillayouts/update.php b/modules/system/controllers/maillayouts/update.php
index 1958c0f353..d973a54493 100644
--- a/modules/system/controllers/maillayouts/update.php
+++ b/modules/system/controllers/maillayouts/update.php
@@ -7,7 +7,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row min-size">
             <div class="scoreboard">
diff --git a/modules/system/controllers/mailpartials/create.php b/modules/system/controllers/mailpartials/create.php
index 78942e0c18..0a28f374b2 100644
--- a/modules/system/controllers/mailpartials/create.php
+++ b/modules/system/controllers/mailpartials/create.php
@@ -7,7 +7,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/system/controllers/mailpartials/update.php b/modules/system/controllers/mailpartials/update.php
index cde6aa8432..6f17bef9a9 100644
--- a/modules/system/controllers/mailpartials/update.php
+++ b/modules/system/controllers/mailpartials/update.php
@@ -7,7 +7,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row min-size">
             <div class="scoreboard">
diff --git a/modules/system/controllers/mailtemplates/create.php b/modules/system/controllers/mailtemplates/create.php
index 19995235af..7fd2856c42 100644
--- a/modules/system/controllers/mailtemplates/create.php
+++ b/modules/system/controllers/mailtemplates/create.php
@@ -7,7 +7,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row">
             <?= $this->formRender() ?>
diff --git a/modules/system/controllers/mailtemplates/update.php b/modules/system/controllers/mailtemplates/update.php
index 1727196215..41b6bac781 100644
--- a/modules/system/controllers/mailtemplates/update.php
+++ b/modules/system/controllers/mailtemplates/update.php
@@ -7,7 +7,7 @@
 
 <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['class'=>'layout']) ?>
+    <?= Form::open(['class' => 'layout']) ?>
 
         <div class="layout-row min-size">
             <div class="scoreboard">
diff --git a/modules/system/controllers/updates/_column_code.php b/modules/system/controllers/updates/_column_code.php
index f4fbf8f5d5..9ef2ac0b90 100644
--- a/modules/system/controllers/updates/_column_code.php
+++ b/modules/system/controllers/updates/_column_code.php
@@ -1,4 +1,5 @@
 <?php
+
 $icon = null;
 
 if ($record->is_disabled) {
@@ -11,6 +12,6 @@
     $icon = 'lock';
 }
 ?>
-<span class="<?= $icon ? 'wn-icon-'.$icon : '' ?>">
+<span class="<?= $icon ? 'wn-icon-' . $icon : '' ?>">
     <?= $value ?>
 </span>
diff --git a/modules/system/controllers/updates/_update_list.php b/modules/system/controllers/updates/_update_list.php
index 4444603ddc..f12903c4d0 100644
--- a/modules/system/controllers/updates/_update_list.php
+++ b/modules/system/controllers/updates/_update_list.php
@@ -31,7 +31,7 @@ class="form-control custom-select select-no-search"
                             </div>
                             <dl>
                                 <?php foreach (array_get($core, 'updates', []) as $build => $description): ?>
-                                    <dt><?= e(trans('system::lang.updates.core_build', ['build'=>$build])) ?></dt>
+                                    <dt><?= e(trans('system::lang.updates.core_build', ['build' => $build])) ?></dt>
                                     <?php if (is_array($description)): ?>
                                         <dd>
                                             <span class="important-update-label">
@@ -48,7 +48,7 @@ class="form-control custom-select select-no-search"
                                     <?php endif ?>
                                 <?php endforeach ?>
                                 <?php if ($core['old_build']): ?>
-                                    <dt class="text-muted"><?= e(trans('system::lang.updates.core_build', ['build'=>$core['old_build']])) ?></dt>
+                                    <dt class="text-muted"><?= e(trans('system::lang.updates.core_build', ['build' => $core['old_build']])) ?></dt>
                                     <dd class="text-muted"><?= e(trans('system::lang.updates.core_current_build')) ?></dd>
                                 <?php endif ?>
                             </dl>
diff --git a/modules/system/controllers/updates/details.php b/modules/system/controllers/updates/details.php
index 7e1262117c..6112b8cbb1 100644
--- a/modules/system/controllers/updates/details.php
+++ b/modules/system/controllers/updates/details.php
@@ -36,28 +36,28 @@
             <li class="<?= $activeTab == 'readme' ? 'active' : '' ?>">
                 <a
                     href="#readme"
-                    data-tab-url="<?= Backend::url('system/updates/details/'.$urlCode.'/readme') ?>">
+                    data-tab-url="<?= Backend::url('system/updates/details/' . $urlCode . '/readme') ?>">
                     <?= e(trans('system::lang.updates.details_readme')) ?>
                 </a>
             </li>
             <li class="<?= $activeTab == 'changelog' ? 'active' : '' ?>">
                 <a
                     href="#changelog"
-                    data-tab-url="<?= Backend::url('system/updates/details/'.$urlCode.'/changelog') ?>">
+                    data-tab-url="<?= Backend::url('system/updates/details/' . $urlCode . '/changelog') ?>">
                     <?= e(trans('system::lang.updates.details_changelog')) ?>
                 </a>
             </li>
             <li class="<?= $activeTab == 'upgrades' ? 'active' : '' ?>">
                 <a
                     href="#upgrades"
-                    data-tab-url="<?= Backend::url('system/updates/details/'.$urlCode.'/upgrades') ?>">
+                    data-tab-url="<?= Backend::url('system/updates/details/' . $urlCode . '/upgrades') ?>">
                     <?= e(trans('system::lang.updates.details_upgrades')) ?>
                 </a>
             </li>
             <li class="<?= $activeTab == 'licence' ? 'active' : '' ?>">
                 <a
                     href="#licence"
-                    data-tab-url="<?= Backend::url('system/updates/details/'.$urlCode.'/licence') ?>">
+                    data-tab-url="<?= Backend::url('system/updates/details/' . $urlCode . '/licence') ?>">
                     <?= e(trans('system::lang.updates.details_licence')) ?>
                 </a>
             </li>
@@ -78,7 +78,7 @@
                         <dl>
                             <?php foreach ($changelog as $version => $comments): ?>
                                 <?php foreach ($comments as $index => $comment): ?>
-                                    <dt><?= !$index ? e($version): '' ?></dt>
+                                    <dt><?= !$index ? e($version) : '' ?></dt>
                                     <dd><?= e($comment) ?></dd>
                                 <?php endforeach; ?>
                             <?php endforeach; ?>
diff --git a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
index 12ed0f5209..6196c41eb9 100644
--- a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
+++ b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
@@ -12,8 +12,7 @@ public function up()
                 $layout->content_html = preg_replace("/({{\s*message\s*[|]raw\s*}})/i", "{{ content|raw }}", $layout->content_html);
                 $layout->content_text = preg_replace("/({{\s*message\s*[|]raw\s*}})/i", "{{ content|raw }}", $layout->content_text);
                 $layout->forceSave();
-            }
-            catch (Exception $ex) {
+            } catch (Exception $ex) {
             }
         }
     }
diff --git a/modules/system/database/seeds/DatabaseSeeder.php b/modules/system/database/seeds/DatabaseSeeder.php
index 7dec41339d..9ed27c1818 100644
--- a/modules/system/database/seeds/DatabaseSeeder.php
+++ b/modules/system/database/seeds/DatabaseSeeder.php
@@ -1,11 +1,12 @@
-<?php namespace System\Database\Seeds;
+<?php
+
+namespace System\Database\Seeds;
 
 use Seeder;
 use Eloquent;
 
 class DatabaseSeeder extends Seeder
 {
-
     /**
      * Run the database seeds.
      *
diff --git a/modules/system/database/seeds/SeedSetupMailLayouts.php b/modules/system/database/seeds/SeedSetupMailLayouts.php
index 16433f3186..2c2d9ace57 100644
--- a/modules/system/database/seeds/SeedSetupMailLayouts.php
+++ b/modules/system/database/seeds/SeedSetupMailLayouts.php
@@ -1,4 +1,6 @@
-<?php namespace System\Database\Seeds;
+<?php
+
+namespace System\Database\Seeds;
 
 use Seeder;
 use System\Models\MailLayout;
diff --git a/modules/system/helpers/Cache.php b/modules/system/helpers/Cache.php
index 2b3cde1312..bc32a6dfad 100644
--- a/modules/system/helpers/Cache.php
+++ b/modules/system/helpers/Cache.php
@@ -1,4 +1,6 @@
-<?php namespace System\Helpers;
+<?php
+
+namespace System\Helpers;
 
 use App;
 use File;
@@ -36,7 +38,7 @@ public static function clearInternal()
      */
     public function clearCombiner()
     {
-        $path = storage_path().'/cms/combiner';
+        $path = storage_path() . '/cms/combiner';
         if (!is_dir($path)) {
             return;
         }
@@ -50,11 +52,11 @@ public function clearCombiner()
      */
     public function clearCache()
     {
-        $path = storage_path().'/cms/cache';
+        $path = storage_path() . '/cms/cache';
         if (!is_dir($path)) {
             return;
         }
-        foreach (File::directories(storage_path().'/cms/cache') as $directory) {
+        foreach (File::directories(storage_path() . '/cms/cache') as $directory) {
             File::deleteDirectory($directory);
         }
     }
@@ -64,11 +66,11 @@ public function clearCache()
      */
     public function clearTwig()
     {
-        $path = storage_path().'/cms/twig';
+        $path = storage_path() . '/cms/twig';
         if (!is_dir($path)) {
             return;
         }
-        foreach (File::directories(storage_path().'/cms/twig') as $directory) {
+        foreach (File::directories(storage_path() . '/cms/twig') as $directory) {
             File::deleteDirectory($directory);
         }
     }
diff --git a/modules/system/helpers/DateTime.php b/modules/system/helpers/DateTime.php
index 62c7f94cad..7a17d69426 100644
--- a/modules/system/helpers/DateTime.php
+++ b/modules/system/helpers/DateTime.php
@@ -1,4 +1,6 @@
-<?php namespace System\Helpers;
+<?php
+
+namespace System\Helpers;
 
 use Carbon\Carbon;
 use DateTime as PhpDateTime;
@@ -32,11 +34,9 @@ public static function timeTense($datetime): string
 
         if ($datetime->isToday()) {
             $date = Lang::get('system::lang.datetime.today');
-        }
-        elseif ($datetime->isYesterday()) {
+        } elseif ($datetime->isYesterday()) {
             $date = Lang::get('system::lang.datetime.yesterday');
-        }
-        elseif ($datetime->isTomorrow()) {
+        } elseif ($datetime->isTomorrow()) {
             $date = Lang::get('system::lang.datetime.tomorrow');
         }
 
@@ -52,17 +52,13 @@ public static function makeCarbon($value, $throwException = true)
     {
         if ($value instanceof Carbon) {
             // Do nothing
-        }
-        elseif ($value instanceof PhpDateTime) {
+        } elseif ($value instanceof PhpDateTime) {
             $value = Carbon::instance($value);
-        }
-        elseif (is_numeric($value)) {
+        } elseif (is_numeric($value)) {
             $value = Carbon::createFromTimestamp($value);
-        }
-        elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $value)) {
+        } elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $value)) {
             $value = Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
-        }
-        else {
+        } else {
             try {
                 $value = Carbon::parse($value);
             } catch (Exception $ex) {
@@ -128,7 +124,7 @@ public static function momentFormat($format): string
         ];
 
         foreach ($replacements as $from => $to) {
-            $replacements['\\'.$from] = '['.$from.']';
+            $replacements['\\' . $from] = '[' . $from . ']';
         }
 
         return strtr($format, $replacements);
diff --git a/modules/system/helpers/View.php b/modules/system/helpers/View.php
index 5be25b2d69..b2bc429dfc 100644
--- a/modules/system/helpers/View.php
+++ b/modules/system/helpers/View.php
@@ -1,4 +1,6 @@
-<?php namespace System\Helpers;
+<?php
+
+namespace System\Helpers;
 
 use View as ViewFacade;
 
diff --git a/modules/system/lang/bg/client.php b/modules/system/lang/bg/client.php
index 9c61eea37b..80ff6830e6 100644
--- a/modules/system/lang/bg/client.php
+++ b/modules/system/lang/bg/client.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/lang/bg/lang.php b/modules/system/lang/bg/lang.php
index cbe3aa599c..b16fb70f79 100644
--- a/modules/system/lang/bg/lang.php
+++ b/modules/system/lang/bg/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'app' => [
         'name' => 'Winter CMS',
diff --git a/modules/system/lang/bg/validation.php b/modules/system/lang/bg/validation.php
index bea79b60b1..36f662fe4f 100644
--- a/modules/system/lang/bg/validation.php
+++ b/modules/system/lang/bg/validation.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/lang/el/client.php b/modules/system/lang/el/client.php
index a3038e6953..b24ad4ed7b 100644
--- a/modules/system/lang/el/client.php
+++ b/modules/system/lang/el/client.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Greek Language Updated on 2016-07-16 v1.02 */
 return [
     /*
diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php
index c0d4a7005b..7cbcdb902e 100644
--- a/modules/system/lang/el/lang.php
+++ b/modules/system/lang/el/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Greek Language Updated on 2016-07-16 v1.05 */
 return [
     'app' => [
diff --git a/modules/system/lang/el/validation.php b/modules/system/lang/el/validation.php
index 78499b6e38..0afa8c2852 100644
--- a/modules/system/lang/el/validation.php
+++ b/modules/system/lang/el/validation.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Greek Language Updated on 2015-07-06 v1.01 */
 return [
 
@@ -69,7 +70,7 @@
     ],
     "unique"           => "Η :attribute έχει ήδη χρησιμοποιηθεί.",
     "url"              => "Η :attribute είναι μη έγκυρη.",
-    
+
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php
index 67c644f2e8..d263a26f66 100644
--- a/modules/system/lang/ru/lang.php
+++ b/modules/system/lang/ru/lang.php
@@ -206,28 +206,28 @@
         'layouts' => 'Шаблоны',
         'no_layout' => '-- Нет шаблона --',
         'name' => 'Название',
-        'name_comment'=> 'Уникальное имя, используемое для обозначения этого шаблона',
-        'code'=> 'Код',
-        'code_comment'=> 'Уникальный код, используемый для обозначения этого шаблона',
+        'name_comment' => 'Уникальное имя, используемое для обозначения этого шаблона',
+        'code' => 'Код',
+        'code_comment' => 'Уникальный код, используемый для обозначения этого шаблона',
         'subject' => 'Тема',
         'subject_comment' => 'Тема сообщения',
         'description' => 'Описание',
-        'content_html'=> 'HTML',
+        'content_html' => 'HTML',
         'content_css' => 'CSS',
-        'content_text'=> 'Простой текст',
+        'content_text' => 'Простой текст',
         'test_send' => 'Отправить тестовое сообщение',
-        'test_success'=> 'Тестовое сообщение было успешно отправлено.',
-        'test_confirm'=> 'Тестовое сообщение будет отправлено на :email. Продолжить?',
-        'creating'=> 'Создание...',
+        'test_success' => 'Тестовое сообщение было успешно отправлено.',
+        'test_confirm' => 'Тестовое сообщение будет отправлено на :email. Продолжить?',
+        'creating' => 'Создание...',
         'creating_layout' => 'Создание шаблона...',
-        'saving'=> 'Сохранение...',
+        'saving' => 'Сохранение...',
         'saving_layout' => 'Сохранение шаблона...',
-        'delete_confirm'=> 'Вы действительно хотите это удалить?',
+        'delete_confirm' => 'Вы действительно хотите это удалить?',
         'delete_layout_confirm' => 'Вы действительно хотите удалить этот шаблон?',
-        'deleting'=> 'Удаление...',
+        'deleting' => 'Удаление...',
         'deleting_layout' => 'Удаление шаблона...',
         'sending' => 'Отправка тестового сообщения...',
-        'return'=> 'Вернуться к списку шаблонов',
+        'return' => 'Вернуться к списку шаблонов',
         'options' => 'Опции',
         'disable_auto_inline_css' => 'Выключить автоматический встроенный CSS',
     ],
@@ -235,139 +235,139 @@
         'menu_label' => 'Почтовый брендинг',
         'menu_description' => 'Измените цвета и внешний вид почтовых шаблонов.',
         'page_title' => 'Настройка внешнего вида почты',
-        'sample_template'=> [
+        'sample_template' => [
             'heading' => 'Заголовок',
             'paragraph' => 'Это абзац, содержит текст Lorem Ipsum и ссылку. Cumque dicta <a>doloremque eaque</a>, enim error laboriosam pariatur possimus tenetur veritatis voluptas.',
             'table' => [
-                'item'=> 'Пункт',
+                'item' => 'Пункт',
                 'description' => 'Описание',
                 'price' => 'Цена',
-                'centered'=> 'По центру',
+                'centered' => 'По центру',
                 'right_aligned' => 'По правому краю',
             ],
             'buttons' => [
-                'primary'=> 'Основная кнопка',
+                'primary' => 'Основная кнопка',
                 'positive' => 'Положительная кнопка',
                 'negative' => 'Отрицательная кнопка',
             ],
             'panel' => 'Насколько великолепна эта панель?',
-            'more'=> 'Еще один текст',
+            'more' => 'Еще один текст',
             'promotion' => 'Код купона: WINTER',
             'subcopy' => 'Это подкопия письма',
-            'thanks'=> 'Спасибо',
+            'thanks' => 'Спасибо',
         ],
         'fields' => [
-            '_section_background'=> 'Задний план',
-            'body_bg'=> 'Фон тела документа',
+            '_section_background' => 'Задний план',
+            'body_bg' => 'Фон тела документа',
             'content_bg' => 'Фон обертки содержимого',
             'content_inner_bg' => 'Фон содержимого',
             '_section_buttons' => 'Кнопки',
-            'button_text_color'=> 'Цвет текста кнопки',
-            'button_primary_bg'=> 'Цвет основной кнопки',
+            'button_text_color' => 'Цвет текста кнопки',
+            'button_primary_bg' => 'Цвет основной кнопки',
             'button_positive_bg' => 'Цвет положительной кнопки',
             'button_negative_bg' => 'Цвет отрицательной кнопки',
-            '_section_type'=> 'Типография',
+            '_section_type' => 'Типография',
             'header_color' => 'Цвет заголовка',
-            'heading_color'=> 'Цвет заголовков',
+            'heading_color' => 'Цвет заголовков',
             'text_color' => 'Цвет текста',
             'link_color' => 'Цвет ссылки',
             'footer_color' => 'Нижний колонтитул',
             '_section_borders' => 'Границы',
-            'body_border_color'=> 'Цвет под заголовком',
+            'body_border_color' => 'Цвет под заголовком',
             'subcopy_border_color' => 'Цвет над колонтитулом',
             'table_border_color' => 'Цвет таблицы',
-            '_section_components'=> 'Компоненты',
+            '_section_components' => 'Компоненты',
             'panel_bg' => 'Фон панели',
             'promotion_bg' => 'Фон промо блока',
             'promotion_border_color' => 'Цвет рамки промо блока',
         ],
     ],
-    'install'=> [
+    'install' => [
         'project_label' => 'Присоединить к проекту',
-        'plugin_label'=> 'Установить плагин',
+        'plugin_label' => 'Установить плагин',
         'theme_label' => 'Установить тему',
         'missing_plugin_name' => 'Пожалуйста, укажите название плагина для установки.',
-        'missing_theme_name'=> 'Пожалуйста, укажите название темы для установки.',
-        'install_completing'=> 'Завершение процесса установки',
+        'missing_theme_name' => 'Пожалуйста, укажите название темы для установки.',
+        'install_completing' => 'Завершение процесса установки',
         'install_success' => 'Плагин был успешно установлен.',
     ],
-    'updates'=> [
-        'title'=> 'Менеджер обновлений',
+    'updates' => [
+        'title' => 'Менеджер обновлений',
         'name' => 'Обновление ПО',
         'menu_label' => 'Обновления и плагины',
         'menu_description' => 'Обновление системы, управление и установка плагинов и тем.',
-        'return_link'=> 'Вернуться к системе обновлений',
-        'check_label'=> 'Проверить обновления ',
-        'retry_label'=> 'Попробовать еще раз',
-        'plugin_name'=> 'Название',
-        'plugin_code'=> 'Код',
+        'return_link' => 'Вернуться к системе обновлений',
+        'check_label' => 'Проверить обновления ',
+        'retry_label' => 'Попробовать еще раз',
+        'plugin_name' => 'Название',
+        'plugin_code' => 'Код',
         'plugin_description' => 'Описание',
         'plugin_version' => 'Версия',
-        'plugin_author'=> 'Автор',
+        'plugin_author' => 'Автор',
         'plugin_not_found' => 'Плагин не найден',
         'plugin_version_not_found' => 'Версия плагина не найдена',
         'core_current_build' => 'Текущая сборка',
-        'core_view_changelog'=> 'Просмотр списка изменений',
+        'core_view_changelog' => 'Просмотр списка изменений',
         'core_build' => 'Сборка :build',
-        'core_build_help'=> 'Последняя доступная сборка.',
+        'core_build_help' => 'Последняя доступная сборка.',
         'core_downloading' => 'Загрузка файлов приложения',
-        'core_extracting'=> 'Распаковка файлов приложения',
+        'core_extracting' => 'Распаковка файлов приложения',
         'core_set_build' => 'Установка номера сборки',
-        'update_warnings_title'=> 'Обнаружены проблемы требующие вашего внимания',
+        'update_warnings_title' => 'Обнаружены проблемы требующие вашего внимания',
         'update_warnings_plugin_missing' => 'Плагин :code ялвяется зависисмостью плагина :parent_code, но он не обнаружен в системе. Пожалуйста установите этот плагин.',
         'update_warnings_plugin_replace' => 'Плагин :plugin заменяет :alias, пожалуйста удалите :alias чтобы не было конфликтов',
         'update_warnings_plugin_replace_cli' => 'Плагин :plugin заменяет :alias, пожалуйста удалите :alias чтобы не было конфликтов',
-        'changelog'=> 'Список изменений',
+        'changelog' => 'Список изменений',
         'changelog_view_details' => 'Просмотр подробностей',
-        'plugins'=> 'Плагины',
+        'plugins' => 'Плагины',
         'themes' => 'Темы',
         'disabled' => 'Отключено',
         'plugin_downloading' => 'Загрузка плагина: :name',
-        'plugin_extracting'=> 'Распаковка плагина: :name',
-        'plugin_version_none'=> 'Новый плагин',
+        'plugin_extracting' => 'Распаковка плагина: :name',
+        'plugin_version_none' => 'Новый плагин',
         'plugin_current_version' => 'Текущая версия',
-        'theme_new_install'=> 'Новая тема установлена.',
-        'theme_downloading'=> 'Загрузка темы: :name',
+        'theme_new_install' => 'Новая тема установлена.',
+        'theme_downloading' => 'Загрузка темы: :name',
         'theme_extracting' => 'Распаковка темы: :name',
         'update_label' => 'Обновить',
-        'update_completing'=> 'Завершение процесса обновления',
+        'update_completing' => 'Завершение процесса обновления',
         'update_loading' => 'Поиск доступных обновлений...',
         'update_success' => 'Процесс обновления был успешно завершен.',
-        'update_failed_label'=> 'Не удалось выполнить обновление',
-        'force_label'=> 'Принудительно обновить',
-        'found'=> [
+        'update_failed_label' => 'Не удалось выполнить обновление',
+        'force_label' => 'Принудительно обновить',
+        'found' => [
             'label' => 'Доступны новые обновления!',
-            'help'=> 'Выберите «Обновить», чтобы начать процесс обновления.',
+            'help' => 'Выберите «Обновить», чтобы начать процесс обновления.',
         ],
         'none' => [
             'label' => 'Нет обновлений',
-            'help'=> 'Новые обновления не найдены.',
+            'help' => 'Новые обновления не найдены.',
         ],
         'important_action' => [
             'empty' => 'Выберите действие',
             'confirm' => 'Подтвердите обновление',
-            'skip'=> 'Пропустить этот плагин (только один раз)',
-            'ignore'=> 'Пропустить этот плагин (всегда)',
+            'skip' => 'Пропустить этот плагин (только один раз)',
+            'ignore' => 'Пропустить этот плагин (всегда)',
         ],
-        'important_action_required'=> 'Необходимое действие',
+        'important_action_required' => 'Необходимое действие',
         'important_view_guide' => 'Посмотреть руководство по обновлению',
         'important_view_release_notes' => 'Просмотреть заметки о выпуске',
         'important_alert_text' => 'Некоторые обновления требуют вашего внимания.',
-        'details_title'=> 'Информация о плагине',
-        'details_view_homepage'=> 'Перейти к домашней странице',
+        'details_title' => 'Информация о плагине',
+        'details_view_homepage' => 'Перейти к домашней странице',
         'details_readme' => 'Документация',
         'details_readme_missing' => 'Документация не предоставлена.',
-        'details_changelog'=> 'Изменения',
-        'details_changelog_missing'=> 'Нет никакого измененного списка.',
+        'details_changelog' => 'Изменения',
+        'details_changelog_missing' => 'Нет никакого измененного списка.',
         'details_upgrades' => 'Инструкция по обновлению',
         'details_upgrades_missing' => 'Инструкция по обновлению не предоставлена.',
-        'details_licence'=> 'Лицензия',
-        'details_licence_missing'=> 'Лицензия не предоставляется.',
-        'details_current_version'=> 'Текущая версия',
+        'details_licence' => 'Лицензия',
+        'details_licence_missing' => 'Лицензия не предоставляется.',
+        'details_current_version' => 'Текущая версия',
         'details_author' => 'Автор',
     ],
     'server' => [
-        'connect_error'=> 'Ошибка подключения к серверу.',
+        'connect_error' => 'Ошибка подключения к серверу.',
         'response_not_found' => 'Сервер обновления не найден.',
         'response_invalid' => 'Неверный ответ сервера.',
         'response_empty' => 'Пустой ответ сервера.',
@@ -379,85 +379,85 @@
     ],
     'config' => [
         'not_found' => 'Не удалось найти конфигурационный файл :file, ожидаемый для :location.',
-        'required'=> "Для конфигурации, используемой в :location не указано свойство ':property'.",
+        'required' => "Для конфигурации, используемой в :location не указано свойство ':property'.",
     ],
-    'zip'=> [
+    'zip' => [
         'extract_failed' => "Невозможно извлечь файл ':file'.",
     ],
-    'event_log'=> [
+    'event_log' => [
         'hint' => 'В этом журнале отображается список возможных ошибок, которые возникают в работе приложения, таких как исключения и отладочная информация.',
         'menu_label' => 'Журнал событий',
         'menu_description' => 'Просмотр системного журнала событий.',
         'empty_link' => 'Очистить журнал событий',
-        'empty_loading'=> 'Очищение журнала событий...',
-        'empty_success'=> 'Журнал событий очищен',
-        'return_link'=> 'Вернуться в журнал событий',
+        'empty_loading' => 'Очищение журнала событий...',
+        'empty_success' => 'Журнал событий очищен',
+        'return_link' => 'Вернуться в журнал событий',
         'id' => 'ID',
         'id_label' => 'ID события',
         'created_at' => 'Дата и время',
-        'message'=> 'Сообщение',
-        'level'=> 'Уровень',
-        'preview_title'=> 'События',
+        'message' => 'Сообщение',
+        'level' => 'Уровень',
+        'preview_title' => 'События',
     ],
-    'request_log'=> [
+    'request_log' => [
         'hint' => 'В этом журнале отображается список запросов браузера, которые могут потребовать внимания. Например, если посетитель открывает несуществующую страницу, то в журнале создается запись с кодом статуса 404.',
         'menu_label' => 'Журнал запросов',
         'menu_description' => 'Просмотр неудачных или перенаправленных запросов.',
         'empty_link' => 'Очистить журнал запросов',
-        'empty_loading'=> 'Очищение журнала запросов...',
-        'empty_success'=> 'Успешное очищение журнала запросов.',
-        'return_link'=> 'Вернуться к журналу запросов',
+        'empty_loading' => 'Очищение журнала запросов...',
+        'empty_success' => 'Успешное очищение журнала запросов.',
+        'return_link' => 'Вернуться к журналу запросов',
         'id' => 'ID',
         'id_label' => 'ID записи',
-        'count'=> 'Счетчик',
-        'referer'=> 'Источник запроса',
-        'url'=> 'Адрес',
-        'status_code'=> 'Статус',
-        'preview_title'=> 'Запрос',
+        'count' => 'Счетчик',
+        'referer' => 'Источник запроса',
+        'url' => 'Адрес',
+        'status_code' => 'Статус',
+        'preview_title' => 'Запрос',
     ],
-    'permissions'=> [
-        'name'=> 'Система',
-        'manage_system_settings'=> 'Настройка системных параметров',
+    'permissions' => [
+        'name' => 'Система',
+        'manage_system_settings' => 'Настройка системных параметров',
         'manage_software_updates' => 'Управление обновлениями',
         'access_logs' => 'Просмотр системных логов',
         'manage_mail_templates' => 'Управление почтовыми шаблонами',
-        'manage_mail_settings'=> 'Управление настройками почты',
+        'manage_mail_settings' => 'Управление настройками почты',
         'manage_other_administrators' => 'Управление другими администраторами',
         'impersonate_users' => 'Выдавать себя за пользователей',
-        'manage_preferences'=> 'Управление настройками бэкенда',
+        'manage_preferences' => 'Управление настройками бэкенда',
         'manage_editor' => 'Управление настройками редактора кода',
         'manage_own_editor' => 'Управление настройками персонального редактора кода',
-        'view_the_dashboard'=> 'Просмотр панели управления',
-        'manage_default_dashboard'=> 'Управление панелью управления по умолчанию',
+        'view_the_dashboard' => 'Просмотр панели управления',
+        'manage_default_dashboard' => 'Управление панелью управления по умолчанию',
         'manage_branding' => 'Персонализация панели управления',
     ],
-    'log'=> [
+    'log' => [
         'menu_label' => 'Настройки журналов',
         'menu_description' => 'Укажите для каких частей CMS следует вести журнал.',
-        'default_tab'=> 'Ведение журнала',
+        'default_tab' => 'Ведение журнала',
         'log_events' => 'Сохранять системные события',
         'log_events_comment' => 'Хранить системные события в базе данных в дополнение к файловому журналу.',
         'log_requests' => 'Сохранять неудачные запросы',
         'log_requests_comment' => 'Запросы браузера, которые могут потребовать внимания. Например, 404 ошибки.',
-        'log_theme'=> 'Сохранять изменения темы',
-        'log_theme_comment'=> 'Изменения которые внесены средствами CMS.',
+        'log_theme' => 'Сохранять изменения темы',
+        'log_theme_comment' => 'Изменения которые внесены средствами CMS.',
     ],
-    'media'=> [
-        'invalid_path'=> "Указан недопустимый путь к файлу: ':path'.",
+    'media' => [
+        'invalid_path' => "Указан недопустимый путь к файлу: ':path'.",
         'folder_size_items' => 'элемент|элемента|элементов',
     ],
     'page' => [
         'custom_error' => [
             'label' => 'Ошибка страницы',
-            'help'=> 'Приносим извинения, что-то пошло не так и страница не может быть отображена.',
+            'help' => 'Приносим извинения, что-то пошло не так и страница не может быть отображена.',
         ],
         'invalid_token' => [
             'label' => 'Неверный токен безопасности',
         ],
         'maintenance' => [
-            'label'=> "Мы скоро вернемся!",
+            'label' => "Мы скоро вернемся!",
             'help' => "В настоящее время мы находимся на обслуживании, зайдите позже!",
-            'message'=> 'Сообщение:',
+            'message' => 'Сообщение:',
             'available_at' => 'Попробуйте еще раз после:',
         ],
     ],
diff --git a/modules/system/lang/sk/client.php b/modules/system/lang/sk/client.php
index 4c97dc9699..69121eb9cd 100644
--- a/modules/system/lang/sk/client.php
+++ b/modules/system/lang/sk/client.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/lang/sk/lang.php b/modules/system/lang/sk/lang.php
index 44360a9788..b3bd03ca45 100644
--- a/modules/system/lang/sk/lang.php
+++ b/modules/system/lang/sk/lang.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     'app' => [
         'name' => 'Winter CMS',
diff --git a/modules/system/lang/sk/validation.php b/modules/system/lang/sk/validation.php
index b8b8238133..0fc059c264 100644
--- a/modules/system/lang/sk/validation.php
+++ b/modules/system/lang/sk/validation.php
@@ -1,4 +1,5 @@
 <?php
+
 return [
     /*
     |--------------------------------------------------------------------------
diff --git a/modules/system/lang/zh-cn/lang.php b/modules/system/lang/zh-cn/lang.php
index 50c9e1328a..80869b3492 100644
--- a/modules/system/lang/zh-cn/lang.php
+++ b/modules/system/lang/zh-cn/lang.php
@@ -323,7 +323,7 @@
         'referer' => '来源',
         'url' => 'URL',
         'status_code' => '状态',
-        'preview_title'=> '预览事件日志'
+        'preview_title' => '预览事件日志'
     ],
     'permissions' => [
         'name' => '系统',
diff --git a/modules/system/models/EventLog.php b/modules/system/models/EventLog.php
index 2d2efc358e..d54a9a4e25 100644
--- a/modules/system/models/EventLog.php
+++ b/modules/system/models/EventLog.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use App;
 use Exception;
@@ -42,7 +44,7 @@ class_exists('Model') &&
      */
     public static function add(string $message, string $level = 'info', ?array $details = null): self
     {
-        $record = new static;
+        $record = new static();
         $record->message = $message;
         $record->level = $level;
 
@@ -52,8 +54,7 @@ public static function add(string $message, string $level = 'info', ?array $deta
 
         try {
             $record->save();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
         }
 
         return $record;
diff --git a/modules/system/models/File.php b/modules/system/models/File.php
index f7b8d35f6e..738aeb47b2 100644
--- a/modules/system/models/File.php
+++ b/modules/system/models/File.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use Url;
 use Config;
@@ -66,8 +68,7 @@ public function getPublicPath()
 
         if ($this->isPublic()) {
             $uploadsPath .= '/public';
-        }
-        else {
+        } else {
             $uploadsPath .= '/protected';
         }
 
diff --git a/modules/system/models/LogSetting.php b/modules/system/models/LogSetting.php
index 50766acaf8..8fddfdfa55 100644
--- a/modules/system/models/LogSetting.php
+++ b/modules/system/models/LogSetting.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use Model;
 
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index f4cbe626c1..af3f36a33d 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use App;
 use Str;
@@ -72,7 +74,7 @@ public function initSettingsData()
         $vars = static::getCssVars();
 
         foreach ($vars as $var => $default) {
-            $this->{$var} = $config->get('brand.mail.'.Str::studly($var), $default);
+            $this->{$var} = $config->get('brand.mail.' . Str::studly($var), $default);
         }
     }
 
@@ -96,8 +98,7 @@ public static function renderCss()
         try {
             $customCss = self::compileCss();
             Cache::forever($cacheKey, $customCss);
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $customCss = '/* ' . $ex->getMessage() . ' */';
         }
 
diff --git a/modules/system/models/MailLayout.php b/modules/system/models/MailLayout.php
index 4380cfe662..987d2a96c5 100644
--- a/modules/system/models/MailLayout.php
+++ b/modules/system/models/MailLayout.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use View;
 use Model;
@@ -99,7 +101,7 @@ public static function findOrMakeLayout($code)
         $layout = self::whereCode($code)->first();
 
         if (!$layout && View::exists($code)) {
-            $layout = new self;
+            $layout = new self();
             $layout->code = $code;
             $layout->fillFromView($code);
         }
@@ -123,7 +125,7 @@ public static function createLayouts()
                 continue;
             }
 
-            $layout = new static;
+            $layout = new static();
             $layout->code = $code;
             $layout->is_locked = true;
             $layout->fillFromView($path);
@@ -147,7 +149,7 @@ public function fillFromCode($code = null)
         }
 
         if (!$definition = array_get($definitions, $code)) {
-            throw new ApplicationException('Unable to find a registered layout with code: '.$code);
+            throw new ApplicationException('Unable to find a registered layout with code: ' . $code);
         }
 
         $this->fillFromView($definition);
diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
index c988628ee5..d31beeaf13 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use View;
 use Model;
@@ -64,14 +66,13 @@ public static function findOrMakePartial($code)
     {
         try {
             if (!$template = self::whereCode($code)->first()) {
-                $template = new self;
+                $template = new self();
                 $template->code = $code;
                 $template->fillFromCode($code);
             }
 
             return $template;
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             return null;
         }
     }
@@ -102,7 +103,7 @@ public static function createPartials()
         }
 
         foreach ($newPartials as $code => $path) {
-            $partial = new static;
+            $partial = new static();
             $partial->code = $code;
             $partial->is_custom = 0;
             $partial->fillFromView($path);
@@ -125,7 +126,7 @@ public function fillFromCode($code = null)
         }
 
         if (!$definition = array_get($definitions, $code)) {
-            throw new ApplicationException('Unable to find a registered partial with code: '.$code);
+            throw new ApplicationException('Unable to find a registered partial with code: ' . $code);
         }
 
         $this->fillFromView($definition);
diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php
index 3ddb098c96..e66e73f502 100644
--- a/modules/system/models/MailSetting.php
+++ b/modules/system/models/MailSetting.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use App;
 use Model;
@@ -98,8 +100,7 @@ public static function applyConfigValues()
                 if ($settings->smtp_authorization) {
                     $config->set('mail.mailers.smtp.username', $settings->smtp_user);
                     $config->set('mail.mailers.smtp.password', $settings->smtp_password);
-                }
-                else {
+                } else {
                     $config->set('mail.mailers.smtp.username', null);
                     $config->set('mail.mailers.smtp.password', null);
                 }
diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
index 6fd582fe1a..5344cb1bf1 100644
--- a/modules/system/models/MailTemplate.php
+++ b/modules/system/models/MailTemplate.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use View;
 use Model;
@@ -198,7 +200,7 @@ public static function findOrMakeTemplate($code)
         $template = self::whereCode($code)->first();
 
         if (!$template && View::exists($code)) {
-            $template = new self;
+            $template = new self();
             $template->code = $code;
             $template->fillFromView($code);
         }
diff --git a/modules/system/models/Parameter.php b/modules/system/models/Parameter.php
index b9a5a0714e..38955167de 100644
--- a/modules/system/models/Parameter.php
+++ b/modules/system/models/Parameter.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use App;
 use Cache;
@@ -79,7 +81,7 @@ public static function set($key, $value = null)
 
         $record = static::findRecord($key);
         if (!$record) {
-            $record = new static;
+            $record = new static();
             list($namespace, $group, $item) = $record->parseKey($key);
             $record->namespace = $namespace;
             $record->group = $group;
@@ -117,7 +119,7 @@ public function reset($key)
      */
     public static function findRecord($key)
     {
-        $record = new static;
+        $record = new static();
 
         list($namespace, $group, $item) = $record->parseKey($key);
 
diff --git a/modules/system/models/PluginVersion.php b/modules/system/models/PluginVersion.php
index 14f2155dc8..2a6a8758ee 100644
--- a/modules/system/models/PluginVersion.php
+++ b/modules/system/models/PluginVersion.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use Lang;
 use Model;
@@ -98,12 +100,14 @@ public function afterFetch()
             $activeFlags = $manager->getPluginFlags($pluginObj);
             if (!empty($activeFlags)) {
                 foreach ($activeFlags as $flag => $enabled) {
-                    if (in_array($flag, [
+                    if (
+                        in_array($flag, [
                         PluginManager::DISABLED_MISSING,
                         PluginManager::DISABLED_REPLACED,
                         PluginManager::DISABLED_REPLACEMENT_FAILED,
                         PluginManager::DISABLED_MISSING_DEPENDENCIES,
-                    ])) {
+                        ])
+                    ) {
                         $this->disabledBySystem = true;
                     }
 
@@ -112,8 +116,7 @@ public function afterFetch()
                     }
                 }
             }
-        }
-        else {
+        } else {
             $this->name = $this->code;
             $this->description = Lang::get('system::lang.plugins.unknown_plugin');
             $this->orphaned = true;
diff --git a/modules/system/models/RequestLog.php b/modules/system/models/RequestLog.php
index b8db91cff6..c98b665df1 100644
--- a/modules/system/models/RequestLog.php
+++ b/modules/system/models/RequestLog.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use App;
 use Model;
@@ -55,8 +57,7 @@ public static function add($statusCode = 404)
         if (!$record->exists) {
             $record->count = 1;
             $record->save();
-        }
-        else {
+        } else {
             $record->increment('count');
         }
 
diff --git a/modules/system/models/Revision.php b/modules/system/models/Revision.php
index 35ef3f948b..d499b4c825 100644
--- a/modules/system/models/Revision.php
+++ b/modules/system/models/Revision.php
@@ -1,4 +1,6 @@
-<?php namespace System\Models;
+<?php
+
+namespace System\Models;
 
 use Winter\Storm\Database\Models\Revision as RevisionBase;
 
diff --git a/modules/system/models/mailsetting/_drivers_hint.php b/modules/system/models/mailsetting/_drivers_hint.php
index 8662af1373..4852f301b4 100644
--- a/modules/system/models/mailsetting/_drivers_hint.php
+++ b/modules/system/models/mailsetting/_drivers_hint.php
@@ -1 +1 @@
-<?= trans('system::lang.mail.drivers_hint_content', ['url'=> 'https://wintercms.com/docs/services/mail#drivers']); ?>
+<?= trans('system::lang.mail.drivers_hint_content', ['url' => 'https://wintercms.com/docs/services/mail#drivers']); ?>
diff --git a/modules/system/partials/_settings_menu.php b/modules/system/partials/_settings_menu.php
index 5604967009..997f347a95 100644
--- a/modules/system/partials/_settings_menu.php
+++ b/modules/system/partials/_settings_menu.php
@@ -1,4 +1,5 @@
 <?php
+
     $systemItems = System\Classes\SettingsManager::instance()->listItems('system');
 ?>
 <?= $this->makePartial('~/modules/system/partials/_settings_menu_items.php', ['items' => $systemItems]); ?>
diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php
index 802265b9f1..3f8e529d31 100644
--- a/modules/system/reportwidgets/Status.php
+++ b/modules/system/reportwidgets/Status.php
@@ -1,4 +1,6 @@
-<?php namespace System\ReportWidgets;
+<?php
+
+namespace System\ReportWidgets;
 
 use Lang;
 use Config;
@@ -33,8 +35,7 @@ public function render()
     {
         try {
             $this->loadData();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             $this->vars['error'] = $ex->getMessage();
         }
 
@@ -152,7 +153,7 @@ protected function getSystemWarnings()
         foreach ($writablePaths as $path) {
             if (!is_writable($path)) {
                 $warnings[] = [
-                    'message' => Lang::get('backend::lang.warnings.permissions', ['name' => '<strong>'.$path.'</strong>'])
+                    'message' => Lang::get('backend::lang.warnings.permissions', ['name' => '<strong>' . $path . '</strong>'])
                 ];
             }
         }
@@ -160,7 +161,7 @@ protected function getSystemWarnings()
         foreach ($requiredExtensions as $extension => $installed) {
             if (!$installed) {
                 $warnings[] = [
-                    'message' => Lang::get('backend::lang.warnings.extension', ['name' => '<strong>'.$extension.'</strong>']),
+                    'message' => Lang::get('backend::lang.warnings.extension', ['name' => '<strong>' . $extension . '</strong>']),
                     'fixUrl' => 'https://wintercms.com/docs/v1.2/docs/setup/installation#minimum-system-requirements',
                 ];
             }
diff --git a/modules/system/tests/bootstrap/PluginManagerTestCase.php b/modules/system/tests/bootstrap/PluginManagerTestCase.php
index f558705200..0fe882bb26 100644
--- a/modules/system/tests/bootstrap/PluginManagerTestCase.php
+++ b/modules/system/tests/bootstrap/PluginManagerTestCase.php
@@ -6,7 +6,6 @@
 use System\Classes\VersionManager;
 use System\Classes\PluginManager;
 use ReflectionClass;
-
 use Winter\Storm\Database\Model as ActiveRecord;
 
 class PluginManagerTestCase extends TestCase
@@ -40,7 +39,7 @@ public function createApplication()
      * Perform test case set up.
      * @return void
      */
-    public function setUp() : void
+    public function setUp(): void
     {
         /*
          * Force reload of Winter singletons
@@ -69,7 +68,7 @@ public function setUp() : void
      * Flush event listeners and collect garbage.
      * @return void
      */
-    public function tearDown() : void
+    public function tearDown(): void
     {
         $this->flushModelEventListeners();
         parent::tearDown();
@@ -114,4 +113,4 @@ protected function flushModelEventListeners()
 
         ActiveRecord::flushEventListeners();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/system/tests/bootstrap/PluginTestCase.php b/modules/system/tests/bootstrap/PluginTestCase.php
index f4a0af6a7a..38f60edce2 100644
--- a/modules/system/tests/bootstrap/PluginTestCase.php
+++ b/modules/system/tests/bootstrap/PluginTestCase.php
@@ -142,7 +142,7 @@ protected function instantiatePlugin(string $code, bool $throw = true): void
 
         // First time seeing this plugin, load it up
         if ($firstLoad) {
-            $namespace = '\\'.str_replace('.', '\\', $code);
+            $namespace = '\\' . str_replace('.', '\\', $code);
             $path = array_get(
                 array_change_key_case($manager->getPluginNamespaces(), CASE_LOWER),
                 strtolower($namespace)
diff --git a/modules/system/tests/bootstrap/app.php b/modules/system/tests/bootstrap/app.php
index 1063af2536..06c6a816cc 100644
--- a/modules/system/tests/bootstrap/app.php
+++ b/modules/system/tests/bootstrap/app.php
@@ -11,7 +11,7 @@
  * Fallback autoloader
  */
 $loader = new Winter\Storm\Support\ClassLoader(
-    new Winter\Storm\Filesystem\Filesystem,
+    new Winter\Storm\Filesystem\Filesystem(),
     $baseDir,
     $baseDir . '/storage/framework/classes.php'
 );
diff --git a/modules/system/tests/classes/CombineAssetsTest.php b/modules/system/tests/classes/CombineAssetsTest.php
index a34dbca8bb..159fefc1e7 100644
--- a/modules/system/tests/classes/CombineAssetsTest.php
+++ b/modules/system/tests/classes/CombineAssetsTest.php
@@ -8,7 +8,7 @@
 
 class CombineAssetsTest extends TestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -96,7 +96,7 @@ public function testMakeCacheId()
         self::setProtectedProperty($combiner, 'localPath', $samplePath);
 
         $value = self::callProtectedMethod($combiner, 'getCacheKey', [$sampleResources]);
-        $this->assertEquals(md5($samplePath.implode('|', $sampleResources)), $value);
+        $this->assertEquals(md5($samplePath . implode('|', $sampleResources)), $value);
     }
 
     public function testResetCache()
diff --git a/modules/system/tests/classes/CoreLangTest.php b/modules/system/tests/classes/CoreLangTest.php
index d66a0dbe13..38ad416065 100644
--- a/modules/system/tests/classes/CoreLangTest.php
+++ b/modules/system/tests/classes/CoreLangTest.php
@@ -38,7 +38,7 @@ public function testValidCoreLanguageFiles()
         foreach ($modules as $module) {
             foreach ($locales as $locale) {
                 foreach ($files as $file) {
-                    $srcPath = base_path() . '/modules/'.$module.'/lang/'.$locale.'/'.$file;
+                    $srcPath = base_path() . '/modules/' . $module . '/lang/' . $locale . '/' . $file;
                     if (!file_exists($srcPath)) {
                         continue;
                     }
diff --git a/modules/system/tests/classes/FileManifestTest.php b/modules/system/tests/classes/FileManifestTest.php
index 2ceb55301c..1d8c9987ff 100644
--- a/modules/system/tests/classes/FileManifestTest.php
+++ b/modules/system/tests/classes/FileManifestTest.php
@@ -3,7 +3,6 @@
 namespace System\Tests\Classes;
 
 use ReflectionClass;
-
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\ApplicationException;
 use System\Classes\FileManifest;
diff --git a/modules/system/tests/classes/MarkupManagerTest.php b/modules/system/tests/classes/MarkupManagerTest.php
index d5453d193d..ae8083acc6 100644
--- a/modules/system/tests/classes/MarkupManagerTest.php
+++ b/modules/system/tests/classes/MarkupManagerTest.php
@@ -7,8 +7,7 @@
 
 class MarkupManagerTest extends TestCase
 {
-
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/classes/VersionManagerTest.php b/modules/system/tests/classes/VersionManagerTest.php
index b4d0463a4c..779b740caa 100644
--- a/modules/system/tests/classes/VersionManagerTest.php
+++ b/modules/system/tests/classes/VersionManagerTest.php
@@ -7,8 +7,7 @@
 
 class VersionManagerTest extends TestCase
 {
-
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/console/CreateMigrationTest.php b/modules/system/tests/console/CreateMigrationTest.php
index 77e30eea71..e84419756a 100644
--- a/modules/system/tests/console/CreateMigrationTest.php
+++ b/modules/system/tests/console/CreateMigrationTest.php
@@ -33,27 +33,27 @@ public function testCreateMigration()
         $this->assertTrue(Schema::hasTable($this->table));
 
         $columns = [
-            'id'            => ['type'=>'integer', 'index'=>'primary', 'required'=>true],
-            'cb'            => ['type'=>'boolean'],
-            'switch'        => ['type'=>'boolean'],
-            'int'           => ['type'=>'integer'],
-            'uint'          => ['type'=>'integer', 'required'=>true],
-            'double'        => ['type'=>'float'],
-            'range'         => ['type'=>'integer', 'required'=>true],
-            'datetime'      => ['type'=>'datetime'],
-            'date'          => ['type'=>'date', 'required'=>true],
-            'time'          => ['type'=>'time'],
-            'md'            => ['type'=>'text'],
-            'textarea'      => ['type'=>'text'],
-            'text'          => ['type'=>'string', 'required'=>true],
-            'phone_id'      => ['type'=>'integer', 'index'=>true, 'required'=>true],
-            'user_id'       => ['type'=>'integer', 'index'=>true, 'required'=>true],
-            'data'          => ['type'=>'text'],
-            'sort_order'    => ['type'=>'integer', 'index'=>true],
-            'taggable_id'   => ['type'=>'integer', 'index'=>'morphable_index'],
-            'taggable_type' => ['type'=>'string', 'index'=>'morphable_index'],
-            'created_at'    => ['type'=>'datetime'],
-            'updated_at'    => ['type'=>'datetime'],
+            'id'            => ['type' => 'integer', 'index' => 'primary', 'required' => true],
+            'cb'            => ['type' => 'boolean'],
+            'switch'        => ['type' => 'boolean'],
+            'int'           => ['type' => 'integer'],
+            'uint'          => ['type' => 'integer', 'required' => true],
+            'double'        => ['type' => 'float'],
+            'range'         => ['type' => 'integer', 'required' => true],
+            'datetime'      => ['type' => 'datetime'],
+            'date'          => ['type' => 'date', 'required' => true],
+            'time'          => ['type' => 'time'],
+            'md'            => ['type' => 'text'],
+            'textarea'      => ['type' => 'text'],
+            'text'          => ['type' => 'string', 'required' => true],
+            'phone_id'      => ['type' => 'integer', 'index' => true, 'required' => true],
+            'user_id'       => ['type' => 'integer', 'index' => true, 'required' => true],
+            'data'          => ['type' => 'text'],
+            'sort_order'    => ['type' => 'integer', 'index' => true],
+            'taggable_id'   => ['type' => 'integer', 'index' => 'morphable_index'],
+            'taggable_type' => ['type' => 'string', 'index' => 'morphable_index'],
+            'created_at'    => ['type' => 'datetime'],
+            'updated_at'    => ['type' => 'datetime'],
         ];
 
         $table = Schema::getConnection()->getDoctrineSchemaManager()->listTableDetails($this->table);
diff --git a/modules/system/tests/console/WinterEnvTest.php b/modules/system/tests/console/WinterEnvTest.php
index 4b2bdc3135..69d2e44e28 100644
--- a/modules/system/tests/console/WinterEnvTest.php
+++ b/modules/system/tests/console/WinterEnvTest.php
@@ -88,7 +88,7 @@ protected function setUpConfigFixtures()
         $this->app->useEnvironmentPath(storage_path('temp/tests/env'));
 
         // Re-load configuration
-        $configBootstrap = new LoadConfiguration;
+        $configBootstrap = new LoadConfiguration();
         $configBootstrap->bootstrap($this->app);
     }
 
@@ -120,7 +120,7 @@ protected function tearDownConfigFixtures()
         }
 
         // Re-load configuration
-        $configBootstrap = new LoadConfiguration;
+        $configBootstrap = new LoadConfiguration();
         $configBootstrap->bootstrap($this->app);
     }
 }
diff --git a/modules/system/tests/fixtures/config/app.php b/modules/system/tests/fixtures/config/app.php
index 98d819f130..45f43edc10 100644
--- a/modules/system/tests/fixtures/config/app.php
+++ b/modules/system/tests/fixtures/config/app.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/config/cache.php b/modules/system/tests/fixtures/config/cache.php
index 050c12bb31..bd4a38aa67 100644
--- a/modules/system/tests/fixtures/config/cache.php
+++ b/modules/system/tests/fixtures/config/cache.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/config/cms.php b/modules/system/tests/fixtures/config/cms.php
index f1b6674a51..ece59c0b7b 100644
--- a/modules/system/tests/fixtures/config/cms.php
+++ b/modules/system/tests/fixtures/config/cms.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/config/database.php b/modules/system/tests/fixtures/config/database.php
index a1e048a2b4..3815940d65 100644
--- a/modules/system/tests/fixtures/config/database.php
+++ b/modules/system/tests/fixtures/config/database.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/config/mail.php b/modules/system/tests/fixtures/config/mail.php
index 7620ae57ef..9e4b28db63 100644
--- a/modules/system/tests/fixtures/config/mail.php
+++ b/modules/system/tests/fixtures/config/mail.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/config/queue.php b/modules/system/tests/fixtures/config/queue.php
index 906e5848b4..4e4ff9be3b 100644
--- a/modules/system/tests/fixtures/config/queue.php
+++ b/modules/system/tests/fixtures/config/queue.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/config/session.php b/modules/system/tests/fixtures/config/session.php
index 2ebabb8c24..89f7ef74c3 100644
--- a/modules/system/tests/fixtures/config/session.php
+++ b/modules/system/tests/fixtures/config/session.php
@@ -1,4 +1,5 @@
 <?php
+
 // Fixture used for `winter:env` unit tests in `tests/unit/system/console/WinterEnvTest.php
 
 return [
diff --git a/modules/system/tests/fixtures/plugins/database/tester/Plugin.php b/modules/system/tests/fixtures/plugins/database/tester/Plugin.php
index bd3796d288..e1537023e2 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester;
+<?php
+
+namespace Database\Tester;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Author.php b/modules/system/tests/fixtures/plugins/database/tester/models/Author.php
index 6a6a15cf24..3c19ebd264 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Author.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Author.php
@@ -1,10 +1,11 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
 class Author extends Model
 {
-
     /**
      * @var string The database table used by the model.
      */
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Category.php b/modules/system/tests/fixtures/plugins/database/tester/models/Category.php
index 0fe409fd6d..ed957bd90a 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Category.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Category.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
@@ -19,7 +21,7 @@ class Category extends Model
 
     public function getCustomNameAttribute()
     {
-        return $this->name.' (#'.$this->id.')';
+        return $this->name . ' (#' . $this->id . ')';
     }
 }
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Country.php b/modules/system/tests/fixtures/plugins/database/tester/models/Country.php
index 54119dd593..36237a072c 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Country.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Country.php
@@ -1,10 +1,11 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
 class Country extends Model
 {
-
     /**
      * @var string The database table used by the model.
      */
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php b/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php
index 3cc9672ad5..8afac86ae6 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php b/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php
index 2abd6853e6..c2c61bdba8 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php b/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php
index 54035a5c59..69fc029f42 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php
@@ -1,10 +1,11 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
 class Phone extends Model
 {
-
     /**
      * @var string The database table used by the model.
      */
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Post.php b/modules/system/tests/fixtures/plugins/database/tester/models/Post.php
index a500f11c78..4f66b240fe 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Post.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Post.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Role.php b/modules/system/tests/fixtures/plugins/database/tester/models/Role.php
index 8d561319d1..ab8b550ed1 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Role.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Role.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php b/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php
index 50b85db0f0..b5a382470b 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/User.php b/modules/system/tests/fixtures/plugins/database/tester/models/User.php
index 6559dd9fcc..9aa91bf726 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/User.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/User.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Models;
+<?php
+
+namespace Database\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
index c43f9c51be..85c46ae8b9 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
index 45924a9269..3c85f53648 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreateCategoriesTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_categories', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php
index 63a3421f72..492f421791 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php
@@ -1,4 +1,6 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php
index 7db8eaadbc..2a3c766f1d 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreateEventLogTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_event_log', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php
index 6e22545daf..2ce62a6628 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreateMetaTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_meta', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php
index 21e5fe4bd5..af075bf629 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreatePhonesTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_phones', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
index 6c31890760..4fc2db8af2 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreatePostsTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_posts', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php
index b3571a68b2..820a4a340f 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreateRolesTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_roles', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php
index 6b6df0f1c1..50d08f53bb 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreateTagsTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_tags', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php
index 4b7dd50636..3a61dd134e 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php
@@ -1,11 +1,12 @@
-<?php namespace Database\Tester\Updates;
+<?php
+
+namespace Database\Tester\Updates;
 
 use Schema;
 use Winter\Storm\Database\Updates\Migration;
 
 class CreateUsersTable extends Migration
 {
-
     public function up()
     {
         Schema::create('database_tester_users', function ($table) {
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php
index da5abc06a1..030d812d82 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace DependencyTest\Acme;
+<?php
+
+namespace DependencyTest\Acme;
 
 use Backend;
 use Backend\Models\UserRole;
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php
index 57bddff388..8ec587ee19 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace DependencyTest\Dependency;
+<?php
+
+namespace DependencyTest\Dependency;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php
index df9eeddb23..35b2af81f8 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace DependencyTest\Found;
+<?php
+
+namespace DependencyTest\Found;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php
index 29b009a5fe..6191e799e6 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace DependencyTest\NotFound;
+<?php
+
+namespace DependencyTest\NotFound;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php
index 7523b921ed..5f76297494 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace DependencyTest\WrongCase;
+<?php
+
+namespace DependencyTest\WrongCase;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php b/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php
index befa81a75e..463573484b 100644
--- a/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Mix\TestA;
+<?php
+
+namespace Mix\TestA;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php b/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php
index a1e2c25c79..ac9fdffad8 100644
--- a/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Mix\TestB;
+<?php
+
+namespace Mix\TestB;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php b/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php
index abbb3f6e42..cc1f693e24 100644
--- a/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Mix\TestC;
+<?php
+
+namespace Mix\TestC;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php b/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php
index cb9921a567..a647a8c951 100644
--- a/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace TestVendor\Test;
+<?php
+
+namespace TestVendor\Test;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/testvendor/test/formwidgets/Sample.php b/modules/system/tests/fixtures/plugins/testvendor/test/formwidgets/Sample.php
index 1507d31189..98d1507dde 100644
--- a/modules/system/tests/fixtures/plugins/testvendor/test/formwidgets/Sample.php
+++ b/modules/system/tests/fixtures/plugins/testvendor/test/formwidgets/Sample.php
@@ -1,4 +1,6 @@
-<?php namespace TestVendor\Test\FormWidgets;
+<?php
+
+namespace TestVendor\Test\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php b/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php
index 42bcb7bf8c..52d38131e2 100644
--- a/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\InvalidReplacement;
+<?php
+
+namespace Winter\InvalidReplacement;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php b/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php
index 37cf70c7c7..e0c3d84fb2 100644
--- a/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\NoUpdates;
+<?php
+
+namespace Winter\NoUpdates;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/original/Plugin.php b/modules/system/tests/fixtures/plugins/winter/original/Plugin.php
index b6c3da2168..554556c280 100644
--- a/modules/system/tests/fixtures/plugins/winter/original/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/original/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Original;
+<?php
+
+namespace Winter\Original;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php b/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php
index 1767ce0395..cd9eb991fd 100644
--- a/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Replacement;
+<?php
+
+namespace Winter\Replacement;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php b/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php
index 6c806475c9..2823aed20e 100644
--- a/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Sample;
+<?php
+
+namespace Winter\Sample;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php b/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php
index 3678be9dce..2a19c0929e 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester;
+<?php
+
+namespace Winter\Tester;
 
 use System\Classes\PluginBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/classes/Users.php b/modules/system/tests/fixtures/plugins/winter/tester/classes/Users.php
index 10ef4167ea..e6e51964b6 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/classes/Users.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/classes/Users.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Classes;
+<?php
+
+namespace Winter\Tester\Classes;
 
 class Users
 {
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
index 0bce3abdf6..846e2314ad 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Components;
+<?php
+
+namespace Winter\Tester\Components;
 
 use Cms\Classes\ComponentBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php
index 4de6985852..99d33fd6bf 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Components;
+<?php
+
+namespace Winter\Tester\Components;
 
 use Cms\Classes\ComponentBase;
 use Cms\Classes\CodeBase;
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php
index ab22ce6d41..12065e2f18 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Components;
+<?php
+
+namespace Winter\Tester\Components;
 
 use Cms\Classes\ComponentBase;
 use Cms\Classes\CodeBase;
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php b/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php
index 15a6fd0325..0939db6718 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Components;
+<?php
+
+namespace Winter\Tester\Components;
 
 use Cms\Classes\ComponentBase;
 
@@ -15,7 +17,7 @@ public function componentDetails()
     public function onRender()
     {
         if ($output = $this->property('output')) {
-            return 'Custom output: '.$output;
+            return 'Custom output: ' . $output;
         }
 
         return 'Pass';
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php b/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php
index 3891fe5693..79aac3a546 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Components;
+<?php
+
+namespace Winter\Tester\Components;
 
 use Cms\Classes\ComponentBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
index 86656ef581..50e2d5c68d 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Components;
+<?php
+
+namespace Winter\Tester\Components;
 
 use Cms\Classes\ComponentBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/formwidgets/Preview.php b/modules/system/tests/fixtures/plugins/winter/tester/formwidgets/Preview.php
index 31a198346a..59bbe0baf0 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/formwidgets/Preview.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/formwidgets/Preview.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\FormWidgets;
+<?php
+
+namespace Winter\Tester\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php b/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php
index f43919f1e4..21c2dd77fa 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Models;
+<?php
+
+namespace Winter\Tester\Models;
 
 use Model;
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/rules/BeLikeBobRule.php b/modules/system/tests/fixtures/plugins/winter/tester/rules/BeLikeBobRule.php
index aab810baa0..fe48957a62 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/rules/BeLikeBobRule.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/rules/BeLikeBobRule.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Tester\Rules;
+<?php
+
+namespace Winter\Tester\Rules;
 
 use Winter\Storm\Validation\Rule;
 
diff --git a/modules/system/tests/plugins/database/AttachManyModelTest.php b/modules/system/tests/plugins/database/AttachManyModelTest.php
index b1453f509e..43c0801f2c 100644
--- a/modules/system/tests/plugins/database/AttachManyModelTest.php
+++ b/modules/system/tests/plugins/database/AttachManyModelTest.php
@@ -9,7 +9,7 @@
 
 class AttachManyModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/AttachOneModelTest.php b/modules/system/tests/plugins/database/AttachOneModelTest.php
index c7ba1307dc..fa683f1f3a 100644
--- a/modules/system/tests/plugins/database/AttachOneModelTest.php
+++ b/modules/system/tests/plugins/database/AttachOneModelTest.php
@@ -11,7 +11,7 @@
 
 class AttachOneModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/BelongsToManyModelTest.php b/modules/system/tests/plugins/database/BelongsToManyModelTest.php
index 71150db329..e09d3814fe 100644
--- a/modules/system/tests/plugins/database/BelongsToManyModelTest.php
+++ b/modules/system/tests/plugins/database/BelongsToManyModelTest.php
@@ -12,7 +12,7 @@
 
 class BelongsToManyModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/BelongsToModelTest.php b/modules/system/tests/plugins/database/BelongsToModelTest.php
index 5f96081a9b..3bc0c82875 100644
--- a/modules/system/tests/plugins/database/BelongsToModelTest.php
+++ b/modules/system/tests/plugins/database/BelongsToModelTest.php
@@ -9,7 +9,7 @@
 
 class BelongsToModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/DeferredBindingTest.php b/modules/system/tests/plugins/database/DeferredBindingTest.php
index a190410a94..846da74f86 100644
--- a/modules/system/tests/plugins/database/DeferredBindingTest.php
+++ b/modules/system/tests/plugins/database/DeferredBindingTest.php
@@ -10,7 +10,7 @@
 
 class DeferredBindingTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/HasManyModelTest.php b/modules/system/tests/plugins/database/HasManyModelTest.php
index 058b9a9e1b..3043101a09 100644
--- a/modules/system/tests/plugins/database/HasManyModelTest.php
+++ b/modules/system/tests/plugins/database/HasManyModelTest.php
@@ -10,7 +10,7 @@
 
 class HasManyModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/HasManyThroughModelTest.php b/modules/system/tests/plugins/database/HasManyThroughModelTest.php
index 568d91a0ce..5ee7872a4c 100644
--- a/modules/system/tests/plugins/database/HasManyThroughModelTest.php
+++ b/modules/system/tests/plugins/database/HasManyThroughModelTest.php
@@ -11,7 +11,7 @@
 
 class HasManyThroughModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/HasOneModelTest.php b/modules/system/tests/plugins/database/HasOneModelTest.php
index 7d0b4907c4..9dc9491e9d 100644
--- a/modules/system/tests/plugins/database/HasOneModelTest.php
+++ b/modules/system/tests/plugins/database/HasOneModelTest.php
@@ -9,7 +9,7 @@
 
 class HasOneModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/HasOneThroughModelTest.php b/modules/system/tests/plugins/database/HasOneThroughModelTest.php
index e121846afb..8fc3b15dec 100644
--- a/modules/system/tests/plugins/database/HasOneThroughModelTest.php
+++ b/modules/system/tests/plugins/database/HasOneThroughModelTest.php
@@ -10,7 +10,7 @@
 
 class HasOneThroughModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/MorphManyModelTest.php b/modules/system/tests/plugins/database/MorphManyModelTest.php
index 723046a742..254d32423a 100644
--- a/modules/system/tests/plugins/database/MorphManyModelTest.php
+++ b/modules/system/tests/plugins/database/MorphManyModelTest.php
@@ -12,7 +12,7 @@
 
 class MorphManyModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/MorphOneModelTest.php b/modules/system/tests/plugins/database/MorphOneModelTest.php
index ce434eaac1..0c59f1b5bd 100644
--- a/modules/system/tests/plugins/database/MorphOneModelTest.php
+++ b/modules/system/tests/plugins/database/MorphOneModelTest.php
@@ -10,7 +10,7 @@
 
 class MorphOneModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/MorphToModelTest.php b/modules/system/tests/plugins/database/MorphToModelTest.php
index bdae9f7aaf..ddc32b8f7f 100644
--- a/modules/system/tests/plugins/database/MorphToModelTest.php
+++ b/modules/system/tests/plugins/database/MorphToModelTest.php
@@ -10,7 +10,7 @@
 
 class MorphToModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/NestedTreeModelTest.php b/modules/system/tests/plugins/database/NestedTreeModelTest.php
index 1621da5170..d10326cb68 100644
--- a/modules/system/tests/plugins/database/NestedTreeModelTest.php
+++ b/modules/system/tests/plugins/database/NestedTreeModelTest.php
@@ -8,7 +8,7 @@
 
 class NestedTreeModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/NullableModelTest.php b/modules/system/tests/plugins/database/NullableModelTest.php
index 14d93c9a1f..e56d2ce01a 100644
--- a/modules/system/tests/plugins/database/NullableModelTest.php
+++ b/modules/system/tests/plugins/database/NullableModelTest.php
@@ -7,7 +7,7 @@
 
 class NullableModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/PluginModelTest.php b/modules/system/tests/plugins/database/PluginModelTest.php
index e0514958b5..c9c7d54fb3 100644
--- a/modules/system/tests/plugins/database/PluginModelTest.php
+++ b/modules/system/tests/plugins/database/PluginModelTest.php
@@ -7,7 +7,7 @@
 
 class PluginModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -19,7 +19,7 @@ public function setUp() : void
     public function testCreateFirstPost()
     {
         Post::truncate();
-        $post = new Post;
+        $post = new Post();
         $post->title = "First post";
         $post->description = "Yay!!";
         $post->save();
diff --git a/modules/system/tests/plugins/database/RevisionableModelTest.php b/modules/system/tests/plugins/database/RevisionableModelTest.php
index 543ac7cd80..7f74614f2c 100644
--- a/modules/system/tests/plugins/database/RevisionableModelTest.php
+++ b/modules/system/tests/plugins/database/RevisionableModelTest.php
@@ -9,7 +9,7 @@
 
 class RevisionableModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -55,7 +55,7 @@ public function testUpdateMultipleFields()
             'slug' => 'hello-world',
             'description' => 'Good day, Commander',
             'is_published' => true,
-            'published_at' => new DateTime
+            'published_at' => new DateTime()
         ]);
 
         $this->assertEquals(0, $post->revision_history()->count());
@@ -86,7 +86,7 @@ public function testExceedingRevisionLimit()
             'slug' => 'hello-world',
             'description' => 'Good day, Commander',
             'is_published' => true,
-            'published_at' => new DateTime
+            'published_at' => new DateTime()
         ]);
 
         $this->assertEquals(0, $post->revision_history()->count());
diff --git a/modules/system/tests/plugins/database/SimpleTreeModelTest.php b/modules/system/tests/plugins/database/SimpleTreeModelTest.php
index 1ec3847440..071660c2cb 100644
--- a/modules/system/tests/plugins/database/SimpleTreeModelTest.php
+++ b/modules/system/tests/plugins/database/SimpleTreeModelTest.php
@@ -9,7 +9,7 @@
 
 class SimpleTreeModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/SluggableModelTest.php b/modules/system/tests/plugins/database/SluggableModelTest.php
index c623337948..bb67b20c3b 100644
--- a/modules/system/tests/plugins/database/SluggableModelTest.php
+++ b/modules/system/tests/plugins/database/SluggableModelTest.php
@@ -7,7 +7,7 @@
 
 class SluggableModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -24,7 +24,7 @@ public function testFillPost()
 
     public function testSetAttributeOnPost()
     {
-        $post = new SluggablePost;
+        $post = new SluggablePost();
         $post->title = "Let's go, rock show!";
         $post->save();
 
@@ -33,7 +33,7 @@ public function testSetAttributeOnPost()
 
     public function testSetSlugAttributeManually()
     {
-        $post = new SluggablePost;
+        $post = new SluggablePost();
         $post->title = 'We parked in a comfortable spot';
         $post->slug = 'war-is-pain';
         $post->save();
@@ -43,7 +43,7 @@ public function testSetSlugAttributeManually()
 
     public function testConcatenatedSlug()
     {
-        $post = new SluggablePost;
+        $post = new SluggablePost();
         $post->title = 'Sweetness and Light';
         $post->description = 'Itchee and Scratchee';
         $post->save();
diff --git a/modules/system/tests/plugins/database/SoftDeleteModelTest.php b/modules/system/tests/plugins/database/SoftDeleteModelTest.php
index 597bffd3f9..d375d011b9 100644
--- a/modules/system/tests/plugins/database/SoftDeleteModelTest.php
+++ b/modules/system/tests/plugins/database/SoftDeleteModelTest.php
@@ -14,7 +14,7 @@
 
 class SoftDeleteModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/database/ValidationModelTest.php b/modules/system/tests/plugins/database/ValidationModelTest.php
index 08b44da257..1ea806c2ea 100644
--- a/modules/system/tests/plugins/database/ValidationModelTest.php
+++ b/modules/system/tests/plugins/database/ValidationModelTest.php
@@ -7,7 +7,7 @@
 
 class ValidationModelTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/plugins/system/CustomValidatorRulesTest.php b/modules/system/tests/plugins/system/CustomValidatorRulesTest.php
index db3ef7b817..483b0db350 100644
--- a/modules/system/tests/plugins/system/CustomValidatorRulesTest.php
+++ b/modules/system/tests/plugins/system/CustomValidatorRulesTest.php
@@ -7,7 +7,7 @@
 
 class CustomValidatorRulesTest extends PluginTestCase
 {
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/modules/system/tests/traits/AssetMakerTest.php b/modules/system/tests/traits/AssetMakerTest.php
index ca461941d9..3b907fa6da 100644
--- a/modules/system/tests/traits/AssetMakerTest.php
+++ b/modules/system/tests/traits/AssetMakerTest.php
@@ -13,13 +13,15 @@ class AssetMakerStub
     use AssetMaker;
     use ViewMaker; // Needed for `guessViewPath()`, which is used to set default assetPath
     use EventEmitter; // Needed for `addAsset()`
+
+    // Intentionally left blank
 }
 
 class AssetMakerTest extends TestCase
 {
     private AssetMakerStub $stub;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         $this->createApplication();
         $this->stub = new AssetMakerStub();
@@ -36,21 +38,21 @@ public function testGetLocalPath(): void
         // Default assetPath
         $assetPath = $this->stub->guessViewPath('/assets', true);
         $resolvedPath = $this->callProtectedMethod($this->stub, 'getLocalPath', [$assetPath]);
-        $this->assertEquals(realpath($basePath.$assetPath), realpath($resolvedPath));
+        $this->assertEquals(realpath($basePath . $assetPath), realpath($resolvedPath));
 
         // Paths with symbols
         $resolvedPath = $this->callProtectedMethod($this->stub, 'getLocalPath', ['~/themes/demo/']);
-        $this->assertEquals(realpath($basePath.'/themes/demo/'), realpath($resolvedPath));
+        $this->assertEquals(realpath($basePath . '/themes/demo/'), realpath($resolvedPath));
 
         $resolvedPath = $this->callProtectedMethod($this->stub, 'getLocalPath', ['~/plugins/demo/']);
-        $this->assertEquals(realpath($basePath.'/plugins/demo/'), realpath($resolvedPath));
+        $this->assertEquals(realpath($basePath . '/plugins/demo/'), realpath($resolvedPath));
 
         $resolvedPath = $this->callProtectedMethod($this->stub, 'getLocalPath', ['$/demo/']);
-        $this->assertEquals(realpath($basePath.'/plugins/demo/'), realpath($resolvedPath));
+        $this->assertEquals(realpath($basePath . '/plugins/demo/'), realpath($resolvedPath));
 
         // Absolute Path
-        $resolvedPath = $this->callProtectedMethod($this->stub, 'getLocalPath', [$basePath.'/some/wild/absolute/path/']);
-        $this->assertEquals(realpath($basePath.'/some/wild/absolute/path/'), realpath($resolvedPath));
+        $resolvedPath = $this->callProtectedMethod($this->stub, 'getLocalPath', [$basePath . '/some/wild/absolute/path/']);
+        $this->assertEquals(realpath($basePath . '/some/wild/absolute/path/'), realpath($resolvedPath));
     }
 
     public function testGetAssetPath(): void
diff --git a/modules/system/tests/traits/ViewMakerTest.php b/modules/system/tests/traits/ViewMakerTest.php
index 3dab780e76..fc3c347fd3 100644
--- a/modules/system/tests/traits/ViewMakerTest.php
+++ b/modules/system/tests/traits/ViewMakerTest.php
@@ -25,7 +25,7 @@ protected function normalizePath(string $path): string
         return str_replace('/', DIRECTORY_SEPARATOR, $path);
     }
 
-    public function setUp() : void
+    public function setUp(): void
     {
         $this->createApplication();
         $this->stub = new ViewMakerStub();
diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index 956b20657b..36975bf21c 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 use Yaml;
 use File;
@@ -17,7 +19,6 @@
  */
 trait ConfigMaker
 {
-
     /**
      * @var string Specifies a path to the config directory.
      */
@@ -35,26 +36,17 @@ public function makeConfig($configFile = [], $requiredConfig = [])
             $configFile = [];
         }
 
-        /*
-         * Config already made
-         */
         if (is_object($configFile)) {
+            // Config already made
             $config = $configFile;
-        }
-        /*
-         * Embedded config
-         */
-        elseif (is_array($configFile)) {
+        } elseif (is_array($configFile)) {
+            // Embedded config
             $config = $this->makeConfigFromArray($configFile);
-        }
-        /*
-         * Process config from file contents
-         */
-        else {
+        } else {
+            // Process config from file contents
             if (isset($this->controller) && method_exists($this->controller, 'getConfigPath')) {
                 $configFile = $this->controller->getConfigPath($configFile);
-            }
-            else {
+            } else {
                 $configFile = $this->getConfigPath($configFile);
             }
 
@@ -117,7 +109,7 @@ public function makeConfig($configFile = [], $requiredConfig = [])
      */
     public function makeConfigFromArray($configArray = [])
     {
-        $object = new stdClass;
+        $object = new stdClass();
 
         if (!is_array($configArray)) {
             return $object;
@@ -150,7 +142,8 @@ public function getConfigPath($fileName, $configPath = null)
 
         $fileName = File::symbolizePath($fileName);
 
-        if (File::isLocalPath($fileName) ||
+        if (
+            File::isLocalPath($fileName) ||
             (!Config::get('cms.restrictBaseDir', true) && realpath($fileName) !== false)
         ) {
             return $fileName;
diff --git a/modules/system/traits/EventEmitter.php b/modules/system/traits/EventEmitter.php
index ba4495e3ad..ac953fe62f 100644
--- a/modules/system/traits/EventEmitter.php
+++ b/modules/system/traits/EventEmitter.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 use Event;
 
@@ -84,7 +86,7 @@ public function fireViewEvent($event, $params = [])
         array_unshift($params, $this);
 
         if ($result = Event::fire($event, $params)) {
-            return implode(PHP_EOL.PHP_EOL, (array) $result);
+            return implode(PHP_EOL . PHP_EOL, (array) $result);
         }
 
         return '';
diff --git a/modules/system/traits/LazyOwnerAlias.php b/modules/system/traits/LazyOwnerAlias.php
index 484f7d1b26..1a751b4233 100644
--- a/modules/system/traits/LazyOwnerAlias.php
+++ b/modules/system/traits/LazyOwnerAlias.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 /**
  * Lazy Owner Alias
diff --git a/modules/system/traits/PropertyContainer.php b/modules/system/traits/PropertyContainer.php
index d145a342af..4dcb6bfa8c 100644
--- a/modules/system/traits/PropertyContainer.php
+++ b/modules/system/traits/PropertyContainer.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 /**
  * Property container trait
diff --git a/modules/system/traits/ResponseMaker.php b/modules/system/traits/ResponseMaker.php
index aba20bf35b..4908c11327 100644
--- a/modules/system/traits/ResponseMaker.php
+++ b/modules/system/traits/ResponseMaker.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 use Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -73,7 +75,7 @@ public function setResponse($response)
     public function setResponseHeader($key, $values, $replace = true)
     {
         if ($this->responseHeaderBag === null) {
-            $this->responseHeaderBag = new ResponseHeaderBag;
+            $this->responseHeaderBag = new ResponseHeaderBag();
         }
 
         $this->responseHeaderBag->set($key, $values, $replace);
@@ -90,7 +92,7 @@ public function setResponseHeader($key, $values, $replace = true)
     public function setResponseCookie($cookie)
     {
         if ($this->responseHeaderBag === null) {
-            $this->responseHeaderBag = new ResponseHeaderBag;
+            $this->responseHeaderBag = new ResponseHeaderBag();
         }
 
         if (is_string($cookie) && function_exists('cookie')) {
diff --git a/modules/system/traits/SecurityController.php b/modules/system/traits/SecurityController.php
index f8ac8d20ad..60f5c9c078 100644
--- a/modules/system/traits/SecurityController.php
+++ b/modules/system/traits/SecurityController.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 use Crypt;
 use Config;
diff --git a/modules/system/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php
index 8407e4e033..15d6658b05 100644
--- a/modules/system/traits/ViewMaker.php
+++ b/modules/system/traits/ViewMaker.php
@@ -1,4 +1,6 @@
-<?php namespace System\Traits;
+<?php
+
+namespace System\Traits;
 
 use File;
 use Lang;
@@ -221,7 +223,8 @@ public function getViewPath(string $fileName, string|array $viewPaths = null): s
      */
     public function makeFileContents(string $filePath, array $extraParams = []): string
     {
-        if (!strlen($filePath) ||
+        if (
+            !strlen($filePath) ||
             !File::isFile($filePath) ||
             (!File::isLocalPath($filePath) && Config::get('cms.restrictBaseDir', true))
         ) {
@@ -245,8 +248,7 @@ public function makeFileContents(string $filePath, array $extraParams = []): str
         // an exception is thrown. This prevents any partial views from leaking.
         try {
             include $filePath;
-        }
-        catch (Throwable $e) {
+        } catch (Throwable $e) {
             $this->handleViewException($e, $obLevel);
         }
 
diff --git a/modules/system/twig/Engine.php b/modules/system/twig/Engine.php
index aff64cbd8c..f285c61b57 100644
--- a/modules/system/twig/Engine.php
+++ b/modules/system/twig/Engine.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use System\Twig\Loader as TwigLoader;
 use Twig\Environment as TwigEnvironment;
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 1ef914b7c1..5c926eaeec 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Url;
 use System\Classes\ImageResizer;
@@ -85,8 +87,8 @@ public function getFilters()
     public function getTokenParsers()
     {
         $parsers = [
-            new SpacelessTokenParser,
-            new FilterTokenParser,
+            new SpacelessTokenParser(),
+            new FilterTokenParser(),
         ];
 
         /*
diff --git a/modules/system/twig/FilterTokenParser.php b/modules/system/twig/FilterTokenParser.php
index 250478c54d..97761d946f 100644
--- a/modules/system/twig/FilterTokenParser.php
+++ b/modules/system/twig/FilterTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Twig\Node\BlockNode;
 use Twig\Node\Expression\BlockReferenceExpression;
diff --git a/modules/system/twig/Loader.php b/modules/system/twig/Loader.php
index 009b08ba59..c7a3c99c94 100644
--- a/modules/system/twig/Loader.php
+++ b/modules/system/twig/Loader.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use App;
 use Exception;
@@ -95,8 +97,7 @@ public function exists(string $name): bool
         try {
             $this->findTemplate($name);
             return true;
-        }
-        catch (Exception $exception) {
+        } catch (Exception $exception) {
             return false;
         }
     }
diff --git a/modules/system/twig/MailPartialNode.php b/modules/system/twig/MailPartialNode.php
index 8810d9f212..8dd52dd83b 100644
--- a/modules/system/twig/MailPartialNode.php
+++ b/modules/system/twig/MailPartialNode.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
@@ -42,7 +44,7 @@ public function compile(TwigCompiler $compiler)
         }
 
         for ($i = 1; $i < count($this->getNode('nodes')); $i++) {
-            $compiler->write("\$context['__system_partial_params']['".$this->getAttribute('names')[$i-1]."'] = ");
+            $compiler->write("\$context['__system_partial_params']['" . $this->getAttribute('names')[$i - 1] . "'] = ");
             $compiler->subcompile($this->getNode('nodes')->getNode($i));
             $compiler->write(";\n");
         }
diff --git a/modules/system/twig/MailPartialTokenParser.php b/modules/system/twig/MailPartialTokenParser.php
index cad3947162..7512153a74 100644
--- a/modules/system/twig/MailPartialTokenParser.php
+++ b/modules/system/twig/MailPartialTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
diff --git a/modules/system/twig/SecurityPolicy.php b/modules/system/twig/SecurityPolicy.php
index 19d2c348e2..f336feff43 100644
--- a/modules/system/twig/SecurityPolicy.php
+++ b/modules/system/twig/SecurityPolicy.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Twig\Markup;
 use Twig\Template;
diff --git a/modules/system/twig/SpacelessNode.php b/modules/system/twig/SpacelessNode.php
index 939326596c..a45c5de4ae 100644
--- a/modules/system/twig/SpacelessNode.php
+++ b/modules/system/twig/SpacelessNode.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Twig\Compiler;
 use Twig\Node\Node;
diff --git a/modules/system/twig/SpacelessTokenParser.php b/modules/system/twig/SpacelessTokenParser.php
index d17eab1500..b6e427a428 100644
--- a/modules/system/twig/SpacelessTokenParser.php
+++ b/modules/system/twig/SpacelessTokenParser.php
@@ -1,4 +1,6 @@
-<?php namespace System\Twig;
+<?php
+
+namespace System\Twig;
 
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
diff --git a/phpcs.xml b/phpcs.xml
index bdac268c45..80d7734e2b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0"?>
 <ruleset name="Winter CMS">
     <description>The coding standard for Winter CMS.</description>
-    <rule ref="PSR2">
+    <rule ref="PSR12">
         <!--
         Exceptions to the PSR-2 guidelines as per our Developer Guide:
-        https://wintercms.com/help/guidelines/developer#psr-exceptions
+        https://wintercms.com/docs/v1.2/docs/architecture/developer-guide#exceptions-to-the-standard
         -->
         <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
-        <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" />
-        <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace" />
 
         <!--  We're not enforcing a line length limit -->
         <exclude name="Generic.Files.LineLength" />
@@ -21,6 +19,13 @@
         </properties>
     </rule>
 
+    <rule ref="Generic.Formatting.SpaceAfterNot">
+        <!-- We do not allow a space after a logical NOT operator (ie. `if (! $this->exists) {` will be a code smell)-->
+        <properties>
+            <property name="spacing" value="0" />
+        </properties>
+    </rule>
+
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen">
         <!--
         Ignore correct spacing for control structure in partial templates - spacing may be useful for templates to
@@ -125,10 +130,11 @@
     <file>config/</file>
     <file>modules/</file>
     <file>plugins/winter/demo/</file>
-    <file>tests/</file>
 
     <!-- Ignore vendor files -->
     <exclude-pattern>*/vendor/*</exclude-pattern>
+    <!-- Ignore manifest test fixtures -->
+    <exclude-pattern>modules/system/tests/fixtures/manifest/*</exclude-pattern>
     <!-- Ignore this view file as fixing the issues in here will break the template -->
     <exclude-pattern>modules/system/views/exception.php</exclude-pattern>
     <!-- Ignore this view file as PHPCS wants line 8 to have 44 spaces instead of 12, clearly insane -->
diff --git a/plugins/winter/demo/Plugin.php b/plugins/winter/demo/Plugin.php
index 2664f09844..45de94ebf5 100644
--- a/plugins/winter/demo/Plugin.php
+++ b/plugins/winter/demo/Plugin.php
@@ -1,14 +1,15 @@
-<?php namespace Winter\Demo;
+<?php
 
 /**
  * The plugin.php file (called the plugin initialization script) defines the plugin information class.
  */
 
+namespace Winter\Demo;
+
 use System\Classes\PluginBase;
 
 class Plugin extends PluginBase
 {
-
     public function pluginDetails()
     {
         return [
diff --git a/plugins/winter/demo/components/Todo.php b/plugins/winter/demo/components/Todo.php
index 4cc7dc3bc6..e1dab41f3e 100644
--- a/plugins/winter/demo/components/Todo.php
+++ b/plugins/winter/demo/components/Todo.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Demo\Components;
+<?php
+
+namespace Winter\Demo\Components;
 
 use Flash;
 use ApplicationException;
@@ -6,7 +8,6 @@
 
 class Todo extends ComponentBase
 {
-
     public function componentDetails()
     {
         return [

From 66bd3f313a0d749383c19e928b44ec5187044d55 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 10:12:17 +0800
Subject: [PATCH 02/30] Additional code style fixes to improve future diffs and
 IDE support

- Convert all aliases to qualified class names (mainly facades)
- Reorder imports alphabetically
- Ensure last item in array has a trailing comma
- Strip out unused imports
---
 composer.json                                 |  4 +-
 modules/backend/ServiceProvider.php           | 30 ++++----
 modules/backend/behaviors/FormController.php  | 22 +++---
 .../behaviors/ImportExportController.php      | 26 +++----
 modules/backend/behaviors/ListController.php  |  8 +--
 .../backend/behaviors/RelationController.php  | 12 ++--
 .../backend/behaviors/ReorderController.php   |  6 +-
 .../behaviors/UserPreferencesModel.php        |  2 +-
 .../partials/_manage_form.php                 |  2 +-
 .../partials/_manage_list.php                 |  2 +-
 .../partials/_pivot_form.php                  |  4 +-
 .../relationcontroller/partials/_toolbar.php  |  4 +-
 modules/backend/classes/AuthManager.php       |  6 +-
 modules/backend/classes/BackendController.php | 20 +++---
 modules/backend/classes/Controller.php        | 34 ++++-----
 .../backend/classes/ControllerBehavior.php    |  8 +--
 modules/backend/classes/FormField.php         |  6 +-
 modules/backend/classes/FormTabs.php          |  4 +-
 modules/backend/classes/NavigationManager.php | 20 +++---
 modules/backend/classes/Skin.php              |  4 +-
 modules/backend/classes/WidgetBase.php        |  4 +-
 modules/backend/classes/WidgetManager.php     |  8 +--
 modules/backend/console/WinterPasswd.php      |  2 +-
 modules/backend/controllers/AccessLogs.php    |  3 +-
 modules/backend/controllers/Auth.php          | 26 +++----
 modules/backend/controllers/Files.php         | 14 ++--
 modules/backend/controllers/Index.php         |  6 +-
 modules/backend/controllers/Media.php         |  2 +-
 modules/backend/controllers/Preferences.php   | 10 +--
 modules/backend/controllers/UserGroups.php    |  2 +-
 modules/backend/controllers/UserRoles.php     |  6 +-
 modules/backend/controllers/Users.php         | 24 +++----
 ...1_000008_Db_Backend_Add_Superuser_Flag.php |  2 +-
 ...017_10_01_000010_Db_Backend_User_Roles.php |  6 +-
 .../backend/database/seeds/DatabaseSeeder.php |  9 ++-
 .../backend/database/seeds/SeedSetupAdmin.php |  8 +--
 modules/backend/formwidgets/CodeEditor.php    |  4 +-
 modules/backend/formwidgets/ColorPicker.php   |  6 +-
 modules/backend/formwidgets/DataTable.php     |  8 +--
 modules/backend/formwidgets/DatePicker.php    |  4 +-
 modules/backend/formwidgets/FileUpload.php    | 23 +++---
 modules/backend/formwidgets/IconPicker.php    |  5 +-
 .../backend/formwidgets/MarkdownEditor.php    |  8 +--
 modules/backend/formwidgets/MediaFinder.php   |  6 +-
 .../backend/formwidgets/PermissionEditor.php  |  2 +-
 modules/backend/formwidgets/RecordFinder.php  |  4 +-
 modules/backend/formwidgets/Relation.php      |  6 +-
 modules/backend/formwidgets/Repeater.php      | 10 +--
 modules/backend/formwidgets/RichEditor.php    | 18 ++---
 modules/backend/formwidgets/Sensitive.php     |  2 +-
 modules/backend/formwidgets/TagList.php       |  2 +-
 .../datepicker/partials/_datepicker.php       |  2 +-
 modules/backend/helpers/Backend.php           | 18 ++---
 .../helpers/exception/DecompileException.php  |  2 +-
 modules/backend/lang/ar/lang.php              | 12 ++--
 modules/backend/lang/be/lang.php              | 64 ++++++++---------
 modules/backend/lang/bg/lang.php              | 58 +++++++--------
 modules/backend/lang/ca/lang.php              | 62 ++++++++--------
 modules/backend/lang/cs/lang.php              | 52 +++++++-------
 modules/backend/lang/da/lang.php              | 64 ++++++++---------
 modules/backend/lang/de/lang.php              |  2 +-
 modules/backend/lang/el/lang.php              | 18 ++---
 modules/backend/lang/es-ar/lang.php           | 18 ++---
 modules/backend/lang/es/lang.php              | 60 ++++++++--------
 modules/backend/lang/et/lang.php              | 60 ++++++++--------
 modules/backend/lang/fa/lang.php              | 30 ++++----
 modules/backend/lang/fi/lang.php              | 60 ++++++++--------
 modules/backend/lang/fr/lang.php              | 42 +++++------
 modules/backend/lang/id/lang.php              | 48 ++++++-------
 modules/backend/lang/it/lang.php              | 50 ++++++-------
 modules/backend/lang/ja/lang.php              |  2 +-
 modules/backend/lang/kr/lang.php              | 46 ++++++------
 modules/backend/lang/lt/lang.php              | 66 ++++++++---------
 modules/backend/lang/lv/lang.php              |  2 +-
 modules/backend/lang/nb-no/lang.php           | 60 ++++++++--------
 modules/backend/lang/nl/lang.php              |  2 +-
 modules/backend/lang/pt-br/lang.php           | 30 ++++----
 modules/backend/lang/pt-pt/lang.php           |  2 +-
 modules/backend/lang/ro/lang.php              |  6 +-
 modules/backend/lang/ru/lang.php              |  2 +-
 modules/backend/lang/sk/lang.php              | 46 ++++++------
 modules/backend/lang/sv/lang.php              | 38 +++++-----
 modules/backend/lang/tr/lang.php              |  2 +-
 modules/backend/lang/vn/lang.php              | 58 +++++++--------
 modules/backend/lang/zh-cn/lang.php           | 70 +++++++++----------
 modules/backend/lang/zh-tw/lang.php           | 50 ++++++-------
 modules/backend/models/AccessLog.php          |  6 +-
 modules/backend/models/BrandSetting.php       | 22 +++---
 modules/backend/models/EditorSetting.php      | 14 ++--
 modules/backend/models/ExportModel.php        | 14 ++--
 modules/backend/models/ImportModel.php        | 12 ++--
 modules/backend/models/Preference.php         | 18 ++---
 modules/backend/models/User.php               | 16 ++---
 modules/backend/models/UserGroup.php          |  2 +-
 modules/backend/models/UserPreference.php     |  3 +-
 modules/backend/models/UserRole.php           |  4 +-
 modules/backend/models/UserThrottle.php       |  4 +-
 modules/backend/reportwidgets/Welcome.php     |  6 +-
 modules/backend/routes.php                    |  2 +-
 modules/backend/skins/Standard.php            |  4 +-
 .../backend/tests/classes/AuthManagerTest.php | 42 +++++------
 .../tests/classes/NavigationManagerTest.php   | 42 +++++------
 .../tests/classes/WidgetManagerTest.php       |  8 +--
 .../tests/fixtures/models/UserFixture.php     |  4 +-
 .../tests/formwidgets/CheckboxTest.php        |  2 +-
 .../tests/formwidgets/ColorPickerTest.php     | 10 +--
 .../tests/helpers/BackendHelperTest.php       |  2 +-
 .../backend/tests/models/ExportModelTest.php  |  2 +-
 .../backend/tests/models/ImportModelTest.php  |  2 +-
 .../backend/tests/traits/WidgetMakerTest.php  |  2 +-
 .../tests/widgets/FilterWidgetTest.php        | 24 +++----
 modules/backend/tests/widgets/FormTest.php    | 36 +++++-----
 modules/backend/tests/widgets/ListsTest.php   | 24 +++----
 modules/backend/traits/FormModelSaver.php     |  2 +-
 modules/backend/traits/FormModelWidget.php    | 14 ++--
 .../backend/traits/InspectableContainer.php   |  8 +--
 modules/backend/traits/PreferenceMaker.php    |  2 +-
 modules/backend/traits/SearchableWidget.php   |  2 +-
 modules/backend/traits/SelectableWidget.php   |  2 +-
 modules/backend/traits/SessionMaker.php       |  2 +-
 modules/backend/traits/UploadableWidget.php   | 16 ++---
 modules/backend/traits/WidgetMaker.php        |  8 +--
 modules/backend/widgets/Filter.php            | 28 ++++----
 modules/backend/widgets/Form.php              | 16 ++---
 modules/backend/widgets/Lists.php             | 48 ++++++-------
 modules/backend/widgets/MediaManager.php      | 54 +++++++-------
 modules/backend/widgets/ReportContainer.php   | 30 ++++----
 modules/backend/widgets/Search.php            |  2 +-
 modules/backend/widgets/Table.php             | 22 +++---
 .../widgets/form/partials/_field_hint.php     |  2 +-
 .../widgets/form/partials/_field_partial.php  |  2 +-
 .../widgets/lists/partials/_list_body_row.php |  2 +-
 .../mediamanager/partials/_crop-toolbar.php   |  2 +-
 .../mediamanager/partials/_rename-form.php    |  2 +-
 .../mediamanager/partials/_sorting.php        |  4 +-
 .../partials/_new_widget_popup.php            |  2 +-
 .../reportcontainer/partials/_widget_list.php |  2 +-
 modules/cms/ServiceProvider.php               | 64 ++++++++---------
 modules/cms/classes/Asset.php                 | 26 +++----
 modules/cms/classes/AutoDatasource.php        |  4 +-
 modules/cms/classes/CmsCompoundObject.php     | 20 +++---
 modules/cms/classes/CmsController.php         |  3 +-
 modules/cms/classes/CmsException.php          |  6 +-
 modules/cms/classes/CmsObject.php             | 24 +++----
 modules/cms/classes/CmsObjectCollection.php   |  2 +-
 modules/cms/classes/CodeParser.php            | 12 ++--
 modules/cms/classes/ComponentBase.php         | 10 +--
 modules/cms/classes/ComponentHelpers.php      |  6 +-
 modules/cms/classes/ComponentManager.php      |  6 +-
 modules/cms/classes/ComponentPartial.php      |  8 +--
 modules/cms/classes/Content.php               |  4 +-
 modules/cms/classes/Controller.php            | 26 +++----
 modules/cms/classes/MediaViewHelper.php       |  6 +-
 modules/cms/classes/Meta.php                  |  2 +-
 modules/cms/classes/Page.php                  | 12 ++--
 modules/cms/classes/PartialStack.php          |  4 +-
 modules/cms/classes/Router.php                | 12 ++--
 modules/cms/classes/Theme.php                 | 22 +++---
 modules/cms/classes/ThemeManager.php          |  6 +-
 modules/cms/components/Resources.php          | 14 ++--
 modules/cms/components/SoftComponent.php      |  2 +-
 modules/cms/components/UnknownComponent.php   |  2 +-
 modules/cms/components/ViewBag.php            |  4 +-
 modules/cms/console/ThemeInstall.php          |  2 +-
 modules/cms/console/ThemeSync.php             |  2 +-
 modules/cms/controllers/Index.php             | 64 ++++++++---------
 modules/cms/controllers/ThemeLogs.php         |  8 +--
 modules/cms/controllers/ThemeOptions.php      | 12 ++--
 modules/cms/controllers/Themes.php            | 24 +++----
 modules/cms/controllers/index/_form_page.php  |  2 +-
 .../controllers/themes/_theme_create_form.php |  2 +-
 .../controllers/themes/_theme_export_form.php |  2 +-
 .../controllers/themes/_theme_fields_form.php |  2 +-
 modules/cms/formwidgets/Components.php        |  2 +-
 modules/cms/helpers/Cms.php                   |  6 +-
 modules/cms/helpers/File.php                  |  3 -
 modules/cms/lang/ar/lang.php                  |  6 +-
 modules/cms/lang/be/lang.php                  | 34 ++++-----
 modules/cms/lang/bg/lang.php                  | 36 +++++-----
 modules/cms/lang/ca/lang.php                  | 40 +++++------
 modules/cms/lang/cs/lang.php                  | 38 +++++-----
 modules/cms/lang/da/lang.php                  | 34 ++++-----
 modules/cms/lang/de/lang.php                  | 14 ++--
 modules/cms/lang/el/lang.php                  |  2 +-
 modules/cms/lang/es-ar/lang.php               | 26 +++----
 modules/cms/lang/es/lang.php                  | 40 +++++------
 modules/cms/lang/et/lang.php                  | 40 +++++------
 modules/cms/lang/fa/lang.php                  | 22 +++---
 modules/cms/lang/fi/lang.php                  | 42 +++++------
 modules/cms/lang/fr/lang.php                  | 20 +++---
 modules/cms/lang/id/lang.php                  | 42 +++++------
 modules/cms/lang/it/lang.php                  | 26 +++----
 modules/cms/lang/ja/lang.php                  |  2 +-
 modules/cms/lang/kr/lang.php                  | 16 ++---
 modules/cms/lang/lt/lang.php                  | 40 +++++------
 modules/cms/lang/lv/lang.php                  |  2 +-
 modules/cms/lang/nb-no/lang.php               | 32 ++++-----
 modules/cms/lang/pl/lang.php                  | 32 ++++-----
 modules/cms/lang/pt-br/lang.php               | 10 +--
 modules/cms/lang/pt-pt/lang.php               | 12 ++--
 modules/cms/lang/ro/lang.php                  | 10 +--
 modules/cms/lang/sk/lang.php                  | 40 +++++------
 modules/cms/lang/sl/lang.php                  |  2 +-
 modules/cms/lang/sv/lang.php                  | 26 +++----
 modules/cms/lang/uk/lang.php                  |  2 +-
 modules/cms/lang/vn/lang.php                  | 40 +++++------
 modules/cms/lang/zh-cn/lang.php               | 30 ++++----
 modules/cms/lang/zh-tw/lang.php               | 34 ++++-----
 modules/cms/models/MaintenanceSetting.php     |  8 +--
 modules/cms/models/ThemeData.php              |  6 +-
 modules/cms/models/ThemeExport.php            | 12 ++--
 modules/cms/models/ThemeImport.php            | 14 ++--
 modules/cms/models/ThemeLog.php               |  8 +--
 modules/cms/reportwidgets/ActiveTheme.php     | 10 +--
 modules/cms/tests/classes/AssetTest.php       |  2 +-
 .../cms/tests/classes/AutoDatasourceTest.php  | 10 +--
 .../tests/classes/CmsCompoundObjectTest.php   |  8 +--
 .../cms/tests/classes/CmsExceptionTest.php    |  2 +-
 .../cms/tests/classes/CmsObjectQueryTest.php  |  2 +-
 modules/cms/tests/classes/CmsObjectTest.php   | 22 +++---
 modules/cms/tests/classes/CodeParserTest.php  |  4 +-
 .../tests/classes/ComponentManagerTest.php    |  2 +-
 modules/cms/tests/classes/ContentTest.php     |  2 +-
 modules/cms/tests/classes/ControllerTest.php  |  8 +--
 modules/cms/tests/classes/PageTest.php        |  2 +-
 .../cms/tests/classes/PartialStackTest.php    |  2 +-
 modules/cms/tests/classes/RouterTest.php      |  2 +-
 modules/cms/tests/classes/ThemeTest.php       |  6 +-
 .../cms/tests/classes/TwigExtensionTest.php   |  2 +-
 modules/cms/traits/UrlMaker.php               | 12 ++--
 modules/cms/twig/ComponentNode.php            |  2 +-
 modules/cms/twig/ComponentTokenParser.php     |  2 +-
 modules/cms/twig/ContentNode.php              |  2 +-
 modules/cms/twig/ContentTokenParser.php       |  2 +-
 modules/cms/twig/DebugExtension.php           | 14 ++--
 modules/cms/twig/DefaultNode.php              |  2 +-
 modules/cms/twig/Extension.php                |  4 +-
 modules/cms/twig/FlashNode.php                |  2 +-
 modules/cms/twig/FrameworkNode.php            |  6 +-
 modules/cms/twig/Loader.php                   |  8 +--
 modules/cms/twig/PageNode.php                 |  2 +-
 modules/cms/twig/PartialNode.php              |  2 +-
 modules/cms/twig/PartialTokenParser.php       |  2 +-
 modules/cms/twig/PlaceholderNode.php          |  2 +-
 modules/cms/twig/PlaceholderTokenParser.php   |  2 +-
 modules/cms/twig/PutNode.php                  |  2 +-
 modules/cms/twig/ScriptsNode.php              |  2 +-
 modules/cms/twig/SnowboardNode.php            |  4 +-
 modules/cms/twig/StylesNode.php               |  2 +-
 modules/cms/widgets/AssetList.php             | 48 ++++++-------
 modules/cms/widgets/ComponentList.php         | 24 +++----
 modules/cms/widgets/TemplateList.php          | 18 ++---
 .../widgets/assetlist/partials/_move_form.php |  2 +-
 .../assetlist/partials/_new_dir_form.php      |  2 +-
 .../assetlist/partials/_rename_form.php       |  2 +-
 modules/system/ServiceProvider.php            | 44 ++++++------
 modules/system/behaviors/SettingsModel.php    |  8 +--
 modules/system/classes/CombineAssets.php      | 31 ++++----
 modules/system/classes/ErrorHandler.php       | 11 ++-
 modules/system/classes/FileManifest.php       |  4 +-
 modules/system/classes/ImageResizer.php       | 15 ++--
 modules/system/classes/MailManager.php        | 12 ++--
 modules/system/classes/MediaLibrary.php       | 14 ++--
 modules/system/classes/MediaLibraryItem.php   |  6 +-
 modules/system/classes/ModelBehavior.php      |  6 +-
 modules/system/classes/PluginBase.php         | 12 ++--
 modules/system/classes/PluginManager.php      | 27 ++++---
 modules/system/classes/SettingsManager.php    | 12 ++--
 modules/system/classes/SourceManifest.php     |  8 +--
 modules/system/classes/SystemController.php   |  9 ++-
 modules/system/classes/UpdateManager.php      | 34 ++++-----
 modules/system/classes/VersionManager.php     | 16 ++---
 .../system/classes/asset/BundleManager.php    |  2 +-
 .../system/classes/asset/PackageManager.php   |  6 +-
 modules/system/console/CreateCommand.php      |  1 -
 modules/system/console/CreateJob.php          |  2 -
 modules/system/console/CreateMigration.php    |  4 +-
 modules/system/console/CreateModel.php        |  1 -
 modules/system/console/CreatePlugin.php       |  2 -
 modules/system/console/CreateSettings.php     |  4 +-
 modules/system/console/CreateTest.php         |  1 -
 modules/system/console/PluginDisable.php      |  3 +-
 modules/system/console/PluginEnable.php       |  3 +-
 modules/system/console/PluginInstall.php      |  4 +-
 modules/system/console/PluginList.php         |  2 -
 modules/system/console/PluginRefresh.php      |  2 +-
 modules/system/console/PluginRemove.php       |  6 +-
 modules/system/console/PluginRollback.php     |  2 +-
 modules/system/console/WinterDown.php         |  2 +-
 modules/system/console/WinterEnv.php          |  4 +-
 modules/system/console/WinterFresh.php        |  4 +-
 modules/system/console/WinterInstall.php      | 10 +--
 modules/system/console/WinterManifest.php     |  8 +--
 modules/system/console/WinterMirror.php       |  8 +--
 modules/system/console/WinterTest.php         |  4 +-
 modules/system/console/WinterUpdate.php       |  4 +-
 modules/system/console/WinterUtil.php         | 12 ++--
 modules/system/console/asset/AssetCompile.php |  2 +-
 modules/system/console/asset/NpmRun.php       |  4 +-
 modules/system/console/asset/NpmUpdate.php    |  4 +-
 .../system/console/asset/mix/MixCompile.php   |  4 +-
 modules/system/console/asset/mix/MixWatch.php |  2 +-
 .../system/console/asset/vite/ViteCompile.php |  2 +-
 .../system/console/asset/vite/ViteWatch.php   |  2 +-
 modules/system/controllers/EventLogs.php      |  8 +--
 .../system/controllers/MailBrandSettings.php  | 20 +++---
 modules/system/controllers/MailLayouts.php    |  8 +--
 modules/system/controllers/MailPartials.php   |  2 +-
 modules/system/controllers/MailTemplates.php  | 12 ++--
 modules/system/controllers/RequestLogs.php    |  6 +-
 modules/system/controllers/Settings.php       | 20 +++---
 modules/system/controllers/Updates.php        | 42 +++++------
 ...Db_Deferred_Bindings_Add_Index_Session.php |  2 +-
 ...000026_Db_System_Add_App_Birthday_Date.php |  2 +-
 ...9_24_000028_Db_System_Sessions_Indexes.php |  3 -
 .../system/database/seeds/DatabaseSeeder.php  |  4 +-
 .../database/seeds/SeedSetupMailLayouts.php   |  2 +-
 modules/system/helpers/Cache.php              |  6 +-
 modules/system/helpers/DateTime.php           |  4 +-
 modules/system/lang/ar/lang.php               |  4 +-
 modules/system/lang/be/client.php             | 16 ++---
 modules/system/lang/be/lang.php               | 54 +++++++-------
 modules/system/lang/bg/lang.php               | 50 ++++++-------
 modules/system/lang/ca/client.php             | 18 ++---
 modules/system/lang/ca/lang.php               | 56 +++++++--------
 modules/system/lang/cs/lang.php               | 48 ++++++-------
 modules/system/lang/da/client.php             | 14 ++--
 modules/system/lang/da/lang.php               | 50 ++++++-------
 modules/system/lang/de/client.php             |  2 +-
 modules/system/lang/el/client.php             |  8 +--
 modules/system/lang/el/lang.php               | 18 ++---
 modules/system/lang/en/client.php             |  2 +-
 modules/system/lang/es-ar/lang.php            |  8 +--
 modules/system/lang/es/client.php             | 18 ++---
 modules/system/lang/es/lang.php               | 36 +++++-----
 modules/system/lang/es/validation.php         | 10 +--
 modules/system/lang/et/client.php             | 16 ++---
 modules/system/lang/et/lang.php               | 56 +++++++--------
 modules/system/lang/fa/client.php             | 18 ++---
 modules/system/lang/fa/lang.php               | 28 ++++----
 modules/system/lang/fi/client.php             | 20 +++---
 modules/system/lang/fi/lang.php               | 64 ++++++++---------
 modules/system/lang/fr/client.php             | 18 ++---
 modules/system/lang/fr/lang.php               | 20 +++---
 modules/system/lang/hu/client.php             | 22 +++---
 modules/system/lang/hu/lang.php               |  4 +-
 modules/system/lang/id/lang.php               | 50 ++++++-------
 modules/system/lang/it/client.php             |  4 +-
 modules/system/lang/it/lang.php               | 16 ++---
 modules/system/lang/ja/lang.php               |  6 +-
 modules/system/lang/kr/client.php             | 16 ++---
 modules/system/lang/kr/lang.php               | 26 +++----
 modules/system/lang/lt/client.php             | 16 ++---
 modules/system/lang/lt/lang.php               | 56 +++++++--------
 modules/system/lang/lv/client.php             |  2 +-
 modules/system/lang/nb-no/client.php          | 16 ++---
 modules/system/lang/nb-no/lang.php            | 50 ++++++-------
 modules/system/lang/nl/client.php             | 10 +--
 modules/system/lang/pl/client.php             | 14 ++--
 modules/system/lang/pt-br/client.php          | 20 +++---
 modules/system/lang/pt-br/lang.php            | 26 +++----
 modules/system/lang/pt-pt/client.php          | 16 ++---
 modules/system/lang/pt-pt/lang.php            | 16 ++---
 modules/system/lang/ro/lang.php               |  4 +-
 modules/system/lang/rs/client.php             |  2 +-
 modules/system/lang/sk/client.php             | 18 ++---
 modules/system/lang/sk/lang.php               | 60 ++++++++--------
 modules/system/lang/sv/lang.php               | 22 +++---
 modules/system/lang/th/lang.php               |  2 +-
 modules/system/lang/tr/lang.php               |  2 +-
 modules/system/lang/tr/validation.php         |  2 +-
 modules/system/lang/uk/validation.php         |  2 +-
 modules/system/lang/vn/client.php             | 18 ++---
 modules/system/lang/vn/lang.php               | 62 ++++++++--------
 modules/system/lang/zh-cn/client.php          | 14 ++--
 modules/system/lang/zh-cn/lang.php            | 60 ++++++++--------
 modules/system/lang/zh-tw/client.php          |  4 +-
 modules/system/lang/zh-tw/lang.php            | 52 +++++++-------
 modules/system/models/EventLog.php            |  6 +-
 modules/system/models/File.php                |  6 +-
 modules/system/models/LogSetting.php          |  4 +-
 modules/system/models/MailBrandSetting.php    | 12 ++--
 modules/system/models/MailLayout.php          | 10 +--
 modules/system/models/MailPartial.php         | 10 +--
 modules/system/models/MailSetting.php         |  8 +--
 modules/system/models/MailTemplate.php        |  8 +--
 modules/system/models/Parameter.php           |  4 +-
 modules/system/models/PluginVersion.php       |  4 +-
 modules/system/models/RequestLog.php          |  6 +-
 modules/system/reportwidgets/Status.php       | 22 +++---
 modules/system/tests/ServiceProviderTest.php  |  4 +-
 .../tests/bootstrap/PluginManagerTestCase.php |  4 +-
 .../system/tests/bootstrap/PluginTestCase.php | 10 +--
 modules/system/tests/bootstrap/TestCase.php   |  2 +-
 .../tests/classes/CombineAssetsTest.php       |  7 +-
 modules/system/tests/classes/CoreLangTest.php |  3 +-
 .../system/tests/classes/FileManifestTest.php |  2 +-
 .../system/tests/classes/ImageResizerTest.php | 10 +--
 .../tests/classes/MarkupManagerTest.php       |  2 +-
 .../system/tests/classes/MediaLibraryTest.php |  6 +-
 .../system/tests/classes/PluginBaseTest.php   |  6 +-
 .../tests/classes/PluginManagerTest.php       |  4 +-
 .../tests/classes/SourceManifestTest.php      | 16 ++---
 .../tests/classes/VersionManagerTest.php      | 46 ++++++------
 .../tests/classes/asset/BundleManagerTest.php | 16 ++---
 .../tests/console/CreateMigrationTest.php     |  5 +-
 .../tests/console/asset/MixCompileTest.php    | 12 ++--
 .../tests/console/asset/ViteCompileTest.php   |  6 +-
 .../plugins/database/tester/Plugin.php        |  2 +-
 .../plugins/database/tester/models/Author.php |  8 +--
 .../database/tester/models/Category.php       |  6 +-
 .../database/tester/models/Country.php        |  4 +-
 .../database/tester/models/EventLog.php       |  4 +-
 .../plugins/database/tester/models/Meta.php   |  6 +-
 .../plugins/database/tester/models/Phone.php  |  2 +-
 .../plugins/database/tester/models/Post.php   | 14 ++--
 .../plugins/database/tester/models/Role.php   |  4 +-
 .../plugins/database/tester/models/Tag.php    |  2 +-
 .../plugins/database/tester/models/User.php   |  8 +--
 .../tester/updates/create_authors_table.php   |  2 +-
 .../updates/create_categories_table.php       |  2 +-
 .../tester/updates/create_countries_table.php |  2 +-
 .../tester/updates/create_event_log_table.php |  2 +-
 .../tester/updates/create_meta_table.php      |  2 +-
 .../tester/updates/create_phones_table.php    |  2 +-
 .../tester/updates/create_posts_table.php     |  2 +-
 .../tester/updates/create_roles_table.php     |  2 +-
 .../tester/updates/create_tags_table.php      |  2 +-
 .../tester/updates/create_users_table.php     |  2 +-
 .../plugins/dependencytest/acme/Plugin.php    |  4 +-
 .../dependencytest/dependency/Plugin.php      |  2 +-
 .../plugins/dependencytest/found/Plugin.php   |  4 +-
 .../dependencytest/notfound/Plugin.php        |  4 +-
 .../dependencytest/wrongcase/Plugin.php       |  4 +-
 .../fixtures/plugins/mix/testa/Plugin.php     |  2 +-
 .../fixtures/plugins/mix/testb/Plugin.php     |  2 +-
 .../fixtures/plugins/mix/testc/Plugin.php     |  2 +-
 .../plugins/testvendor/test/Plugin.php        |  6 +-
 .../winter/invalidreplacement/Plugin.php      |  4 +-
 .../plugins/winter/noupdates/Plugin.php       |  2 +-
 .../plugins/winter/original/Plugin.php        |  2 +-
 .../plugins/winter/replacement/Plugin.php     |  4 +-
 .../winter/replacenotinstalled/Plugin.php     |  4 +-
 .../fixtures/plugins/winter/sample/Plugin.php |  2 +-
 .../fixtures/plugins/winter/tester/Plugin.php | 14 ++--
 .../winter/tester/components/Archive.php      | 10 +--
 .../winter/tester/components/Categories.php   |  6 +-
 .../winter/tester/components/Comments.php     |  6 +-
 .../winter/tester/components/ContentBlock.php |  2 +-
 .../winter/tester/components/MainMenu.php     |  2 +-
 .../plugins/winter/tester/components/Post.php |  6 +-
 .../winter/tester/models/TestModel.php        |  8 +--
 .../plugins/database/AttachManyModelTest.php  |  6 +-
 .../plugins/database/AttachOneModelTest.php   |  8 +--
 .../database/BelongsToManyModelTest.php       |  8 +--
 .../plugins/database/BelongsToModelTest.php   |  6 +-
 .../plugins/database/DeferredBindingTest.php  |  6 +-
 .../plugins/database/HasManyModelTest.php     | 14 ++--
 .../database/HasManyThroughModelTest.php      |  8 +--
 .../plugins/database/HasOneModelTest.php      |  4 +-
 .../database/HasOneThroughModelTest.php       |  6 +-
 .../plugins/database/MorphManyModelTest.php   | 18 ++---
 .../plugins/database/MorphOneModelTest.php    |  6 +-
 .../plugins/database/MorphToModelTest.php     |  6 +-
 .../plugins/database/NestedTreeModelTest.php  | 26 +++----
 .../plugins/database/NullableModelTest.php    |  2 +-
 .../plugins/database/PluginModelTest.php      |  2 +-
 .../database/RevisionableModelTest.php        | 10 +--
 .../plugins/database/SimpleTreeModelTest.php  | 19 +++--
 .../plugins/database/SluggableModelTest.php   |  2 +-
 .../plugins/database/SoftDeleteModelTest.php  |  9 ++-
 .../plugins/database/ValidationModelTest.php  |  6 +-
 .../system/CustomValidatorRulesTest.php       | 14 ++--
 modules/system/tests/traits/ViewMakerTest.php |  2 +-
 modules/system/traits/AssetMaker.php          | 10 +--
 modules/system/traits/ConfigMaker.php         | 12 ++--
 modules/system/traits/EventEmitter.php        |  2 +-
 modules/system/traits/ResponseMaker.php       |  4 +-
 modules/system/traits/SecurityController.php  |  9 ++-
 modules/system/traits/ViewMaker.php           | 10 +--
 modules/system/twig/Engine.php                |  2 +-
 modules/system/twig/Extension.php             |  6 +-
 modules/system/twig/Loader.php                |  6 +-
 modules/system/twig/MailPartialNode.php       |  2 +-
 .../system/twig/MailPartialTokenParser.php    |  2 +-
 modules/system/twig/SecurityPolicy.php        |  4 +-
 phpcs.xml                                     | 17 +++++
 plugins/winter/demo/Plugin.php                |  4 +-
 plugins/winter/demo/components/Todo.php       |  8 +--
 489 files changed, 3201 insertions(+), 3226 deletions(-)

diff --git a/composer.json b/composer.json
index 9263add65b..3d4d2dbf40 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
         "mockery/mockery": "^1.4.4",
         "fakerphp/faker": "^1.9.2",
         "squizlabs/php_codesniffer": "^3.2",
+        "slevomat/coding-standard": "^8.15.0",
         "php-parallel-lint/php-parallel-lint": "^1.0",
         "dms/phpunit-arraysubset-asserts": "^0.1.0|^0.2.1"
     },
@@ -79,7 +80,8 @@
     "config": {
         "allow-plugins": {
             "composer/installers": true,
-            "wikimedia/composer-merge-plugin": true
+            "wikimedia/composer-merge-plugin": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }
diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 3a70003324..8206dba1d1 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -2,13 +2,13 @@
 
 namespace Backend;
 
-use Backend;
-use BackendMenu;
-use BackendAuth;
-use Backend\Models\UserRole;
 use Backend\Classes\WidgetManager;
-use System\Classes\MailManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
+use Backend\Models\UserRole;
 use System\Classes\CombineAssets;
+use System\Classes\MailManager;
 use System\Classes\SettingsManager;
 use Winter\Storm\Support\ModuleServiceProvider;
 
@@ -119,7 +119,7 @@ protected function registerBackendNavigation()
                     'iconSvg'     => 'modules/backend/assets/images/dashboard-icon.svg',
                     'url'         => Backend::url('backend'),
                     'permissions' => ['backend.access_dashboard'],
-                    'order'       => 10
+                    'order'       => 10,
                 ],
                 'media' => [
                     'label'       => 'backend::lang.media.menu_label',
@@ -127,8 +127,8 @@ protected function registerBackendNavigation()
                     'iconSvg'     => 'modules/backend/assets/images/media-icon.svg',
                     'url'         => Backend::url('backend/media'),
                     'permissions' => ['media.*'],
-                    'order'       => 200
-                ]
+                    'order'       => 200,
+                ],
             ]);
             $manager->registerOwnerAlias('Winter.Backend', 'October.Backend');
         });
@@ -142,7 +142,7 @@ protected function registerBackendReportWidgets()
         WidgetManager::instance()->registerReportWidgets(function ($manager) {
             $manager->registerReportWidget(\Backend\ReportWidgets\Welcome::class, [
                 'label'   => 'backend::lang.dashboard.welcome.widget_title_default',
-                'context' => 'dashboard'
+                'context' => 'dashboard',
             ]);
         });
     }
@@ -250,7 +250,7 @@ protected function registerBackendSettings()
                     'class'       => 'Backend\Models\BrandSetting',
                     'permissions' => ['backend.manage_branding'],
                     'order'       => 500,
-                    'keywords'    => 'brand style'
+                    'keywords'    => 'brand style',
                 ],
                 'editor' => [
                     'label'       => 'backend::lang.editor.menu_label',
@@ -260,7 +260,7 @@ protected function registerBackendSettings()
                     'class'       => 'Backend\Models\EditorSetting',
                     'permissions' => ['backend.manage_editor'],
                     'order'       => 500,
-                    'keywords'    => 'html code class style'
+                    'keywords'    => 'html code class style',
                 ],
                 'myaccount' => [
                     'label'       => 'backend::lang.myaccount.menu_label',
@@ -270,7 +270,7 @@ protected function registerBackendSettings()
                     'url'         => Backend::url('backend/users/myaccount'),
                     'order'       => 500,
                     'context'     => 'mysettings',
-                    'keywords'    => 'backend::lang.myaccount.menu_keywords'
+                    'keywords'    => 'backend::lang.myaccount.menu_keywords',
                 ],
                 'preferences' => [
                     'label'       => 'backend::lang.backend_preferences.menu_label',
@@ -280,7 +280,7 @@ protected function registerBackendSettings()
                     'url'         => Backend::url('backend/preferences'),
                     'permissions' => ['backend.manage_preferences'],
                     'order'       => 510,
-                    'context'     => 'mysettings'
+                    'context'     => 'mysettings',
                 ],
                 'access_logs' => [
                     'label'       => 'backend::lang.access_log.menu_label',
@@ -289,8 +289,8 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-lock',
                     'url'         => Backend::url('backend/accesslogs'),
                     'permissions' => ['system.access_logs'],
-                    'order'       => 920
-                ]
+                    'order'       => 920,
+                ],
             ]);
             $manager->registerOwnerAlias('Winter.Backend', 'October.Backend');
         });
diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index fc1670bbf2..e484ef9353 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -2,17 +2,17 @@
 
 namespace Backend\Behaviors;
 
-use Db;
-use Str;
-use Lang;
-use Flash;
-use Event;
-use Redirect;
-use Backend;
 use Backend\Classes\ControllerBehavior;
-use Winter\Storm\Router\Helper as RouterHelper;
-use ApplicationException;
+use Backend\Facades\Backend;
 use Exception;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Str;
 
 /**
  * Adds features for working with backend forms. This behavior
@@ -531,7 +531,7 @@ protected function getLang($name, $default = null, $extras = [])
     {
         $name = $this->getConfig($name, $default);
         $vars = [
-            'name' => Lang::get($this->getConfig('name', 'backend::lang.model.name'))
+            'name' => Lang::get($this->getConfig('name', 'backend::lang.model.name')),
         ];
         $vars = array_merge($vars, $extras);
         return Lang::get($name, $vars);
@@ -778,7 +778,7 @@ public function formFindModelObject($recordId)
 
         if (!$result) {
             throw new ApplicationException($this->getLang('not-found-message', 'backend::lang.form.not_found', [
-                'class' => get_class($model), 'id' => $recordId
+                'class' => get_class($model), 'id' => $recordId,
             ]));
         }
 
diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 91f61df522..08532a3d4e 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -2,22 +2,22 @@
 
 namespace Backend\Behaviors;
 
-use Str;
-use Lang;
-use View;
-use Response;
-use Backend;
-use BackendAuth;
-use Backend\Classes\ControllerBehavior;
 use Backend\Behaviors\ImportExportController\TranscodeFilter;
+use Backend\Classes\ControllerBehavior;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Exception;
 use Illuminate\Database\Eloquent\MassAssignmentException;
-use League\Csv\Reader as CsvReader;
-use League\Csv\Writer as CsvWriter;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 use League\Csv\EscapeFormula as CsvEscapeFormula;
+use League\Csv\Reader as CsvReader;
 use League\Csv\Statement as CsvStatement;
-use ApplicationException;
+use League\Csv\Writer as CsvWriter;
 use SplTempFileObject;
-use Exception;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Str;
 
 /**
  * Adds features for importing and exporting data.
@@ -420,7 +420,7 @@ protected function checkRequiredImportColumns()
 
             if (!$found) {
                 throw new ApplicationException(Lang::get('backend::lang.import_export.required_match_column_error', [
-                    'label' => Lang::get($label)
+                    'label' => Lang::get($label),
                 ]));
             }
         }
@@ -736,7 +736,7 @@ protected function getModelForType($type)
         $modelClass = $this->getConfig($type . '[modelClass]');
         if (!$modelClass) {
             throw new ApplicationException(Lang::get('backend::lang.import_export.missing_model_class_error', [
-                'type' => $type
+                'type' => $type,
             ]));
         }
 
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index cc3fab6137..9104a5314b 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Behaviors;
 
-use Lang;
-use Event;
-use Flash;
-use ApplicationException;
 use Backend\Classes\ControllerBehavior;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Adds features for working with backend lists.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index a94cf17b6a..112c1795d1 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -2,13 +2,13 @@
 
 namespace Backend\Behaviors;
 
-use Db;
-use Lang;
-use Request;
-use Form as FormHelper;
 use Backend\Classes\ControllerBehavior;
+use Form as FormHelper;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
 use Winter\Storm\Database\Model;
-use ApplicationException;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\DB;
 
 /**
  * Uses a combination of lists and forms for managing Model relations.
@@ -616,7 +616,7 @@ protected function makeToolbarWidget()
 
         if ($useSearch) {
             $toolbarConfig->search = [
-                'prompt' => 'backend::lang.list.search_prompt'
+                'prompt' => 'backend::lang.list.search_prompt',
             ];
         }
 
diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index 47adc7cf20..8e2a313317 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -2,10 +2,10 @@
 
 namespace Backend\Behaviors;
 
-use Lang;
-use Backend;
-use ApplicationException;
 use Backend\Classes\ControllerBehavior;
+use Backend\Facades\Backend;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Used for reordering and sorting records.
diff --git a/modules/backend/behaviors/UserPreferencesModel.php b/modules/backend/behaviors/UserPreferencesModel.php
index c3984eb56c..c285b9bbd6 100644
--- a/modules/backend/behaviors/UserPreferencesModel.php
+++ b/modules/backend/behaviors/UserPreferencesModel.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Behaviors;
 
-use System\Behaviors\SettingsModel;
 use Backend\Models\UserPreference;
+use System\Behaviors\SettingsModel;
 
 /**
  * User Preferences model extension, identical to System\Behaviors\SettingsModel
diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_form.php b/modules/backend/behaviors/relationcontroller/partials/_manage_form.php
index cab9fec785..58e4144780 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_form.php
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_form.php
@@ -35,7 +35,7 @@
         <?= Form::ajax('onRelationManageCreate', [
             'data-popup-load-indicator' => true,
             'data-request-success' => "$.wn.relationBehavior.changed('" . e($relationField) . "', 'created')",
-            'sessionKey' => $newSessionKey
+            'sessionKey' => $newSessionKey,
         ]) ?>
 
             <!-- Passable fields -->
diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_list.php b/modules/backend/behaviors/relationcontroller/partials/_manage_list.php
index f3664c9906..56bb03d7c6 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_list.php
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_list.php
@@ -3,7 +3,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
             <h4 class="modal-title"><?= e(trans($relationManageTitle, [
-                'name' => trans($relationLabel)
+                'name' => trans($relationLabel),
             ])) ?></h4>
         </div>
 
diff --git a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php
index fd055a2a21..c1c2efd784 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php
+++ b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.php
@@ -3,7 +3,7 @@
     <?= Form::ajax('onRelationManagePivotUpdate', [
         'data' => ['_relation_field' => $relationField, 'manage_id' => $relationManageId],
         'data-request-success' => "$.wn.relationBehavior.changed('" . e($relationField) . "', 'updated')",
-        'data-popup-load-indicator' => true
+        'data-popup-load-indicator' => true,
     ]) ?>
 
         <div class="modal-header">
@@ -24,7 +24,7 @@
     <?= Form::ajax('onRelationManagePivotCreate', [
         'data' => ['_relation_field' => $relationField, 'foreign_id' => $foreignId],
         'data-request-success' => "$.wn.relationBehavior.changed('" . e($relationField) . "', 'created')",
-        'data-popup-load-indicator' => true
+        'data-popup-load-indicator' => true,
     ]) ?>
 
         <div class="modal-header">
diff --git a/modules/backend/behaviors/relationcontroller/partials/_toolbar.php b/modules/backend/behaviors/relationcontroller/partials/_toolbar.php
index d7f85f55e5..f110018d40 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_toolbar.php
+++ b/modules/backend/behaviors/relationcontroller/partials/_toolbar.php
@@ -5,11 +5,11 @@
         <?php if ($type === 'update'): ?>
             <?= $this->relationMakePartial('button_update', [
                 'relationManageId' => $relationViewModel->getKey(),
-                'text' => $text
+                'text' => $text,
             ]) ?>
         <?php else: ?>
             <?= $this->relationMakePartial('button_' . $type, [
-                'text' => $text
+                'text' => $text,
             ]) ?>
         <?php endif ?>
 
diff --git a/modules/backend/classes/AuthManager.php b/modules/backend/classes/AuthManager.php
index 22bae8513e..b6b5328558 100644
--- a/modules/backend/classes/AuthManager.php
+++ b/modules/backend/classes/AuthManager.php
@@ -2,10 +2,10 @@
 
 namespace Backend\Classes;
 
-use Config;
 use System\Classes\PluginManager;
 use Winter\Storm\Auth\Manager as StormAuthManager;
 use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Back-end authentication manager.
@@ -36,7 +36,7 @@ class AuthManager extends StormAuthManager
         'label'   => null,
         'comment' => null,
         'roles'   => null,
-        'order'   => 500
+        'order'   => 500,
     ];
 
     /**
@@ -107,7 +107,7 @@ public function registerPermissions($owner, array $definitions)
         foreach ($definitions as $code => $definition) {
             $permission = (object) array_merge(self::$permissionDefaults, array_merge($definition, [
                 'code' => $code,
-                'owner' => $owner
+                'owner' => $owner,
             ]));
 
             $this->permissions[] = $permission;
diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php
index 075005d2b3..0b5b1164a0 100644
--- a/modules/backend/classes/BackendController.php
+++ b/modules/backend/classes/BackendController.php
@@ -2,18 +2,18 @@
 
 namespace Backend\Classes;
 
-use App;
 use Closure;
-use Config;
-use Event;
-use File;
 use Illuminate\Routing\Controller as ControllerBase;
-use Request;
-use Response;
-use Str;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 use System\Classes\PluginManager;
-use View;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * This is the master controller for all back-end pages.
@@ -204,7 +204,7 @@ protected function getRequestedController($url)
             return [
                 'controller' => $controllerObj,
                 'action' => $action,
-                'params' => $controllerParams
+                'params' => $controllerParams,
             ];
         }
 
@@ -233,7 +233,7 @@ protected function getRequestedController($url)
                 return [
                     'controller' => $controllerObj,
                     'action' => $action,
-                    'params' => $controllerParams
+                    'params' => $controllerParams,
                 ];
             }
         }
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 04ec44def6..4d0e07b878 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -2,26 +2,26 @@
 
 namespace Backend\Classes;
 
-use Lang;
-use View;
-use Flash;
-use Config;
-use Request;
-use Backend;
-use Redirect;
-use Response;
-use Exception;
-use BackendAuth;
-use Backend\Models\UserPreference;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
 use Backend\Models\Preference as BackendPreference;
+use Backend\Models\UserPreference;
 use Backend\Widgets\MediaManager;
-use Winter\Storm\Exception\AjaxException;
-use Winter\Storm\Exception\SystemException;
-use Winter\Storm\Exception\ValidationException;
-use Winter\Storm\Exception\ApplicationException;
+use Exception;
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Controller as ControllerBase;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
+use Winter\Storm\Exception\AjaxException;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Exception\ValidationException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * The Backend base controller class, used by Backend controllers.
@@ -107,7 +107,7 @@ class Controller extends ControllerBase
         'getId',
         'setStatusCode',
         'handleError',
-        'makeHintPartial'
+        'makeHintPartial',
     ];
 
     /**
@@ -709,7 +709,7 @@ public function makeHintPartial($name, $partial = null, $params = [])
             'hintName'    => $name,
             'hintPartial' => $partial,
             'hintContent' => array_get($params, 'content'),
-            'hintParams'  => $params
+            'hintParams'  => $params,
         ] + $params);
     }
 
diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php
index df4f134f89..688f5d4475 100644
--- a/modules/backend/classes/ControllerBehavior.php
+++ b/modules/backend/classes/ControllerBehavior.php
@@ -2,10 +2,10 @@
 
 namespace Backend\Classes;
 
-use Lang;
-use ApplicationException;
-use Winter\Storm\Extension\ExtensionBase;
+use Illuminate\Support\Facades\Lang;
 use System\Traits\ViewMaker;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Extension\ExtensionBase;
 use Winter\Storm\Html\Helper as HtmlHelper;
 
 /**
@@ -61,7 +61,7 @@ public function __construct($controller)
                 throw new ApplicationException(Lang::get('system::lang.behavior.missing_property', [
                     'class' => get_class($controller),
                     'property' => $property,
-                    'behavior' => get_called_class()
+                    'behavior' => get_called_class(),
                 ]));
             }
         }
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index cd0824024d..560b0b9608 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -3,9 +3,9 @@
 namespace Backend\Classes;
 
 use BackedEnum;
-use Html;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Html\Helper as HtmlHelper;
+use Winter\Storm\Support\Facades\Html;
 use Winter\Storm\Support\Str;
 
 /**
@@ -520,7 +520,7 @@ protected function filterTriggerAttributes($attributes, $position = 'field')
             'data-trigger' => '[name="' . $fullTriggerField . '"]',
             'data-trigger-action' => $triggerAction,
             'data-trigger-condition' => $triggerCondition,
-            'data-trigger-closest-parent' => 'form, div[data-control="formwidget"]'
+            'data-trigger-closest-parent' => 'form, div[data-control="formwidget"]',
         ];
 
         return $attributes + $newAttributes;
@@ -554,7 +554,7 @@ protected function filterPresetAttributes($attributes, $position = 'field')
         $newAttributes = [
             'data-input-preset' => '[name="' . $fullPresetField . '"]',
             'data-input-preset-type' => $presetType,
-            'data-input-preset-closest-parent' => 'form'
+            'data-input-preset-closest-parent' => 'form',
         ];
 
         if ($prefixInput = array_get($this->preset, 'prefixInput')) {
diff --git a/modules/backend/classes/FormTabs.php b/modules/backend/classes/FormTabs.php
index 8e3755a891..462671ad4d 100644
--- a/modules/backend/classes/FormTabs.php
+++ b/modules/backend/classes/FormTabs.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Classes;
 
-use IteratorAggregate;
-use ArrayIterator;
 use ArrayAccess;
+use ArrayIterator;
+use IteratorAggregate;
 use Traversable;
 
 /**
diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php
index a56205a21d..c7aabc866d 100644
--- a/modules/backend/classes/NavigationManager.php
+++ b/modules/backend/classes/NavigationManager.php
@@ -2,13 +2,13 @@
 
 namespace Backend\Classes;
 
-use Event;
-use BackendAuth;
+use Backend\Facades\BackendAuth;
+use Illuminate\Support\Facades\Log;
 use System\Classes\PluginManager;
-use Validator;
-use SystemException;
-use Log;
-use Config;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Validator;
 
 /**
  * Manages the backend navigation.
@@ -285,7 +285,7 @@ public function addMainMenuItem($owner, $code, array $definition)
 
         $item = array_merge($definition, [
             'code'  => $code,
-            'owner' => $owner
+            'owner' => $owner,
         ]);
 
         $this->items[$itemKey] = MainMenuItem::createFromArray($item);
@@ -356,7 +356,7 @@ public function addSideMenuItem($owner, $code, $sideCode, array $definition)
 
         $definition = array_merge($definition, [
             'code'  => $sideCode,
-            'owner' => $owner
+            'owner' => $owner,
         ]);
 
         if (isset($mainItem->sideMenu[$sideCode])) {
@@ -524,7 +524,7 @@ public function registerQuickActions($owner, array $definitions)
         $validator = Validator::make($definitions, [
             '*.label' => 'required',
             '*.icon' => 'required_without:*.iconSvg',
-            '*.url' => 'required'
+            '*.url' => 'required',
         ]);
 
         if ($validator->fails()) {
@@ -571,7 +571,7 @@ public function addQuickActionItem($owner, $code, array $definition)
 
         $item = array_merge($definition, [
             'code'  => $code,
-            'owner' => $owner
+            'owner' => $owner,
         ]);
 
         $this->quickActions[$itemKey] = QuickActionItem::createFromArray($item);
diff --git a/modules/backend/classes/Skin.php b/modules/backend/classes/Skin.php
index 3290b668e9..ccefd8a896 100644
--- a/modules/backend/classes/Skin.php
+++ b/modules/backend/classes/Skin.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Classes;
 
-use File;
-use Config;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Skin Base class
diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php
index e88021f485..fbd96792c4 100644
--- a/modules/backend/classes/WidgetBase.php
+++ b/modules/backend/classes/WidgetBase.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Classes;
 
-use Winter\Storm\Html\Helper as HtmlHelper;
-use Winter\Storm\Extension\Extendable;
 use stdClass;
+use Winter\Storm\Extension\Extendable;
+use Winter\Storm\Html\Helper as HtmlHelper;
 
 /**
  * Widget base class.
diff --git a/modules/backend/classes/WidgetManager.php b/modules/backend/classes/WidgetManager.php
index 13e90a6b74..f6acb89af6 100644
--- a/modules/backend/classes/WidgetManager.php
+++ b/modules/backend/classes/WidgetManager.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Classes;
 
-use Str;
-use BackendAuth;
-use SystemException;
+use Backend\Facades\BackendAuth;
 use System\Classes\PluginManager;
-use Event;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Str;
 
 /**
  * Widget manager
diff --git a/modules/backend/console/WinterPasswd.php b/modules/backend/console/WinterPasswd.php
index 3cb83e831b..d9b0b54d62 100644
--- a/modules/backend/console/WinterPasswd.php
+++ b/modules/backend/console/WinterPasswd.php
@@ -4,9 +4,9 @@
 
 use Backend\Models\User;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Str;
 use Symfony\Component\Console\Question\Question;
 use Winter\Storm\Console\Command;
+use Winter\Storm\Support\Str;
 
 /**
  * Console command to change the password of a Backend user via CLI.
diff --git a/modules/backend/controllers/AccessLogs.php b/modules/backend/controllers/AccessLogs.php
index 558b490519..b7f609c54b 100644
--- a/modules/backend/controllers/AccessLogs.php
+++ b/modules/backend/controllers/AccessLogs.php
@@ -2,9 +2,8 @@
 
 namespace Backend\Controllers;
 
-use Backend;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 use System\Classes\SettingsManager;
 
 /**
diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php
index 66a322c023..2981133593 100644
--- a/modules/backend/controllers/Auth.php
+++ b/modules/backend/controllers/Auth.php
@@ -2,20 +2,20 @@
 
 namespace Backend\Controllers;
 
-use ApplicationException;
-use Backend;
-use BackendAuth;
 use Backend\Classes\Controller;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
 use Backend\Models\AccessLog;
-use Config;
 use Exception;
-use Flash;
-use Mail;
-use Request;
+use Illuminate\Support\Facades\Request;
 use System\Classes\UpdateManager;
-use ValidationException;
-use Validator;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\ValidationException;
 use Winter\Storm\Foundation\Http\Middleware\CheckForTrustedHost;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Mail;
+use Winter\Storm\Support\Facades\Validator;
 
 /**
  * Authentication controller
@@ -78,7 +78,7 @@ public function signin_onSubmit()
     {
         $rules = [
             'login'    => 'required|between:2,255',
-            'password' => 'required|between:4,255'
+            'password' => 'required|between:4,255',
         ];
 
         $validation = Validator::make(post(), $rules);
@@ -93,7 +93,7 @@ public function signin_onSubmit()
         // Authenticate user
         $user = BackendAuth::authenticate([
             'login' => post('login'),
-            'password' => post('password')
+            'password' => post('password'),
         ], $remember);
 
         $runMigrationsOnLogin = (bool) Config::get('cms.runMigrationsOnLogin', Config::get('app.debug', false));
@@ -169,7 +169,7 @@ public function restore_onSubmit()
         }
 
         $rules = [
-            'login' => 'required|between:2,255'
+            'login' => 'required|between:2,255',
         ];
 
         $validation = Validator::make(post(), $rules);
@@ -231,7 +231,7 @@ public function reset_onSubmit()
         }
 
         $rules = [
-            'password' => 'required|between:4,255'
+            'password' => 'required|between:4,255',
         ];
 
         $validation = Validator::make(post(), $rules);
diff --git a/modules/backend/controllers/Files.php b/modules/backend/controllers/Files.php
index 9b8dd44f19..c1d82c99ce 100644
--- a/modules/backend/controllers/Files.php
+++ b/modules/backend/controllers/Files.php
@@ -2,16 +2,16 @@
 
 namespace Backend\Controllers;
 
-use View;
-use Cache;
-use Config;
-use Backend;
-use Response;
-use System\Models\File as FileModel;
 use Backend\Classes\Controller;
-use ApplicationException;
+use Backend\Facades\Backend;
 use Exception;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 use RuntimeException;
+use System\Models\File as FileModel;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Backend files controller
diff --git a/modules/backend/controllers/Index.php b/modules/backend/controllers/Index.php
index 749b76a4af..269c483cc5 100644
--- a/modules/backend/controllers/Index.php
+++ b/modules/backend/controllers/Index.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Controllers;
 
-use Backend;
-use Redirect;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
 use Backend\Widgets\ReportContainer;
+use Illuminate\Support\Facades\Redirect;
 
 /**
  * Dashboard controller
diff --git a/modules/backend/controllers/Media.php b/modules/backend/controllers/Media.php
index 4073340f60..e495b044f6 100644
--- a/modules/backend/controllers/Media.php
+++ b/modules/backend/controllers/Media.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 use Backend\Widgets\MediaManager;
 
 /**
diff --git a/modules/backend/controllers/Preferences.php b/modules/backend/controllers/Preferences.php
index 9015762922..362ccea6f4 100644
--- a/modules/backend/controllers/Preferences.php
+++ b/modules/backend/controllers/Preferences.php
@@ -2,13 +2,13 @@
 
 namespace Backend\Controllers;
 
-use Lang;
-use Flash;
-use Backend;
-use BackendMenu;
 use Backend\Classes\Controller;
-use System\Classes\SettingsManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
 use Backend\Models\Preference as PreferenceModel;
+use Illuminate\Support\Facades\Lang;
+use System\Classes\SettingsManager;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Editor Settings controller
diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php
index a372c86747..cd91455ea8 100644
--- a/modules/backend/controllers/UserGroups.php
+++ b/modules/backend/controllers/UserGroups.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 use System\Classes\SettingsManager;
 
 /**
diff --git a/modules/backend/controllers/UserRoles.php b/modules/backend/controllers/UserRoles.php
index 7afe98c394..3796f20969 100644
--- a/modules/backend/controllers/UserRoles.php
+++ b/modules/backend/controllers/UserRoles.php
@@ -2,10 +2,10 @@
 
 namespace Backend\Controllers;
 
-use View;
-use Response;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 use System\Classes\SettingsManager;
 
 /**
diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php
index 315350ec6e..94a294f34c 100644
--- a/modules/backend/controllers/Users.php
+++ b/modules/backend/controllers/Users.php
@@ -2,17 +2,17 @@
 
 namespace Backend\Controllers;
 
-use Mail;
-use Lang;
-use Flash;
-use Backend;
-use Redirect;
-use Response;
-use BackendMenu;
-use BackendAuth;
-use Backend\Models\UserGroup;
 use Backend\Classes\Controller;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
+use Backend\Models\UserGroup;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
 use System\Classes\SettingsManager;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Backend user controller
@@ -231,9 +231,9 @@ protected function generatePermissionsField()
                 'trigger' => [
                     'action' => 'disable',
                     'field' => 'is_superuser',
-                    'condition' => 'checked'
-                ]
-            ]
+                    'condition' => 'checked',
+                ],
+            ],
         ];
     }
 
diff --git a/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php b/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php
index e72897e06e..ef87aa772c 100644
--- a/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php
+++ b/modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php
@@ -1,8 +1,8 @@
 <?php
 
+use Backend\Models\User as AdminModel;
 use Winter\Storm\Database\Schema\Blueprint;
 use Winter\Storm\Database\Updates\Migration;
-use Backend\Models\User as AdminModel;
 
 class DbBackendAddSuperuserFlag extends Migration
 {
diff --git a/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php b/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php
index bb41c86b13..27bea59590 100644
--- a/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php
+++ b/modules/backend/database/migrations/2017_10_01_000010_Db_Backend_User_Roles.php
@@ -85,7 +85,7 @@ protected function migratePermissionsFromGroupsToRoles()
                 $roles[$group->id] = Db::table('backend_user_roles')->insertGetId([
                     'name' => $group->name,
                     'description' => $group->description,
-                    'permissions' => $group->permissions ?? null
+                    'permissions' => $group->permissions ?? null,
                 ]);
             } catch (Exception $ex) {
             }
@@ -108,7 +108,7 @@ protected function migratePermissionsFromGroupsToRoles()
 
             if (!isset($found[$userId])) {
                 Db::table('backend_users')->where('id', $userId)->update([
-                    'role_id' => $roleId
+                    'role_id' => $roleId,
                 ]);
             }
 
@@ -154,7 +154,7 @@ protected function splicePermissionsForUser($userId, $permissions)
             $newPerms = array_merge($permissions, $currentPerms);
 
             Db::table('backend_users')->where('id', $userId)->update([
-                'permissions' => json_encode($newPerms)
+                'permissions' => json_encode($newPerms),
             ]);
         } catch (Exception $ex) {
         }
diff --git a/modules/backend/database/seeds/DatabaseSeeder.php b/modules/backend/database/seeds/DatabaseSeeder.php
index 59d43fdd6c..1068e2fb43 100644
--- a/modules/backend/database/seeds/DatabaseSeeder.php
+++ b/modules/backend/database/seeds/DatabaseSeeder.php
@@ -2,10 +2,9 @@
 
 namespace Backend\Database\Seeds;
 
-use Str;
-use Seeder;
-use Eloquent;
-use Backend\Database\Seeds\SeedSetupAdmin;
+use Illuminate\Database\Eloquent\Model as Eloquent;
+use Winter\Storm\Database\Updates\Seeder;
+use Winter\Storm\Support\Str;
 
 class DatabaseSeeder extends Seeder
 {
@@ -23,7 +22,7 @@ public function run()
             // Generate a random password for the seeded admin account
             $adminSeeder = new \Backend\Database\Seeds\SeedSetupAdmin();
             $adminSeeder->setDefaults([
-                'password' => $adminPassword
+                'password' => $adminPassword,
             ]);
             $this->call($adminSeeder);
         });
diff --git a/modules/backend/database/seeds/SeedSetupAdmin.php b/modules/backend/database/seeds/SeedSetupAdmin.php
index 0d4ff93a6a..52b91e25d6 100644
--- a/modules/backend/database/seeds/SeedSetupAdmin.php
+++ b/modules/backend/database/seeds/SeedSetupAdmin.php
@@ -2,10 +2,10 @@
 
 namespace Backend\Database\Seeds;
 
-use Seeder;
 use Backend\Models\User;
-use Backend\Models\UserRole;
 use Backend\Models\UserGroup;
+use Backend\Models\UserRole;
+use Winter\Storm\Database\Updates\Seeder;
 
 class SeedSetupAdmin extends Seeder
 {
@@ -43,7 +43,7 @@ public function run()
             'name' => 'Owners',
             'code' => UserGroup::CODE_OWNERS,
             'description' => 'Default group for website owners.',
-            'is_new_user_default' => false
+            'is_new_user_default' => false,
         ]);
 
         $user = User::create([
@@ -56,7 +56,7 @@ public function run()
             'permissions'           => [],
             'is_superuser'          => true,
             'is_activated'          => true,
-            'role_id'               => $role->id
+            'role_id'               => $role->id,
         ]);
 
         $user->addGroup($group);
diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php
index 658449de4f..a5575ba06d 100644
--- a/modules/backend/formwidgets/CodeEditor.php
+++ b/modules/backend/formwidgets/CodeEditor.php
@@ -2,8 +2,8 @@
 
 namespace Backend\FormWidgets;
 
-use Backend\Models\Preference as BackendPreference;
 use Backend\Classes\FormWidgetBase;
+use Backend\Models\Preference as BackendPreference;
 
 /**
  * Code Editor
@@ -147,7 +147,7 @@ public function init()
             'autocompletion',
             'enableSnippets',
             'displayIndentGuides',
-            'showPrintMargin'
+            'showPrintMargin',
         ]);
     }
 
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
index 62a830ff42..068bdbc696 100644
--- a/modules/backend/formwidgets/ColorPicker.php
+++ b/modules/backend/formwidgets/ColorPicker.php
@@ -2,10 +2,10 @@
 
 namespace Backend\FormWidgets;
 
-use Lang;
 use Backend\Classes\FormWidgetBase;
-use ApplicationException;
 use Backend\Models\BrandSetting;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Color picker
@@ -143,7 +143,7 @@ protected function getAvailableColors()
                 throw new ApplicationException(Lang::get('backend::lang.field.colors_method_not_exists', [
                     'model'  => get_class($this->model),
                     'method' => $availableColors,
-                    'field'  => $this->formField->fieldName
+                    'field'  => $this->formField->fieldName,
                 ]));
             }
         } else {
diff --git a/modules/backend/formwidgets/DataTable.php b/modules/backend/formwidgets/DataTable.php
index 6cefc7637e..5ce8f0ead0 100644
--- a/modules/backend/formwidgets/DataTable.php
+++ b/modules/backend/formwidgets/DataTable.php
@@ -2,11 +2,11 @@
 
 namespace Backend\FormWidgets;
 
-use Lang;
-use Backend\Widgets\Table;
 use Backend\Classes\FormWidgetBase;
+use Backend\Widgets\Table;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Html\Helper as HtmlHelper;
-use ApplicationException;
 
 /**
  * Data Table
@@ -186,7 +186,7 @@ public function getDataTableOptions($columnName, $rowData)
                     'backend::lang.model.missing_method',
                     [
                         'class' => get_class($this->model),
-                        'method' => 'getDataTableOptions'
+                        'method' => 'getDataTableOptions',
                     ]
                 )
             );
diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php
index 6a98d2ad78..8629b86dd7 100644
--- a/modules/backend/formwidgets/DatePicker.php
+++ b/modules/backend/formwidgets/DatePicker.php
@@ -2,12 +2,12 @@
 
 namespace Backend\FormWidgets;
 
-use Config;
-use Carbon\Carbon;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
+use Carbon\Carbon;
 use System\Helpers\DateTime as DateTimeHelper;
 use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Date picker
diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index a4ee6aa311..95c2be2aa3 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -2,19 +2,18 @@
 
 namespace Backend\FormWidgets;
 
-use Db;
-use Input;
-use Event;
-use Request;
-use Response;
-use Validator;
-use Backend\Widgets\Form;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
-use Winter\Storm\Filesystem\Definitions as FileDefinitions;
-use ApplicationException;
-use ValidationException;
+use Backend\Widgets\Form;
 use Exception;
+use Illuminate\Support\Facades\Response;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\ValidationException;
+use Winter\Storm\Filesystem\Definitions as FileDefinitions;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Facades\Validator;
 
 /**
  * File upload field
@@ -72,7 +71,7 @@ class FileUpload extends FormWidgetBase
      */
     public $thumbOptions = [
         'mode'      => 'crop',
-        'extension' => 'auto'
+        'extension' => 'auto',
     ];
 
     /**
@@ -478,7 +477,7 @@ public function onUpload()
             $result = [
                 'id' => $file->id,
                 'thumb' => $file->thumbUrl,
-                'path' => $file->pathUrl
+                'path' => $file->pathUrl,
             ];
 
             $response = Response::make($result, 200);
diff --git a/modules/backend/formwidgets/IconPicker.php b/modules/backend/formwidgets/IconPicker.php
index 0e941f96ca..ebd93652f2 100644
--- a/modules/backend/formwidgets/IconPicker.php
+++ b/modules/backend/formwidgets/IconPicker.php
@@ -3,9 +3,8 @@
 namespace Backend\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
-use File;
-use Url;
-use Yaml;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Yaml;
 
 /**
  * Icon picker
diff --git a/modules/backend/formwidgets/MarkdownEditor.php b/modules/backend/formwidgets/MarkdownEditor.php
index 2253270566..9ab4b199e0 100644
--- a/modules/backend/formwidgets/MarkdownEditor.php
+++ b/modules/backend/formwidgets/MarkdownEditor.php
@@ -2,10 +2,10 @@
 
 namespace Backend\FormWidgets;
 
-use Html;
-use Markdown;
-use BackendAuth;
 use Backend\Classes\FormWidgetBase;
+use Backend\Facades\BackendAuth;
+use Winter\Storm\Support\Facades\Html;
+use Winter\Storm\Support\Facades\Markdown;
 
 /**
  * Code Editor
@@ -136,7 +136,7 @@ public function onRefresh()
         }
 
         return [
-            'preview' => $previewHtml
+            'preview' => $previewHtml,
         ];
     }
 }
diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
index d1eed96e5e..ea3d6bbbe2 100644
--- a/modules/backend/formwidgets/MediaFinder.php
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -2,10 +2,10 @@
 
 namespace Backend\FormWidgets;
 
-use BackendAuth;
 use Backend\Classes\FormField;
-use System\Classes\MediaLibrary;
 use Backend\Classes\FormWidgetBase;
+use Backend\Facades\BackendAuth;
+use System\Classes\MediaLibrary;
 
 /**
  * Media Finder
@@ -63,7 +63,7 @@ public function init()
             'mode',
             'prompt',
             'imageWidth',
-            'imageHeight'
+            'imageHeight',
         ]);
 
         $user = BackendAuth::getUser();
diff --git a/modules/backend/formwidgets/PermissionEditor.php b/modules/backend/formwidgets/PermissionEditor.php
index be0b6b9afb..d377b8a198 100644
--- a/modules/backend/formwidgets/PermissionEditor.php
+++ b/modules/backend/formwidgets/PermissionEditor.php
@@ -3,7 +3,7 @@
 namespace Backend\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
-use BackendAuth;
+use Backend\Facades\BackendAuth;
 
 /**
  * User/group permission editor
diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index 27ef97a214..c93b2c3fea 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -2,10 +2,10 @@
 
 namespace Backend\FormWidgets;
 
-use Lang;
-use ApplicationException;
 use Backend\Classes\FormWidgetBase;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Record Finder
diff --git a/modules/backend/formwidgets/Relation.php b/modules/backend/formwidgets/Relation.php
index 767941eab1..e23f19f2eb 100644
--- a/modules/backend/formwidgets/Relation.php
+++ b/modules/backend/formwidgets/Relation.php
@@ -2,12 +2,12 @@
 
 namespace Backend\FormWidgets;
 
-use Db;
-use Lang;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
 use Illuminate\Database\Eloquent\Relations\Relation as RelationBase;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\DB;
 
 /**
  * Form Relationship
@@ -120,7 +120,7 @@ protected function makeRenderFormField()
             } else {
                 throw new SystemException(
                     Lang::get('backend::lang.relation.relationwidget_unsupported_type', [
-                        'type' => $relationType
+                        'type' => $relationType,
                     ])
                 );
             }
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index 92d38e3db1..86c36b5367 100644
--- a/modules/backend/formwidgets/Repeater.php
+++ b/modules/backend/formwidgets/Repeater.php
@@ -2,9 +2,9 @@
 
 namespace Backend\FormWidgets;
 
-use Lang;
-use ApplicationException;
 use Backend\Classes\FormWidgetBase;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Repeater Form Widget
@@ -340,7 +340,7 @@ protected function makeItemFormWidget($index = 0, $groupCode = null)
         $widget->bindToController();
 
         $this->indexMeta[$index] = [
-            'groupCode' => $groupCode
+            'groupCode' => $groupCode,
         ];
 
         return $this->formWidgets[$index] = $widget;
@@ -382,7 +382,7 @@ public function onAddItem()
 
         return [
             $addItemContainer => '',
-            $itemContainer => $this->makePartial('repeater_item') . $this->makePartial('repeater_add_item')
+            $itemContainer => $this->makePartial('repeater_item') . $this->makePartial('repeater_add_item'),
         ];
     }
 
@@ -507,7 +507,7 @@ protected function processGroupMode()
                 'name' => array_get($config, 'name'),
                 'icon' => array_get($config, 'icon', 'icon-square-o'),
                 'description' => array_get($config, 'description'),
-                'fields' => array_get($config, 'fields')
+                'fields' => array_get($config, 'fields'),
             ];
         }
 
diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php
index a1c0726adf..9c7f75b4a4 100644
--- a/modules/backend/formwidgets/RichEditor.php
+++ b/modules/backend/formwidgets/RichEditor.php
@@ -2,16 +2,16 @@
 
 namespace Backend\FormWidgets;
 
-use App;
-use File;
-use Lang;
-use Event;
-use Config;
-use Request;
-use Backend;
-use BackendAuth;
-use Backend\Models\EditorSetting;
 use Backend\Classes\FormWidgetBase;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Models\EditorSetting;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Rich Editor
diff --git a/modules/backend/formwidgets/Sensitive.php b/modules/backend/formwidgets/Sensitive.php
index 4d34c6f54f..ce45628e90 100644
--- a/modules/backend/formwidgets/Sensitive.php
+++ b/modules/backend/formwidgets/Sensitive.php
@@ -92,7 +92,7 @@ public function prepareVars()
     public function onShowValue()
     {
         return [
-            'value' => $this->getLoadValue()
+            'value' => $this->getLoadValue(),
         ];
     }
 
diff --git a/modules/backend/formwidgets/TagList.php b/modules/backend/formwidgets/TagList.php
index 2f82e4f633..8841d29393 100644
--- a/modules/backend/formwidgets/TagList.php
+++ b/modules/backend/formwidgets/TagList.php
@@ -76,7 +76,7 @@ public function init()
             'mode',
             'nameFrom',
             'useKey',
-            'placeholder'
+            'placeholder',
         ]);
     }
 
diff --git a/modules/backend/formwidgets/datepicker/partials/_datepicker.php b/modules/backend/formwidgets/datepicker/partials/_datepicker.php
index 13a307a09f..fbc46c8447 100644
--- a/modules/backend/formwidgets/datepicker/partials/_datepicker.php
+++ b/modules/backend/formwidgets/datepicker/partials/_datepicker.php
@@ -7,7 +7,7 @@
     <div class="form-control"><?= Backend::dateTime($value, [
         'format' => $format,
         'formatAlias' => $formatAlias,
-        'defaultValue' => $value
+        'defaultValue' => $value,
     ]) ?></div>
 <?php else: ?>
     <div
diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php
index 81abcef049..a22a5f5dd7 100644
--- a/modules/backend/helpers/Backend.php
+++ b/modules/backend/helpers/Backend.php
@@ -2,17 +2,17 @@
 
 namespace Backend\Helpers;
 
-use Url;
-use File;
-use Html;
-use Config;
-use Request;
-use Redirect;
-use Exception;
-use Winter\Storm\Router\Helper as RouterHelper;
-use System\Helpers\DateTime as DateTimeHelper;
 use Backend\Classes\Skin;
 use Backend\Helpers\Exception\DecompileException;
+use Exception;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\URL;
+use System\Helpers\DateTime as DateTimeHelper;
+use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Html;
 
 /**
  * Backend Helper
diff --git a/modules/backend/helpers/exception/DecompileException.php b/modules/backend/helpers/exception/DecompileException.php
index a95252656c..6cd1e10683 100644
--- a/modules/backend/helpers/exception/DecompileException.php
+++ b/modules/backend/helpers/exception/DecompileException.php
@@ -2,7 +2,7 @@
 
 namespace Backend\Helpers\Exception;
 
-use ApplicationException;
+use Winter\Storm\Exception\ApplicationException;
 
 class DecompileException extends ApplicationException
 {
diff --git a/modules/backend/lang/ar/lang.php b/modules/backend/lang/ar/lang.php
index 08e208c821..4e83adf7e6 100644
--- a/modules/backend/lang/ar/lang.php
+++ b/modules/backend/lang/ar/lang.php
@@ -2,13 +2,13 @@
 
 return [
     'auth' => [
-        'title' => 'لوحة الإدارة'
+        'title' => 'لوحة الإدارة',
     ],
     'page' => [
         'access_denied' => [
             'label' => 'ممنوع الوصول',
             'help' => "ليس لديك الصلاحيات لعرض هذه الصفحة.",
-            'cms_link' => 'عودة للوحة الإدارة'
+            'cms_link' => 'عودة للوحة الإدارة',
         ],
     ],
     'account' => [
@@ -48,7 +48,7 @@
             'last_sign_in' => 'آخر تسجيل دخول لك كان في',
             'view_access_logs' => 'عرض سجلات الدخول',
             'nice_message' => 'نتمنى لك يوماً سعيداً!',
-        ]
+        ],
     ],
     'list' => [
         'default_title' => 'القائمة',
@@ -60,7 +60,7 @@
         'delete_selected_confirm' => 'هل أنت متأكد من حذف السجلات المحددة؟',
         'delete_selected_success' => 'حذف السجلات المحددة.',
         'column_switch_true' => 'نعم',
-        'column_switch_false' => 'لا'
+        'column_switch_false' => 'لا',
     ],
     'form' => [
         'action_confirm' => 'هل أنت متأكد؟',
@@ -133,11 +133,11 @@
         'link_name' => 'ربط :name',
         'unlink' => 'إلغاء ربط',
         'unlink_name' => 'إلغاء ربط :name',
-        'unlink_confirm' => 'هل أنت متأكد؟'
+        'unlink_confirm' => 'هل أنت متأكد؟',
     ],
     'reorder' => [
         'default_title' => 'إعادة الترتيب',
-        'no_records' => 'ليس هناك سجلات لإعادة ترتيبها.'
+        'no_records' => 'ليس هناك سجلات لإعادة ترتيبها.',
     ],
     'myaccount' => [
         'menu_label' => 'حسابي',
diff --git a/modules/backend/lang/be/lang.php b/modules/backend/lang/be/lang.php
index c01b45f2d0..5b3b7ca944 100644
--- a/modules/backend/lang/be/lang.php
+++ b/modules/backend/lang/be/lang.php
@@ -2,32 +2,32 @@
 
 return [
     'auth' => [
-        'title' => "Панэль кіравання"
+        'title' => "Панэль кіравання",
     ],
     'field' => [
         'invalid_type' => "Выкарыстаны няправільны тып поля: \":type\"",
         'options_method_invalid_model' => "Для атрыбуту \":field\" не была знойздена адпаведная мадэль. Паспрабуйце яўна вызначыць метад опцый для мадэлі \":model\"",
-        'options_method_not_exists' => "Клас мадэлі \":model\" павінен мець метад \":method()\", які вяртае опцыі для поля формы \":field\""
+        'options_method_not_exists' => "Клас мадэлі \":model\" павінен мець метад \":method()\", які вяртае опцыі для поля формы \":field\"",
     ],
     'widget' => [
         'not_registered' => "Віджэт з імем класа \":name\" не быў зарэгістрыраваны",
-        'not_bound' => "Віджэт з імем класа \":name\" не быў злучаны з кантролерам"
+        'not_bound' => "Віджэт з імем класа \":name\" не быў злучаны з кантролерам",
     ],
     'page' => [
         'untitled' => "Без назвы",
         'access_denied' => [
             'label' => "Доступ забаронены",
             'help' => "У вас няма патрэбных праў для прагляду гэтай старонкі",
-            'cms_link' => 'Вярнуцца у панэль кіравання'
+            'cms_link' => 'Вярнуцца у панэль кіравання',
         ],
         'no_database' => [
             'label' => "Няма базы дадзеных",
             'help' => "Неабходна база дадзеных мець доступ у панэль кіравання. Праверце, што база дадзеных правільна наладжаная, а міграцыі выкананыя, перад тым, як пасправаць зноў",
-            'cms_link' => "Вярнуцца на хатнюю старонку"
+            'cms_link' => "Вярнуцца на хатнюю старонку",
         ],
     ],
     'partial' => [
-        'not_found_name' => "Частковы шаблон \":name\" не знойдзены."
+        'not_found_name' => "Частковы шаблон \":name\" не знойдзены.",
     ],
     'account' => [
         'sign_out' => "Выйсці",
@@ -49,7 +49,7 @@
         'apply' => "Ужыць",
         'cancel' => "Адмяніць",
         'delete' => "Выдаліць",
-        'ok' => "Добра"
+        'ok' => "Добра",
     ],
     'dashboard' => [
         'menu_label' => "Панэль кіравання",
@@ -96,7 +96,7 @@
             'last_sign_in' => "Ваш апошні ўваход быў",
             'view_access_logs' => "Прагледзець журнал доступу",
             'nice_message' => "Добрага дню!",
-        ]
+        ],
     ],
     'user' => [
         'name' => "Адміністратар",
@@ -143,11 +143,11 @@
             'new' => "Новая група",
             'delete_confirm' => "Выдаліць гэтую адміністратарскую групу?",
             'return' => "Вярнуцца да спісу груп",
-            'users_count' => "Карыстальнікі"
+            'users_count' => "Карыстальнікі",
         ],
         'preferences' => [
-            'not_authenticated' => "Немагчыма загрузіць ці захаваць налады для невядомага карыстальніка"
-        ]
+            'not_authenticated' => "Немагчыма загрузіць ці захаваць налады для невядомага карыстальніка",
+        ],
     ],
     'list' => [
         'default_title' => "Спіс",
@@ -176,7 +176,7 @@
         'delete_selected_confirm' => "Выдяліць абраныя запісы?",
         'delete_selected_success' => "Абраныя запісы былі выдаленыя",
         'column_switch_true' => "Так",
-        'column_switch_false' => "Не"
+        'column_switch_false' => "Не",
     ],
     'fileupload' => [
         'attachment' => "Прымацаванне",
@@ -188,7 +188,7 @@
         'upload_file' => "Загрузіць файл",
         'upload_error' => "Памылка загрузкі",
         'remove_confirm' => "Вы ўпэўнены?",
-        'remove_file' => "Выдаліць файл"
+        'remove_file' => "Выдаліць файл",
     ],
     'form' => [
         'create_title' => "Новая :name",
@@ -244,14 +244,14 @@
         'delete_row' => "Выдаліць радок",
         'concurrency_file_changed_title' => "Файл быў зменены",
         'concurrency_file_changed_description' => "Файл які вы рэдагуеце быў зменены на діску іншым карыстальнікам. Вы можаце альбо перазагрузіць файл і згубіць сваі змяненні, альбо перазапісаць файл на діску",
-        'return_to_list' => "Вярнуцца да спісу"
+        'return_to_list' => "Вярнуцца да спісу",
     ],
     'recordfinder' => [
-        'find_record' => "Знайсці запіс"
+        'find_record' => "Знайсці запіс",
     ],
     'pagelist' => [
         'page_link' => "Спасылка на староку",
-        'select_page' => "Выберыце старонку..."
+        'select_page' => "Выберыце старонку...",
     ],
     'relation' => [
         'missing_config' => "Паводзіны стаўлення не маюць ніводнай канфігурацыі для \":config\"",
@@ -284,11 +284,11 @@
         'link_name' => "Звязаць :name",
         'unlink' => "Раз'яднаць",
         'unlink_name' => "Раз'яднаць :name",
-        'unlink_confirm' => "Вы ўпэўнены?"
+        'unlink_confirm' => "Вы ўпэўнены?",
     ],
     'reorder' => [
         'default_title' => "Змяніць парадак запісаў",
-        'no_records' => "Няма запісаў для сартавання"
+        'no_records' => "Няма запісаў для сартавання",
     ],
     'model' => [
         'name' => 'Мадэль',
@@ -297,13 +297,13 @@
         'missing_relation' => "Мадэль \":class\" не мае вызначэнняў для \":relation\"",
         'missing_method' => "Мадэль \":class\" не мае метаду \":method\"",
         'invalid_class' => "Мадэль \":model\" выкарыстаная ў класе \":class\" неправільная, яна павінна ўспадкоўваць клас \\Model",
-        'mass_assignment_failed' => "Памылковае масавае прызначэнне для атрыбуту \":attribute\""
+        'mass_assignment_failed' => "Памылковае масавае прызначэнне для атрыбуту \":attribute\"",
     ],
     'warnings' => [
         'tips' => "Парады па канфігурацыі сістэмы",
         'tips_description' => "Ёсць пытанні, на якія Вам неабходна звярнуць увагу, каб наладзіць сістэму належным чынам",
         'permissions'  => "PHP не можа пісаць у каталог \":name\" альбо ў яго падкаталогі. Калі ласка, вызначце патрэбныя дазволы ў наладах сервера для гэтага каталога",
-        'extension' => "Пашыранне PHP \":name\" не ўсталявана. Калі ласка, ўсталюце пашырэнне і актывуйце яго"
+        'extension' => "Пашыранне PHP \":name\" не ўсталявана. Калі ласка, ўсталюце пашырэнне і актывуйце яго",
     ],
     'editor' => [
         'menu_label' => "Налады рэдактара",
@@ -349,19 +349,19 @@
         'no_wrap' => "Не абгортваць тэгі",
         'no_wrap_comment' => "Ліст тэгаў, якія не абгортваюцца блокавымі тэгамі",
         'remove_tags' => "Выдаліць тэгі",
-        'remove_tags_comment' => "Ліст тэгаў, якія выдаляюцца разам са зместам"
+        'remove_tags_comment' => "Ліст тэгаў, якія выдаляюцца разам са зместам",
     ],
     'tooltips' => [
-        'preview_website' => "Праглядзець сайт"
+        'preview_website' => "Праглядзець сайт",
     ],
     'mysettings' => [
         'menu_label' => "Маі налады",
-        'menu_description' => "Налады для Вашага акаунту"
+        'menu_description' => "Налады для Вашага акаунту",
     ],
     'myaccount' => [
         'menu_label' => "Мой акаунт",
         'menu_description' => "Абнавіць прыватныя налады (імя, электронную пошту, пароль)",
-        'menu_keywords' => "бяспека лагін"
+        'menu_keywords' => "бяспека лагін",
     ],
     'branding' => [
         'menu_label' => "Налады адлюстравання панэлі кіравання",
@@ -383,7 +383,7 @@
         'menu_mode' => "Стыль меню",
         'menu_mode_inline' => "Строкавы",
         'menu_mode_tile' => "Плітка",
-        'menu_mode_collapsed' => "Выпадаючы"
+        'menu_mode_collapsed' => "Выпадаючы",
     ],
     'backend_preferences' => [
         'menu_label' => "Сістэмныя налады панэлі кіравання",
@@ -393,7 +393,7 @@
         'timezone' => "Часавая зона",
         'timezone_comment' => "Настройка адлюстравання дат у гэтым часавым поясе",
         'locale' => "Лакалізацыя",
-        'locale_comment' => "Выберыце жаданую лакалізацыю, каб змяніць мову"
+        'locale_comment' => "Выберыце жаданую лакалізацыю, каб змяніць мову",
     ],
     'access_log' => [
         'hint' => "Гэты ліст паказвае паспяховыя спробы ўваходу адміністратараў. Запісы захоўваюцца на працягу :days д",
@@ -404,12 +404,12 @@
         'ip_address' => "IP адрас",
         'first_name' => "Імя",
         'last_name' => "Прозвішча",
-        'email' => "Электронная пошта"
+        'email' => "Электронная пошта",
     ],
     'filter' => [
         'all' => 'all',
         'options_method_not_exists' => "The model class :model must define a method :method() returning options for the ':filter' filter.",
-        'date_all' => 'all period'
+        'date_all' => 'all period',
     ],
     'import_export' => [
         'upload_csv_file' => "1. Загрузіць CSV файл",
@@ -461,14 +461,14 @@
         'missing_column_id_error' => "Прапушчаны ідэнтыфікатар слупка",
         'unknown_column_error' => "Невядомы слупок",
         'encoding_not_supported_error' => "Не атрымалася вызначыць кадзіроўку файла. Калі ласка, выберыце правільны фармат самастойна",
-        'encoding_format' => "Кадзіроўка файла"
+        'encoding_format' => "Кадзіроўка файла",
     ],
     'permissions' => [
-        'manage_media' => "Загрузка і кіраванне медыя зместам - выявы, відэа, гукі, дакументы"
+        'manage_media' => "Загрузка і кіраванне медыя зместам - выявы, відэа, гукі, дакументы",
     ],
     'mediafinder' => [
         'label' => "Медыя каталог",
-        'default_prompt' => "Націсніце %s кнопку, каб адшукаць медыя файлы"
+        'default_prompt' => "Націсніце %s кнопку, каб адшукаць медыя файлы",
     ],
     'media' => [
         'menu_label' => "Медыя",
@@ -533,5 +533,5 @@
         'rename_new_name' => "Новае імя",
         'move_please_select' => "калі ласка, выберыце",
         'move_button' => "Перамясціць",
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/bg/lang.php b/modules/backend/lang/bg/lang.php
index 2da2010be1..188768a071 100644
--- a/modules/backend/lang/bg/lang.php
+++ b/modules/backend/lang/bg/lang.php
@@ -2,26 +2,26 @@
 
 return [
     'auth' => [
-        'title' => 'Администраторски Панел'
+        'title' => 'Администраторски Панел',
     ],
     'field' => [
         'invalid_type' => 'Използвано невалиден тип поле :type.',
-        'options_method_not_exists' => "Моделът клас :model трябва да се определя метод :method() връщайки настройки за ':field' поле."
+        'options_method_not_exists' => "Моделът клас :model трябва да се определя метод :method() връщайки настройки за ':field' поле.",
     ],
     'widget' => [
         'not_registered' => "Името на класът за джаджата ':name' не е било регистрирано",
-        'not_bound' => "Джаджата с име на класът ':name' не е бил свързан към контролера"
+        'not_bound' => "Джаджата с име на класът ':name' не е бил свързан към контролера",
     ],
     'page' => [
         'untitled' => 'Неозаглавен',
         'access_denied' => [
             'label' => 'Отказан достъп',
             'help' => "Вие нямате нужните права за да видите тази страница.",
-            'cms_link' => 'Върни се към администраторския-панел'
+            'cms_link' => 'Върни се към администраторския-панел',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Частичната страница ':name' не е намерена."
+        'not_found_name' => "Частичната страница ':name' не е намерена.",
     ],
     'account' => [
         'sign_out' => 'Изход',
@@ -43,7 +43,7 @@
         'apply' => 'Приложи',
         'cancel' => 'Отказ',
         'delete' => 'Изтрии',
-        'ok' => 'Потвърди'
+        'ok' => 'Потвърди',
     ],
     'dashboard' => [
         'menu_label' => 'Табло',
@@ -65,8 +65,8 @@
             'widget_title_default' => 'Състояние на системата',
             'online' => 'на линия',
             'maintenance' => 'в поддръжка',
-            'update_available' => '{0} актуализации налични!|{1} актуализация налична!|[2,Inf] актуализации налични!'
-        ]
+            'update_available' => '{0} актуализации налични!|{1} актуализация налична!|[2,Inf] актуализации налични!',
+        ],
     ],
     'user' => [
         'name' => 'Администратор',
@@ -107,11 +107,11 @@
             'new' => 'Нова група',
             'delete_confirm' => 'Наистина ли искате да изтриете тази администраторска група?',
             'return' => 'Назад към списъка с групи',
-            'users_count' => 'Потребители'
+            'users_count' => 'Потребители',
         ],
         'preferences' => [
-            'not_authenticated' => 'Няма удостоверен потребител, за да се зареди или запишат предпочитанията му.'
-        ]
+            'not_authenticated' => 'Няма удостоверен потребител, за да се зареди или запишат предпочитанията му.',
+        ],
     ],
     'list' => [
         'default_title' => 'Списък',
@@ -138,7 +138,7 @@
         'delete_selected_confirm' => 'Изтриване на избраните записи?',
         'delete_selected_success' => 'Успешно изтрити избраните записи.',
         'column_switch_true' => 'Да',
-        'column_switch_false' => 'Не'
+        'column_switch_false' => 'Не',
     ],
     'fileupload' => [
         'attachment' => 'Прикачен файл',
@@ -150,7 +150,7 @@
         'upload_file' => 'Качи файл',
         'upload_error' => 'Грешка при качване',
         'remove_confirm' => 'Сигурни ли сте?',
-        'remove_file' => 'Премахни файл'
+        'remove_file' => 'Премахни файл',
     ],
     'form' => [
         'create_title' => 'Ново :name',
@@ -205,10 +205,10 @@
         'delete_row' => 'Изтрии ред',
         'concurrency_file_changed_title' => 'Файлът беше променен',
         'concurrency_file_changed_description' => "Файлът, който редактирате е бил променен на диска от друг потребител. Можете да презаредите файла и да загубите вашите промени или замени файла на диска.",
-        'return_to_list' => 'Назад към списъка'
+        'return_to_list' => 'Назад към списъка',
     ],
     'recordfinder' => [
-        'find_record' => 'Намери запис'
+        'find_record' => 'Намери запис',
     ],
     'relation' => [
         'missing_config' => "Режим на работа на връзки няма никакви настройки за ':config'.",
@@ -241,7 +241,7 @@
         'link_name' => 'Вържи :name',
         'unlink' => 'Прекратяване на връзката',
         'unlink_name' => 'Прекратяване на връзката :name',
-        'unlink_confirm' => 'Сигурни ли сте?'
+        'unlink_confirm' => 'Сигурни ли сте?',
     ],
     'reorder' => [
         'default_title' => 'Пренареждане на записи',
@@ -254,13 +254,13 @@
         'missing_relation' => "Модел ':class' не съдържа определение за ':relation'.",
         'missing_method' => "Модел ':class'не съдържа метод ':method'.",
         'invalid_class' => "Модел :model използван в :class не е валиден, той трябва да наследи \Model клас.",
-        'mass_assignment_failed' => "Масовото назначаване Mass assignment се провали за Модела атрибут ':attribute'."
+        'mass_assignment_failed' => "Масовото назначаване Mass assignment се провали за Модела атрибут ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Съвети за конфигурацията на системата',
         'tips_description' => 'Има проблематични въпроси, на които трябва да се обърне внимание, за да конфигурирате системата правилно.',
         'permissions'  => 'Директория :name или нейните поддиректории не е достъпна за писане от PHP (Няма права). Моля, задайте съответните разрешения за уеб сървъра на тази директория (папка).',
-        'extension' => 'Разширението на PHP :name не е инсталирано. Моля инсталирайте тази библиотека и активирайте разширението.'
+        'extension' => 'Разширението на PHP :name не е инсталирано. Моля инсталирайте тази библиотека и активирайте разширението.',
     ],
     'editor' => [
         'menu_label' => 'Редактор Код предпочитания и настройки',
@@ -274,19 +274,19 @@
         'auto_closing' => 'Автоматично затваряне на тагове и специални символи',
         'show_invisibles' => 'Покажи невидими знаци',
         'show_gutter' => 'Покажи gutter',
-        'theme' => 'Цветова схема'
+        'theme' => 'Цветова схема',
     ],
     'tooltips' => [
-        'preview_website' => 'Преглед на сайта'
+        'preview_website' => 'Преглед на сайта',
     ],
     'mysettings' => [
         'menu_label' => 'Моите Настройки',
-        'menu_description' => 'Настройки свързани с вашия администраторски профил'
+        'menu_description' => 'Настройки свързани с вашия администраторски профил',
     ],
     'myaccount' => [
         'menu_label' => 'Моят профил',
         'menu_description' => 'Обнови данните на профила ви, като име, имейл адрес и парола.',
-        'menu_keywords' => 'вход за сигурност'
+        'menu_keywords' => 'вход за сигурност',
     ],
     'branding' => [
         'menu_label' => 'Персонализирайте администраторския-панел',
@@ -304,13 +304,13 @@
         'secondary_light' => 'Вторичен (Светъл)',
         'secondary_dark' => 'Вторичен (Тъмен)',
         'styles' => 'Стилове',
-        'custom_stylesheet' => 'Персонализиран стилове'
+        'custom_stylesheet' => 'Персонализиран стилове',
     ],
     'backend_preferences' => [
         'menu_label' => 'Администраторски-панел предпочитания',
         'menu_description' => 'Управлявайте предпочитанията на профила си като например желания език.',
         'locale' => 'Език',
-        'locale_comment' => 'Изберете желаното местоположение за използване на език.'
+        'locale_comment' => 'Изберете желаното местоположение за използване на език.',
     ],
     'access_log' => [
         'hint' => 'Този дневник показва списък на успешните опити за влизане от администраторите. Записите се съхраняват в продължение на общо :days дни.',
@@ -321,10 +321,10 @@
         'ip_address' => 'ИП адрес',
         'first_name' => 'Име',
         'last_name' => 'Фамилия name',
-        'email' => 'Имейл'
+        'email' => 'Имейл',
     ],
     'filter' => [
-        'all' => 'всичко'
+        'all' => 'всичко',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Качи CSV файл',
@@ -369,11 +369,11 @@
         'empty_error' => 'Няма предоставени данни за изнасяне',
     ],
     'permissions' => [
-        'manage_media' => 'Управление на медия'
+        'manage_media' => 'Управление на медия',
     ],
     'mediafinder' => [
         'label' => 'Медия',
-        'default_prompt' => 'Кликнете върху %s бутон за да намерите медия'
+        'default_prompt' => 'Кликнете върху %s бутон за да намерите медия',
     ],
     'media' => [
         'menu_label' => 'Медия',
@@ -437,5 +437,5 @@
         'rename_new_name' => 'Ново име',
         'move_please_select' => 'Моля изберете',
         'move_button' => 'Премести',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/ca/lang.php b/modules/backend/lang/ca/lang.php
index ee7e60bbe3..47691c84f7 100644
--- a/modules/backend/lang/ca/lang.php
+++ b/modules/backend/lang/ca/lang.php
@@ -3,35 +3,35 @@
 return [
     'auth' => [
         'title' => "Àrea d'Administració",
-        'invalid_login' => "Els detalls que has introduït no corresponen als nostres registres. Si us plau revisa'ls i torna-ho a intentar."
+        'invalid_login' => "Els detalls que has introduït no corresponen als nostres registres. Si us plau revisa'ls i torna-ho a intentar.",
     ],
     'field' => [
         'invalid_type' => 'El tipus de camp :type utilitzat és invàlid.',
         'options_method_invalid_model' => "L'atribut ':field' no resol a un model vàlid. Intenta especificar explícitament el mètode d'opcions per la classe de model :model.",
-        'options_method_not_exists' => "La classe de model :model ha de definir un mètode :method() que retorni opcions pel camp de formulari ':field'."
+        'options_method_not_exists' => "La classe de model :model ha de definir un mètode :method() que retorni opcions pel camp de formulari ':field'.",
     ],
     'widget' => [
         'not_registered' => "No s'ha registrat un widget amb el nom de classe ':name'",
-        'not_bound' => "No s'ha vinculat al controlador un widget amb el nom de classe ':name'"
+        'not_bound' => "No s'ha vinculat al controlador un widget amb el nom de classe ':name'",
     ],
     'page' => [
         'untitled' => 'Sense títol',
         'access_denied' => [
             'label' => 'Accés denegat',
             'help' => "No tens els permisos necessaris per veure aquesta pàgina.",
-            'cms_link' => "Tornar al panell d'administració"
+            'cms_link' => "Tornar al panell d'administració",
         ],
         'no_database' => [
             'label' => 'No es troba la base de dades',
             'help' => "Es requereix una base de dades per accedir al panell d'administració. Comprova que la base de dades estigui configurada i migrada abans de tornar-ho a intentar.",
-            'cms_link' => 'Tornar a la pàgina principal'
+            'cms_link' => 'Tornar a la pàgina principal',
         ],
         'invalid_token' => [
-            'label' => 'Token de seguretat invàlid'
-        ]
+            'label' => 'Token de seguretat invàlid',
+        ],
     ],
     'partial' => [
-        'not_found_name' => "El parcial ':name' no s'ha trobat."
+        'not_found_name' => "El parcial ':name' no s'ha trobat.",
     ],
     'account' => [
         'signed_in_as' => 'Connectat com :full_name',
@@ -55,7 +55,7 @@
         'apply' => 'Aplicar',
         'cancel' => 'Cancel·lar',
         'delete' => 'Eliminar',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Escriptori',
@@ -104,7 +104,7 @@
             'last_sign_in' => "L'últim cop que vas accedir va ser",
             'view_access_logs' => "Veure els registres d'accés",
             'nice_message' => 'Que tinguis un gran dia!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrador',
@@ -153,7 +153,7 @@
             'new' => 'Nou grup',
             'delete_confirm' => "Eliminar aquest grup d'administració?",
             'return' => 'Tornar a la llista de grups',
-            'users_count' => 'Usuaris'
+            'users_count' => 'Usuaris',
         ],
         'role' => [
             'name' => 'Rol',
@@ -167,11 +167,11 @@
             'new' => 'Nou rol',
             'delete_confirm' => "Eliminar aquest rol d'administració?",
             'return' => 'Tornar a la llista de rols',
-            'users_count' => 'Usuaris'
+            'users_count' => 'Usuaris',
         ],
         'preferences' => [
-            'not_authenticated' => 'No hi ha un usuari autenticat per a qui carregar o guardar les preferències.'
-        ]
+            'not_authenticated' => 'No hi ha un usuari autenticat per a qui carregar o guardar les preferències.',
+        ],
     ],
     'list' => [
         'default_title' => 'Llista',
@@ -202,7 +202,7 @@
         'delete_selected_confirm' => 'Eliminar els registres seleccionats?',
         'delete_selected_success' => 'Registres eliminats.',
         'column_switch_true' => 'Sí',
-        'column_switch_false' => 'No'
+        'column_switch_false' => 'No',
     ],
     'fileupload' => [
         'attachment' => 'Adjunt',
@@ -214,7 +214,7 @@
         'upload_file' => 'Pujar arxiu',
         'upload_error' => 'Error de pujada',
         'remove_confirm' => 'Segur que ho vols eliminar?',
-        'remove_file' => 'Elminar arxiu'
+        'remove_file' => 'Elminar arxiu',
     ],
     'repeater' => [
         'min_items_failed' => ":name requereix un mínim de :min elements, només n'hi ha :items",
@@ -275,7 +275,7 @@
         'delete_row' => 'Eliminar fila',
         'concurrency_file_changed_title' => "L'arxiu ha canviat",
         'concurrency_file_changed_description' => "L'arxiu que estàs editant ha estat canviat al disc per un altre usuari. Pots o bé recarregar l'arxiu i perdre els teus canvis, o bé sobreescriure l'arxiu al disc.",
-        'return_to_list' => 'Tornar a la llista'
+        'return_to_list' => 'Tornar a la llista',
     ],
     'recordfinder' => [
         'find_record' => 'Trobar registre',
@@ -283,7 +283,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Enllaç a pàgina',
-        'select_page' => 'Selecciona una pàgina...'
+        'select_page' => 'Selecciona una pàgina...',
     ],
     'relation' => [
         'missing_config' => "El comportament Relation no té una configuració per ':config'.",
@@ -316,11 +316,11 @@
         'link_name' => 'Vincular :name',
         'unlink' => 'Desvincular',
         'unlink_name' => 'Desvincular :name',
-        'unlink_confirm' => "N'estàs segur?"
+        'unlink_confirm' => "N'estàs segur?",
     ],
     'reorder' => [
         'default_title' => 'Reordenar registres',
-        'no_records' => 'No hi ha registres disponibles per reordenar.'
+        'no_records' => 'No hi ha registres disponibles per reordenar.',
     ],
     'model' => [
         'name' => 'Model',
@@ -329,7 +329,7 @@
         'missing_relation' => "El model ':class' no té una definició per ':relation'.",
         'missing_method' => "El model ':class' no té un mètode ':method'.",
         'invalid_class' => "El model :model utilitzat a :class no és vàlid, ha d'heretar la classe \Model.",
-        'mass_assignment_failed' => "L'assignació massiva ha fallat per l'atribut ':attribute' del model."
+        'mass_assignment_failed' => "L'assignació massiva ha fallat per l'atribut ':attribute' del model.",
     ],
     'warnings' => [
         'tips' => 'Consells de configuració del sistema',
@@ -389,16 +389,16 @@
         'toolbar_buttons_comment' => "Els botons de la barra d'eines que es mostraran en l'editor de text enriquit per defecte.",
     ],
     'tooltips' => [
-        'preview_website' => 'Previsualitzar el lloc web'
+        'preview_website' => 'Previsualitzar el lloc web',
     ],
     'mysettings' => [
         'menu_label' => 'Les meves opcions',
-        'menu_description' => "Les opcions de configuració relacionades amb el teu compte d'administració"
+        'menu_description' => "Les opcions de configuració relacionades amb el teu compte d'administració",
     ],
     'myaccount' => [
         'menu_label' => 'El meu compte',
         'menu_description' => "Actualitza els teus detalls de compte com ara el nom, adreça d'email i contrasenya.",
-        'menu_keywords' => 'seguretat acces security login'
+        'menu_keywords' => 'seguretat acces security login',
     ],
     'branding' => [
         'menu_label' => "Personalitzar el panell d'administració",
@@ -420,7 +420,7 @@
         'menu_mode' => 'Estil del menú',
         'menu_mode_inline' => 'En línia',
         'menu_mode_tile' => 'Rajoles',
-        'menu_mode_collapsed' => 'Comprimit'
+        'menu_mode_collapsed' => 'Comprimit',
     ],
     'backend_preferences' => [
         'menu_label' => 'Preferències del panell',
@@ -430,7 +430,7 @@
         'timezone' => 'Zona horària',
         'timezone_comment' => 'Ajustar les dates mostrades a aquesta zona horària.',
         'locale' => 'Idioma',
-        'locale_comment' => 'Selecciona el teu idioma preferit.'
+        'locale_comment' => 'Selecciona el teu idioma preferit.',
     ],
     'access_log' => [
         'hint' => "Aquest registre mostra una llista dels accessos d'administradors. Els registres es guarden durant :days dies.",
@@ -441,7 +441,7 @@
         'ip_address' => 'Adreça IP',
         'first_name' => 'Nom',
         'last_name' => 'Cognom',
-        'email' => 'Email'
+        'email' => 'Email',
     ],
     'filter' => [
         'all' => 'tots',
@@ -519,15 +519,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celta)',
             'iso_8859_15' => "ISO-8859-15 (Latin-9, Europa Occidental - revisió amb signe de l'euro)",
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Puja i gestiona continguts multimèdia - imatges, vídeos, sons, documents'
+        'manage_media' => 'Puja i gestiona continguts multimèdia - imatges, vídeos, sons, documents',
     ],
     'mediafinder' => [
         'label' => 'Cercador multimèdia',
-        'default_prompt' => 'Clica el botó %s per cercar un element multimèdia'
+        'default_prompt' => 'Clica el botó %s per cercar un element multimèdia',
     ],
     'media' => [
         'menu_label' => 'Mèdia',
diff --git a/modules/backend/lang/cs/lang.php b/modules/backend/lang/cs/lang.php
index 8c0f03f165..1e331ccf81 100644
--- a/modules/backend/lang/cs/lang.php
+++ b/modules/backend/lang/cs/lang.php
@@ -2,32 +2,32 @@
 
 return [
     'auth' => [
-        'title' => 'Administrace'
+        'title' => 'Administrace',
     ],
     'field' => [
         'invalid_type' => 'Byl použitý špatný typ :type.',
         'options_method_invalid_model' => "Vlastnost ':field' neodpovídá platnému modelu. Zkuste specifikovat metodu voleb pro modelovou třídu :model explicitně.",
-        'options_method_not_exists' => "Modelová třída :model musí implementovat metodu :method(), která vrací volby pro formulářové pole ':field'"
+        'options_method_not_exists' => "Modelová třída :model musí implementovat metodu :method(), která vrací volby pro formulářové pole ':field'",
     ],
     'widget' => [
         'not_registered' => "Třída widgetu se jménem ':name' není zaregistrovaná.",
-        'not_bound' => "Widget s názvem třídy ':name' není navázaná na kontroler."
+        'not_bound' => "Widget s názvem třídy ':name' není navázaná na kontroler.",
     ],
     'page' => [
         'untitled' => 'Bez názvu',
         'access_denied' => [
             'label' => 'Přístup odmítnut',
             'help' => 'Nemáte potřebná oprávnění k prohlížení této stránky.',
-            'cms_link' => 'Zpět do administrace'
+            'cms_link' => 'Zpět do administrace',
         ],
         'no_database' => [
             'label' => 'Chybí databáze',
             'help' => "K přístupu do administrace je zapotřebí databáze. Zkontrolujte, zda je databáze nakonfigurována a migrována a zkuste to znovu.",
-            'cms_link' => 'Zpět na úvodní stránku'
+            'cms_link' => 'Zpět na úvodní stránku',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Dílčí šablona ':name' nebyla nalezena."
+        'not_found_name' => "Dílčí šablona ':name' nebyla nalezena.",
     ],
     'account' => [
         'sign_out' => 'Odhlásit',
@@ -50,7 +50,7 @@
         'apply' => 'Použít',
         'cancel' => 'Zrušit',
         'delete' => 'Smazat',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Plocha',
@@ -99,7 +99,7 @@
             'last_sign_in' => 'Vaše poslední přihlášení bylo',
             'view_access_logs' => 'Zobrazit protokol přihlášení',
             'nice_message' => 'Hezký den!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrátor',
@@ -148,7 +148,7 @@
             'new' => 'Nová skupina',
             'delete_confirm' => 'Opravdu chcete smazat tuto skupinu administrátorů?',
             'return' => 'Zpět na seznam skupin',
-            'users_count' => 'Uživatelů'
+            'users_count' => 'Uživatelů',
         ],
         'role' => [
             'name' => 'Role',
@@ -162,11 +162,11 @@
             'new' => 'Nová role',
             'delete_confirm' => 'Opravdu chcete smazat tuto roli?',
             'return' => 'Zpět na seznam rolí',
-            'users_count' => 'Uživatelů'
+            'users_count' => 'Uživatelů',
         ],
         'preferences' => [
-            'not_authenticated' => 'Nebyl nalezen žádný přihlášený uživatel pro načtení, nebo uložení nastavení.'
-        ]
+            'not_authenticated' => 'Nebyl nalezen žádný přihlášený uživatel pro načtení, nebo uložení nastavení.',
+        ],
     ],
     'list' => [
         'default_title' => 'Seznam',
@@ -197,7 +197,7 @@
         'delete_selected_confirm' => 'Opravdu chcete smazat vybrané záznamy?',
         'delete_selected_success' => 'Vybrané záznamy byly smazány.',
         'column_switch_true' => 'Ano',
-        'column_switch_false' => 'Ne'
+        'column_switch_false' => 'Ne',
     ],
     'fileupload' => [
         'attachment' => 'Příloha',
@@ -209,7 +209,7 @@
         'upload_file' => 'Nahrát soubor',
         'upload_error' => 'Chyba nahrávání',
         'remove_confirm' => 'Jste si jistí?',
-        'remove_file' => 'Odstranit soubor'
+        'remove_file' => 'Odstranit soubor',
     ],
     'form' => [
         'create_title' => 'Nový :name',
@@ -266,7 +266,7 @@
         'delete_row' => 'Smazat řádek',
         'concurrency_file_changed_title' => 'Soubor byl změněn',
         'concurrency_file_changed_description' => "Soubor, který upravujete, byl na disku změněn jiným uživatelem. Můžete buď znovu načíst soubor a ztratit změny, nebo přepsat soubor na disku.",
-        'return_to_list' => 'Zpět na seznam'
+        'return_to_list' => 'Zpět na seznam',
     ],
     'recordfinder' => [
         'find_record' => 'Najít záznam',
@@ -274,7 +274,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Odkaz na stránku',
-        'select_page' => 'vyberte stránku...'
+        'select_page' => 'vyberte stránku...',
     ],
     'relation' => [
         'missing_config' => "Chování relace nemá žádné nastavení pro ':config'.",
@@ -307,7 +307,7 @@
         'link_name' => 'Vazba :name',
         'unlink' => 'Zrušit vazbu',
         'unlink_name' => 'Zrušit vazbu :name',
-        'unlink_confirm' => 'Jste si jistí?'
+        'unlink_confirm' => 'Jste si jistí?',
     ],
     'reorder' => [
         'default_title' => 'Seřadit záznamy',
@@ -320,7 +320,7 @@
         'missing_relation' => "Model ':class' neobsahuje definici pro ':relation'.",
         'missing_method' => "Model ':class' nemá implementovanou metodu ':method'.",
         'invalid_class' => "Model :model použitý ve třídě :class není validní, musí dědit ze třídy Model.",
-        'mass_assignment_failed' => "Hromadné přiřazení selhalo pro vlastnost ':attribute'."
+        'mass_assignment_failed' => "Hromadné přiřazení selhalo pro vlastnost ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Tipy pro konfiguraci systému',
@@ -378,16 +378,16 @@
         'toolbar_buttons_comment' => 'Seznam výchozích tlačítek na panelů nástrojů textového editoru.',
     ],
     'tooltips' => [
-        'preview_website' => 'Náhled stránek'
+        'preview_website' => 'Náhled stránek',
     ],
     'mysettings' => [
         'menu_label' => 'Moje nastavení',
-        'menu_description' => 'Nastavení vašeho administrátorského účtu'
+        'menu_description' => 'Nastavení vašeho administrátorského účtu',
     ],
     'myaccount' => [
         'menu_label' => 'Můj účet',
         'menu_description' => 'Nastavte si svoje jméno, e-mailovou adresu a heslo.',
-        'menu_keywords' => 'bezpečnost login'
+        'menu_keywords' => 'bezpečnost login',
     ],
     'branding' => [
         'menu_label' => 'Nastavení administrace',
@@ -419,7 +419,7 @@
         'timezone' => 'Časová zóna',
         'timezone_comment' => 'Upraví zobrazení času a data podle této časové zóny.',
         'locale' => 'Jazyk',
-        'locale_comment' => 'Vyberte jazyk administrace.'
+        'locale_comment' => 'Vyberte jazyk administrace.',
     ],
     'access_log' => [
         'hint' => 'Tento záznam zobrazuje seznam úspěšných přihlášení do administrace. Záznamy jsou uchovávány :days dní.',
@@ -430,12 +430,12 @@
         'ip_address' => 'IP adresa',
         'first_name' => 'Jméno',
         'last_name' => 'Příjmení',
-        'email' => 'E-mail'
+        'email' => 'E-mail',
     ],
     'filter' => [
         'all' => 'Vše',
         'options_method_not_exists' => "Třída modelu :model musí definovat metodu :method(), která vrací položky filtru ':filter'.",
-        'date_all' => 'Všechna období'
+        'date_all' => 'Všechna období',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Nahrajte CSV soubor',
@@ -490,11 +490,11 @@
         'encoding_format' => 'Kódování souboru',
     ],
     'permissions' => [
-        'manage_media' => 'Správa médií'
+        'manage_media' => 'Správa médií',
     ],
     'mediafinder' => [
         'label' => 'Vyhledávač médií',
-        'default_prompt' => 'Klikněte na tlačítko %s pro hledání souboru'
+        'default_prompt' => 'Klikněte na tlačítko %s pro hledání souboru',
     ],
     'media' => [
         'menu_label' => 'Média',
diff --git a/modules/backend/lang/da/lang.php b/modules/backend/lang/da/lang.php
index 20a20c1b49..5acbb39c46 100644
--- a/modules/backend/lang/da/lang.php
+++ b/modules/backend/lang/da/lang.php
@@ -2,31 +2,31 @@
 
 return [
     'auth' => [
-        'title' => 'Administrationsområde'
+        'title' => 'Administrationsområde',
     ],
     'field' => [
         'invalid_type' => 'Ugyldig felttype :type.',
-        'options_method_not_exists' => "Model klassen :model skal implementere :method() som returnerer valgmuligheder for feltet ':field'."
+        'options_method_not_exists' => "Model klassen :model skal implementere :method() som returnerer valgmuligheder for feltet ':field'.",
     ],
     'widget' => [
         'not_registered' => "En widget klasse med navnet ':name' er ikke registreret",
-        'not_bound' => "En widget klasse med navnet ':name' er ikke blevet bundet til controlleren"
+        'not_bound' => "En widget klasse med navnet ':name' er ikke blevet bundet til controlleren",
     ],
     'page' => [
         'untitled' => 'Unavngivet',
         'access_denied' => [
             'label' => 'Adgang nægtet',
             'help' => "Du har ikke de fornødne rettigheder til at se denne side.",
-            'cms_link' => 'Tilbage til backenden'
+            'cms_link' => 'Tilbage til backenden',
         ],
         'no_database' => [
             'label' => 'Databasen kan ikke findes',
             'help' => "En database er påkrævet for at kunne tilgå backenden. Kontroller om databasen er konfigureret og migreret, inden du prøver igen.",
-            'cms_link' => 'Tilbage til hjemmesiden'
+            'cms_link' => 'Tilbage til hjemmesiden',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Partialen ':name' kunne ikke findes."
+        'not_found_name' => "Partialen ':name' kunne ikke findes.",
     ],
     'account' => [
         'sign_out' => 'Log ud',
@@ -48,7 +48,7 @@
         'apply' => 'Accepter',
         'cancel' => 'Fortryd',
         'delete' => 'Slet',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Dashboard',
@@ -95,7 +95,7 @@
             'last_sign_in' => 'Du var sidst logget ind',
             'view_access_logs' => 'Vis access logs',
             'nice_message' => 'Hav en god dag!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrator',
@@ -138,11 +138,11 @@
             'new' => 'Ny Gruppe',
             'delete_confirm' => 'Slet denne administratorgruppe??',
             'return' => 'Tilbage til gruppelisten',
-            'users_count' => 'Brugere'
+            'users_count' => 'Brugere',
         ],
         'preferences' => [
-            'not_authenticated' => 'Der er ingen bruger at loade eller save preferencer for.'
-        ]
+            'not_authenticated' => 'Der er ingen bruger at loade eller save preferencer for.',
+        ],
     ],
     'list' => [
         'default_title' => 'Liste',
@@ -171,7 +171,7 @@
         'delete_selected_confirm' => 'Slet de valgte records?',
         'delete_selected_success' => 'Slet valgte records.',
         'column_switch_true' => 'Ja',
-        'column_switch_false' => 'Nej'
+        'column_switch_false' => 'Nej',
     ],
     'fileupload' => [
         'attachment' => 'Vedhæftning',
@@ -183,7 +183,7 @@
         'upload_file' => 'Upload fil',
         'upload_error' => 'Upload fejl',
         'remove_confirm' => 'Er du sikker?',
-        'remove_file' => 'Fjern fil'
+        'remove_file' => 'Fjern fil',
     ],
     'form' => [
         'create_title' => 'Ny :name',
@@ -239,10 +239,10 @@
         'delete_row' => 'Slet Række',
         'concurrency_file_changed_title' => 'Fil er blevet ændret',
         'concurrency_file_changed_description' => "Den fil du redigerer er blevet ændret på disken, af en anden bruger. Du kan enten reloade filen og miste ændringer eller overskrive filen på disken.",
-        'return_to_list' => 'Tilbage til listen'
+        'return_to_list' => 'Tilbage til listen',
     ],
     'recordfinder' => [
-        'find_record' => 'Find Record'
+        'find_record' => 'Find Record',
     ],
     'relation' => [
         'missing_config' => "Relation behavioren har ingen konfiguration for ':config'.",
@@ -275,11 +275,11 @@
         'link_name' => 'Link :name',
         'unlink' => 'Fjern link',
         'unlink_name' => 'Fjern link til :name',
-        'unlink_confirm' => 'Er du sikker?'
+        'unlink_confirm' => 'Er du sikker?',
     ],
     'reorder' => [
         'default_title' => 'Sorter records',
-        'no_records' => 'Der er ikke nogle records at sortere.'
+        'no_records' => 'Der er ikke nogle records at sortere.',
     ],
     'model' => [
         'name' => 'Model',
@@ -288,13 +288,13 @@
         'missing_relation' => "Model ':class' har ingen definition af ':relation'.",
         'missing_method' => "Model ':class' har ikke metoden ':method'.",
         'invalid_class' => "Model :model brugt i :class er ikke gyldig. Den skal nedarve fra \\Model Klassen.",
-        'mass_assignment_failed' => "Mass assignment fejlede for Model attributen ':attribute'."
+        'mass_assignment_failed' => "Mass assignment fejlede for Model attributen ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Systemkonfigurations-tips',
         'tips_description' => 'Der er problemer du skal være opmærksom på for at konfigurre systemet ordenligt.',
         'permissions'  => 'Mappe :name eller dens undermapper, er ikke skrivbare for PHP. Konfigurer venligst webserverens rettigheder for denne mappe.',
-        'extension' => 'PHP extensionen :name er ikke installeret. Installer og aktiver venligst denne extension.'
+        'extension' => 'PHP extensionen :name er ikke installeret. Installer og aktiver venligst denne extension.',
     ],
     'editor' => [
         'menu_label' => 'Indstillinger for redigeringsværktøj',
@@ -340,19 +340,19 @@
         'no_wrap' => 'Omgiv ikke tags',
         'no_wrap_comment' => 'Liste af tags der ikke skal omgives af block tags.',
         'remove_tags' => 'Fjern tags',
-        'remove_tags_comment' => 'Liste af tags der bliver fjernet, inklusiv deres indhold.'
+        'remove_tags_comment' => 'Liste af tags der bliver fjernet, inklusiv deres indhold.',
     ],
     'tooltips' => [
-        'preview_website' => 'Forhåndsvis hjemmesiden'
+        'preview_website' => 'Forhåndsvis hjemmesiden',
     ],
     'mysettings' => [
         'menu_label' => 'Mine indstillinger',
-        'menu_description' => 'Indstilling til din administrationsbruger'
+        'menu_description' => 'Indstilling til din administrationsbruger',
     ],
     'myaccount' => [
         'menu_label' => 'Min konto',
         'menu_description' => 'Opdater dine kontodetaljer som eksempelvis navn, email-adresse og adgangskode.',
-        'menu_keywords' => 'Sikkerhedslogin'
+        'menu_keywords' => 'Sikkerhedslogin',
     ],
     'branding' => [
         'menu_label' => 'Tilpas back-end',
@@ -374,7 +374,7 @@
         'menu_mode' => 'Menu style',
         'menu_mode_inline' => 'På linie',
         'menu_mode_tile' => 'Stablet',
-        'menu_mode_collapsed' => 'Kollapset'
+        'menu_mode_collapsed' => 'Kollapset',
     ],
     'backend_preferences' => [
         'menu_label' => 'Backend indstillinger',
@@ -384,7 +384,7 @@
         'timezone' => 'Tidszone',
         'timezone_comment' => 'Juster viste datoer til denne tidszone.',
         'locale' => 'Locale',
-        'locale_comment' => 'Vælg din ønskede locale.'
+        'locale_comment' => 'Vælg din ønskede locale.',
     ],
     'access_log' => [
         'hint' => 'Denne log viser en liste af successfulde administratorlogins. Records bliver gemt i :days dage.',
@@ -395,12 +395,12 @@
         'ip_address' => 'IP addresse',
         'first_name' => 'Fornavn',
         'last_name' => 'Efternavn',
-        'email' => 'Email'
+        'email' => 'Email',
     ],
     'filter' => [
         'all' => 'alle',
         'options_method_not_exists' => "Model klassen :model skal implementere metoden :method() som returnerer muligheder til ':filter' filteret.",
-        'date_all' => 'altid'
+        'date_all' => 'altid',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Upload en CSV fil',
@@ -471,15 +471,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Keltisk)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Vesteuropæisk med eurotegn)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Upload og administrer media indhold - billeder, video, lyd, dokumenter'
+        'manage_media' => 'Upload og administrer media indhold - billeder, video, lyd, dokumenter',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
-        'default_prompt' => 'Tryk på %s knappen for at finde et mediaobjekt'
+        'default_prompt' => 'Tryk på %s knappen for at finde et mediaobjekt',
     ],
     'media' => [
         'menu_label' => 'Media',
@@ -544,5 +544,5 @@
         'rename_new_name' => 'Nyt navn',
         'move_please_select' => 'Vælg venligst',
         'move_button' => 'Flyt',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
index 424ffe31a3..9532914bdb 100644
--- a/modules/backend/lang/de/lang.php
+++ b/modules/backend/lang/de/lang.php
@@ -435,7 +435,7 @@
         'paragraph_formats_comment' => 'Die Optionen, welche in der Dropdown-Liste für Absatzformatierungen angezeigt werden.',
     ],
     'tooltips' => [
-        'preview_website' => 'Vorschau der Webseite'
+        'preview_website' => 'Vorschau der Webseite',
     ],
     'mysettings' => [
         'menu_label' => 'Meine Einstellungen',
diff --git a/modules/backend/lang/el/lang.php b/modules/backend/lang/el/lang.php
index d06f96fbe6..4ed67b7094 100644
--- a/modules/backend/lang/el/lang.php
+++ b/modules/backend/lang/el/lang.php
@@ -96,7 +96,7 @@
             'last_sign_in' => 'Η τελευταία σύνδεση σας ήταν',
             'view_access_logs' => 'Προβολή του αρχείου καταγραφής προσβάσεων',
             'nice_message' => 'Να έχετε μια υπέροχη ημέρα!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Διαχειριστής',
@@ -143,7 +143,7 @@
         ],
         'preferences' => [
             'not_authenticated' => 'Δεν υπάρχει κανένας πιστοποιημένος χρήστης για να φορτωθούν ή να σωθούν οι ρυθμίσεις του.' ,
-        ]
+        ],
     ],
     'list' => [
         'default_title' => 'Λίστα',
@@ -172,7 +172,7 @@
         'delete_selected_confirm' => 'Να διαγραφούν οι επιλεγμένες εγγραφές;',
         'delete_selected_success' => 'Διαγραφή επιλεγμένων εγγραφών.',
         'column_switch_true' => 'Ναι',
-        'column_switch_false' => 'Όχι'
+        'column_switch_false' => 'Όχι',
     ],
     'fileupload' => [
         'attachment' => 'Επισύναψη',
@@ -345,7 +345,7 @@
         'no_wrap' => 'Do not wrap tags',
         'no_wrap_comment' => 'The list of tags that should not be wrapped inside block tags.',
         'remove_tags' => 'Remove tags',
-        'remove_tags_comment' => 'The list of tags that are removed together with their content.'
+        'remove_tags_comment' => 'The list of tags that are removed together with their content.',
 
 
     ],
@@ -478,15 +478,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Ανέβασμα και διαχείριση περιεχομένου μέσων - εικόνων, βίντεο, ήχων, εγγράφων,//Upload and manage media contents - images, videos, sounds, documents'
+        'manage_media' => 'Ανέβασμα και διαχείριση περιεχομένου μέσων - εικόνων, βίντεο, ήχων, εγγράφων,//Upload and manage media contents - images, videos, sounds, documents',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
-        'default_prompt' => 'Click the %s button to find a media item'
+        'default_prompt' => 'Click the %s button to find a media item',
     ],
     'media' => [
         'menu_label' => 'Μέσα',
@@ -551,5 +551,5 @@
         'rename_new_name' => 'Νέο όνομα',
         'move_please_select' => 'παρακαλούμε επιλέξτε',
         'move_button' => 'Μετακίνηση',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/es-ar/lang.php b/modules/backend/lang/es-ar/lang.php
index d9c345dd93..946d8b0b89 100644
--- a/modules/backend/lang/es-ar/lang.php
+++ b/modules/backend/lang/es-ar/lang.php
@@ -62,7 +62,7 @@
             'widget_title_default' => 'Estado del sistema',
             'online' => 'online',
             'update_available' => '{0} actualizaciones disponibles!|{1} actualizaciones disponibles!|[2,Inf] actualizaciones disponibles!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrador',
@@ -99,8 +99,8 @@
             'return' => 'Regresar a la lista de grupos',
         ],
         'preferences' => [
-            'not_authenticated' => 'No existe un usuario autenticado para cargar o guardar las preferencias.'
-        ]
+            'not_authenticated' => 'No existe un usuario autenticado para cargar o guardar las preferencias.',
+        ],
     ],
     'list' => [
         'default_title' => 'Listar',
@@ -125,7 +125,7 @@
         'attachment' => 'Adjunto',
         'help' => 'Añadir un título y una descripción para este Adjunto.',
         'title_label' => 'Título',
-        'description_label' => 'Descripción'
+        'description_label' => 'Descripción',
     ],
 
     'form' => [
@@ -203,7 +203,7 @@
         'tips' => 'Consejos de configuración del sistema.',
         'tips_description' => 'Hay problemas que necesitan de su atención para configurar el sistema correctamente.',
         'permissions'  => 'El directorio :name o los subdirectorios no se puede escribir por PHP. Por favor establezca los permisos correctos para el servidor web en este directorio.',
-        'extension' => 'La extensión PHP :name no está instalada. Por favor instale esta librería y active la extensión.'
+        'extension' => 'La extensión PHP :name no está instalada. Por favor instale esta librería y active la extensión.',
     ],
     'editor' => [
         'menu_label' => 'Preferencias del editor de código',
@@ -219,7 +219,7 @@
         'theme' => 'Color del esquema',
     ],
     'tooltips' => [
-        'preview_website' => 'Vista previa de la página web'
+        'preview_website' => 'Vista previa de la página web',
     ],
     'mysettings' => [
         'menu_label' => 'Mi configuración',
@@ -228,7 +228,7 @@
     'myaccount' => [
         'menu_label' => 'Mi cuenta',
         'menu_description' => 'Actualizar información de su cuenta, como nombre, dirección de correo electrónico y contraseña.',
-        'menu_keywords' => 'Inicio seguro'
+        'menu_keywords' => 'Inicio seguro',
     ],
     'backend_preferences' => [
         'menu_label' => 'Preferencias de backend',
@@ -248,7 +248,7 @@
         'email' => 'Email',
     ],
     'filter' => [
-      'all' => 'Todo'
+      'all' => 'Todo',
     ],
     'media' => [
         'rename_popup_title' => 'Renombrar',
@@ -256,5 +256,5 @@
         'move_please_select' => 'por favor seleccionar',
         'move_button' => 'Mover',
 
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php
index c10026cf7f..2518de8aed 100644
--- a/modules/backend/lang/es/lang.php
+++ b/modules/backend/lang/es/lang.php
@@ -3,26 +3,26 @@
 return [
     'auth' => [
         'title' => 'Area de Administración',
-        'invalid_login' => 'Los datos ingresados no concuerdan con nuestros registros. Por favor verifique e intente nuevamente.'
+        'invalid_login' => 'Los datos ingresados no concuerdan con nuestros registros. Por favor verifique e intente nuevamente.',
     ],
     'field' => [
         'invalid_type' => 'El tipo de campo utilizado es inválido :type.',
-        'options_method_not_exists' => 'El modelo clase: model debe definir un método: method() opciones recurrentes para el ":field" desde campo.'
+        'options_method_not_exists' => 'El modelo clase: model debe definir un método: method() opciones recurrentes para el ":field" desde campo.',
     ],
     'widget' => [
         'not_registered' => "La clase del modulo ':name' no ha sido registrada",
-        'not_bound' => "El módulo con la clase ':name' no se ha unido al controlador"
+        'not_bound' => "El módulo con la clase ':name' no se ha unido al controlador",
     ],
     'page' => [
         'untitled' => 'Sin título',
         'access_denied' => [
             'label' => 'Acceso denegado',
             'help' => 'No tiene permisos necesarios para ver esta página.',
-            'cms_link' => 'Volver al panel de administración'
+            'cms_link' => 'Volver al panel de administración',
         ],
     ],
     'partial' => [
-        'not_found_name' => "El parcial ':name' no se encuentra."
+        'not_found_name' => "El parcial ':name' no se encuentra.",
     ],
     'account' => [
         'sign_out' => 'Desconectarse',
@@ -44,7 +44,7 @@
         'apply' => 'Aplicar',
         'cancel' => 'Cancelar',
         'delete' => 'Borrar',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Escritorio',
@@ -81,7 +81,7 @@
             'core_build' => 'Versión del sistema',
             'event_log' => 'Registro de eventos',
             'request_log' => 'Registro de peticiones',
-            'app_birthday' => 'En línea desde'
+            'app_birthday' => 'En línea desde',
         ],
         'welcome' => [
             'widget_title_default' => 'Bienvenido',
@@ -90,8 +90,8 @@
             'first_sign_in' => 'Esta es la primera vez que ha iniciado sesión.',
             'last_sign_in' => 'Su última sesión fue',
             'view_access_logs' => 'Ver los registros de acceso',
-            'nice_message' => '¡Que tengas un gran día!'
-        ]
+            'nice_message' => '¡Que tengas un gran día!',
+        ],
     ],
     'user' => [
         'name' => 'Administrador',
@@ -134,11 +134,11 @@
             'new' => 'Nuevo Grupo',
             'delete_confirm' => '¿Eliminar este grupo de administradores?',
             'return' => 'Volver a la lista de grupos',
-            'users_count' => 'Usuarios'
+            'users_count' => 'Usuarios',
         ],
         'preferences' => [
             'not_authenticated' => 'No existe un usuario autenticado para cargar o guardar las preferencias para.',
-        ]
+        ],
     ],
     'list' => [
         'default_title' => 'Lista',
@@ -167,7 +167,7 @@
         'delete_selected_confirm' => '¿Borrar los registros seleccionados?',
         'delete_selected_success' => 'Eliminados los registros seleccionados.',
         'column_switch_true' => 'Sí',
-        'column_switch_false' => 'No'
+        'column_switch_false' => 'No',
     ],
     'fileupload' => [
         'attachment' => 'Adjunto',
@@ -179,7 +179,7 @@
         'upload_file' => 'Subir archivo',
         'upload_error' => 'Error al subir.',
         'remove_confirm' => '¿Está seguro?',
-        'remove_file' => 'Eliminar archivo'
+        'remove_file' => 'Eliminar archivo',
     ],
     'form' => [
         'create_title' => 'Nuevo :name',
@@ -235,10 +235,10 @@
         'delete_row' => 'Borrar Fila',
         'concurrency_file_changed_title' => 'Archivo ha cambiado',
         'concurrency_file_changed_description' => "El archivo que está editando ha sido cambiado en el disco por otro usuario. Usted puede volver a cargar el archivo y perder los cambios o sobreescribir el archivo en el disco.",
-        'return_to_list' => 'Volver a listado'
+        'return_to_list' => 'Volver a listado',
     ],
     'recordfinder' => [
-        'find_record' => 'Buscar Registro'
+        'find_record' => 'Buscar Registro',
     ],
     'relation' => [
         'missing_config' => "Relación de comportamiento no tiene ninguna configuración para ':config'.",
@@ -271,11 +271,11 @@
         'link_name' => 'Vincular :name',
         'unlink' => 'Desvincular',
         'unlink_name' => 'Desvincular :name',
-        'unlink_confirm' => '¿Está usted seguro?'
+        'unlink_confirm' => '¿Está usted seguro?',
     ],
     'reorder' => [
         'default_title' => 'Reordenar registros',
-        'no_records' => 'No existen registros disponibles para ordenar.'
+        'no_records' => 'No existen registros disponibles para ordenar.',
     ],
     'model' => [
         'name' => 'Modelo',
@@ -284,13 +284,13 @@
         'missing_relation' => "Modelo ':class' no contiene una definición para ':relation'.",
         'missing_method' => "Modelo ':class' no contiene un método ':method'.",
         'invalid_class' => "Modelo :model utilizado en :class no es váildo, este debería heredar la clase del \Model.",
-        'mass_assignment_failed' => "Asignación masiva falló para el atributo del Modelo ':attribute'."
+        'mass_assignment_failed' => "Asignación masiva falló para el atributo del Modelo ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Consejos de configuración del sistema',
         'tips_description' => 'Hay problemas que necesitan de su atención para configurar el sistema correctamente.',
         'permissions' => 'Directorio :name o los subdirectorios no se puede escribir por PHP. Por favor establecer los permisos correctos para el servidor web en este directorio.',
-        'extension' => 'La extensión PHP :name no está instalada. Por favor instalar esta librería y activar la extensión.'
+        'extension' => 'La extensión PHP :name no está instalada. Por favor instalar esta librería y activar la extensión.',
     ],
     'editor' => [
         'menu_label' => 'Preferencias del Editor',
@@ -336,19 +336,19 @@
         'no_wrap' => 'No envuelva las etiquetas',
         'no_wrap_comment' => 'La lista de etiquetas que no deben estar envueltas dentro de etiquetas de bloque.',
         'remove_tags' => 'Quitar etiquetas',
-        'remove_tags_comment' => 'La lista de etiquetas que se eliminan junto con su contenido.'
+        'remove_tags_comment' => 'La lista de etiquetas que se eliminan junto con su contenido.',
     ],
     'tooltips' => [
-        'preview_website' => 'Vista previa del sitio'
+        'preview_website' => 'Vista previa del sitio',
     ],
     'mysettings' => [
         'menu_label' => 'Mis configuraciones',
-        'menu_description' => 'Configuraciones relacionadas con su cuenta'
+        'menu_description' => 'Configuraciones relacionadas con su cuenta',
     ],
     'myaccount' => [
         'menu_label' => 'Mi Cuenta',
         'menu_description' => 'Actualice la información de su cuenta, como nombre, dirección de correo electrónico y contraseña.',
-        'menu_keywords' => 'Inicio de sesión de seguridad'
+        'menu_keywords' => 'Inicio de sesión de seguridad',
     ],
     'branding' => [
         'menu_label' => 'Personalizar back-end',
@@ -370,7 +370,7 @@
         'menu_mode' => 'Estilo de Menú',
         'menu_mode_inline' => 'Inline',
         'menu_mode_tile' => 'Mosaicos',
-        'menu_mode_collapsed' => 'Colapsado'
+        'menu_mode_collapsed' => 'Colapsado',
     ],
     'backend_preferences' => [
         'menu_label' => 'Preferencias del panel de administración',
@@ -380,7 +380,7 @@
         'timezone' => 'Zona horaria',
         'timezone_comment' => 'Ajustar las fechas mostradas a esta zona horaria.',
         'locale' => 'Idioma',
-        'locale_comment' => 'Seleccione su localización deseada para el uso del idioma.'
+        'locale_comment' => 'Seleccione su localización deseada para el uso del idioma.',
     ],
     'access_log' => [
         'hint' => 'Este registro muestra la lista de ingresos al panel de administración. Los registros se mantienen por un total de :days días.',
@@ -391,13 +391,13 @@
         'ip_address' => 'IP',
         'first_name' => 'Nombre',
         'last_name' => 'Apellido',
-        'email' => 'Correo'
+        'email' => 'Correo',
     ],
     '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'
+        'number_all' => 'todos los números',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Subir un archivo CSV',
@@ -468,11 +468,11 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Subir y gestionar contenidos multimedia - imágenes, vídeos, sonidos y documentos'
+        'manage_media' => 'Subir y gestionar contenidos multimedia - imágenes, vídeos, sonidos y documentos',
     ],
     'mediafinder' => [
         'label' => 'Buscador de multimedia',
diff --git a/modules/backend/lang/et/lang.php b/modules/backend/lang/et/lang.php
index ef037bf6bc..5b2145a003 100644
--- a/modules/backend/lang/et/lang.php
+++ b/modules/backend/lang/et/lang.php
@@ -2,32 +2,32 @@
 
 return [
     'auth' => [
-        'title' => 'Haldusliides'
+        'title' => 'Haldusliides',
     ],
     'field' => [
         'invalid_type' => 'Välja tüüpi :type pole olemas.',
         'options_method_invalid_model' => "Atribuut ':field' ei vasta ühelegi olemasolevale andmemudelile. Palun defineeri valikväärtuste funktioon :model andmemudelis.",
-        'options_method_not_exists' => "Andmemudelis :model peab olema defineeritud funktsioon :method(), mis tagastab valikväärtused välja ':field' jaoks."
+        'options_method_not_exists' => "Andmemudelis :model peab olema defineeritud funktsioon :method(), mis tagastab valikväärtused välja ':field' jaoks.",
     ],
     'widget' => [
         'not_registered' => "Vidina klassinimi ':name' pole registreeritud",
-        'not_bound' => "Vidin klassinimega ':name' pole seotud kontrolleriga"
+        'not_bound' => "Vidin klassinimega ':name' pole seotud kontrolleriga",
     ],
     'page' => [
         'untitled' => 'Nimeta',
         'access_denied' => [
             'label' => 'Juurdepääs keelatud',
             'help' => "Sul pole vajalikke õiguseid, et seda lehte näha.",
-            'cms_link' => 'Tagasi haldusliidesesse'
+            'cms_link' => 'Tagasi haldusliidesesse',
         ],
         'no_database' => [
             'label' => 'Andmebaas puudub',
             'help' => "Haldusliidese kasutamiseks peab olemas seadistatud andmebaas. Enne jätkamist palun kontrolli andmebaasi seadistust.",
-            'cms_link' => 'Tagasi kodulehele'
+            'cms_link' => 'Tagasi kodulehele',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Koodiblokki ':name' ei leitud."
+        'not_found_name' => "Koodiblokki ':name' ei leitud.",
     ],
     'account' => [
         'sign_out' => 'Logi välja',
@@ -49,7 +49,7 @@
         'apply' => 'Rakenda',
         'cancel' => 'Loobu',
         'delete' => 'Kustuta',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Töölaud',
@@ -98,7 +98,7 @@
             'last_sign_in' => 'Sinu viimane sisselogimine oli',
             'view_access_logs' => 'Vaata juurdepääsu logi',
             'nice_message' => 'Kena päeva jätku!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administraator',
@@ -145,11 +145,11 @@
             'new' => 'Uus grupp',
             'delete_confirm' => 'Kusuta see grupp?',
             'return' => 'Tagasi nimekirja',
-            'users_count' => 'Kasutajad'
+            'users_count' => 'Kasutajad',
         ],
         'preferences' => [
-            'not_authenticated' => 'Puudub autoriseeritud kasutaja kellele seadeid laadida või salvestada.'
-        ]
+            'not_authenticated' => 'Puudub autoriseeritud kasutaja kellele seadeid laadida või salvestada.',
+        ],
     ],
     'list' => [
         'default_title' => 'Nimekiri',
@@ -180,7 +180,7 @@
         'delete_selected_confirm' => 'Kustuta valitud kirjed?',
         'delete_selected_success' => 'Valitud kirjed on kustutatud.',
         'column_switch_true' => 'Jah',
-        'column_switch_false' => 'Ei'
+        'column_switch_false' => 'Ei',
     ],
     'fileupload' => [
         'attachment' => 'Manus',
@@ -192,7 +192,7 @@
         'upload_file' => 'Lae fail üles',
         'upload_error' => 'Üleslaadimisel tekkis viga',
         'remove_confirm' => 'Oled sa kindel?',
-        'remove_file' => 'Eemalda fail'
+        'remove_file' => 'Eemalda fail',
     ],
     'form' => [
         'create_title' => 'Loomine: :name',
@@ -249,7 +249,7 @@
         'delete_row' => 'Kustuta rida',
         'concurrency_file_changed_title' => 'Faili on muudetud',
         'concurrency_file_changed_description' => "Teine kasutaja on muutnud sama faili, mida sina praegu muudad. Võid faili uuesti laadida ja sellega kaotada oma muudatused või kirjutada üle teise kasutaja muudatused.",
-        'return_to_list' => 'Tagasi nimekirja'
+        'return_to_list' => 'Tagasi nimekirja',
     ],
     'recordfinder' => [
         'find_record' => 'Leia kirje',
@@ -257,7 +257,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Lehe link',
-        'select_page' => 'Vali leht...'
+        'select_page' => 'Vali leht...',
     ],
     'relation' => [
         'missing_config' => "':config' jaoks puuduvad seoste definitsioonid.",
@@ -290,11 +290,11 @@
         'link_name' => 'Lisa :name',
         'unlink' => 'Eemalda',
         'unlink_name' => 'Eemalda :name',
-        'unlink_confirm' => 'Oled sa kindel?'
+        'unlink_confirm' => 'Oled sa kindel?',
     ],
     'reorder' => [
         'default_title' => 'Muuda järjestust',
-        'no_records' => 'Ühtegi kirjet ei leitud.'
+        'no_records' => 'Ühtegi kirjet ei leitud.',
     ],
     'model' => [
         'name' => 'Andmemudel',
@@ -303,7 +303,7 @@
         'missing_relation' => "Andmemudelil ':class' puudub definitsioon seosele ':relation'.",
         'missing_method' => "Andmemudelil ':class' puudub funktsioon ':method'.",
         'invalid_class' => "Klassis :class kasutatud andmemudel :model ei ole korrektne. See peab olema päritud klassist \Model.",
-        'mass_assignment_failed' => "Andmemudeli atribuudi ':attribute' väärtuste määramine ebaõnnestus."
+        'mass_assignment_failed' => "Andmemudeli atribuudi ':attribute' väärtuste määramine ebaõnnestus.",
     ],
     'warnings' => [
         'tips' => 'Näpunäited süsteemi seadistamiseks',
@@ -356,19 +356,19 @@
         'no_wrap' => 'HTML blokktägid',
         'no_wrap_comment' => 'Nimekiri HTML tägidest, mida ei ole automaatselt vaja panna blokktägide sisse.',
         'remove_tags' => 'Eemalda HTML tägid',
-        'remove_tags_comment' => 'Nimekiri HTML tägidest, mis eemaldatakse automaatselt koos sisuga.'
+        'remove_tags_comment' => 'Nimekiri HTML tägidest, mis eemaldatakse automaatselt koos sisuga.',
     ],
     'tooltips' => [
-        'preview_website' => 'Kodulehe eelvaade'
+        'preview_website' => 'Kodulehe eelvaade',
     ],
     'mysettings' => [
         'menu_label' => 'Minu seaded',
-        'menu_description' => 'Sinu haldusliidese kontoga seonduvad seadistused'
+        'menu_description' => 'Sinu haldusliidese kontoga seonduvad seadistused',
     ],
     'myaccount' => [
         'menu_label' => 'Minu konto',
         'menu_description' => 'Muuda oma konto andmeid nagu nimi, e-posti aadress ja parool.',
-        'menu_keywords' => 'parool konto turva sala'
+        'menu_keywords' => 'parool konto turva sala',
     ],
     'branding' => [
         'menu_label' => 'Isikupärasta haldusliidest',
@@ -390,7 +390,7 @@
         'menu_mode' => 'Menüü stiil',
         'menu_mode_inline' => 'Järjekorras',
         'menu_mode_tile' => 'Kastid',
-        'menu_mode_collapsed' => 'Minimaalne'
+        'menu_mode_collapsed' => 'Minimaalne',
     ],
     'backend_preferences' => [
         'menu_label' => 'Haldusliidese seaded',
@@ -400,7 +400,7 @@
         'timezone' => 'Ajatsoon',
         'timezone_comment' => 'Kuva kõiki kuupäevi selles ajatsoonis.',
         'locale' => 'Keel',
-        'locale_comment' => 'Vali haldusliidese keel.'
+        'locale_comment' => 'Vali haldusliidese keel.',
     ],
     'access_log' => [
         'hint' => 'See logi sisaldab kõiki edukaid sisselogimisi haldusliidesesse. Andmeid hoitakse maksimaalselt :days päeva.',
@@ -411,12 +411,12 @@
         'ip_address' => 'IP aaddress',
         'first_name' => 'Eesnimi',
         'last_name' => 'Perenimi',
-        'email' => 'E-post'
+        'email' => 'E-post',
     ],
     'filter' => [
         'all' => 'kõik',
         'options_method_not_exists' => "Andmemudelis :model peab olema defineeritud functioon :method(), mis tagastab valikud filtrile ':filter'.",
-        'date_all' => 'kõik perioodid'
+        'date_all' => 'kõik perioodid',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Lae üles CSV fail',
@@ -487,15 +487,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
+        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
-        'default_prompt' => 'Click the %s button to find a media item'
+        'default_prompt' => 'Click the %s button to find a media item',
     ],
     'media' => [
         'menu_label' => 'Media',
diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php
index b169560b8e..c20cfd6a9c 100644
--- a/modules/backend/lang/fa/lang.php
+++ b/modules/backend/lang/fa/lang.php
@@ -31,7 +31,7 @@
         'no_database' => [
             'label' => 'پایگاه داده یافت نشد',
             'help' => "جهت استفاده از بخش مدیریت به یک پایگاه داده نیاز دارید. تنظیمات پایگاه داده را بررسی نموده و از نصب جدولها در آن اطمینان حاصل کنید.",
-            'cms_link' => 'بازگشت به صفحه اصلی'
+            'cms_link' => 'بازگشت به صفحه اصلی',
         ],
     ],
     'partial' => [
@@ -123,7 +123,7 @@
             'last_sign_in' => 'آخرین ورود شما',
             'view_access_logs' => 'نمایش گزارش دسترسی ها',
             'nice_message' => 'روز خوبی داشته باشید',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'مدیریت',
@@ -174,7 +174,7 @@
             'new' => 'گروه مدیریت جدید',
             'delete_confirm' => 'آیا از حذف این گروه از مدیران اطمینان دارید?',
             'return' => 'بازگشت به لیست گروه ها',
-            'users_count' => 'کاربران'
+            'users_count' => 'کاربران',
         ],
         'role' => [
             'name' => 'نقش',
@@ -188,10 +188,10 @@
             'new' => 'نقش جدید',
             'delete_confirm' => 'آیا از حذف این نقش اطمینان دارید؟',
             'return' => 'بازگشت به لیست نقش ها',
-            'users_count' => 'کاربران'
+            'users_count' => 'کاربران',
         ],
         'preferences' => [
-            'not_authenticated' => 'هیچ کاربر ثبت شده ای جهت بارگذاری یا ذخیره تنظیمات وجود ندارد.'
+            'not_authenticated' => 'هیچ کاربر ثبت شده ای جهت بارگذاری یا ذخیره تنظیمات وجود ندارد.',
         ],
         'trashed_hint_title' => 'این کاربر حذف شده است.',
         'trashed_hint_desc' => 'این کاربرحذف شده است و نمی توانید آن وارد سیستم شوید. جهت بازیابی آن ، روی نماد بازیابی کاربر در سمت چپ-پایین کلیک کنید',
@@ -225,7 +225,7 @@
         'delete_selected_confirm' => 'آیا میخواهید موارد انتخابی را حذف کنید؟',
         'delete_selected_success' => 'حدف موارد انتخابی انجام شد.',
         'column_switch_true' => 'بله',
-        'column_switch_false' => 'خیر'
+        'column_switch_false' => 'خیر',
     ],
     'fileupload' => [
         'attachment' => 'فایل ضمیمه',
@@ -237,7 +237,7 @@
         'upload_file' => 'ارسال فایل',
         'upload_error' => 'خطا در ارسال فایل',
         'remove_confirm' => 'آیا اطمینان دارید؟',
-        'remove_file' => 'حذف فایل'
+        'remove_file' => 'حذف فایل',
     ],
     'repeater' => [
         'add_new_item' => 'افزودن مورد جدید',
@@ -303,7 +303,7 @@
         'delete_row' => 'حذف سطر',
         'concurrency_file_changed_title' => 'فایل تغییر کرد',
         'concurrency_file_changed_description' => 'فایلی که شما ویرایش کردید توسط کاربر دیگری تغییر یافته و ذخیره شده است. شما میتوانید فایل را مجددا بارگذاری نمایید و تغییراتی که اعمال کرده اید را از دست بدهید و یا تغییرات اعمال شده توسط آن کاربر را بین برده و فایل را بازنویسی نمایید.',
-        'return_to_list' => 'بازگشت به لیست'
+        'return_to_list' => 'بازگشت به لیست',
     ],
     'recordfinder' => [
         'find_record' => 'انتخاب مورد',
@@ -312,7 +312,7 @@
     ],
     'pagelist' => [
         'page_link' => 'لینک صفحه',
-        'select_page' => 'صفحه ای را انتخاب نمایید...'
+        'select_page' => 'صفحه ای را انتخاب نمایید...',
     ],
     'relation' => [
         'missing_config' => "کنترل کننده ارتباطات پایگاه داده شامل تعریفی برای ':config' نمی باشد.",
@@ -435,7 +435,7 @@
         'paragraph_formats_comment' => 'گزینه هایی که در قالب های پاراگراف دیده می شود',
     ],
     'tooltips' => [
-        'preview_website' => 'پیش نمایش وب سایت'
+        'preview_website' => 'پیش نمایش وب سایت',
     ],
     'mysettings' => [
         'menu_label' => 'تنظیمات من',
@@ -444,7 +444,7 @@
     'myaccount' => [
         'menu_label' => 'حساب کاربری من',
         'menu_description' => 'به روز رسانی اطلاعات حساب کار بری شما مانند نام و کلمه عبور و ... .',
-        'menu_keywords' => 'ورود امن'
+        'menu_keywords' => 'ورود امن',
     ],
     'branding' => [
         'menu_label' => 'شخصی سازی بخش مدیریت',
@@ -474,7 +474,7 @@
         'menu_mode_inline' => 'آیکون در کنار',
         'menu_mode_inline_no_icons' => '(بدون آیکون) در کنار',
         'menu_mode_tile' => 'آیکون در بالا',
-        'menu_mode_collapsed' => 'جمع شونده'
+        'menu_mode_collapsed' => 'جمع شونده',
     ],
     'backend_preferences' => [
         'menu_label' => 'تنظیمات مدیریت',
@@ -576,8 +576,8 @@
             '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' => 'مدیریت چند رسانه ها',
@@ -586,7 +586,7 @@
     ],
     'mediafinder' => [
         'label' => 'جستجوگر رسانه',
-        'default_prompt' => '%s را جهت انتخاب فایل چند رسانه ای انتخاب کنید'
+        'default_prompt' => '%s را جهت انتخاب فایل چند رسانه ای انتخاب کنید',
     ],
     'media' => [
         'menu_label' => 'چند رسانه ای',
diff --git a/modules/backend/lang/fi/lang.php b/modules/backend/lang/fi/lang.php
index ee697f4eca..0458845845 100644
--- a/modules/backend/lang/fi/lang.php
+++ b/modules/backend/lang/fi/lang.php
@@ -2,32 +2,32 @@
 
 return [
     'auth' => [
-        'title' => 'Ylläpitoalue'
+        'title' => 'Ylläpitoalue',
     ],
     'field' => [
         'invalid_type' => 'Kentän tyyppi :type ei ole sallittu.',
         'options_method_invalid_model' => "Attribuutti ':field' ratkaise kelvollista mallia. Spesifioit vaihtoehtoinen metodi mallille :model explisiittisesti.",
-        'options_method_not_exists' => "Luokan :model täytyy määritellä metodi :method(), joka palauttaa ':field' lomakekentän ehdot."
+        'options_method_not_exists' => "Luokan :model täytyy määritellä metodi :method(), joka palauttaa ':field' lomakekentän ehdot.",
     ],
     'widget' => [
         'not_registered' => "Vimpaimen luokan nimi ':name' ei ole rekisteröity",
-        'not_bound' => "Vimpaimen luokkaa nimellä ':name' ei ole löydetty ohjaimeen"
+        'not_bound' => "Vimpaimen luokkaa nimellä ':name' ei ole löydetty ohjaimeen",
     ],
     'page' => [
         'untitled' => 'Nimetön',
         'access_denied' => [
             'label' => 'Pääsy kielletty',
             'help' => "Sinulla ei ole tarvittavia oikeuksia tälle sivulle.",
-            'cms_link' => 'Palaa ylläpitopuolelle'
+            'cms_link' => 'Palaa ylläpitopuolelle',
         ],
         'no_database' => [
             'label' => 'Tietokanta puuttuu',
             'help' => "Tietokanta on pakollinen. Varmista, että tietokanta on olemassa ja pystyssä kunnes kokeilet uudelleen.",
-            'cms_link' => 'Palaa kotisivulle'
+            'cms_link' => 'Palaa kotisivulle',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Osiota ':name' ei löydy."
+        'not_found_name' => "Osiota ':name' ei löydy.",
     ],
     'account' => [
         'signed_in_as' => 'Kirjauduit nimellä :full_name',
@@ -51,7 +51,7 @@
         'apply' => 'Käytä',
         'cancel' => 'Peruuta',
         'delete' => 'Poista',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Dashboard',
@@ -100,7 +100,7 @@
             'last_sign_in' => 'Viimeisin kirjautumisesi',
             'view_access_logs' => 'Tarkastele kirjautumislokiasi',
             'nice_message' => 'Hauskaa päivää!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Ylläpitäjä',
@@ -149,7 +149,7 @@
             'new' => 'Uusi ryhmä',
             'delete_confirm' => 'Poista tämä ylläpitoryhmä?',
             'return' => 'Palaa ryhmälistaukseen',
-            'users_count' => 'Käyttäjät'
+            'users_count' => 'Käyttäjät',
         ],
         'role' => [
             'name' => 'Rooli',
@@ -163,11 +163,11 @@
             'new' => 'Uusi Rooli',
             'delete_confirm' => 'Poista tämä hallintarooli?',
             'return' => 'Palaa roolilistaukseen',
-            'users_count' => 'Käyttäjät'
+            'users_count' => 'Käyttäjät',
         ],
         'preferences' => [
-            'not_authenticated' => 'Sallittua käyttäjää, joka voisi tallentaa asetukset, ei löydy.'
-        ]
+            'not_authenticated' => 'Sallittua käyttäjää, joka voisi tallentaa asetukset, ei löydy.',
+        ],
     ],
     'list' => [
         'default_title' => 'Lista',
@@ -198,7 +198,7 @@
         'delete_selected_confirm' => 'Poistetaan valitut tietueet?',
         'delete_selected_success' => 'Tietueet poistettu.',
         'column_switch_true' => 'Kyllä',
-        'column_switch_false' => 'Ei'
+        'column_switch_false' => 'Ei',
     ],
     'fileupload' => [
         'attachment' => 'Liite',
@@ -210,7 +210,7 @@
         'upload_file' => 'Siirrä tiedosto',
         'upload_error' => 'Virhe siirrossa',
         'remove_confirm' => 'Oletko varma?',
-        'remove_file' => 'Poista tiedosto'
+        'remove_file' => 'Poista tiedosto',
     ],
     'form' => [
         'create_title' => 'Uusi :name',
@@ -267,7 +267,7 @@
         'delete_row' => 'Poista rivi',
         'concurrency_file_changed_title' => 'Tiedosto muutettu',
         'concurrency_file_changed_description' => "Toinen käyttäjä on muokannut samaa tiedostoa, jota olet muokkaamassa. Voit joko ladata tiedoston ja menettää tekemäsi muutokset tai ylikirjoittaa toisen käyttäjän tekemät muutokset.",
-        'return_to_list' => 'Palaa listaukseen'
+        'return_to_list' => 'Palaa listaukseen',
     ],
     'recordfinder' => [
         'find_record' => 'Etsi tietue',
@@ -275,7 +275,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Linkki sivuun',
-        'select_page' => 'Valitse sivu...'
+        'select_page' => 'Valitse sivu...',
     ],
     'relation' => [
         'missing_config' => "Suhteella ei ole mitään asetuksia ':config'.",
@@ -308,11 +308,11 @@
         'link_name' => 'Linkki :name',
         'unlink' => 'Poista linkki',
         'unlink_name' => 'Poista linkki :name',
-        'unlink_confirm' => 'Oletko varma?'
+        'unlink_confirm' => 'Oletko varma?',
     ],
     'reorder' => [
         'default_title' => 'Järjestä tietueet uudelleen',
-        'no_records' => 'Ei järjestettäviä tietueita.'
+        'no_records' => 'Ei järjestettäviä tietueita.',
     ],
     'model' => [
         'name' => 'Malli',
@@ -321,7 +321,7 @@
         'missing_relation' => "Malli ':class' ei sisällä määritelmää suhteelle ':relation'.",
         'missing_method' => "Malli ':class' ei sisällä metodia ':method'.",
         'invalid_class' => "Mallia :model luokassa :class ei ole kelvollinen, sen täytyy periä \Model luokka.",
-        'mass_assignment_failed' => "Massan osoittaminen epäonnistui malli attribuutille ':attribute'."
+        'mass_assignment_failed' => "Massan osoittaminen epäonnistui malli attribuutille ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Järjestelmän kokoonpanovinkkejä',
@@ -379,16 +379,16 @@
         'toolbar_buttons_comment' => 'Työkalurivin nappulat, jotka näytetään editorissa oletuksena.',
     ],
     'tooltips' => [
-        'preview_website' => 'Esikatsele verkkosivusto'
+        'preview_website' => 'Esikatsele verkkosivusto',
     ],
     'mysettings' => [
         'menu_label' => 'Omat asetukset',
-        'menu_description' => 'Ylläpitäjän tiliin liittyvät asetukset.'
+        'menu_description' => 'Ylläpitäjän tiliin liittyvät asetukset.',
     ],
     'myaccount' => [
         'menu_label' => 'Oma tili',
         'menu_description' => 'Päivitä tilisi asetukset, kuten nimesi, sähköpostisi ja salasanasi.',
-        'menu_keywords' => 'tietoturvakirjautuminen'
+        'menu_keywords' => 'tietoturvakirjautuminen',
     ],
     'branding' => [
         'menu_label' => 'Kustomoi ylläpito',
@@ -410,7 +410,7 @@
         'menu_mode' => 'Valikon tyyli',
         'menu_mode_inline' => 'Rivissä',
         'menu_mode_tile' => 'Laatat',
-        'menu_mode_collapsed' => 'Taitettu'
+        'menu_mode_collapsed' => 'Taitettu',
     ],
     'backend_preferences' => [
         'menu_label' => 'Hallinnan asetukset',
@@ -420,7 +420,7 @@
         'timezone' => 'Aikavyöhyke',
         'timezone_comment' => 'Säätää kellonajat tähän aikavyöhykkeeseen.',
         'locale' => 'Kieli',
-        'locale_comment' => 'Valitse haluttu käyttöliittymän kieli.'
+        'locale_comment' => 'Valitse haluttu käyttöliittymän kieli.',
     ],
     'access_log' => [
         'hint' => 'Tämä loki näyttää listan onnistuneista kirjautumisista järjestelmänvalvojilta. Tiedot pidetään tallessa :days päivää.',
@@ -431,12 +431,12 @@
         'ip_address' => 'IP-osoite',
         'first_name' => 'Etunimi',
         'last_name' => 'Sukunimi',
-        'email' => 'Sähköposti'
+        'email' => 'Sähköposti',
     ],
     'filter' => [
         'all' => 'kaikki',
         'options_method_not_exists' => "Mallin :model täytyy määritellä metodi :method(), joka palauttaa ehdot ':filter' suodattimelle.",
-        'date_all' => 'kaikilta ajoilta'
+        'date_all' => 'kaikilta ajoilta',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Vie CSV-tiedosto',
@@ -507,15 +507,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Kelttiläinen)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Länsi-Eurooppalainen vedos euro symbolilla)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Siirrä ja hallitse mediaa - kuvat, videot, äänet, dokumentit'
+        'manage_media' => 'Siirrä ja hallitse mediaa - kuvat, videot, äänet, dokumentit',
     ],
     'mediafinder' => [
         'label' => 'Mediaetsin',
-        'default_prompt' => 'Klikkaa %s nappulaa etsiäksesi media'
+        'default_prompt' => 'Klikkaa %s nappulaa etsiäksesi media',
     ],
     'media' => [
         'menu_label' => 'Media',
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index 54403cbc75..0e3f19c40a 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -3,18 +3,18 @@
 return [
     'auth' => [
         'title' => 'Zone d\'administration',
-        'invalid_login' => 'L\'utilisateur saisi ne correspond à aucun utilisateur enregistré. Merci de vérifier votre saisie et de réessayer.'
+        'invalid_login' => 'L\'utilisateur saisi ne correspond à aucun utilisateur enregistré. Merci de vérifier votre saisie et de réessayer.',
     ],
     'field' => [
         'invalid_type' => 'Type de champ invalide :type.',
         'options_method_invalid_model' => "L\'attribut ':field' ne correspond à aucun modèle valide. Essayez de spécifier explicitement la méthode d\'options pour la classe du modèle ':model'.",
         'options_method_not_exists' => 'La classe du modèle :model doit définir une méthode :method() renvoyant des options pour le champ ":field" du formulaire.',
         'options_static_method_invalid_value' => "La méthode statique ':method()' de :class ne renvoie pas un tableau d'options valide.",
-        'colors_method_not_exists' => "La classe du modèle :model doit définir une méthode :method() renvoyant le code html en hexadécimal de la couleur du champ ':field' du formulaire."
+        'colors_method_not_exists' => "La classe du modèle :model doit définir une méthode :method() renvoyant le code html en hexadécimal de la couleur du champ ':field' du formulaire.",
     ],
     'widget' => [
         'not_registered' => 'Aucun widget au nom de classe ":name" n\'a été enregistré',
-        'not_bound' => 'Un widget au nom de classe ":name" n\'a pas été lié au contrôleur'
+        'not_bound' => 'Un widget au nom de classe ":name" n\'a pas été lié au contrôleur',
     ],
     'page' => [
         'untitled' => 'Sans titre',
@@ -26,12 +26,12 @@
         'access_denied' => [
             'label' => 'Accès refusé',
             'help' => 'Vous n\'êtes pas autorisé à consulter cette page.',
-            'cms_link' => 'Retour à l\'interface d\'administration'
+            'cms_link' => 'Retour à l\'interface d\'administration',
         ],
         'no_database' => [
             'label' => 'Base de données introuvable',
             'help' => 'Une base de données est requise pour l\'accès à l\'interface d\'administration. Veuillez vérifier que la base de données existe et que les migrations ont été effectuées avant de réessayer.',
-            'cms_link' => 'Retour à l\'accueil'
+            'cms_link' => 'Retour à l\'accueil',
         ],
     ],
     'partial' => [
@@ -127,7 +127,7 @@
             'last_sign_in' => 'Votre dernière connexion remonte au',
             'view_access_logs' => 'Consulter le journal des accès',
             'nice_message' => 'Passez une agréable journée !',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrateur',
@@ -178,7 +178,7 @@
             'new' => 'Ajouter un groupe d\'administrateurs',
             'delete_confirm' => 'Supprimer ce groupe d\'administrateurs ?',
             'return' => 'Retour à la liste des groupes',
-            'users_count' => 'Utilisateurs'
+            'users_count' => 'Utilisateurs',
         ],
         'role' => [
             'name' => 'Rôle',
@@ -192,10 +192,10 @@
             'new' => 'Nouveau rôle',
             'delete_confirm' => 'Supprimer le rôle administrateur ?',
             'return' => 'Retourner à la liste des rôles',
-            'users_count' => 'Utilisateurs'
+            'users_count' => 'Utilisateurs',
         ],
         'preferences' => [
-            'not_authenticated' => 'Il n\'y a aucun utilisateur authentifié pour lequel il est possible de charger ou modifier les préférences.'
+            'not_authenticated' => 'Il n\'y a aucun utilisateur authentifié pour lequel il est possible de charger ou modifier les préférences.',
         ],
         'trashed_hint_title' => 'Ce compte a été supprimé',
         'trashed_hint_desc' => 'Ce compte a été supprimé et il sera impossible de se connecter avec. Pour le récupérer, cliquer sur l\'icône "Utilisateur" en bas à droite.',
@@ -229,7 +229,7 @@
         'delete_selected_confirm' => 'Confirmer la suppression des enregistrements sélectionnés ?',
         'delete_selected_success' => 'Les enregistrements ont été supprimés.',
         'column_switch_true' => 'Oui',
-        'column_switch_false' => 'Non'
+        'column_switch_false' => 'Non',
     ],
     'fileupload' => [
         'attachment' => 'Pièce jointe',
@@ -307,7 +307,7 @@
         'delete_row' => 'Supprimer une ligne',
         'concurrency_file_changed_title' => 'Le fichier a été modifié',
         'concurrency_file_changed_description' => 'Un autre utilisateur a modifié ce fichier sur le disque. Vous pouvez ou recharger le fichier depuis le disque, mais vous perdrez vos modifications, ou écraser le fichier sur le disque.',
-        'return_to_list' => 'Retourner à la liste'
+        'return_to_list' => 'Retourner à la liste',
     ],
     'recordfinder' => [
         'find_record' => 'Trouver un enregistrement',
@@ -316,7 +316,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Lien de page',
-        'select_page' => 'Sélectionnez une page...'
+        'select_page' => 'Sélectionnez une page...',
     ],
     'relation' => [
         'missing_config' => 'La behavior relation n\'a pas de configuration pour ":config".',
@@ -363,7 +363,7 @@
         'missing_relation' => 'Le modèle ":class" ne contient pas de définition ":relation".',
         'missing_method' => 'Le modèle ":class" ne contient pas de méthode ":method".',
         'invalid_class' => 'Le modèle :model utilisé dans la classe :class est invalide, il doit hériter de la classe \Model.',
-        'mass_assignment_failed' => 'L\'affectation de masse a échoué pour l\'attribut ":attribute" du modèle.'
+        'mass_assignment_failed' => 'L\'affectation de masse a échoué pour l\'attribut ":attribute" du modèle.',
     ],
     'warnings' => [
         'tips' => 'Astuces de configuration du système',
@@ -439,16 +439,16 @@
         'paragraph_formats_comment' => 'Les options qui apparaîtrons dans la liste déroulante des styles de paragraphe.',
     ],
     'tooltips' => [
-        'preview_website' => 'Aperçu du site'
+        'preview_website' => 'Aperçu du site',
     ],
     'mysettings' => [
         'menu_label' => 'Mes paramètres',
-        'menu_description' => 'Paramètres de votre compte administrateur'
+        'menu_description' => 'Paramètres de votre compte administrateur',
     ],
     'myaccount' => [
         'menu_label' => 'Mon compte',
         'menu_description' => 'Modifier les informations de votre compte comme le nom, l\'adresse e-mail ou le mot de passe.',
-        'menu_keywords' => 'identification de sécurité'
+        'menu_keywords' => 'identification de sécurité',
     ],
     'branding' => [
         'menu_label' => 'Personnaliser l\'interface d\'administration',
@@ -488,7 +488,7 @@
         'timezone' => 'Fuseau horaire',
         'timezone_comment' => 'Ajuster les dates affichées à ce fuseau horaire.',
         'locale' => 'Langue',
-        'locale_comment' => 'Choisir une langue.'
+        'locale_comment' => 'Choisir une langue.',
     ],
     'access_log' => [
         'hint' => 'Ce journal affiche la liste des tentatives d\'authentification réussies des administrateurs. Les données sont sauvegardées pendant :days jours.',
@@ -501,7 +501,7 @@
         'ip_address' => 'Adresse IP',
         'first_name' => 'Prénom',
         'last_name' => 'Nom',
-        'email' => 'Adresse e-mail'
+        'email' => 'Adresse e-mail',
     ],
     'filter' => [
       'all' => 'tous',
@@ -580,8 +580,8 @@
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, européen occidental révisé avec le signe euro)',
             'windows_1250' => 'Windows-1250 (CP1250, Europe centrale et orientale)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
         'manage_media' => 'Déposer et gérer les contenus media - images, vidéos, sons, documents',
@@ -658,5 +658,5 @@
         'rename_new_name' => 'Nouveau nom',
         'move_please_select' => 'Faire une sélection',
         'move_button' => 'Déplacer',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/id/lang.php b/modules/backend/lang/id/lang.php
index 2a0b76b72b..59557e4e17 100644
--- a/modules/backend/lang/id/lang.php
+++ b/modules/backend/lang/id/lang.php
@@ -2,26 +2,26 @@
 
 return [
     'auth' => [
-        'title' => 'Area Administrasi'
+        'title' => 'Area Administrasi',
     ],
     'field' => [
         'invalid_type' => 'Jenis medan tidak valid digunakan :type.',
-        'options_method_not_exists' => "Kelas model :model harus menentukan metode :method() yang mengembalikan opsi untuk borang medan ':field'."
+        'options_method_not_exists' => "Kelas model :model harus menentukan metode :method() yang mengembalikan opsi untuk borang medan ':field'.",
     ],
     'widget' => [
         'not_registered' => "Kelas gawit bernama ':name' belum terdaftar",
-        'not_bound' => "Gawit dengan kelas bernama ':name' belum terikat pada controller"
+        'not_bound' => "Gawit dengan kelas bernama ':name' belum terikat pada controller",
     ],
     'page' => [
         'untitled' => 'Tak Berjudul',
         'access_denied' => [
             'label' => 'Akses ditolak',
             'help' => "Anda tidak memiliki izin untuk melihat laman ini.",
-            'cms_link' => 'Kembali ke back-end'
-        ]
+            'cms_link' => 'Kembali ke back-end',
+        ],
     ],
     'partial' => [
-        'not_found' => "Potongan ':name' tidak ditemukan."
+        'not_found' => "Potongan ':name' tidak ditemukan.",
     ],
     'account' => [
         'sign_out' => 'Keluar',
@@ -43,7 +43,7 @@
         'apply' => 'Terapkan',
         'cancel' => 'Urung',
         'delete' => 'Hapus',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Dasbor',
@@ -63,8 +63,8 @@
         'widget_title_error' => 'Tajuk gawit diperlukan.',
         'status' => [
             'widget_title_default' => 'Status sistem',
-            'update_available' => '{0} pembaruan tersedia!|{1} pembaruan tersedia!|[2,Inf] pembaruan tersedia!'
-        ]
+            'update_available' => '{0} pembaruan tersedia!|{1} pembaruan tersedia!|[2,Inf] pembaruan tersedia!',
+        ],
     ],
     'user' => [
         'name' => 'Administrator',
@@ -106,8 +106,8 @@
             'return' => 'Kembali ke senarai grup',
         ],
         'preferences' => [
-            'not_authenticated' => 'Tidak ada pengguna berotentikasi untuk memuat atau menyimpan pengaturan.'
-        ]
+            'not_authenticated' => 'Tidak ada pengguna berotentikasi untuk memuat atau menyimpan pengaturan.',
+        ],
     ],
     'list' => [
         'default_title' => 'Senarai',
@@ -136,7 +136,7 @@
         'attachment' => 'Lampiran',
         'help' => 'Tambah judul dan jabaran untuk lampiran ini.',
         'title_label' => 'Judul',
-        'description_label' => 'Jabaran'
+        'description_label' => 'Jabaran',
     ],
     'form' => [
         'create_title' => ':name Baru',
@@ -185,7 +185,7 @@
         'insert_row' => 'Sisipkan Baris',
         'delete_row' => 'Hapus Baris',
         'concurrency_file_changed_title' => 'Berkas telah diubah',
-        'concurrency_file_changed_description' => "Berkas yang Anda sunting telah diubah pada diska oleh pengguna lain. Anda dapat memuat ulang berkas dan kehilangan perubahan yang telah Anda buat atau menimpa berkas pada diska."
+        'concurrency_file_changed_description' => "Berkas yang Anda sunting telah diubah pada diska oleh pengguna lain. Anda dapat memuat ulang berkas dan kehilangan perubahan yang telah Anda buat atau menimpa berkas pada diska.",
     ],
     'relation' => [
         'missing_config' => "Behavior hubungan tidak memiliki pengaturan untuk ':config'.",
@@ -227,13 +227,13 @@
         'missing_relation' => "Model ':class' tidak berisi tentuan untuk ':relation'.",
         'missing_method' => "Model ':class' tidak berisi metode ':method'.",
         'invalid_class' => "Model :model yang digunakan pada :class tidak valid, model harus turunan kelas \Model.",
-        'mass_assignment_failed' => "Penetapan masal gagal untuk atribut Model ':attribute'."
+        'mass_assignment_failed' => "Penetapan masal gagal untuk atribut Model ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Kiat pengaturan sistem',
         'tips_description' => 'Ada masalah yang perlu Anda perhatikan untuk mengatur sistem dengan tepat.',
         'permissions'  => 'Direktori :name atau direktori di bawahnya tidak dapat ditulis oleh PHP. Silakan atur hak akses webserver yang sesuai pada direktori ini.',
-        'extension' => 'Ekstensi PHP :name tidak terpasang. Silakan pasang pustaka ini dan aktifkan ekstensi.'
+        'extension' => 'Ekstensi PHP :name tidak terpasang. Silakan pasang pustaka ini dan aktifkan ekstensi.',
     ],
     'editor' => [
         'menu_label' => 'Penyesuaian Penyunting Kode',
@@ -246,19 +246,19 @@
         'highlight_active_line' => 'Sorot baris aktif',
         'show_invisibles' => 'Tampilkan karakter tak terlihat',
         'show_gutter' => 'Tampilkan parit',
-        'theme' => 'Skema warna'
+        'theme' => 'Skema warna',
     ],
     'tooltips' => [
-        'preview_website' => 'Tinjau website'
+        'preview_website' => 'Tinjau website',
     ],
     'mysettings' => [
         'menu_label' => 'Pengaturanku',
-        'menu_description' => 'Pengaturan yang berkaitan dengan akun administrasi Anda'
+        'menu_description' => 'Pengaturan yang berkaitan dengan akun administrasi Anda',
     ],
     'myaccount' => [
         'menu_label' => 'Akunku',
         'menu_description' => 'Perbarui rincian akun Anda seperti nama, alamat surel dan sandi lewat.',
-        'menu_keywords' => 'security login'
+        'menu_keywords' => 'security login',
     ],
     'branding' => [
         'menu_label' => 'Penyesuaian back-end',
@@ -275,13 +275,13 @@
         'secondary_color' => 'Sekunder color',
         'accent_color' => 'Accent color',
         'styles' => 'Gaya',
-        'custom_stylesheet' => 'Lembar gaya ubah suai'
+        'custom_stylesheet' => 'Lembar gaya ubah suai',
     ],
     'backend_preferences' => [
         'menu_label' => 'Penyesuaian Back-end',
         'menu_description' => 'Kelola penyesuaian akun Anda seperti bahasa yang diinginkan.',
         'locale' => 'Bahasa',
-        'locale_comment' => 'Pilih bahasa lokal yang ingin digunakan.'
+        'locale_comment' => 'Pilih bahasa lokal yang ingin digunakan.',
     ],
     'access_log' => [
         'hint' => 'Catatan ini menampilkan senarai percobaan masuk yang berhasil oleh administrator. Rekam akan disimpan selama :days hari.',
@@ -292,15 +292,15 @@
         'ip_address' => 'Alamat IP',
         'first_name' => 'Nama depan',
         'last_name' => 'Nama belakang',
-        'email' => 'Surel'
+        'email' => 'Surel',
     ],
     'filter' => [
-      'all' => 'semua'
+      'all' => 'semua',
     ],
     'media' => [
         'rename_popup_title' => 'Ganti nama',
         'rename_new_name' => 'Nama baru',
         'move_please_select' => 'silakan pilih',
         'move_button' => 'Pindahkan',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php
index 97a1d1bb4b..1cb1fa6e6f 100644
--- a/modules/backend/lang/it/lang.php
+++ b/modules/backend/lang/it/lang.php
@@ -2,11 +2,11 @@
 
 return [
     'auth' => [
-        'title' => 'Area di Amministrazione'
+        'title' => 'Area di Amministrazione',
     ],
     'field' => [
         'invalid_type' => 'Il tipo di campo :type non è valido.',
-        'options_method_not_exists' => 'La classe :model deve definire un metodo :method() che ritorni le opzioni per il campo ":field".'
+        'options_method_not_exists' => 'La classe :model deve definire un metodo :method() che ritorni le opzioni per il campo ":field".',
     ],
     'widget' => [
         'not_registered' => "Nessun widget ':name' è stato registrato",
@@ -17,11 +17,11 @@
         'access_denied' => [
             'label' => 'Accesso negato',
             'help' => "Non hai le autorizzazioni necessarie per accedere a questa pagina.",
-            'cms_link' => 'Ritorna al pannello di controllo'
+            'cms_link' => 'Ritorna al pannello di controllo',
         ],
     ],
     'partial' => [
-        'not_found_name' => "La vista parziale ':name' non è stata trovata."
+        'not_found_name' => "La vista parziale ':name' non è stata trovata.",
     ],
     'ajax_handler' => [
         'invalid_name' => "Il nome dell'AJAX handler non è valido: :name.",
@@ -108,7 +108,7 @@
             'last_sign_in' => 'Il tuo ultimo accesso è stato ',
             'view_access_logs' => 'Visualizza log accessi',
             'nice_message' => 'Buona giornata!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Amministratore',
@@ -151,7 +151,7 @@
             'new' => 'Nuovo gruppo',
             'delete_confirm' => 'Vuoi davvero eliminare questo gruppo amministratore?',
             'return' => 'Ritorna alla lista dei gruppi',
-            'users_count' => 'Utenti'
+            'users_count' => 'Utenti',
         ],
         'role' => [
             'name' => 'Ruolo',
@@ -168,8 +168,8 @@
             'users_count' => 'Utenti',
         ],
         'preferences' => [
-            'not_authenticated' => 'Non c\'è nessun utente autenticato per cui caricare o salvare le preferenze.'
-        ]
+            'not_authenticated' => 'Non c\'è nessun utente autenticato per cui caricare o salvare le preferenze.',
+        ],
     ],
     'list' => [
         'default_title' => 'Elenco',
@@ -198,7 +198,7 @@
         'delete_selected_confirm' => 'Elimina i record selezionati?',
         'delete_selected_success' => 'I record selezionati sono stati eliminati con successo.',
         'column_switch_true' => 'Sì',
-        'column_switch_false' => 'No'
+        'column_switch_false' => 'No',
     ],
     'fileupload' => [
         'attachment' => 'Allegato',
@@ -210,7 +210,7 @@
         'upload_file' => 'Carica file',
         'upload_error' => 'Errore nel caricamento',
         'remove_confirm' => 'Sei sicuro?',
-        'remove_file' => 'Rimuovi file'
+        'remove_file' => 'Rimuovi file',
     ],
     'repeater' => [
         'add_new_item' => 'Aggiungi elemento',
@@ -271,10 +271,10 @@
         'delete_row' => 'Elimina riga',
         'concurrency_file_changed_title' => 'Il file è stato cambiato',
         'concurrency_file_changed_description' => "Il file che stavi modificando è stato cambiato da un altro utente. Puoi ricaricare il file e perdere le tue modifiche oppure sovrascrivere il file sul disco.",
-        'return_to_list' => 'Ritorna all\'elenco'
+        'return_to_list' => 'Ritorna all\'elenco',
     ],
     'recordfinder' => [
-        'find_record' => 'Trova record'
+        'find_record' => 'Trova record',
     ],
     'pagelist' => [
         'page_link' => 'Link pagina',
@@ -311,11 +311,11 @@
         'link_name' => 'Collega :name',
         'unlink' => 'Scollega',
         'unlink_name' => 'Scollega :name',
-        'unlink_confirm' => 'Sei sicuro?'
+        'unlink_confirm' => 'Sei sicuro?',
     ],
     'reorder' => [
         'default_title' => 'Riordina record',
-        'no_records' => 'Non ci sono record disponibili per ordinare.'
+        'no_records' => 'Non ci sono record disponibili per ordinare.',
     ],
     'model' => [
         'name' => 'Modello',
@@ -330,7 +330,7 @@
         'tips' => 'Suggerimenti per la configurazione del sistema',
         'tips_description' => 'Ci sono elementi a cui è necessario prestare attenzione al fine di configurare il sistema in maniera corretta.',
         'permissions'  => 'La cartella :name o le sue sottocartelle non sono scrivibili da PHP. Imposta le corrette autorizzazioni per il server web su questa cartella.',
-        'extension' => 'L\'estensione di PHP :name non è installata. Installa questa libreria ed attiva l\'estensione.'
+        'extension' => 'L\'estensione di PHP :name non è installata. Installa questa libreria ed attiva l\'estensione.',
     ],
     'editor' => [
         'menu_label' => 'Preferenze editor di codice',
@@ -395,16 +395,16 @@
         'paragraph_formats_comment' => 'Le opzioni che appariranno nel menu a tendina relativo alla formattazione dei paragrafi.',
     ],
     'tooltips' => [
-        'preview_website' => 'Anteprima del sito web'
+        'preview_website' => 'Anteprima del sito web',
     ],
     'mysettings' => [
         'menu_label' => 'Impostazioni personali',
-        'menu_description' => 'Impostazioni legate al tuo account amministratore'
+        'menu_description' => 'Impostazioni legate al tuo account amministratore',
     ],
     'myaccount' => [
         'menu_label' => 'Il mio account',
         'menu_description' => 'Aggiorna i dettagli del tuo account, come il nome, l\'indirizzo e-mail e la password.',
-        'menu_keywords' => 'sicurezza login'
+        'menu_keywords' => 'sicurezza login',
     ],
     'branding' => [
         'menu_label' => 'Personalizza pannello di controllo',
@@ -426,7 +426,7 @@
         'menu_mode' => 'Stile menu',
         'menu_mode_inline' => 'In linea',
         'menu_mode_tile' => 'Piastrelle',
-        'menu_mode_collapsed' => 'Compresso'
+        'menu_mode_collapsed' => 'Compresso',
     ],
     'backend_preferences' => [
         'menu_label' => 'Preferenze pannello di controllo',
@@ -452,7 +452,7 @@
     'filter' => [
         'all' => 'tutto',
         'options_method_not_exists' => "Il modello :model deve definire un metodo :method() che ritorni le opzioni per il filtro ':filter'.",
-        'date_all' => 'tutte'
+        'date_all' => 'tutte',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Carica un file CSV',
@@ -523,15 +523,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtico)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Revisione di Europa Occidentale con il simbolo dell\'euro)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Gestisci elementi multimediali'
+        'manage_media' => 'Gestisci elementi multimediali',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
-        'default_prompt' => 'Fai clic sul pulsante %s per trovare un elemento multimediale'
+        'default_prompt' => 'Fai clic sul pulsante %s per trovare un elemento multimediale',
     ],
     'media' => [
         'menu_label' => 'Elementi multimediali',
@@ -596,5 +596,5 @@
         'rename_new_name' => 'Nuovo nome',
         'move_please_select' => 'seleziona',
         'move_button' => 'Sposta',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php
index c795233d98..a926a308a0 100644
--- a/modules/backend/lang/ja/lang.php
+++ b/modules/backend/lang/ja/lang.php
@@ -656,5 +656,5 @@
         'rename_new_name' => '新しい名前',
         'move_please_select' => '選択してください',
         'move_button' => '移動',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/kr/lang.php b/modules/backend/lang/kr/lang.php
index f5797d3b8a..87295042c8 100644
--- a/modules/backend/lang/kr/lang.php
+++ b/modules/backend/lang/kr/lang.php
@@ -2,7 +2,7 @@
 
 return [
     'auth' => [
-        'title' => '시스템관리자영역'
+        'title' => '시스템관리자영역',
     ],
     'field' => [
         'invalid_type' => '유효하지 않은 필드타입 사용 :type ',
@@ -23,7 +23,7 @@
         'no_database' => [
             'label' => 'DB를 찾을 수 없습니다',
             'help' => "백엔드에 접속하기 위해선 DB가 필요합니다. 다시 접속하시기 전에 DB가 정상적으로 설정및 이전되었는지 확인해주세요.",
-            'cms_link' => '홈페이지로 돌아가기'
+            'cms_link' => '홈페이지로 돌아가기',
         ],
     ],
     'partial' => [
@@ -98,7 +98,7 @@
             'last_sign_in' => '당신의 최종 접속은 ',
             'view_access_logs' => '접속 로그 보기',
             'nice_message' => '좋은 하루 되세요!',
-        ]
+        ],
     ],
     'user' => [
         'name' => '사용자관리',
@@ -144,11 +144,11 @@
             'new' => '신규 그룹',
             'delete_confirm' => '이 사용자 그룹을 삭제하시겠습니까?',
             'return' => '그룹 관리로 돌아가기',
-            'users_count' => '명'
+            'users_count' => '명',
         ],
         'preferences' => [
-            'not_authenticated' => '설정을 저장하기 위한 권한확인이 되지 않았습니다.'
-        ]
+            'not_authenticated' => '설정을 저장하기 위한 권한확인이 되지 않았습니다.',
+        ],
     ],
     'list' => [
         'default_title' => '목록',
@@ -179,7 +179,7 @@
         'delete_selected_confirm' => '선택하신 기록을 삭제하시겠습니까?',
         'delete_selected_success' => '선택하신 기록을 삭제했습니다.',
         'column_switch_true' => 'Y',
-        'column_switch_false' => 'N'
+        'column_switch_false' => 'N',
     ],
     'fileupload' => [
         'attachment' => '첨부',
@@ -191,7 +191,7 @@
         'upload_file' => '파일 업로드',
         'upload_error' => '업로드 오류',
         'remove_confirm' => '삭제하시겠습니까?',
-        'remove_file' => '파일 삭제'
+        'remove_file' => '파일 삭제',
     ],
     'form' => [
         'create_title' => '신규 :name',
@@ -248,7 +248,7 @@
         'delete_row' => '행 삭제',
         'concurrency_file_changed_title' => '파일이 변경되었습니다',
         'concurrency_file_changed_description' => "다른 사용자에의해 파일이 변경되었습니다. 갱신하여 변경내용을 버리거나 덮어쓰기를 하실 수 있습니다.",
-        'return_to_list' => '목록으로 돌아가기'
+        'return_to_list' => '목록으로 돌아가기',
     ],
     'recordfinder' => [
         'find_record' => '기록 찾기',
@@ -256,7 +256,7 @@
     ],
     'pagelist' => [
         'page_link' => '페이지 링크',
-        'select_page' => '페이지를 선택...'
+        'select_page' => '페이지를 선택...',
     ],
     'relation' => [
         'missing_config' => "릴레이션 행동은 ':config' 설정을 가지고 있지 않습니다.",
@@ -293,7 +293,7 @@
     ],
     'reorder' => [
         'default_title' => '기록순서변경',
-        'no_records' => '분류할 기록이 없습니다.'
+        'no_records' => '분류할 기록이 없습니다.',
     ],
     'model' => [
         'name' => "모델",
@@ -355,19 +355,19 @@
         'no_wrap' => '테그를 줄바꿈하지 않음',
         'no_wrap_comment' => '블록 테그안에서 줄바꿈 하지않을 테그목록',
         'remove_tags' => '테그제거',
-        'remove_tags_comment' => '내용과 함께 제거할 테그목록'
+        'remove_tags_comment' => '내용과 함께 제거할 테그목록',
     ],
     'tooltips' => [
-        'preview_website' => '웹사이트 미리보기'
+        'preview_website' => '웹사이트 미리보기',
     ],
     'mysettings' => [
         'menu_label' => '내 설정',
-        'menu_description' => '사용자 계정의 설정을 합니다.'
+        'menu_description' => '사용자 계정의 설정을 합니다.',
     ],
     'myaccount' => [
         'menu_label' => '계정',
         'menu_description' => '이름, 이메일주소, 비밀번호 등의 계정 세부정보를 변경해주세요.',
-        'menu_keywords' => '보안 로그인'
+        'menu_keywords' => '보안 로그인',
     ],
     'branding' => [
         'menu_label' => '백엔드 설정변경',
@@ -389,7 +389,7 @@
         'menu_mode' => '메뉴 스타일',
         'menu_mode_inline' => '인라인',
         'menu_mode_tile' => '타일',
-        'menu_mode_collapsed' => '접힘'
+        'menu_mode_collapsed' => '접힘',
     ],
     'backend_preferences' => [
         'menu_label' => '백엔드 환경설정',
@@ -399,7 +399,7 @@
         'timezone' => '타임존',
         'timezone_comment' => '타임존에 맞는 날짜 조정.',
         'locale' => '로케일',
-        'locale_comment' => '사용언어에 맞는 로케일을 선택해주세요.'
+        'locale_comment' => '사용언어에 맞는 로케일을 선택해주세요.',
     ],
     'access_log' => [
         'hint' => '이 로그는 사용자들의 성공적인 로그인 접속 기록 목록을 표시합니다. 총 :days일보관함.',
@@ -410,12 +410,12 @@
         'ip_address' => 'IP주소',
         'first_name' => '이름',
         'last_name' => '성',
-        'email' => '이메일'
+        'email' => '이메일',
     ],
     'filter' => [
         'all' => '전체',
         'options_method_not_exists' => ":model 모델클래스는 ':filter' 필터옵션을 리턴하기위해서 반드시 :method() 메소드를 정의해야합니다.",
-        'date_all' => '전체기간'
+        'date_all' => '전체기간',
     ],
     'import_export' => [
         'upload_csv_file' => '1. CSV 파일 업로드',
@@ -486,15 +486,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => '미디어관리와 업로드 - 이미지, 동영상, 소리, 문서'
+        'manage_media' => '미디어관리와 업로드 - 이미지, 동영상, 소리, 문서',
     ],
     'mediafinder' => [
         'label' => '미디어 탐색기',
-        'default_prompt' => '%s 버튼 클릭하여 미디어 아이템 찾기'
+        'default_prompt' => '%s 버튼 클릭하여 미디어 아이템 찾기',
     ],
     'media' => [
         'menu_label' => '미디어',
diff --git a/modules/backend/lang/lt/lang.php b/modules/backend/lang/lt/lang.php
index aeaf776bc4..c41b8fc1b1 100644
--- a/modules/backend/lang/lt/lang.php
+++ b/modules/backend/lang/lt/lang.php
@@ -2,32 +2,32 @@
 
 return [
     'auth' => [
-        'title' => 'Administracijos zona'
+        'title' => 'Administracijos zona',
     ],
     'field' => [
         'invalid_type' => 'Netinkamas laukelio tipas :type.',
         'options_method_invalid_model' => "Artributas ':field' nenuskaito tinkamo modelio. Bandykite nurodyti parinkties metodą išskirtinai modelio klasei :model",
-        'options_method_not_exists' => "Modelio klasė :model turi nurodyti metodą :method() gražinantį parinktis ':field' formos laukeliui."
+        'options_method_not_exists' => "Modelio klasė :model turi nurodyti metodą :method() gražinantį parinktis ':field' formos laukeliui.",
     ],
     'widget' => [
         'not_registered' => "Valdiklio klasės pavadinimas ':name' neiregistruotas",
-        'not_bound' => "Valdiklio klasės pavadinimas ':name' nepriskirtas kontroleriui"
+        'not_bound' => "Valdiklio klasės pavadinimas ':name' nepriskirtas kontroleriui",
     ],
     'page' => [
         'untitled' => 'Neužvardintas',
         'access_denied' => [
             'label' => 'Prieiga atmesta',
             'help' => "Neturite reikiamų prieigos teisių šio puslapio peržiūrai.",
-            'cms_link' => 'Grįžti į administraciją'
+            'cms_link' => 'Grįžti į administraciją',
         ],
         'no_database' => [
             'label' => 'Truksta duombazės',
             'help' => "Duomenų bazė reikalinga administracijos prieigai. Patikrinkite duomenų bazės konfigūraciją bei migracijas ir bandykite dar kartą.",
-            'cms_link' => 'Grįžti į svetainę'
+            'cms_link' => 'Grįžti į svetainę',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Priedėlis ':name' nerastas."
+        'not_found_name' => "Priedėlis ':name' nerastas.",
     ],
     'account' => [
         'sign_out' => 'Atsijungti',
@@ -49,7 +49,7 @@
         'apply' => 'Taikyti',
         'cancel' => 'Atšaukti',
         'delete' => 'trinti',
-        'ok' => 'GERAI'
+        'ok' => 'GERAI',
     ],
     'dashboard' => [
         'menu_label' => 'Valdymas',
@@ -98,7 +98,7 @@
             'last_sign_in' => 'Paskutinį kartą prisijungėte',
             'view_access_logs' => 'Žiurėti prieigos registrą',
             'nice_message' => 'Geros Jums dienos!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administratorius',
@@ -145,11 +145,11 @@
             'new' => 'Nauja Grupė',
             'delete_confirm' => 'Ištrinti šią administratorių grupę?',
             'return' => 'Grįžti į grupių sąrašą',
-            'users_count' => 'Vartotojai(ų)'
+            'users_count' => 'Vartotojai(ų)',
         ],
         'preferences' => [
-            'not_authenticated' => 'Nėra prisijungusio vartotojo, kurio nustatymus būtų galima užkrauti arba išsaugoti.'
-        ]
+            'not_authenticated' => 'Nėra prisijungusio vartotojo, kurio nustatymus būtų galima užkrauti arba išsaugoti.',
+        ],
     ],
     'list' => [
         'default_title' => 'Sąrašas',
@@ -180,7 +180,7 @@
         'delete_selected_confirm' => 'Ištrinti pasirinktus įrašus?',
         'delete_selected_success' => 'Pasirinktus įrašus ištrynėme.',
         'column_switch_true' => 'Taip',
-        'column_switch_false' => 'Ne'
+        'column_switch_false' => 'Ne',
     ],
     'fileupload' => [
         'attachment' => 'Priedas',
@@ -192,7 +192,7 @@
         'upload_file' => 'Įkelti failą',
         'upload_error' => 'Įkėlimo klaida',
         'remove_confirm' => 'Ar tikrai?',
-        'remove_file' => 'Pašalinti failą'
+        'remove_file' => 'Pašalinti failą',
     ],
     'form' => [
         'create_title' => 'Naujas :name',
@@ -248,14 +248,14 @@
         'delete_row' => 'Trinti Eilutę',
         'concurrency_file_changed_title' => 'Failas buvo pakeistas',
         'concurrency_file_changed_description' => "Jūsų redaguojamą failą diske pakeitė kitas vartotojas. Galite perkrauti failą prarasdami pakeitimus arba perrašyti failą diske.",
-        'return_to_list' => 'Grįžti į sąrašą'
+        'return_to_list' => 'Grįžti į sąrašą',
     ],
     'recordfinder' => [
-        'find_record' => 'Rasti Įrašą'
+        'find_record' => 'Rasti Įrašą',
     ],
     'pagelist' => [
         'page_link' => 'Puslapio nuoroda',
-        'select_page' => 'Pasirinkti puslapį...'
+        'select_page' => 'Pasirinkti puslapį...',
     ],
     'relation' => [
         'missing_config' => "Subendrinimo elgsena neturi konfigūracijos ':config'.",
@@ -288,11 +288,11 @@
         'link_name' => 'Nuoroda :name',
         'unlink' => 'Atjungti',
         'unlink_name' => 'Atjungti :name',
-        'unlink_confirm' => 'Ar tikrai?'
+        'unlink_confirm' => 'Ar tikrai?',
     ],
     'reorder' => [
         'default_title' => 'Rūšiuoti įrašus',
-        'no_records' => 'Nėra įrašų galimų rūšiavimui.'
+        'no_records' => 'Nėra įrašų galimų rūšiavimui.',
     ],
     'model' => [
         'name' => 'Modelis',
@@ -301,13 +301,13 @@
         'missing_relation' => "Modelis ':class' neturi nustatymo ':relation'.",
         'missing_method' => "Modelis ':class' neturi metodo ':method'.",
         'invalid_class' => "Modelis :model naudojamas klasėje :class yra netinkamas. Jis turi kreiptis į \Model klasę.",
-        'mass_assignment_failed' => "Masinis priskyrimas nepavyko Modelio atributui ':attribute'."
+        'mass_assignment_failed' => "Masinis priskyrimas nepavyko Modelio atributui ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Sistemos konfigūracijos patarimai',
         'tips_description' => 'Yra problemų į kurias turėtumėte atkreipti dėmesį norėdami sukonfigūruoti sistemą tinkamai.',
         'permissions'  => 'Direktorija :name arba jos subdirektorijos nėra įrašomos naudojant PHP. Prašome nustatyti rašymo prieigą serveryje šiai direktorijai.',
-        'extension' => 'PHP priedas :name nėra įdiegtas. Prašome įdiegti ir aktyvuoti šį priedą.'
+        'extension' => 'PHP priedas :name nėra įdiegtas. Prašome įdiegti ir aktyvuoti šį priedą.',
     ],
     'editor' => [
         'menu_label' => 'Redaktoriaus nustatymai',
@@ -353,19 +353,19 @@
         'no_wrap' => 'Neperkelti tagų',
         'no_wrap_comment' => 'Tagų sąrašas, kurie nebus perkeliami blokuose.',
         'remove_tags' => 'Pašalinti tagus',
-        'remove_tags_comment' => 'Tagų sąrašas, kurie šalinami su esančiu turiniu juose.'
+        'remove_tags_comment' => 'Tagų sąrašas, kurie šalinami su esančiu turiniu juose.',
     ],
     'tooltips' => [
-        'preview_website' => 'Peržiūrėti svetainę'
+        'preview_website' => 'Peržiūrėti svetainę',
     ],
     'mysettings' => [
         'menu_label' => 'Mano nustatymai',
-        'menu_description' => 'Nustatymai susieto su Jūsų administracine anketa'
+        'menu_description' => 'Nustatymai susieto su Jūsų administracine anketa',
     ],
     'myaccount' => [
         'menu_label' => 'Mano anketa',
         'menu_description' => 'Atnaujinkite savo anketos informaciją tokią kaip vardas, el.paštas ir slaptažodis.',
-        'menu_keywords' => 'saugus prisijungimas'
+        'menu_keywords' => 'saugus prisijungimas',
     ],
     'branding' => [
         'menu_label' => 'Redaguoti posistemę',
@@ -387,7 +387,7 @@
         'menu_mode' => 'Meniu stilius',
         'menu_mode_inline' => 'Linijoje',
         'menu_mode_tile' => 'Langeliais',
-        'menu_mode_collapsed' => 'Sutraukta'
+        'menu_mode_collapsed' => 'Sutraukta',
     ],
     'backend_preferences' => [
         'menu_label' => 'Posistemės savybės',
@@ -397,7 +397,7 @@
         'timezone' => 'Laiko Juosta',
         'timezone_comment' => 'Pritaikyti rodomas datas šiai laiko juostai.',
         'locale' => 'Kalba',
-        'locale_comment' => 'Pasirinkite norimą kalbą.'
+        'locale_comment' => 'Pasirinkite norimą kalbą.',
     ],
     'access_log' => [
         'hint' => 'Šis registras rodo sėkmingų administratoriaus prisijungimų sąrašą. Įrašai yra saugomi viso :days dienų.',
@@ -408,12 +408,12 @@
         'ip_address' => 'IP adresas',
         'first_name' => 'Vardas',
         'last_name' => 'Pavardė',
-        'email' => 'El.paštas'
+        'email' => 'El.paštas',
     ],
     'filter' => [
         'all' => 'viską',
         'options_method_not_exists' => "Modelio klasė :model turi nurodyti metodą :method() gražinantš parinktis ':filter' filtrui.",
-        'date_all' => 'visas periodas'
+        'date_all' => 'visas periodas',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Įkelkite CSV failą',
@@ -484,15 +484,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Įkelti ir tvarkyti media elementus - paveiksliukus, video, garsus, dokumentus'
+        'manage_media' => 'Įkelti ir tvarkyti media elementus - paveiksliukus, video, garsus, dokumentus',
     ],
     'mediafinder' => [
         'label' => 'Failų Tvarkyklė',
-        'default_prompt' => 'Spauskite %s mygtuką media failų paieškai'
+        'default_prompt' => 'Spauskite %s mygtuką media failų paieškai',
     ],
     'media' => [
         'menu_label' => 'Media',
@@ -557,5 +557,5 @@
         'rename_new_name' => 'Naujas pavadinimas',
         'move_please_select' => 'prašome pasirinkti',
         'move_button' => 'Perkelti',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/lv/lang.php b/modules/backend/lang/lv/lang.php
index 093ee9b94a..7d8a1d786b 100644
--- a/modules/backend/lang/lv/lang.php
+++ b/modules/backend/lang/lv/lang.php
@@ -366,7 +366,7 @@
         'missing_relation' => "Modelis ':class' nesatur definīciju ':relation'.",
         'missing_method' => "Modelis ':class' nesatur metodi ':method'.",
         'invalid_class' => "Klasē :class lietotais modelis :model nav derīgs, modelim jāpārmanto \Model klase.",
-        'mass_assignment_failed' => "Masveida vērtību piešķiršana neizdevās modeļa atribūtam ':attribute'."
+        'mass_assignment_failed' => "Masveida vērtību piešķiršana neizdevās modeļa atribūtam ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Sistēmas konfigurācijas padomi',
diff --git a/modules/backend/lang/nb-no/lang.php b/modules/backend/lang/nb-no/lang.php
index e6aa336979..f98ad35a27 100644
--- a/modules/backend/lang/nb-no/lang.php
+++ b/modules/backend/lang/nb-no/lang.php
@@ -2,31 +2,31 @@
 
 return [
     'auth' => [
-        'title' => 'Administrasjonsområde'
+        'title' => 'Administrasjonsområde',
     ],
     'field' => [
         'invalid_type' => 'Ugyldig felttype brukt :type.',
-        'options_method_not_exists' => "Modellklassen :model må definere en metode :method() som returnerer vilkår for formfeltet ':field'."
+        'options_method_not_exists' => "Modellklassen :model må definere en metode :method() som returnerer vilkår for formfeltet ':field'.",
     ],
     'widget' => [
         'not_registered' => "En widget med klassenavnet ':name' har ikke blitt registrert",
-        'not_bound' => "En widget med klassenavnet ':name' er ikke bundet til kontrolleren"
+        'not_bound' => "En widget med klassenavnet ':name' er ikke bundet til kontrolleren",
     ],
     'page' => [
         'untitled' => 'Uten navn',
         'access_denied' => [
             'label' => 'Ingen tilgang',
             'help' => "Du har ikke nødvendig tilgang til å se denne siden.",
-            'cms_link' => 'Tilbake til backend'
+            'cms_link' => 'Tilbake til backend',
         ],
         'no_database' => [
             'label' => 'Database mangler',
             'help' => "En database kreves for å koble til backend. Sjekk at databasetilgang er konfigurert og migrert før du prøver igjen.",
-            'cms_link' => 'Tilbake til hovedsiden'
+            'cms_link' => 'Tilbake til hovedsiden',
         ],
     ],
     'partial' => [
-        'not_found_name' => "En partial ved navn ':name' ble ikke funnet."
+        'not_found_name' => "En partial ved navn ':name' ble ikke funnet.",
     ],
     'account' => [
         'sign_out' => 'Logg ut',
@@ -48,7 +48,7 @@
         'apply' => 'Fortsett',
         'cancel' => 'Avbryt',
         'delete' => 'Slett',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Dashboard',
@@ -95,7 +95,7 @@
             'last_sign_in' => 'Forrige innlogging var',
             'view_access_logs' => 'Vis adgangslogg',
             'nice_message' => 'Ha en fantastisk dag!!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrator',
@@ -142,11 +142,11 @@
             'new' => 'Ny gruppe',
             'delete_confirm' => 'Vil du virkelig slette denne administratorgruppen?',
             'return' => 'Tilbake til gruppeoversikten',
-            'users_count' => 'Antall brukere'
+            'users_count' => 'Antall brukere',
         ],
         'preferences' => [
-            'not_authenticated' => 'Det er ingen autentiserte brukere å laste eller lagre innstillinger for.'
-        ]
+            'not_authenticated' => 'Det er ingen autentiserte brukere å laste eller lagre innstillinger for.',
+        ],
     ],
     'list' => [
         'default_title' => 'Liste',
@@ -175,7 +175,7 @@
         'delete_selected_confirm' => 'Vil du slette valgte rader?',
         'delete_selected_success' => 'Rader har blitt slettet.',
         'column_switch_true' => 'Ja',
-        'column_switch_false' => 'Nei'
+        'column_switch_false' => 'Nei',
     ],
     'fileupload' => [
         'attachment' => 'Vedlegg',
@@ -187,7 +187,7 @@
         'upload_file' => 'Last opp fil',
         'upload_error' => 'Feil ved opplasting',
         'remove_confirm' => 'Er du sikker?',
-        'remove_file' => 'Fjern filen'
+        'remove_file' => 'Fjern filen',
     ],
     'form' => [
         'create_title' => 'Ny :name',
@@ -243,10 +243,10 @@
         'delete_row' => 'Slett rad',
         'concurrency_file_changed_title' => 'Filen er endret',
         'concurrency_file_changed_description' => "Filen du endrer på har blitt endret på disken av en annen bruker. Du kan enten oppdatere filen og tape endret data, eller overskrive filen på disken.",
-        'return_to_list' => 'Tilbake til listen'
+        'return_to_list' => 'Tilbake til listen',
     ],
     'recordfinder' => [
-        'find_record' => 'Finn oppføring'
+        'find_record' => 'Finn oppføring',
     ],
     'relation' => [
         'missing_config' => "Relasjonen mangler en konfigurasjon for ':config'.",
@@ -283,7 +283,7 @@
     ],
     'reorder' => [
         'default_title' => 'Sortere oppføringer',
-        'no_records' => 'Det er ingen tilgjengelige oppføringer å sortere.'
+        'no_records' => 'Det er ingen tilgjengelige oppføringer å sortere.',
     ],
     'model' => [
         'name' => 'Modell',
@@ -292,13 +292,13 @@
         'missing_relation' => "Modellen ':class' mangler en definisjon for ':relation'.",
         'missing_method' => "Modellen ':class' mangler metoden ':method'.",
         'invalid_class' => "Modellen :model som brukes i :class er ugyldig, den må arve \Model-klassen.",
-        'mass_assignment_failed' => "Mass assignment feilet for modell-attributten ':attribute'."
+        'mass_assignment_failed' => "Mass assignment feilet for modell-attributten ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Tips for systemkonfigurasjon',
         'tips_description' => 'Det er problemer du må være oppmerksom på for å konfigurere systemet riktig.',
         'permissions'  => 'Mappen :name eller dens undermapper kan ikke skrives på av PHP. Vennligst sjekk skrivetilganger på serveren.',
-        'extension' => 'PHP-extensionen :name er ikke installert..'
+        'extension' => 'PHP-extensionen :name er ikke installert..',
     ],
     'editor' => [
         'menu_label' => 'Teksteditor-innstillinger',
@@ -344,19 +344,19 @@
         'no_wrap' => 'Ikke pakk inn tagger',
         'no_wrap_comment' => 'Liste av tagger som ikke kan puttes inne i block-tagger.',
         'remove_tags' => 'Fjern tagger',
-        'remove_tags_comment' => 'Liste over tagger som fjernes med innholdet.'
+        'remove_tags_comment' => 'Liste over tagger som fjernes med innholdet.',
     ],
     'tooltips' => [
-        'preview_website' => 'Forhåndsvis nettsiden'
+        'preview_website' => 'Forhåndsvis nettsiden',
     ],
     'mysettings' => [
         'menu_label' => 'Mine innstillinger',
-        'menu_description' => 'Innstillinger relatert til din administratorkonto'
+        'menu_description' => 'Innstillinger relatert til din administratorkonto',
     ],
     'myaccount' => [
         'menu_label' => 'Min konto',
         'menu_description' => 'Oppdater dine kontodetaljer, som navn, e-postadresse og passord.',
-        'menu_keywords' => 'sikkerhetsinnlogging'
+        'menu_keywords' => 'sikkerhetsinnlogging',
     ],
     'branding' => [
         'menu_label' => 'Tilpass backend',
@@ -378,7 +378,7 @@
         'menu_mode' => 'Menystyil',
         'menu_mode_inline' => 'Inline',
         'menu_mode_tile' => 'Fliser',
-        'menu_mode_collapsed' => 'Kollapset'
+        'menu_mode_collapsed' => 'Kollapset',
     ],
     'backend_preferences' => [
         'menu_label' => 'Backend-innstillinger',
@@ -388,7 +388,7 @@
         'timezone' => 'Tidssone',
         'timezone_comment' => 'Formatér viste datoer til gjeldende tidssone.',
         'locale' => 'Språk',
-        'locale_comment' => 'Velg ønsket språk.'
+        'locale_comment' => 'Velg ønsket språk.',
     ],
     'access_log' => [
         'hint' => 'Denne loggen viser en liste over vellykkede administratorinnlogginger. Innloggingene blir lagret i 60 dager.',
@@ -399,12 +399,12 @@
         'ip_address' => 'IP-adresse',
         'first_name' => 'Fornavn',
         'last_name' => 'Etternavn',
-        'email' => 'E-postadresse'
+        'email' => 'E-postadresse',
     ],
     'filter' => [
         'all' => 'alle',
         'options_method_not_exists' => "Modellen :model må definere en metode :method() som sender tilbake regler for  ':filter' filteret.",
-        'date_all' => 'hele perioden'
+        'date_all' => 'hele perioden',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Last opp en CSV-fil',
@@ -475,14 +475,14 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
         'manage_media' => 'Last opp og behandle media - bilder, video, lydfiler, dokumenter',
     ],
     'mediafinder' => [
-        'default_prompt' => 'Klikk på %s knappen for å hente media'
+        'default_prompt' => 'Klikk på %s knappen for å hente media',
     ],
     'media' => [
         'menu_label' => 'Media',
@@ -547,5 +547,5 @@
         'rename_new_name' => 'Nytt navn',
         'move_please_select' => 'velg',
         'move_button' => 'Flytt',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index 425a3f4c10..fc978f1c4b 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -644,6 +644,6 @@
         'rename_popup_title' => 'Hernoemen',
         'rename_new_name' => 'Nieuwe naam',
         'move_please_select' => 'selecteer',
-        'move_button' => 'Verplaats'
+        'move_button' => 'Verplaats',
     ],
 ];
diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php
index d71bec0e4b..6244919dfa 100644
--- a/modules/backend/lang/pt-br/lang.php
+++ b/modules/backend/lang/pt-br/lang.php
@@ -3,14 +3,14 @@
 return [
     'auth' => [
         'title' => 'Área Administrativa',
-        'invalid_login' => 'Os dados digitados não correspondem aos nossos registros. Por favor, verifique e tente novamente.'
+        'invalid_login' => 'Os dados digitados não correspondem aos nossos registros. Por favor, verifique e tente novamente.',
     ],
     'field' => [
         'invalid_type' => 'Tipo de campo inválido :type.',
         'options_method_invalid_model' => 'O atributo ":field" não resolve a classe. Tente especificar as opções do método para o modelo :model.',
         'options_method_not_exists' => 'A classe :model deve definir um método :method() retornando opções para o campo ":field".',
         'options_static_method_invalid_value' => "O método estático ':method()' na :class não retornou um array de opções válidas.",
-        'colors_method_not_exists' => 'A classe de modelo :model deve definir um método :method() retornando códigos HEX de cor html para o campo de formulário ":field".'
+        'colors_method_not_exists' => 'A classe de modelo :model deve definir um método :method() retornando códigos HEX de cor html para o campo de formulário ":field".',
     ],
     'widget' => [
         'not_registered' => 'Uma classe de widget com o nome ":name" não foi definida',
@@ -40,7 +40,7 @@
     ],
     'ajax_handler' => [
         'invalid_name' => 'Nome do manipulador AJAX inválido: :name.',
-        'not_found' => "Manipulador AJAX ':name' não foi encontrado."
+        'not_found' => "Manipulador AJAX ':name' não foi encontrado.",
     ],
     'account' => [
         'impersonate' => 'Representar usuário',
@@ -123,7 +123,7 @@
             'last_sign_in' => 'Seu último acesso foi em',
             'view_access_logs' => 'Visualizar registros de acesso',
             'nice_message' => 'Tenha um excelente dia!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrador',
@@ -174,7 +174,7 @@
             'new' => 'Novo grupo administrador',
             'delete_confirm' => 'Você realmente deseja excluir este grupo?',
             'return' => 'Voltar para a lista de grupos',
-            'users_count' => 'Usuários'
+            'users_count' => 'Usuários',
         ],
         'role' => [
             'name' => 'Função',
@@ -188,7 +188,7 @@
             'new' => 'Nova Função',
             'delete_confirm' => 'Excluir esta função de administrador?',
             'return' => 'Retornar para lista de funções',
-            'users_count' => 'Usuários'
+            'users_count' => 'Usuários',
         ],
         'preferences' => [
             'not_authenticated' => 'Nenhum usuário autenticado para carregar as preferências.',
@@ -225,7 +225,7 @@
         'delete_selected_confirm' => 'Excluir os registros selecionados?',
         'delete_selected_success' => 'Registros selecionados excluídos com sucesso.',
         'column_switch_true' => 'Sim',
-        'column_switch_false' => 'Não'
+        'column_switch_false' => 'Não',
     ],
     'fileupload' => [
         'attachment' => 'Anexo',
@@ -237,7 +237,7 @@
         'upload_file' => 'Enviar arquivo',
         'upload_error' => 'Erro ao enviar',
         'remove_confirm' => 'Você tem certeza?',
-        'remove_file' => 'Remover arquivo'
+        'remove_file' => 'Remover arquivo',
     ],
     'repeater' => [
         'add_new_item' => 'Adicionar novo item',
@@ -431,7 +431,7 @@
         'paragraph_formats_comment' => 'As opções que aparecerão na lista de Formatos do parágrafo.',
     ],
     'tooltips' => [
-        'preview_website' => 'Visualizar a página'
+        'preview_website' => 'Visualizar a página',
     ],
     'mysettings' => [
         'menu_label' => 'Minhas Configurações',
@@ -440,7 +440,7 @@
     'myaccount' => [
         'menu_label' => 'Minha Conta',
         'menu_description' => 'Atualizar detalhes da sua conta, como nome, e-mail e senha.',
-        'menu_keywords' => 'login de segurança'
+        'menu_keywords' => 'login de segurança',
     ],
     'branding' => [
         'menu_label' => 'Personalização',
@@ -465,7 +465,7 @@
         'menu_mode_inline' => 'Em linha',
         'menu_mode_inline_no_icons' => 'Em linha (sem ícones)',
         'menu_mode_tile' => 'Blocos',
-        'menu_mode_collapsed' => 'Colapsados'
+        'menu_mode_collapsed' => 'Colapsados',
     ],
     'backend_preferences' => [
         'menu_label' => 'Preferências da Administração',
@@ -567,8 +567,8 @@
             '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' => 'Gerenciar mídias',
@@ -577,7 +577,7 @@
     'mediafinder' => [
         'label' => 'Localizador de Mídia',
         'default_prompt' => 'Clique no botão %s para localizar um arquivo de mídia',
-        'no_image' => 'A imagem não foi encontrada'
+        'no_image' => 'A imagem não foi encontrada',
     ],
     'media' => [
         'menu_label' => 'Mídias',
@@ -645,5 +645,5 @@
         'rename_new_name' => 'Novo nome',
         'move_please_select' => 'por favor selecione',
         'move_button' => 'Mover',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/pt-pt/lang.php b/modules/backend/lang/pt-pt/lang.php
index aa526cfb05..d592569182 100644
--- a/modules/backend/lang/pt-pt/lang.php
+++ b/modules/backend/lang/pt-pt/lang.php
@@ -118,7 +118,7 @@
             'last_sign_in' => 'O último acesso foi em',
             'view_access_logs' => 'Visualizar registos de acesso',
             'nice_message' => 'Tenha um excelente dia!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrador',
diff --git a/modules/backend/lang/ro/lang.php b/modules/backend/lang/ro/lang.php
index 80ddcf69d6..e8e0586657 100644
--- a/modules/backend/lang/ro/lang.php
+++ b/modules/backend/lang/ro/lang.php
@@ -191,7 +191,7 @@
             'users_count' => 'Utilizatori',
         ],
         'preferences' => [
-            'not_authenticated' => 'Nu există niciun utilizator autentificat pentru care să se încarce sau să se salveze preferințe.'
+            'not_authenticated' => 'Nu există niciun utilizator autentificat pentru care să se încarce sau să se salveze preferințe.',
         ],
         'trashed_hint_title' => 'Acest cont a fost șters',
         'trashed_hint_desc' => 'Acest cont a fost șters și nu se va mai putea conecta. Pentru a-l restabili, faceți clic pe pictograma din dreapta jos de restaurare a utilizatorului',
@@ -433,7 +433,7 @@
         'paragraph_formats_comment' => 'Opțiunile care vor apărea în câmpul derulant Format paragraf.',
     ],
     'tooltips' => [
-        'preview_website' => 'Previzualizare site'
+        'preview_website' => 'Previzualizare site',
     ],
     'mysettings' => [
         'menu_label' => 'Setările mele',
@@ -442,7 +442,7 @@
     'myaccount' => [
         'menu_label' => 'Contul meu',
         'menu_description' => 'Actualizați datele contului, precum nume, adresa de email și parola.',
-        'menu_keywords' => 'securitate autentificare'
+        'menu_keywords' => 'securitate autentificare',
     ],
     'branding' => [
         'menu_label' => 'Personalizați back-end-ul',
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
index b102c1cc4f..02b1288137 100644
--- a/modules/backend/lang/ru/lang.php
+++ b/modules/backend/lang/ru/lang.php
@@ -583,7 +583,7 @@
             'windows_1250' => 'Windows-1250 (CP1250, Central and Eastern European)',
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)',
-        ]
+        ],
     ],
     'permissions' => [
         'manage_media' => 'Загрузка и управление медиаконтентом - изображениями, видео, звуками, документами',
diff --git a/modules/backend/lang/sk/lang.php b/modules/backend/lang/sk/lang.php
index da20152937..fc44144f5c 100644
--- a/modules/backend/lang/sk/lang.php
+++ b/modules/backend/lang/sk/lang.php
@@ -3,7 +3,7 @@
 return [
     'auth' => [
         'title' => 'Administrácia',
-        'invalid_login' => 'Údaje, ktoré ste zadali sú nesprávne. Prosím skontrolujte údaje a skúste to znova.'
+        'invalid_login' => 'Údaje, ktoré ste zadali sú nesprávne. Prosím skontrolujte údaje a skúste to znova.',
     ],
     'field' => [
         'invalid_type' => 'Bol použitý zlý typ :type.',
@@ -14,7 +14,7 @@
     ],
     'widget' => [
         'not_registered' => "Trieda widget s menom ':name' nie je registrovaná",
-        'not_bound' => "Widget s názvom triedy ':name' nie je naviazaný na controller"
+        'not_bound' => "Widget s názvom triedy ':name' nie je naviazaný na controller",
     ],
     'page' => [
         'untitled' => 'Bez názvu',
@@ -26,12 +26,12 @@
         'access_denied' => [
             'label' => 'Prístup bol odmietnutý',
             'help' => "Nemáte potrebné oprávnenia na zobrazenie tejto stránky.",
-            'cms_link' => 'Späť do administrácie'
+            'cms_link' => 'Späť do administrácie',
         ],
         'no_database' => [
             'label' => 'Chýba databáza',
             'help' => "Pre prístup do administrácie je potrebná databáza. Zkontrolujte, či je databáza nakonfigurovaná, migrovaná a skúste to znova.",
-            'cms_link' => 'Späť na úvodnú stránku'
+            'cms_link' => 'Späť na úvodnú stránku',
         ],
     ],
     'partial' => [
@@ -127,7 +127,7 @@
             'last_sign_in' => 'Vaše posledné prihlásenie bolo',
             'view_access_logs' => 'Zobraziť záznam prihlásení',
             'nice_message' => 'Pekný deň!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrátor',
@@ -178,7 +178,7 @@
             'new' => 'Nová skupina',
             'delete_confirm' => 'Skutočne zmazať túto skupinu administrátorov?',
             'return' => 'Späť na zoznam skupín',
-            'users_count' => 'Užívateľov'
+            'users_count' => 'Užívateľov',
         ],
         'role' => [
             'name' => 'Rola',
@@ -192,10 +192,10 @@
             'new' => 'Nová rola',
             'delete_confirm' => 'Skutočne znazať túto rolu?',
             'return' => 'Späť na zoznam rolí',
-            'users_count' => 'Užívatelia'
+            'users_count' => 'Užívatelia',
         ],
         'preferences' => [
-            'not_authenticated' => 'Nebol nájdený žiadny prihlásený užívateľ pre načítanie alebo uloženie nastavení.'
+            'not_authenticated' => 'Nebol nájdený žiadny prihlásený užívateľ pre načítanie alebo uloženie nastavení.',
         ],
         'trashed_hint_title' => 'Konto bolo vymazané',
         'trashed_hint_desc' => 'Tento účet bol odstránený a nebude možné sa pod neho prihlásiť. Ak ho chcete obnoviť, kliknite na ikonu obnovenia používateľa vpravo dole',
@@ -229,7 +229,7 @@
         'delete_selected_confirm' => 'Skutočne chcete zmazať vybrané záznamy?',
         'delete_selected_success' => 'Vybrané záznamy boli zmazané.',
         'column_switch_true' => 'Áno',
-        'column_switch_false' => 'Nie'
+        'column_switch_false' => 'Nie',
     ],
     'fileupload' => [
         'attachment' => 'Príloha',
@@ -241,7 +241,7 @@
         'upload_file' => 'Nahrať súbor',
         'upload_error' => 'Chyba nahrávanie',
         'remove_confirm' => 'Ste si istý?',
-        'remove_file' => 'Odstrániť súbor'
+        'remove_file' => 'Odstrániť súbor',
     ],
     'repeater' => [
         'add_new_item' => 'Pridať novú položku',
@@ -307,7 +307,7 @@
         'delete_row' => 'Zmazať riadok',
         'concurrency_file_changed_title' => 'Súbor bol zmenený',
         'concurrency_file_changed_description' => "Súbor, ktorý upravujete bol na disku zmenený iným užívateľom. Môžete buď znovu načítať súbor a stratiť zmeny alebo prepísať súbor na disku.",
-        'return_to_list' => 'Spať na zoznam'
+        'return_to_list' => 'Spať na zoznam',
     ],
     'recordfinder' => [
         'find_record' => 'Nájsť záznam',
@@ -316,7 +316,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Odkaz na stránku',
-        'select_page' => 'Vyberte stránku...'
+        'select_page' => 'Vyberte stránku...',
     ],
     'relation' => [
         'missing_config' => "Správanie relácie nemá žiadne nastavenie pre ':config'.",
@@ -350,11 +350,11 @@
         'link_name' => 'Väzba :name',
         'unlink' => 'Zrušiť väzbu',
         'unlink_name' => 'Zrušiť väzbu :name',
-        'unlink_confirm' => 'Ste si istý?'
+        'unlink_confirm' => 'Ste si istý?',
     ],
     'reorder' => [
         'default_title' => 'Zoradiť záznamy',
-        'no_records' => 'Nenašli sa žiadne záznamy na zoradenie.'
+        'no_records' => 'Nenašli sa žiadne záznamy na zoradenie.',
     ],
     'model' => [
         'name' => 'Model',
@@ -363,7 +363,7 @@
         'missing_relation' => "Model ':class' neobsahuje definíciu pre ':relation'.",
         'missing_method' => "Model ':class' nemá implementovanú metódu ':method'.",
         'invalid_class' => "Model :model použitý v :class nie je platný, musí dediť triedu \Model.",
-        'mass_assignment_failed' => "Hromadné priradenie zlyhalo pre atribút ':attribute'."
+        'mass_assignment_failed' => "Hromadné priradenie zlyhalo pre atribút ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Tipy pre konfiguráciu systému',
@@ -439,16 +439,16 @@
         'paragraph_formats_comment' => 'Možnosti, ktoré sa zobrazia v rozbaľovacej ponuke Formát odseku.',
     ],
     'tooltips' => [
-        'preview_website' => 'Náhľad stránok'
+        'preview_website' => 'Náhľad stránok',
     ],
     'mysettings' => [
         'menu_label' => 'Moje nastavenia',
-        'menu_description' => 'Nastavenia vášho administrátorského účtu'
+        'menu_description' => 'Nastavenia vášho administrátorského účtu',
     ],
     'myaccount' => [
         'menu_label' => 'Môj účet',
         'menu_description' => 'Nastavte si detaily svojho účtu ako meno, e-mail a heslo.',
-        'menu_keywords' => 'bezpečnosť login'
+        'menu_keywords' => 'bezpečnosť login',
     ],
     'branding' => [
         'menu_label' => 'Nastavenia administrácie',
@@ -478,7 +478,7 @@
         'menu_mode_inline' => 'V riadku',
         'menu_mode_inline_no_icons' => 'V riadku (žiadne ikony)',
         'menu_mode_tile' => 'Dlaždice',
-        'menu_mode_collapsed' => 'Zbalené'
+        'menu_mode_collapsed' => 'Zbalené',
     ],
     'backend_preferences' => [
         'menu_label' => 'Nastavenia administrácie',
@@ -488,7 +488,7 @@
         'timezone' => 'Časové pásmo',
         'timezone_comment' => 'Upraví zobrazenie času podľa tejto časovej zóny.',
         'locale' => 'Jazyk',
-        'locale_comment' => 'Vyberte jazyk administrácie.'
+        'locale_comment' => 'Vyberte jazyk administrácie.',
     ],
     'access_log' => [
         'hint' => 'Tento záznam zobrazuje zoznam úspešných administrátorských prihlásení. Záznamy sú uchovávané po dobu :days dní.',
@@ -501,7 +501,7 @@
         'ip_address' => 'IP adresa',
         'first_name' => 'Meno',
         'last_name' => 'Priezvisko',
-        'email' => 'E-mail'
+        'email' => 'E-mail',
     ],
     'filter' => [
         'all' => 'všetko',
@@ -580,8 +580,8 @@
             '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' => 'Nahrávanie a správa mediálneho obsahu - obrázkov, videí, zvukov, dokumentov',
diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
index f3aac2edc3..35c82a07be 100644
--- a/modules/backend/lang/sv/lang.php
+++ b/modules/backend/lang/sv/lang.php
@@ -2,7 +2,7 @@
 
 return [
     'auth' => [
-        'title' => 'Administrationsområde'
+        'title' => 'Administrationsområde',
     ],
     'field' => [
         'invalid_type' => 'Felaktig fälttyp använd :type.',
@@ -63,8 +63,8 @@
         'widget_title_error' => 'En widgets titel är tvingande.',
         'status' => [
             'widget_title_default' => 'Systemstatus',
-            'update_available' => '{0} uppdateringar tillgängliga!|{1} uppdatering tillgänglig!|[2,Inf] uppdateringar tillgängliga!'
-        ]
+            'update_available' => '{0} uppdateringar tillgängliga!|{1} uppdatering tillgänglig!|[2,Inf] uppdateringar tillgängliga!',
+        ],
     ],
     'user' => [
         'name' => 'Administratör',
@@ -105,11 +105,11 @@
             'new' => 'Ny administratörsgrupp',
             'delete_confirm' => 'Vill du verkligen radera denna administratörsgrupp?',
             'return' => 'Återgå till grupplistan',
-            'users_count' => 'Användare'
+            'users_count' => 'Användare',
         ],
         'preferences' => [
             'not_authenticated' => 'Det finns ingen autentiserad användare att ladda eller spara inställningar för',
-        ]
+        ],
     ],
     'list' => [
         'default_title' => 'Lista',
@@ -144,7 +144,7 @@
         'upload_file' => 'Ladda upp fil',
         'upload_error' => 'Fel vid uppladdning',
         'remove_confirm' => 'Är du säker?',
-        'remove_file' => 'Radera fil'
+        'remove_file' => 'Radera fil',
     ],
     'form' => [
         'create_title' => "Skapa :name",
@@ -195,7 +195,7 @@
         'insert_row' => 'Lägg till rad',
         'delete_row' => 'Radera rad',
         'concurrency_file_changed_title' => 'Filen var ändrad',
-        'concurrency_file_changed_description' => "Filen du redigerar har ändrats av en annan användare. Du kan antingen ladda om sidan och förlora dina ändringar eller skriva över filen med dina ändringar."
+        'concurrency_file_changed_description' => "Filen du redigerar har ändrats av en annan användare. Du kan antingen ladda om sidan och förlora dina ändringar eller skriva över filen med dina ändringar.",
     ],
     'relation' => [
         'missing_config' => "Relationsbeteendet har ingen konfiguration för ': config '.",
@@ -247,7 +247,7 @@
         'tips' => 'Systemkonfigurationstips',
         'tips_description' => 'Det finns problem som du behöver åtgärda för att konfigurera systemet ordentligt.',
         'permissions'  => 'Katalogen :name eller dess underkataloger är inte skrivbara av PHP. Väligen ändra dess motsvarande behörigheter för web-servern i denna katalogen.',
-        'extension' => 'PHP-tillägget: Namnet är inte installerat. Vänligen installera och aktivera det biblioteket.'
+        'extension' => 'PHP-tillägget: Namnet är inte installerat. Vänligen installera och aktivera det biblioteket.',
     ],
     'editor' => [
         'menu_label' => 'Kodnings preferenser',
@@ -261,19 +261,19 @@
         'auto_closing' => 'Stäng taggar och specialtecken automatiskt',
         'show_invisibles' => 'Visa dolda tecken',
         'show_gutter' => 'Visa ränna',
-        'theme' => 'Färgschema'
+        'theme' => 'Färgschema',
     ],
     'tooltips' => [
-        'preview_website' => 'Förhandsgranska websidan'
+        'preview_website' => 'Förhandsgranska websidan',
     ],
     'mysettings' => [
         'menu_label' => 'Mina inställningar',
-        'menu_description' => 'Inställningar rörande ditt administrationskonto'
+        'menu_description' => 'Inställningar rörande ditt administrationskonto',
     ],
     'myaccount' => [
         'menu_label' => 'Mitt konto',
         'menu_description' => 'Uppdatera dina kontouppgifter såsom namn, e-postadress och lösenord.',
-        'menu_keywords' => 'säkerhets inloggning'
+        'menu_keywords' => 'säkerhets inloggning',
     ],
     'branding' => [
         'menu_label' => 'Anpassa back-end',
@@ -290,13 +290,13 @@
         'secondary_color' => 'Sekundär color',
         'accent_color' => 'Accent color',
         'styles' => 'Formatmallar',
-        'custom_stylesheet' => 'Anpassad formatmall'
+        'custom_stylesheet' => 'Anpassad formatmall',
     ],
     'backend_preferences' => [
         'menu_label' => 'Back-end preferenser',
         'menu_description' => 'Hantera dina kontoinställningar såsom önskat språk.',
         'locale' => 'Språk',
-        'locale_comment' => 'Välj önskat språk.'
+        'locale_comment' => 'Välj önskat språk.',
     ],
     'access_log' => [
         'hint' => 'Denna logg visar en lista över lyckade inloggningsförsök till administratrationen. Registret behålls i :days dagar.',
@@ -307,16 +307,16 @@
         'ip_address' => 'IP adress',
         'first_name' => 'Förnamn',
         'last_name' => 'Efternamn',
-        'email' => 'E-post'
+        'email' => 'E-post',
     ],
     'filter' => [
-      'all' => 'alla'
+      'all' => 'alla',
     ],
     'permissions' => [
-        'manage_media' => 'Hantera media'
+        'manage_media' => 'Hantera media',
     ],
     'mediafinder' => [
-        'default_prompt' => 'Klicka på %s knappen för att hitta ett mediaföremål'
+        'default_prompt' => 'Klicka på %s knappen för att hitta ett mediaföremål',
     ],
     'media' => [
         'menu_label' => 'Media',
@@ -379,5 +379,5 @@
         'rename_new_name' => 'Nytt namn',
         'move_please_select' => 'Var god välj',
         'move_button' => 'Flytta',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
index ed3a764916..12b68682ce 100644
--- a/modules/backend/lang/tr/lang.php
+++ b/modules/backend/lang/tr/lang.php
@@ -195,7 +195,7 @@
             'users_count' => 'Kişiler',
         ],
         'preferences' => [
-            'not_authenticated' => 'Ayarları görüntülemek veya düzenlemek için yetkili bir kullanıcı yok.'
+            'not_authenticated' => 'Ayarları görüntülemek veya düzenlemek için yetkili bir kullanıcı yok.',
         ],
         'trashed_hint_title' => 'Bu hesap silindi',
         'trashed_hint_desc' => 'Bu hesap silindi ve oturum açılamadı. Tekrar aktifleştirmek için sağ alt kısımdaki kullanıcıyı aktifleştir simgesine tıklayın.',
diff --git a/modules/backend/lang/vn/lang.php b/modules/backend/lang/vn/lang.php
index 3d1671fa05..9e9f09f6d4 100644
--- a/modules/backend/lang/vn/lang.php
+++ b/modules/backend/lang/vn/lang.php
@@ -2,32 +2,32 @@
 
 return [
     'auth' => [
-        'title' => 'Khu vực quản trị'
+        'title' => 'Khu vực quản trị',
     ],
     'field' => [
         'invalid_type' => 'Loại Field không hợp lệ :type.',
         'options_method_invalid_model' => "Thuộc tính ':field' không đưa ra được model hợp lệ. Hãy thử chỉ định phương pháp tùy chọn cho model :model một cách rõ ràng.",
-        'options_method_not_exists' => "Model class :model phải khai báo :method() trả về tùy chọn cho trường ':field'."
+        'options_method_not_exists' => "Model class :model phải khai báo :method() trả về tùy chọn cho trường ':field'.",
     ],
     'widget' => [
         'not_registered' => "Tên của widget class ':name' chưa được đăng ký",
-        'not_bound' => "Widget với tên class ':name' đã không bị ràng buộc với controller"
+        'not_bound' => "Widget với tên class ':name' đã không bị ràng buộc với controller",
     ],
     'page' => [
         'untitled' => 'Không có tiêu đề',
         'access_denied' => [
             'label' => 'Truy cập bị chặn',
             'help' => "Bạn không đủ quyền để xem trang này.",
-            'cms_link' => 'Quay lại trang quản trị'
+            'cms_link' => 'Quay lại trang quản trị',
         ],
         'no_database' => [
             'label' => 'Không tìm thấy Database',
             'help' => "Bắt buộc phải có 1 database để truy cập vào trang quản trị. Kiểm tra lại cấu hình database và migrated trước khi thử lại.",
-            'cms_link' => 'Quay lại trang chủ'
+            'cms_link' => 'Quay lại trang chủ',
         ],
     ],
     'partial' => [
-        'not_found_name' => "Không tìm thấy partial ':name'."
+        'not_found_name' => "Không tìm thấy partial ':name'.",
     ],
     'account' => [
         'signed_in_as' => 'Đã đăng nhập với :full_name',
@@ -51,7 +51,7 @@
         'apply' => 'Áp dụng',
         'cancel' => 'Bỏ qua',
         'delete' => 'Xóa',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => 'Bảng điều khiển chính',
@@ -100,7 +100,7 @@
             'last_sign_in' => 'Lần cuối bạn đăng nhập vào lúc',
             'view_access_logs' => 'Xem nhật ký các lần đăng nhập',
             'nice_message' => 'Chúc bạn một ngày vui vẻ!',
-        ]
+        ],
     ],
     'user' => [
         'name' => 'Administrator',
@@ -149,7 +149,7 @@
             'new' => 'Nhóm mới',
             'delete_confirm' => 'Xóa nhóm này?',
             'return' => 'Quay lại danh sách nhóm',
-            'users_count' => 'Số user'
+            'users_count' => 'Số user',
         ],
         'role' => [
             'name' => 'Role',
@@ -163,11 +163,11 @@
             'new' => 'Thêm mới Role',
             'delete_confirm' => 'Xóa role này?',
             'return' => 'Quay lại trang  danh sách role',
-            'users_count' => 'Số user'
+            'users_count' => 'Số user',
         ],
         'preferences' => [
-            'not_authenticated' => 'Người dùng không xác định.'
-        ]
+            'not_authenticated' => 'Người dùng không xác định.',
+        ],
     ],
     'list' => [
         'default_title' => 'Trang danh sách các bản ghi',
@@ -198,7 +198,7 @@
         'delete_selected_confirm' => 'Xóa các bản ghi đã chọn?',
         'delete_selected_success' => 'Xóa thành công các bản ghi.',
         'column_switch_true' => 'Có',
-        'column_switch_false' => 'Không'
+        'column_switch_false' => 'Không',
     ],
     'fileupload' => [
         'attachment' => 'Tệp đính kèm',
@@ -210,7 +210,7 @@
         'upload_file' => 'Upload file',
         'upload_error' => 'Lỗi upload',
         'remove_confirm' => 'Bạn có chắc chắn muốn xóa?',
-        'remove_file' => 'Xóa file'
+        'remove_file' => 'Xóa file',
     ],
     'form' => [
         'create_title' => 'Thêm mới :name',
@@ -267,7 +267,7 @@
         'delete_row' => 'Xóa Row',
         'concurrency_file_changed_title' => 'File đã được thay đổi',
         'concurrency_file_changed_description' => "File bạn đang chỉnh sửa đã bị thay đổi bởi người khác. Bạn có thể tải lại và các thay đổi của bạn không được lưu hoặc ghi đè lên file đó",
-        'return_to_list' => 'Quay lại trang danh sách'
+        'return_to_list' => 'Quay lại trang danh sách',
     ],
     'recordfinder' => [
         'find_record' => 'Tìm kiếm bản ghi',
@@ -275,7 +275,7 @@
     ],
     'pagelist' => [
         'page_link' => 'Page link',
-        'select_page' => 'Lựa chọn một trang...'
+        'select_page' => 'Lựa chọn một trang...',
     ],
     'relation' => [
         'missing_config' => "Relation behavior không được cấu hình cho ':config'.",
@@ -308,11 +308,11 @@
         'link_name' => 'Link :name',
         'unlink' => 'Unlink',
         'unlink_name' => 'Unlink :name',
-        'unlink_confirm' => 'Bạn có chắc muốn xóa?'
+        'unlink_confirm' => 'Bạn có chắc muốn xóa?',
     ],
     'reorder' => [
         'default_title' => 'Xắp xếp các bản ghi',
-        'no_records' => 'Không có bản ghi nào để sắp xếp.'
+        'no_records' => 'Không có bản ghi nào để sắp xếp.',
     ],
     'model' => [
         'name' => 'Model',
@@ -321,7 +321,7 @@
         'missing_relation' => "Model ':class' không được định nghĩa cho ':relation'.",
         'missing_method' => "Model ':class' không có phương thức ':method'.",
         'invalid_class' => "Model :model sử dụng trong :class không hợp lệ, nó phải được kế thừa từ \Model class.",
-        'mass_assignment_failed' => "Có lỗi của Model attribute ':attribute'."
+        'mass_assignment_failed' => "Có lỗi của Model attribute ':attribute'.",
     ],
     'warnings' => [
         'tips' => 'Hướng dẫn cấu hình hệ thống',
@@ -379,16 +379,16 @@
         'toolbar_buttons_comment' => 'Các nút mặc định ở trên thanh công cụ  của Rich Editor.',
     ],
     'tooltips' => [
-        'preview_website' => 'Xem trước website'
+        'preview_website' => 'Xem trước website',
     ],
     'mysettings' => [
         'menu_label' => 'Những cài đặt của tôi',
-        'menu_description' => 'Những cài đặt liên quan đến tài khoản quản trị của bạn'
+        'menu_description' => 'Những cài đặt liên quan đến tài khoản quản trị của bạn',
     ],
     'myaccount' => [
         'menu_label' => 'Tài khoản của tôi',
         'menu_description' => 'Cập nhật thông tin tài khoản của bạn ví dụ như tên, email hoặc mật khẩu.',
-        'menu_keywords' => 'bảo mật đăng nhập'
+        'menu_keywords' => 'bảo mật đăng nhập',
     ],
     'branding' => [
         'menu_label' => 'Tùy chỉnh trang quản trị',
@@ -410,7 +410,7 @@
         'menu_mode' => 'Kiểu menu',
         'menu_mode_inline' => 'Icon và tiêu đề cùng một dòng',
         'menu_mode_tile' => 'Icon và tiêu đề khác dòng',
-        'menu_mode_collapsed' => 'Thu gọn icon và tiêu đề'
+        'menu_mode_collapsed' => 'Thu gọn icon và tiêu đề',
     ],
     'backend_preferences' => [
         'menu_label' => 'Tùy chỉnh cá nhân',
@@ -420,7 +420,7 @@
         'timezone' => 'Múi giờ',
         'timezone_comment' => 'Điều chỉnh thời gian hiển thị cho múi giờ này.',
         'locale' => 'Ngôn ngữ địa phương',
-        'locale_comment' => 'Chọn khu vực của bạn để sử dụng đúng ngôn ngữ.'
+        'locale_comment' => 'Chọn khu vực của bạn để sử dụng đúng ngôn ngữ.',
     ],
     'access_log' => [
         'hint' => 'Nhật ký những lần đăng nhập thành công của administrators. Số bản ghi được lưu trữ trong :days ngày.',
@@ -431,7 +431,7 @@
         'ip_address' => 'Địa chỉ IP',
         'first_name' => 'First name',
         'last_name' => 'Last name',
-        'email' => 'Email'
+        'email' => 'Email',
     ],
     'filter' => [
         'all' => 'tất cả',
@@ -508,15 +508,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => 'Tải lên và quản lý các tập tin đa phương tiện - images, videos, sounds, documents'
+        'manage_media' => 'Tải lên và quản lý các tập tin đa phương tiện - images, videos, sounds, documents',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
-        'default_prompt' => 'Bấm vào nút %s để tìm kiếm medai file'
+        'default_prompt' => 'Bấm vào nút %s để tìm kiếm medai file',
     ],
     'media' => [
         'menu_label' => 'Media',
diff --git a/modules/backend/lang/zh-cn/lang.php b/modules/backend/lang/zh-cn/lang.php
index 913bc8988a..0bc30e20ac 100644
--- a/modules/backend/lang/zh-cn/lang.php
+++ b/modules/backend/lang/zh-cn/lang.php
@@ -3,43 +3,43 @@
 return [
     'auth' => [
         'title' => '管理',
-        'invalid_login' => '无法匹配到您输入的相关内容，请检查后重试。'
+        'invalid_login' => '无法匹配到您输入的相关内容，请检查后重试。',
     ],
     'field' => [
         'invalid_type' => '不合法的字段类型 :type.',
         'options_method_invalid_model' => "属性 ':field' 不能解析为有效模型. 请尝试为模型类:model指定一个可选方法.",
         'options_method_not_exists' => "模型 :model 必须定义一个返回 ':field' 表单字段选项的方法 :method()。",
-        'colors_method_not_exists' => "模型 :model 必须定义一个返回十六进制格式的颜色值 ':field' 字段的 :method() 方法。 "
+        'colors_method_not_exists' => "模型 :model 必须定义一个返回十六进制格式的颜色值 ':field' 字段的 :method() 方法。 ",
     ],
     'widget' => [
         'not_registered' => "未注册部件 ':name' ",
-        'not_bound' => "部件 ':name' 未绑定至控制器"
+        'not_bound' => "部件 ':name' 未绑定至控制器",
     ],
     'page' => [
         'untitled' => '未命名',
         '404' => [
             'label'     => '找不到页面',
             'help'      => "无法访问到您请求的URL资源，试试其它的？",
-            'back_link' => '返回上个页面'
+            'back_link' => '返回上个页面',
         ],
         'access_denied' => [
             'label' => '拒绝访问',
             'help' => "您没有访问该页面所需的权限.",
-            'cms_link' => '返回后台'
+            'cms_link' => '返回后台',
         ],
         'no_database' => [
             'label' => '无法找到数据库',
             'help' => "需要数据库以访问后端。请在再次尝试之前检查数据库的配置和迁移。",
-            'cms_link' => '返回首页'
+            'cms_link' => '返回首页',
         ],
     ],
     'partial' => [
         'not_found_name' => "未找到部件 ':name' ",
-        'invalid_name' => '未知的部件名称 :name '
+        'invalid_name' => '未知的部件名称 :name ',
     ],
     'ajax_handler' => [
         'invalid_name' => '未知的AJAX处理方法 :name.',
-        'not_found' => "无法找到AJAX处理方法 ':name' "
+        'not_found' => "无法找到AJAX处理方法 ':name' ",
     ],
     'account' => [
         'signed_in_as' => '以 :full_name 身份登陆',
@@ -63,7 +63,7 @@
         'apply' => '应用',
         'cancel' => '取消',
         'delete' => '删除',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => '仪表盘',
@@ -112,7 +112,7 @@
             'last_sign_in' => '您最后登陆是',
             'view_access_logs' => '访问登陆日志',
             'nice_message' => '祝你有美好的一天！',
-        ]
+        ],
     ],
     'user' => [
         'name' => '管理员',
@@ -163,7 +163,7 @@
             'new' => '新管理组',
             'delete_confirm' => '您真的想要删除这个管理组?',
             'return' => '返回组列表',
-            'users_count' => '用户'
+            'users_count' => '用户',
         ],
         'role' => [
             'name' => '角色',
@@ -177,13 +177,13 @@
             'new' => '新建角色',
             'delete_confirm' => '确定删除该角色?',
             'return' => '返回角色列表',
-            'users_count' => '用户'
+            'users_count' => '用户',
         ],
         'preferences' => [
-            'not_authenticated' => '无认证用户加载或保存设置.'
+            'not_authenticated' => '无认证用户加载或保存设置.',
         ],
         'trashed_hint_title' => '该账户已经被删除',
-        'trashed_hint_desc' => '该账户已经被删除而无法登录。你可以点击右下角的恢复按钮进行恢复。'
+        'trashed_hint_desc' => '该账户已经被删除而无法登录。你可以点击右下角的恢复按钮进行恢复。',
     ],
     'list' => [
         'default_title' => '列表',
@@ -214,7 +214,7 @@
         'delete_selected_confirm' => '删除选中的项?',
         'delete_selected_success' => '成功删除选择项',
         'column_switch_true' => '是',
-        'column_switch_false' => '否'
+        'column_switch_false' => '否',
     ],
     'fileupload' => [
         'attachment' => '附件',
@@ -226,11 +226,11 @@
         'upload_file' => '上传文件',
         'upload_error' => '上传错误',
         'remove_confirm' => '你确定吗？',
-        'remove_file' => '删除文件'
+        'remove_file' => '删除文件',
     ],
     'repeater' => [
         'min_items_failed' => ':name 需要大于 :min ',
-        'max_items_failed' => ':name 需要小于 :max '
+        'max_items_failed' => ':name 需要小于 :max ',
     ],
     'form' => [
         'create_title' => '新 :name',
@@ -291,7 +291,7 @@
         'delete_row' => '删除行',
         'concurrency_file_changed_title' => '文件改动',
         'concurrency_file_changed_description' => "您正在编辑的文件正在被其他用户修改，您可以重载或覆盖磁盘上的文件。",
-        'return_to_list' => '返回列表'
+        'return_to_list' => '返回列表',
     ],
     'recordfinder' => [
         'find_record' => '查找记录',
@@ -300,7 +300,7 @@
     ],
     'pagelist' => [
         'page_link' => '页面链接',
-        'select_page' => '选择一个页面...'
+        'select_page' => '选择一个页面...',
     ],
     'relation' => [
         'missing_config' => "关系无配置文件 ':config'",
@@ -337,7 +337,7 @@
     ],
     'reorder' => [
         'default_title' => '重新排序记录',
-        'no_records' => '没有可供排序的记录.'
+        'no_records' => '没有可供排序的记录.',
     ],
     'model' => [
         'name' => '模型',
@@ -346,14 +346,14 @@
         'missing_relation' => "模型 ':class' 不包含 ':relation'.",
         'missing_method' => "模型 ':class' 不包含 ':method'.",
         'invalid_class' => "模型 :model 在 :class 中是不合法的，它必须继承 \\Model 类.",
-        'mass_assignment_failed' => "为模型属性':attribute'赋值失败."
+        'mass_assignment_failed' => "为模型属性':attribute'赋值失败.",
     ],
     'warnings' => [
         'tips' => '系统配置小技巧',
         'tips_description' => '您需要注意以下问题以使系统更好工作。',
         'permissions' => '目录 :name 或子目录对PHP不可写. 请在服务器中对此目录设置正确权限。',
         'extension' => 'PHP扩展 :name 未安装，请安装此库并激活扩展.',
-        'plugin_missing' => '依赖于未安装的插件 :name，请安装该插件.'
+        'plugin_missing' => '依赖于未安装的插件 :name，请安装该插件.',
     ],
     'editor' => [
         'menu_label' => '代码编辑器选项',
@@ -401,19 +401,19 @@
         'remove_tags' => '移除标签',
         'remove_tags_comment' => '所列标签将与其包裹的内容一起删除.',
         'toolbar_buttons' => '工具栏按钮',
-        'toolbar_buttons_comment' => '默认在富文本编辑器中显示的工具栏按钮。例如：'
+        'toolbar_buttons_comment' => '默认在富文本编辑器中显示的工具栏按钮。例如：',
     ],
     'tooltips' => [
-        'preview_website' => '预览网站'
+        'preview_website' => '预览网站',
     ],
     'mysettings' => [
         'menu_label' => '我的设置',
-        'menu_description' => '涉及您管理帐号的设置'
+        'menu_description' => '涉及您管理帐号的设置',
     ],
     'myaccount' => [
         'menu_label' => '我的账户',
         'menu_description' => '更新你的账户细节, 如姓名、邮件地址和密码.',
-        'menu_keywords' => '安全登录'
+        'menu_keywords' => '安全登录',
     ],
     'branding' => [
         'menu_label' => '自定义后台',
@@ -438,7 +438,7 @@
         'menu_mode_inline' => '行内',
         'menu_mode_inline_no_icons' => '行内（无图标）',
         'menu_mode_tile' => '标题',
-        'menu_mode_collapsed' => '已折叠'
+        'menu_mode_collapsed' => '已折叠',
     ],
     'backend_preferences' => [
         'menu_label' => '后台设置',
@@ -448,7 +448,7 @@
         'timezone' => '时区',
         'timezone_comment' => '选择您希望使用的本地语言。',
         'locale' => '语言',
-        'locale_comment' => '选择您想要的语言环境.'
+        'locale_comment' => '选择您想要的语言环境.',
     ],
     'access_log' => [
         'hint' => '此日志显示管理员成功登录信息。记录将保存 :days 天。',
@@ -461,13 +461,13 @@
         'ip_address' => 'IP地址',
         'first_name' => '名',
         'last_name' => '姓',
-        'email' => '电子邮箱'
+        'email' => '电子邮箱',
     ],
     'filter' => [
         'all' => '全部',
         'options_method_not_exists' => "模型 :model 必须定义方法 :method() 并为过滤器 ':filter'返回可选项.",
         'date_all' => '所有日期',
-        'number_all' => '任意数值'
+        'number_all' => '任意数值',
     ],
     'import_export' => [
         'upload_csv_file' => '1. 上传一个 CSV 文件',
@@ -539,15 +539,15 @@
             'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
             'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
             'windows_1251' => 'Windows-1251 (CP1251)',
-            'windows_1252' => 'Windows-1252 (CP1252)'
-        ]
+            'windows_1252' => 'Windows-1252 (CP1252)',
+        ],
     ],
     'permissions' => [
-        'manage_media' => '管理媒体'
+        'manage_media' => '管理媒体',
     ],
     'mediafinder' => [
         'label' => '媒体查找器',
-        'default_prompt' => '点击 %s 按钮查找媒体项'
+        'default_prompt' => '点击 %s 按钮查找媒体项',
     ],
     'media' => [
         'menu_label' => '媒体',
@@ -615,5 +615,5 @@
         'rename_new_name' => '新名称',
         'move_please_select' => '请选择',
         'move_button' => '移动',
-    ]
+    ],
 ];
diff --git a/modules/backend/lang/zh-tw/lang.php b/modules/backend/lang/zh-tw/lang.php
index 99ef90d8a8..cf7d34ad99 100644
--- a/modules/backend/lang/zh-tw/lang.php
+++ b/modules/backend/lang/zh-tw/lang.php
@@ -2,26 +2,26 @@
 
 return [
     'auth' => [
-        'title' => '管理介面'
+        'title' => '管理介面',
     ],
     'field' => [
         'invalid_type' => '錯誤的字串類型 :type',
-        'options_method_not_exists' => "模型 :model 必須定義一個返回 ':field' 表單字串選項的方法 :method()。"
+        'options_method_not_exists' => "模型 :model 必須定義一個返回 ':field' 表單字串選項的方法 :method()。",
     ],
     'widget' => [
         'not_registered' => "元件 ':name' 還沒註冊",
-        'not_bound' => "元件 ':name' 沒綁到控制器"
+        'not_bound' => "元件 ':name' 沒綁到控制器",
     ],
     'page' => [
         'untitled' => '未命名',
         'access_denied' => [
             'label' => '拒絕訪問',
             'help' => "您沒有訪問這個頁面需要的權限.",
-            'cms_link' => '返回管理介面'
-        ]
+            'cms_link' => '返回管理介面',
+        ],
     ],
     'partial' => [
-        'not_found_name' => "元件 ':name' 找不到."
+        'not_found_name' => "元件 ':name' 找不到.",
     ],
     'account' => [
         'sign_out' => '登出',
@@ -43,7 +43,7 @@
         'apply' => '套用',
         'cancel' => '取消',
         'delete' => '刪除',
-        'ok' => 'OK'
+        'ok' => 'OK',
     ],
     'dashboard' => [
         'menu_label' => '儀表板',
@@ -70,8 +70,8 @@
         'make_default_success' => '已設定此版面為預設。',
         'status' => [
             'widget_title_default' => '系統狀態',
-            'update_available' => '{0} 更新可用!|{1} 更新可用!|[2,Inf] 更新可用!'
-        ]
+            'update_available' => '{0} 更新可用!|{1} 更新可用!|[2,Inf] 更新可用!',
+        ],
     ],
     'user' => [
         'name' => '管理員',
@@ -114,8 +114,8 @@
             'return' => '返回群組列表',
         ],
         'preferences' => [
-            'not_authenticated' => '沒有認證使用者載入或儲存設定'
-        ]
+            'not_authenticated' => '沒有認證使用者載入或儲存設定',
+        ],
     ],
     'list' => [
         'default_title' => '列表',
@@ -144,7 +144,7 @@
         'attachment' => '附件',
         'help' => '給附件新增標題和描述',
         'title_label' => '標題',
-        'description_label' => '描述'
+        'description_label' => '描述',
     ],
     'form' => [
         'create_title' => '新 :name',
@@ -193,7 +193,7 @@
         'insert_row' => '插入行',
         'delete_row' => '刪除行',
         'concurrency_file_changed_title' => '檔案異動',
-        'concurrency_file_changed_description' => "您正在編輯的檔案正在被其他使用者修改. 您可以重新載入或覆蓋硬碟上的檔案."
+        'concurrency_file_changed_description' => "您正在編輯的檔案正在被其他使用者修改. 您可以重新載入或覆蓋硬碟上的檔案.",
     ],
     'relation' => [
         'missing_config' => "關聯沒有':config'的設定檔案.",
@@ -235,13 +235,13 @@
         'missing_relation' => "Model ':class' 不包含 ':relation'.",
         'missing_method' => "Model ':class' 不包含 ':method'.",
         'invalid_class' => "Model :model 在 :class 中是錯誤的, 必須繼承 \\Model class.",
-        'mass_assignment_failed' => "針對Model屬性':attribute'的大量賦值失敗."
+        'mass_assignment_failed' => "針對Model屬性':attribute'的大量賦值失敗.",
     ],
     'warnings' => [
         'tips' => '系統設定技巧',
         'tips_description' => '您需要注意那些issue, 以使系統設定正確',
         'permissions'  => '目錄 :name 或子目錄對PHP不可寫. 請對這個目錄上的webserver設定正確的權限',
-        'extension' => 'PHP外掛 :name 沒安裝. 請安裝這個庫並且啟用外掛'
+        'extension' => 'PHP外掛 :name 沒安裝. 請安裝這個庫並且啟用外掛',
     ],
     'editor' => [
         'menu_label' => '代碼編輯器選項',
@@ -254,19 +254,19 @@
         'highlight_active_line' => '醒目顯示操作中的行',
         'show_invisibles' => '顯示隱藏字元',
         'show_gutter' => '顯示gutter',
-        'theme' => '色彩主題'
+        'theme' => '色彩主題',
     ],
     'tooltips' => [
-        'preview_website' => '預覽網站'
+        'preview_website' => '預覽網站',
     ],
     'mysettings' => [
         'menu_label' => '我的設定',
-        'menu_description' => '設定涉及到您的管理帳號'
+        'menu_description' => '設定涉及到您的管理帳號',
     ],
     'myaccount' => [
         'menu_label' => '我的帳號',
         'menu_description' => '更新您的帳號細節, 例如名字, 郵件地址和密碼',
-        'menu_keywords' => '安全登入'
+        'menu_keywords' => '安全登入',
     ],
     'branding' => [
         'menu_label' => '自訂管理介面',
@@ -283,13 +283,13 @@
         'secondary_color' => '次要 color',
         'accent_color' => 'Accent color',
         'styles' => '樣式',
-        'custom_stylesheet' => '自訂樣式'
+        'custom_stylesheet' => '自訂樣式',
     ],
     'backend_preferences' => [
         'menu_label' => '管理介面設定',
         'menu_description' => '管理您的管理介面設定, 例如希望使用的語言。',
         'locale' => '語言',
-        'locale_comment' => '選擇您希望使用的本地語言。'
+        'locale_comment' => '選擇您希望使用的本地語言。',
     ],
     'access_log' => [
         'hint' => '這個log顯示了管理員成功登入的訊息. 記錄保持:days天。',
@@ -300,7 +300,7 @@
         'ip_address' => 'IP地址',
         'first_name' => '名',
         'last_name' => '姓',
-        'email' => 'Email'
+        'email' => 'Email',
     ],
     'filter' => [
         'all' => '全部',
@@ -308,11 +308,11 @@
         'number_all' => '全部數目',
     ],
     'permissions' => [
-        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
+        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents',
     ],
     'mediafinder' => [
         'label' => 'Media Finder',
-        'default_prompt' => 'Click the %s button to find a media item'
+        'default_prompt' => 'Click the %s button to find a media item',
     ],
     'media' => [
         'menu_label' => '媒體',
@@ -378,5 +378,5 @@
         'rename_new_name' => '新名稱',
         'move_please_select' => '請選擇',
         'move_button' => '移動',
-    ]
+    ],
 ];
diff --git a/modules/backend/models/AccessLog.php b/modules/backend/models/AccessLog.php
index 49ea1e2d3c..5d89393fa5 100644
--- a/modules/backend/models/AccessLog.php
+++ b/modules/backend/models/AccessLog.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Models;
 
-use Model;
-use Request;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Database\Model;
 
 /**
  * Model for logging access to the back-end
@@ -22,7 +22,7 @@ class AccessLog extends Model
      * @var array Relations
      */
     public $belongsTo = [
-        'user' => User::class
+        'user' => User::class,
     ];
 
     /**
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index c3a4a87210..bd39d837dc 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -2,16 +2,16 @@
 
 namespace Backend\Models;
 
-use App;
-use Backend;
-use Url;
-use File;
-use Lang;
-use Model;
-use Cache;
-use Config;
-use Less_Parser;
+use Backend\Facades\Backend;
 use Exception;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\URL;
+use Less_Parser;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Brand settings that affect all users
@@ -29,7 +29,7 @@ class BrandSetting extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \System\Behaviors\SettingsModel::class
+        \System\Behaviors\SettingsModel::class,
     ];
 
     /**
@@ -44,7 +44,7 @@ class BrandSetting extends Model
 
     public $attachOne = [
         'favicon' => \System\Models\File::class,
-        'logo' => \System\Models\File::class
+        'logo' => \System\Models\File::class,
     ];
 
     /**
diff --git a/modules/backend/models/EditorSetting.php b/modules/backend/models/EditorSetting.php
index 768033f619..d15a3eb81b 100644
--- a/modules/backend/models/EditorSetting.php
+++ b/modules/backend/models/EditorSetting.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Models;
 
-use File;
-use Cache;
-use Model;
-use Less_Parser;
 use Exception;
+use Illuminate\Support\Facades\Cache;
+use Less_Parser;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Editor settings that affect all users
@@ -23,7 +23,7 @@ class EditorSetting extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \System\Behaviors\SettingsModel::class
+        \System\Behaviors\SettingsModel::class,
     ];
 
     /**
@@ -171,7 +171,7 @@ public static function getConfiguredStyles($key, $default = null)
             if (array_has($value, ['class_name', 'class_label'])) {
                 return [
                     array_get($value, 'class_name'),
-                    array_get($value, 'class_label')
+                    array_get($value, 'class_label'),
                 ];
             }
         });
@@ -187,7 +187,7 @@ public static function getConfiguredFormats($key, $default = null)
             if (array_has($value, ['format_tag', 'format_label'])) {
                 return [
                     array_get($value, 'format_tag'),
-                    array_get($value, 'format_label')
+                    array_get($value, 'format_label'),
                 ];
             }
         });
diff --git a/modules/backend/models/ExportModel.php b/modules/backend/models/ExportModel.php
index 643a66aa31..fac18e5e35 100644
--- a/modules/backend/models/ExportModel.php
+++ b/modules/backend/models/ExportModel.php
@@ -2,14 +2,14 @@
 
 namespace Backend\Models;
 
-use File;
-use Lang;
-use Model;
-use Response;
-use League\Csv\Writer as CsvWriter;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Response;
 use League\Csv\EscapeFormula as CsvEscapeFormula;
-use ApplicationException;
+use League\Csv\Writer as CsvWriter;
 use SplTempFileObject;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Model used for exporting data
@@ -89,7 +89,7 @@ protected function processExportData($columns, $results, $options)
             'fileName' => 'export.csv',
             'delimiter' => null,
             'enclosure' => null,
-            'escape' => null
+            'escape' => null,
         ];
 
         $options = array_merge($defaultOptions, $options);
diff --git a/modules/backend/models/ImportModel.php b/modules/backend/models/ImportModel.php
index 7fac6582c9..f6aef213c7 100644
--- a/modules/backend/models/ImportModel.php
+++ b/modules/backend/models/ImportModel.php
@@ -3,11 +3,11 @@
 namespace Backend\Models;
 
 use Backend\Behaviors\ImportExportController\TranscodeFilter;
-use Str;
-use Lang;
-use Model;
+use Illuminate\Support\Facades\Lang;
 use League\Csv\Reader as CsvReader;
 use League\Csv\Statement as CsvStatement;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Str;
 
 /**
  * Model used for importing data
@@ -40,7 +40,7 @@ abstract class ImportModel extends Model
         'created' => 0,
         'errors' => [],
         'warnings' => [],
-        'skipped' => []
+        'skipped' => [],
     ];
 
     /**
@@ -101,7 +101,7 @@ protected function processImportData($filePath, $matches, $options)
             'delimiter' => null,
             'enclosure' => null,
             'escape' => null,
-            'encoding' => null
+            'encoding' => null,
         ];
 
         $options = array_merge($defaultOptions, $options);
@@ -238,7 +238,7 @@ public function getFormatEncodingOptions()
             'iso-8859-15',
             'Windows-1250',
             'Windows-1251',
-            'Windows-1252'
+            'Windows-1252',
         ];
 
         $translated = array_map(function ($option) {
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index d63ec13007..03fa8f453d 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -2,15 +2,15 @@
 
 namespace Backend\Models;
 
-use App;
-use Lang;
-use Model;
-use Config;
-use Session;
-use BackendAuth;
-use DirectoryIterator;
+use Backend\Facades\BackendAuth;
 use DateTime;
 use DateTimeZone;
+use DirectoryIterator;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+use Session;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Backend preferences for the backend user
@@ -28,7 +28,7 @@ class Preference extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \Backend\Behaviors\UserPreferencesModel::class
+        \Backend\Behaviors\UserPreferencesModel::class,
     ];
 
     /**
@@ -246,7 +246,7 @@ public function getTimezoneOptions()
 
             $tempTimezones[] = [
                 'offset' => (int) $currentTimezone->getOffset($utcTime),
-                'identifier' => $timezoneIdentifier
+                'identifier' => $timezoneIdentifier,
             ];
         }
 
diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php
index deb800c909..024490e4ec 100644
--- a/modules/backend/models/User.php
+++ b/modules/backend/models/User.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Models;
 
-use Mail;
-use Event;
-use Backend;
-use BackendAuth;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
 use Winter\Storm\Auth\Models\User as UserBase;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Administrator user model
@@ -30,7 +30,7 @@ class User extends UserBase
         '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_confirmation' => 'required_with:password|min:4',
     ];
 
     /**
@@ -48,15 +48,15 @@ class User extends UserBase
      * Relations
      */
     public $belongsToMany = [
-        'groups' => [UserGroup::class, 'table' => 'backend_users_groups', 'softDelete' => true]
+        'groups' => [UserGroup::class, 'table' => 'backend_users_groups', 'softDelete' => true],
     ];
 
     public $belongsTo = [
-        'role' => UserRole::class
+        'role' => UserRole::class,
     ];
 
     public $attachOne = [
-        'avatar' => \System\Models\File::class
+        'avatar' => \System\Models\File::class,
     ];
 
     /**
diff --git a/modules/backend/models/UserGroup.php b/modules/backend/models/UserGroup.php
index c923ec8d8f..76970e9d17 100644
--- a/modules/backend/models/UserGroup.php
+++ b/modules/backend/models/UserGroup.php
@@ -31,7 +31,7 @@ class UserGroup extends GroupBase
      */
     public $belongsToMany = [
         'users' => [User::class, 'table' => 'backend_users_groups'],
-        'users_count' => [User::class, 'table' => 'backend_users_groups', 'count' => true]
+        'users_count' => [User::class, 'table' => 'backend_users_groups', 'count' => true],
     ];
 
     public function afterCreate()
diff --git a/modules/backend/models/UserPreference.php b/modules/backend/models/UserPreference.php
index 405929b227..cd70da8a02 100644
--- a/modules/backend/models/UserPreference.php
+++ b/modules/backend/models/UserPreference.php
@@ -2,8 +2,7 @@
 
 namespace Backend\Models;
 
-use BackendAuth;
-use SystemException;
+use Backend\Facades\BackendAuth;
 use Winter\Storm\Auth\Models\Preferences as PreferencesBase;
 
 /**
diff --git a/modules/backend/models/UserRole.php b/modules/backend/models/UserRole.php
index 9f8bcc62ec..2c72a0f390 100644
--- a/modules/backend/models/UserRole.php
+++ b/modules/backend/models/UserRole.php
@@ -34,7 +34,7 @@ class UserRole extends RoleBase
      */
     public $hasMany = [
         'users' => [User::class, 'key' => 'role_id'],
-        'users_count' => [User::class, 'key' => 'role_id', 'count' => true]
+        'users_count' => [User::class, 'key' => 'role_id', 'count' => true],
     ];
 
     public function filterFields($fields)
@@ -78,7 +78,7 @@ public function isSystemRole()
         if (
             $this->is_system || in_array($this->code, [
             self::CODE_DEVELOPER,
-            self::CODE_PUBLISHER
+            self::CODE_PUBLISHER,
             ])
         ) {
             return true;
diff --git a/modules/backend/models/UserThrottle.php b/modules/backend/models/UserThrottle.php
index 5537e4a880..c4c574079b 100644
--- a/modules/backend/models/UserThrottle.php
+++ b/modules/backend/models/UserThrottle.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Models;
 
-use Config;
 use Winter\Storm\Auth\Models\Throttle as ThrottleBase;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Administrator throttling model
@@ -22,7 +22,7 @@ class UserThrottle extends ThrottleBase
      * @var array Relations
      */
     public $belongsTo = [
-        'user' => User::class
+        'user' => User::class,
     ];
 
     /**
diff --git a/modules/backend/reportwidgets/Welcome.php b/modules/backend/reportwidgets/Welcome.php
index 602e21a044..c325660a62 100644
--- a/modules/backend/reportwidgets/Welcome.php
+++ b/modules/backend/reportwidgets/Welcome.php
@@ -2,9 +2,9 @@
 
 namespace Backend\ReportWidgets;
 
-use BackendAuth;
-use Backend\Models\AccessLog;
 use Backend\Classes\ReportWidgetBase;
+use Backend\Facades\BackendAuth;
+use Backend\Models\AccessLog;
 use Backend\Models\BrandSetting;
 use Exception;
 
@@ -44,7 +44,7 @@ public function defineProperties()
                 'type'              => 'string',
                 'validationPattern' => '^.+$',
                 'validationMessage' => 'backend::lang.dashboard.widget_title_error',
-            ]
+            ],
         ];
     }
 
diff --git a/modules/backend/routes.php b/modules/backend/routes.php
index 7ca92974df..4404e96b9e 100644
--- a/modules/backend/routes.php
+++ b/modules/backend/routes.php
@@ -24,7 +24,7 @@
      */
     Route::group([
         'middleware' => ['web'],
-        'prefix' => Config::get('cms.backendUri', 'backend')
+        'prefix' => Config::get('cms.backendUri', 'backend'),
     ], function () {
         Route::any('{slug?}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?');
     });
diff --git a/modules/backend/skins/Standard.php b/modules/backend/skins/Standard.php
index 2fb72cd9a4..14301abd9e 100644
--- a/modules/backend/skins/Standard.php
+++ b/modules/backend/skins/Standard.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Skins;
 
-use File;
 use Backend\Classes\Skin;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Standard skin information file.
@@ -32,7 +32,7 @@ public function __construct()
     public function skinDetails()
     {
         return [
-            'name' => 'Default Skin'
+            'name' => 'Default Skin',
         ];
     }
 
diff --git a/modules/backend/tests/classes/AuthManagerTest.php b/modules/backend/tests/classes/AuthManagerTest.php
index cc112db10c..2b02f5be13 100644
--- a/modules/backend/tests/classes/AuthManagerTest.php
+++ b/modules/backend/tests/classes/AuthManagerTest.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Tests\Classes;
 
+use Backend\Classes\AuthManager;
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\SystemException;
-use Backend\Classes\AuthManager;
 
 class AuthManagerTest extends TestCase
 {
@@ -23,13 +23,13 @@ public function setUp(): void
             'test.permission_one' => [
                 'label' => 'Test Permission 1',
                 'tab' => 'Test',
-                'order' => 200
+                'order' => 200,
             ],
             'test.permission_two' => [
                 'label' => 'Test Permission 2',
                 'tab' => 'Test',
-                'order' => 300
-            ]
+                'order' => 300,
+            ],
         ]);
     }
 
@@ -52,7 +52,7 @@ public function testListPermissions()
         $this->assertCount(2, $permissions);
         $this->assertEquals([
             'test.permission_one',
-            'test.permission_two'
+            'test.permission_two',
         ], $permissions);
     }
 
@@ -62,8 +62,8 @@ public function testRegisterPermissions()
             'test.permission_three' => [
                 'label' => 'Test Permission 3',
                 'tab' => 'Test',
-                'order' => 100
-            ]
+                'order' => 100,
+            ],
         ]);
 
         $permissions = $this->listNewPermissions();
@@ -71,7 +71,7 @@ public function testRegisterPermissions()
         $this->assertEquals([
             'test.permission_three',
             'test.permission_one',
-            'test.permission_two'
+            'test.permission_two',
         ], $permissions);
     }
 
@@ -87,7 +87,7 @@ public function testAliasesPermissions()
         $permissions = $this->listNewPermissions();
         $this->assertCount(1, $permissions);
         $this->assertEquals([
-            'test.permission_two'
+            'test.permission_two',
         ], $permissions);
     }
 
@@ -99,8 +99,8 @@ public function testRegisterPermissionsThroughCallbacks()
                 'test.permission_three' => [
                     'label' => 'Test Permission 3',
                     'tab' => 'Test',
-                    'order' => 100
-                ]
+                    'order' => 100,
+                ],
             ]);
         });
 
@@ -110,8 +110,8 @@ public function testRegisterPermissionsThroughCallbacks()
                 'test.permission_four' => [
                     'label' => 'Test Permission 4',
                     'tab' => 'Test',
-                    'order' => 400
-                ]
+                    'order' => 400,
+                ],
             ]);
         });
 
@@ -121,7 +121,7 @@ public function testRegisterPermissionsThroughCallbacks()
             'test.permission_three',
             'test.permission_one',
             'test.permission_two',
-            'test.permission_four'
+            'test.permission_four',
         ], $permissions);
     }
 
@@ -131,8 +131,8 @@ public function testRegisterAdditionalTab()
             'test.permission_three' => [
                 'label' => 'Test Permission 3',
                 'tab' => 'Test 2',
-                'order' => 100
-            ]
+                'order' => 100,
+            ],
         ]);
 
         $this->instance->registerCallback(function ($manager) {
@@ -140,8 +140,8 @@ public function testRegisterAdditionalTab()
                 'test.permission_four' => [
                     'label' => 'Test Permission 4',
                     'tab' => 'Test 2',
-                    'order' => 400
-                ]
+                    'order' => 400,
+                ],
             ]);
         });
 
@@ -154,11 +154,11 @@ public function testRegisterAdditionalTab()
         $this->assertCount(2, $tabs);
         $this->assertEquals([
             'Test 2',
-            'Test'
+            'Test',
         ], array_keys($tabs));
         $this->assertEquals([
             'test.permission_three',
-            'test.permission_four'
+            'test.permission_four',
         ], collect($tabs['Test 2'])->pluck('code')->toArray());
         $this->assertEquals([
             'test.permission_one',
@@ -173,7 +173,7 @@ public function testRemovePermission()
         $permissions = $this->listNewPermissions();
         $this->assertCount(1, $permissions);
         $this->assertEquals([
-            'test.permission_two'
+            'test.permission_two',
         ], $permissions);
     }
 
diff --git a/modules/backend/tests/classes/NavigationManagerTest.php b/modules/backend/tests/classes/NavigationManagerTest.php
index 91e76df866..197bd454c6 100644
--- a/modules/backend/tests/classes/NavigationManagerTest.php
+++ b/modules/backend/tests/classes/NavigationManagerTest.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Backend\Classes\NavigationManager;
+use System\Tests\Bootstrap\TestCase;
 
 class NavigationManagerTest extends TestCase
 {
@@ -18,8 +18,8 @@ public function testRegisterMenuItems()
                 'label' => 'Dashboard',
                 'icon' => 'icon-dashboard',
                 'url' => 'http://example.com',
-                'order' => 100
-            ]
+                'order' => 100,
+            ],
         ]);
 
         $items = $manager->listMainMenuItems();
@@ -88,8 +88,8 @@ public function testAddMainMenuItems()
             'print' => [
                 'label' => 'Print',
                 'icon' => 'icon-print',
-                'url' => 'javascript:window.print()'
-            ]
+                'url' => 'javascript:window.print()',
+            ],
         ]);
 
         $items = $manager->listMainMenuItems();
@@ -113,8 +113,8 @@ public function testAddMainMenuItemsWithAlias()
             'print' => [
                 'label' => 'Print',
                 'icon' => 'icon-print',
-                'url' => 'javascript:window.print()'
-            ]
+                'url' => 'javascript:window.print()',
+            ],
         ]);
 
         $manager->registerOwnerAlias('Winter.Tester', 'Alias.Tester');
@@ -136,8 +136,8 @@ public function testRemoveMainMenuItem()
             'close' => [
                 'label' => 'Close',
                 'icon' => 'icon-times',
-                'url' => 'javascript:window.close()'
-            ]
+                'url' => 'javascript:window.close()',
+            ],
         ]);
 
         $items = $manager->listMainMenuItems();
@@ -156,8 +156,8 @@ public function testRemoveMainMenuItemByAlias()
             'close' => [
                 'label' => 'Close',
                 'icon' => 'icon-times',
-                'url' => 'javascript:window.close()'
-            ]
+                'url' => 'javascript:window.close()',
+            ],
         ]);
 
         $manager->registerOwnerAlias('Winter.Tester', 'Alias.Tester');
@@ -183,9 +183,9 @@ public function testAddSideMenuItems()
                 'url' => 'http://google.com',
                 'permissions' => [
                     'winter.tester.access_foo',
-                    'winter.tester.access_bar'
-                ]
-            ]
+                    'winter.tester.access_bar',
+                ],
+            ],
         ]);
 
         $manager->setContext('Winter.Tester', 'blog');
@@ -222,9 +222,9 @@ public function testAddSideMenuItemsWithAlias()
                 'url' => 'http://google.com',
                 'permissions' => [
                     'winter.tester.access_foo',
-                    'winter.tester.access_bar'
-                ]
-            ]
+                    'winter.tester.access_bar',
+                ],
+            ],
         ]);
 
         $manager->registerOwnerAlias('Winter.Tester', 'Alias.Tester');
@@ -260,8 +260,8 @@ public function testRemoveSideMenuItem()
             'bar' => [
                 'label' => 'Bar',
                 'icon' => 'icon-bars',
-                'url' => 'http://yahoo.com'
-            ]
+                'url' => 'http://yahoo.com',
+            ],
         ]);
 
         $manager->setContext('Winter.Tester', 'blog');
@@ -284,8 +284,8 @@ public function testRemoveSideMenuItemByAlias()
             'bar' => [
                 'label' => 'Bar',
                 'icon' => 'icon-bars',
-                'url' => 'http://yahoo.com'
-            ]
+                'url' => 'http://yahoo.com',
+            ],
         ]);
 
         $manager->registerOwnerAlias('Winter.Tester', 'Alias.Tester');
diff --git a/modules/backend/tests/classes/WidgetManagerTest.php b/modules/backend/tests/classes/WidgetManagerTest.php
index c3aea566ae..0f1bb080e7 100644
--- a/modules/backend/tests/classes/WidgetManagerTest.php
+++ b/modules/backend/tests/classes/WidgetManagerTest.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Backend\Classes\WidgetManager;
+use System\Tests\Bootstrap\TestCase;
 
 class WidgetManagerTest extends TestCase
 {
@@ -21,7 +21,7 @@ public function testIfWidgetsCanBeExtended()
         $manager = WidgetManager::instance();
         $manager->registerReportWidget('Acme\Fake\ReportWidget\HelloWorld', [
             'name' => 'Hello World Test',
-            'context' => 'dashboard'
+            'context' => 'dashboard',
         ]);
         $widgets = $manager->listReportWidgets();
 
@@ -33,11 +33,11 @@ public function testIfWidgetsCanBeRemoved()
         $manager = WidgetManager::instance();
         $manager->registerReportWidget('Acme\Fake\ReportWidget\HelloWorld', [
             'name' => 'Hello World Test',
-            'context' => 'dashboard'
+            'context' => 'dashboard',
         ]);
         $manager->registerReportWidget('Acme\Fake\ReportWidget\ByeWorld', [
             'name' => 'Hello World Bye',
-            'context' => 'dashboard'
+            'context' => 'dashboard',
         ]);
 
         $manager->removeReportWidget('Acme\Fake\ReportWidget\ByeWorld');
diff --git a/modules/backend/tests/fixtures/models/UserFixture.php b/modules/backend/tests/fixtures/models/UserFixture.php
index 234d5d3a92..d30239d120 100644
--- a/modules/backend/tests/fixtures/models/UserFixture.php
+++ b/modules/backend/tests/fixtures/models/UserFixture.php
@@ -27,7 +27,7 @@ public function __construct(array $attributes = [])
             'created_at' => '2019-09-27 12:00:00',
             'updated_at' => '2019-09-27 12:00:00',
             'deleted_at' => null,
-            'is_superuser' => false
+            'is_superuser' => false,
         ]);
     }
 
@@ -51,7 +51,7 @@ public function withPermission($permission, bool $granted = true)
 
         if (is_string($permission)) {
             $permission = [
-                $permission => (int) $granted
+                $permission => (int) $granted,
             ];
         }
 
diff --git a/modules/backend/tests/formwidgets/CheckboxTest.php b/modules/backend/tests/formwidgets/CheckboxTest.php
index c214633eb5..c5ecf65430 100644
--- a/modules/backend/tests/formwidgets/CheckboxTest.php
+++ b/modules/backend/tests/formwidgets/CheckboxTest.php
@@ -3,8 +3,8 @@
 namespace Backend\Tests\FormWidgets;
 
 use Backend\Widgets\Form;
-use Winter\Storm\Database\Model;
 use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class CheckboxTest extends PluginTestCase
 {
diff --git a/modules/backend/tests/formwidgets/ColorPickerTest.php b/modules/backend/tests/formwidgets/ColorPickerTest.php
index c97200441a..523d3d31e0 100644
--- a/modules/backend/tests/formwidgets/ColorPickerTest.php
+++ b/modules/backend/tests/formwidgets/ColorPickerTest.php
@@ -30,7 +30,7 @@ public function testDefaultSaveValue(): void
     public function testRgbSaveValue(): void
     {
         $widget = $this->makeWidget([
-            'formats' => 'rgb'
+            'formats' => 'rgb',
         ]);
 
         // Config specifies only rgb
@@ -49,7 +49,7 @@ public function testRgbSaveValue(): void
     public function testCmykSaveValue(): void
     {
         $widget = $this->makeWidget([
-            'formats' => 'cmyk'
+            'formats' => 'cmyk',
         ]);
 
         // Config specifies only cmyk
@@ -68,7 +68,7 @@ public function testCmykSaveValue(): void
     public function testHslaSaveValue(): void
     {
         $widget = $this->makeWidget([
-            'formats' => 'hsl'
+            'formats' => 'hsl',
         ]);
 
         // Config specifies only hsl
@@ -89,7 +89,7 @@ public function testHslaSaveValue(): void
     public function testAllSaveValue(): void
     {
         $widget = $this->makeWidget([
-            'formats' => 'all'
+            'formats' => 'all',
         ]);
 
         // Config allows for any valid format
@@ -112,7 +112,7 @@ public function testAllSaveValue(): void
     public function testAllowCustomSaveValue(): void
     {
         $widget = $this->makeWidget([
-            'formats' => 'custom'
+            'formats' => 'custom',
         ]);
 
         // Config allows for any format
diff --git a/modules/backend/tests/helpers/BackendHelperTest.php b/modules/backend/tests/helpers/BackendHelperTest.php
index c5db01d21c..1030ec94e1 100644
--- a/modules/backend/tests/helpers/BackendHelperTest.php
+++ b/modules/backend/tests/helpers/BackendHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Tests\Helpers;
 
-use System\Tests\Bootstrap\TestCase;
 use Backend\Helpers\Backend;
 use Backend\Helpers\Exception\DecompileException;
+use System\Tests\Bootstrap\TestCase;
 
 class BackendHelperTest extends TestCase
 {
diff --git a/modules/backend/tests/models/ExportModelTest.php b/modules/backend/tests/models/ExportModelTest.php
index 4101cb98d8..d89b43381e 100644
--- a/modules/backend/tests/models/ExportModelTest.php
+++ b/modules/backend/tests/models/ExportModelTest.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Tests\Models;
 
-use System\Tests\Bootstrap\TestCase;
 use Backend\Models\ExportModel;
 use Illuminate\Http\Request;
+use System\Tests\Bootstrap\TestCase;
 
 if (!class_exists('Model')) {
     class_alias('Winter\Storm\Database\Model', 'Model');
diff --git a/modules/backend/tests/models/ImportModelTest.php b/modules/backend/tests/models/ImportModelTest.php
index bc3239c606..c57dce1c05 100644
--- a/modules/backend/tests/models/ImportModelTest.php
+++ b/modules/backend/tests/models/ImportModelTest.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Tests\Models;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Backend\Models\ImportModel;
 use System\Models\File as FileModel;
+use System\Tests\Bootstrap\PluginTestCase;
 
 if (!class_exists('Model')) {
     class_alias('Winter\Storm\Database\Model', 'Model');
diff --git a/modules/backend/tests/traits/WidgetMakerTest.php b/modules/backend/tests/traits/WidgetMakerTest.php
index 1acea76a6d..6426ad1de6 100644
--- a/modules/backend/tests/traits/WidgetMakerTest.php
+++ b/modules/backend/tests/traits/WidgetMakerTest.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Tests\Traits;
 
-use System\Tests\Bootstrap\TestCase;
 use Backend\Classes\Controller;
+use System\Tests\Bootstrap\TestCase;
 
 class ExampleTraitClass
 {
diff --git a/modules/backend/tests/widgets/FilterWidgetTest.php b/modules/backend/tests/widgets/FilterWidgetTest.php
index 9623c4eeb7..8ffb49e445 100644
--- a/modules/backend/tests/widgets/FilterWidgetTest.php
+++ b/modules/backend/tests/widgets/FilterWidgetTest.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Tests\Widgets;
 
-use System\Tests\Bootstrap\PluginTestCase;
+use Backend\Models\User;
 use Backend\Tests\Fixtures\Models\UserFixture;
 use Backend\Widgets\Filter;
-use ApplicationException;
-use Backend\Models\User;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Exception\ApplicationException;
 
 class FilterWidgetTest extends PluginTestCase
 {
@@ -65,14 +65,14 @@ public function testRestrictedScopeWithUserWithRightWildcardPermissions()
             'scopes' => [
                 'id' => [
                     'type' => 'text',
-                    'label' => 'ID'
+                    'label' => 'ID',
                 ],
                 'email' => [
                     'type' => 'text',
                     'label' => 'Email',
-                    'permission' => 'test.*'
-                ]
-            ]
+                    'permission' => 'test.*',
+                ],
+            ],
         ]);
         $filter->render();
 
@@ -128,16 +128,16 @@ protected function restrictedFilterFixture(bool $singlePermission = false)
             'scopes' => [
                 'id' => [
                     'type' => 'text',
-                    'label' => 'ID'
+                    'label' => 'ID',
                 ],
                 'email' => [
                     'type' => 'text',
                     'label' => 'Email',
                     'permissions' => ($singlePermission) ? 'test.access_field' : [
-                        'test.access_field'
-                    ]
-                ]
-            ]
+                        'test.access_field',
+                    ],
+                ],
+            ],
         ]);
     }
 }
diff --git a/modules/backend/tests/widgets/FormTest.php b/modules/backend/tests/widgets/FormTest.php
index 5fe5abd878..090bb4e8e3 100644
--- a/modules/backend/tests/widgets/FormTest.php
+++ b/modules/backend/tests/widgets/FormTest.php
@@ -2,10 +2,10 @@
 
 namespace Backend\Tests\Widgets
 {
-    use System\Tests\Bootstrap\PluginTestCase;
-    use Winter\Storm\Database\Model;
     use Backend\Tests\Fixtures\Models\UserFixture;
     use Backend\Widgets\Form;
+    use System\Tests\Bootstrap\PluginTestCase;
+    use Winter\Storm\Database\Model;
 
     class FormTestModel extends Model
     {
@@ -76,14 +76,14 @@ public function testRestrictedFieldWithUserWithRightWildcardPermissions()
                 'fields' => [
                     'testField' => [
                         'type' => 'text',
-                        'label' => 'Test 1'
+                        'label' => 'Test 1',
                     ],
                     'testRestricted' => [
                         'type' => 'text',
                         'label' => 'Test 2',
-                        'permission' => 'test.*'
-                    ]
-                ]
+                        'permission' => 'test.*',
+                    ],
+                ],
             ]);
 
             $form->render();
@@ -132,18 +132,18 @@ public function testCheckboxlistTrigger()
                     'trigger' => [
                         'type' => 'checkboxlist',
                         'options' => [
-                            '1' => 'Value One'
-                        ]
+                            '1' => 'Value One',
+                        ],
                     ],
                     'triggered' => [
                         'type' => 'text',
                         'trigger' => [
                             'field' => 'trigger[]',
                             'action' => 'show',
-                            'condition' => 'value[1]'
-                        ]
-                    ]
-                ]
+                            'condition' => 'value[1]',
+                        ],
+                    ],
+                ],
             ]);
 
             $form->render();
@@ -197,7 +197,7 @@ public function testOptionsGeneration()
                         'type' => 'dropdown',
                         'expect' => ['dropdown', 'options'],
                     ],
-                ]
+                ],
             ]);
 
             $form->render();
@@ -215,16 +215,16 @@ protected function restrictedFormFixture(bool $singlePermission = false)
                 'fields' => [
                     'testField' => [
                         'type' => 'text',
-                        'label' => 'Test 1'
+                        'label' => 'Test 1',
                     ],
                     'testRestricted' => [
                         'type' => 'text',
                         'label' => 'Test 2',
                         'permissions' => ($singlePermission) ? 'test.access_field' : [
-                            'test.access_field'
-                        ]
-                    ]
-                ]
+                            'test.access_field',
+                        ],
+                    ],
+                ],
             ]);
         }
     }
diff --git a/modules/backend/tests/widgets/ListsTest.php b/modules/backend/tests/widgets/ListsTest.php
index 511b635c4a..63179b85ec 100644
--- a/modules/backend/tests/widgets/ListsTest.php
+++ b/modules/backend/tests/widgets/ListsTest.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Tests\Widgets;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use Winter\Storm\Exception\ApplicationException;
-use Backend\Tests\Fixtures\Models\UserFixture;
 use Backend\Models\User;
+use Backend\Tests\Fixtures\Models\UserFixture;
 use Backend\Widgets\Lists;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Exception\ApplicationException;
 
 class ListsTest extends PluginTestCase
 {
@@ -65,14 +65,14 @@ public function testRestrictedColumnWithUserWithRightWildcardPermissions()
             'columns' => [
                 'id' => [
                     'type' => 'text',
-                    'label' => 'ID'
+                    'label' => 'ID',
                 ],
                 'email' => [
                     'type' => 'text',
                     'label' => 'Email',
-                    'permission' => 'test.*'
-                ]
-            ]
+                    'permission' => 'test.*',
+                ],
+            ],
         ]);
         $list->render();
 
@@ -128,16 +128,16 @@ protected function restrictedListsFixture(bool $singlePermission = false)
             'columns' => [
                 'id' => [
                     'type' => 'text',
-                    'label' => 'ID'
+                    'label' => 'ID',
                 ],
                 'email' => [
                     'type' => 'text',
                     'label' => 'Email',
                     'permissions' => ($singlePermission) ? 'test.access_field' : [
-                        'test.access_field'
-                    ]
-                ]
-            ]
+                        'test.access_field',
+                    ],
+                ],
+            ],
         ]);
     }
 }
diff --git a/modules/backend/traits/FormModelSaver.php b/modules/backend/traits/FormModelSaver.php
index 06ef540a11..60d90cec42 100644
--- a/modules/backend/traits/FormModelSaver.php
+++ b/modules/backend/traits/FormModelSaver.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Traits;
 
-use Str;
 use Backend\Classes\FormField;
 use Winter\Storm\Halcyon\Model as HalcyonModel;
+use Winter\Storm\Support\Str;
 
 /**
  * Implements special logic for processing form data, typically from from postback, and
diff --git a/modules/backend/traits/FormModelWidget.php b/modules/backend/traits/FormModelWidget.php
index 5530cc3d5c..98be5648b5 100644
--- a/modules/backend/traits/FormModelWidget.php
+++ b/modules/backend/traits/FormModelWidget.php
@@ -2,11 +2,11 @@
 
 namespace Backend\Traits;
 
-use Lang;
-use ApplicationException;
 use Exception;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Database\Relations\Relation;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Form Model Widget Trait
@@ -30,7 +30,7 @@ public function resolveModelAttribute(string $attribute): array
         } catch (Exception $ex) {
             throw new ApplicationException(Lang::get('backend::lang.model.missing_relation', [
                 'class' => get_class($this->model),
-                'relation' => $attribute
+                'relation' => $attribute,
             ]));
         }
     }
@@ -46,14 +46,14 @@ public function getRelationModel(): Model
         if (!$model) {
             throw new ApplicationException(Lang::get('backend::lang.model.missing_relation', [
                 'class' => get_class($this->model),
-                'relation' => $this->valueFrom
+                'relation' => $this->valueFrom,
             ]));
         }
 
         if (!$model->hasRelation($attribute)) {
             throw new ApplicationException(Lang::get('backend::lang.model.missing_relation', [
                 'class' => get_class($model),
-                'relation' => $attribute
+                'relation' => $attribute,
             ]));
         }
 
@@ -72,14 +72,14 @@ protected function getRelationObject()
         if (!$model) {
             throw new ApplicationException(Lang::get('backend::lang.model.missing_relation', [
                 'class' => get_class($this->model),
-                'relation' => $this->valueFrom
+                'relation' => $this->valueFrom,
             ]));
         }
 
         if (!$model->hasRelation($attribute)) {
             throw new ApplicationException(Lang::get('backend::lang.model.missing_relation', [
                 'class' => get_class($model),
-                'relation' => $attribute
+                'relation' => $attribute,
             ]));
         }
 
diff --git a/modules/backend/traits/InspectableContainer.php b/modules/backend/traits/InspectableContainer.php
index 00d85c1dc9..c101442bc3 100644
--- a/modules/backend/traits/InspectableContainer.php
+++ b/modules/backend/traits/InspectableContainer.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Traits;
 
-use Lang;
-use Request;
-use ApplicationException;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Inspectable Container Trait
@@ -84,7 +84,7 @@ public function onInspectableGetOptions()
         }
 
         return [
-            'options' => $optionsArray
+            'options' => $optionsArray,
         ];
     }
 }
diff --git a/modules/backend/traits/PreferenceMaker.php b/modules/backend/traits/PreferenceMaker.php
index ff5d48143d..0b9cb38d29 100644
--- a/modules/backend/traits/PreferenceMaker.php
+++ b/modules/backend/traits/PreferenceMaker.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Traits;
 
-use Str;
 use Backend\Models\UserPreference;
+use Winter\Storm\Support\Str;
 
 /**
  * Preference Maker Trait
diff --git a/modules/backend/traits/SearchableWidget.php b/modules/backend/traits/SearchableWidget.php
index 2992175796..8a5ffe4dc3 100644
--- a/modules/backend/traits/SearchableWidget.php
+++ b/modules/backend/traits/SearchableWidget.php
@@ -2,7 +2,7 @@
 
 namespace Backend\Traits;
 
-use Str;
+use Winter\Storm\Support\Str;
 
 /**
  * Searchable Widget Trait
diff --git a/modules/backend/traits/SelectableWidget.php b/modules/backend/traits/SelectableWidget.php
index 6cb14998e4..c82a906ef8 100644
--- a/modules/backend/traits/SelectableWidget.php
+++ b/modules/backend/traits/SelectableWidget.php
@@ -2,7 +2,7 @@
 
 namespace Backend\Traits;
 
-use Input;
+use Winter\Storm\Support\Facades\Input;
 
 /**
  * Selectable Widget Trait
diff --git a/modules/backend/traits/SessionMaker.php b/modules/backend/traits/SessionMaker.php
index b516b35b56..5751353bd2 100644
--- a/modules/backend/traits/SessionMaker.php
+++ b/modules/backend/traits/SessionMaker.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Traits;
 
-use Str;
 use Session;
+use Winter\Storm\Support\Str;
 
 /**
  * Session Maker Trait
diff --git a/modules/backend/traits/UploadableWidget.php b/modules/backend/traits/UploadableWidget.php
index e6b559449f..51f4b535d6 100644
--- a/modules/backend/traits/UploadableWidget.php
+++ b/modules/backend/traits/UploadableWidget.php
@@ -2,16 +2,16 @@
 
 namespace Backend\Traits;
 
-use ApplicationException;
-use Event;
-use File;
 use Illuminate\Filesystem\FilesystemAdapter;
-use Lang;
-use Request;
-use Response;
-use Str;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
 use System\Classes\MediaLibrary;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 use Winter\Storm\Support\Svg;
 
 /**
@@ -153,7 +153,7 @@ protected function onUploadDirect(): \Illuminate\Http\Response
 
             $response = Response::make([
                 'link' => $this->uploadableGetUploadUrl($filePath),
-                'result' => 'success'
+                'result' => 'success',
             ]);
         } catch (\Exception $ex) {
             throw new ApplicationException($ex->getMessage());
diff --git a/modules/backend/traits/WidgetMaker.php b/modules/backend/traits/WidgetMaker.php
index e6f9fd2271..1cfca0ffdb 100644
--- a/modules/backend/traits/WidgetMaker.php
+++ b/modules/backend/traits/WidgetMaker.php
@@ -2,9 +2,9 @@
 
 namespace Backend\Traits;
 
-use Lang;
 use Backend\Classes\FormField;
-use SystemException;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\SystemException;
 
 /**
  * Widget Maker Trait
@@ -31,7 +31,7 @@ public function makeWidget($class, $widgetConfig = [])
 
         if (!class_exists($class)) {
             throw new SystemException(Lang::get('backend::lang.widget.not_registered', [
-                'name' => $class
+                'name' => $class,
             ]));
         }
 
@@ -53,7 +53,7 @@ public function makeFormWidget($class, $fieldConfig = [], $widgetConfig = [])
 
         if (!class_exists($class)) {
             throw new SystemException(Lang::get('backend::lang.widget.not_registered', [
-                'name' => $class
+                'name' => $class,
             ]));
         }
 
diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php
index 2920350987..951f30bdd5 100644
--- a/modules/backend/widgets/Filter.php
+++ b/modules/backend/widgets/Filter.php
@@ -2,16 +2,16 @@
 
 namespace Backend\Widgets;
 
-use Db;
-use Str;
-use Lang;
-use Backend;
-use DbDongle;
-use Carbon\Carbon;
-use Backend\Classes\WidgetBase;
 use Backend\Classes\FilterScope;
-use ApplicationException;
-use BackendAuth;
+use Backend\Classes\WidgetBase;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\DbDongle;
+use Winter\Storm\Support\Str;
 
 /**
  * Filter Widget
@@ -337,7 +337,7 @@ public function onFilterGetOptions()
             'options' => [
                 'available' => $this->optionsToAjax($available),
                 'active'    => $this->optionsToAjax($active),
-            ]
+            ],
         ];
     }
 
@@ -467,7 +467,7 @@ protected function getOptionsFromArray($scope, $searchQuery = null)
                 throw new ApplicationException(Lang::get('backend::lang.filter.options_method_not_exists', [
                     'model'  => get_class($model),
                     'method' => $methodName,
-                    'filter' => $scope->scopeName
+                    'filter' => $scope->scopeName,
                 ]));
             }
 
@@ -752,7 +752,7 @@ public function applyScopeToQuery($scope, $query)
                         $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                             ':filtered' => $value->format('Y-m-d'),
                             ':after'    => $value->format('Y-m-d H:i:s'),
-                            ':before'   => $value->copy()->addDay()->addMinutes(-1)->format('Y-m-d H:i:s')
+                            ':before'   => $value->copy()->addDay()->addMinutes(-1)->format('Y-m-d H:i:s'),
                         ])));
                     } elseif ($scopeMethod = $scope->scope) {
                         $query->$scopeMethod($value);
@@ -771,7 +771,7 @@ public function applyScopeToQuery($scope, $query)
                                 ':afterDate'  => $after->format('Y-m-d'),
                                 ':after'      => $after->format('Y-m-d H:i:s'),
                                 ':beforeDate' => $before->format('Y-m-d'),
-                                ':before'     => $before->format('Y-m-d H:i:s')
+                                ':before'     => $before->format('Y-m-d H:i:s'),
                             ])));
                         } elseif ($scopeMethod = $scope->scope) {
                             $query->$scopeMethod($after, $before);
@@ -802,7 +802,7 @@ public function applyScopeToQuery($scope, $query)
                         if ($scopeConditions = $scope->conditions) {
                             $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [
                                 ':min'  => $min === null ? -2147483647 : $min,
-                                ':max'  => $max === null ? 2147483647 : $max
+                                ':max'  => $max === null ? 2147483647 : $max,
                             ])));
                         } elseif ($scopeMethod = $scope->scope) {
                             $query->$scopeMethod($min, $max);
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 9d049aa71c..30860c4028 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -2,17 +2,17 @@
 
 namespace Backend\Widgets;
 
-use ApplicationException;
 use Backend\Classes\FormField;
 use Backend\Classes\FormTabs;
 use Backend\Classes\FormWidgetBase;
 use Backend\Classes\WidgetBase;
 use Backend\Classes\WidgetManager;
-use BackendAuth;
+use Backend\Facades\BackendAuth;
 use Exception;
 use Form as FormHelper;
-use Lang;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Html\Helper as HtmlHelper;
 
 /**
@@ -274,7 +274,7 @@ public function renderFieldElement($field)
             'field_' . $field->type,
             [
                 'field' => $field,
-                'formModel' => $this->model
+                'formModel' => $this->model,
             ]
         );
     }
@@ -1304,7 +1304,7 @@ public function getOptionsFromModel($field, $fieldOptions)
             } catch (Exception $ex) {
                 throw new ApplicationException(Lang::get('backend::lang.field.options_method_invalid_model', [
                     'model' => get_class($this->model),
-                    'field' => $field->fieldName
+                    'field' => $field->fieldName,
                 ]));
             }
 
@@ -1316,7 +1316,7 @@ public function getOptionsFromModel($field, $fieldOptions)
                 throw new ApplicationException(Lang::get('backend::lang.field.options_method_not_exists', [
                     'model'  => get_class($model),
                     'method' => $methodName,
-                    'field'  => $field->fieldName
+                    'field'  => $field->fieldName,
                 ]));
             }
 
@@ -1336,7 +1336,7 @@ public function getOptionsFromModel($field, $fieldOptions)
                     if (!is_array($result)) {
                         throw new ApplicationException(Lang::get('backend::lang.field.options_static_method_invalid_value', [
                             'class' => $options[0],
-                            'method' => $options[1]
+                            'method' => $options[1],
                         ]));
                     }
                     return $result;
@@ -1353,7 +1353,7 @@ public function getOptionsFromModel($field, $fieldOptions)
                 throw new ApplicationException(Lang::get('backend::lang.field.options_method_not_exists', [
                     'model'  => get_class($this->model),
                     'method' => $fieldOptions,
-                    'field'  => $field->fieldName
+                    'field'  => $field->fieldName,
                 ]));
             }
 
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index cd9ce8dffa..db63159423 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -2,24 +2,24 @@
 
 namespace Backend\Widgets;
 
-use Db;
-use Str;
-use Html;
-use Lang;
-use Backend;
-use DbDongle;
-use Carbon\Carbon;
-use Winter\Storm\Html\Helper as HtmlHelper;
-use Winter\Storm\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 Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Lang;
+use System\Classes\ImageResizer;
+use System\Classes\MediaLibrary;
+use System\Classes\PluginManager;
+use System\Helpers\DateTime as DateTimeHelper;
 use Winter\Storm\Database\Model;
-use ApplicationException;
-use BackendAuth;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Html\Helper as HtmlHelper;
+use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\DbDongle;
+use Winter\Storm\Support\Facades\Html;
+use Winter\Storm\Support\Str;
 
 /**
  * List Widget
@@ -30,7 +30,7 @@
  */
 class Lists extends WidgetBase
 {
-    use Backend\Traits\PreferenceMaker;
+    use \Backend\Traits\PreferenceMaker;
 
     //
     // Configurable properties
@@ -1300,7 +1300,7 @@ protected function evalPartialTypeValue($record, $column, $value)
             'listValue'  => $value,
             'column'     => $column,
             'record'     => $record,
-            'value'      => $value
+            'value'      => $value,
         ]);
     }
 
@@ -1340,7 +1340,7 @@ protected function evalDatetimeTypeValue($record, $column, $value)
         $options = [
             'defaultValue' => $value,
             'format' => $column->format,
-            'formatAlias' => 'dateTimeLongMin'
+            'formatAlias' => 'dateTimeLongMin',
         ];
 
         if (!empty($column->config['ignoreTimezone'])) {
@@ -1368,7 +1368,7 @@ protected function evalTimeTypeValue($record, $column, $value)
         $options = [
             'defaultValue' => $value,
             'format' => $column->format,
-            'formatAlias' => 'time'
+            'formatAlias' => 'time',
         ];
 
         if (!empty($column->config['ignoreTimezone'])) {
@@ -1398,7 +1398,7 @@ protected function evalDateTypeValue($record, $column, $value)
         $options = [
             'defaultValue' => $value,
             'format' => $column->format,
-            'formatAlias' => 'dateLongMin'
+            'formatAlias' => 'dateLongMin',
         ];
 
         if (!empty($column->config['ignoreTimezone'])) {
@@ -1423,7 +1423,7 @@ protected function evalTimesinceTypeValue($record, $column, $value)
 
         $options = [
             'defaultValue' => $value,
-            'timeSince' => true
+            'timeSince' => true,
         ];
 
         if (!empty($column->config['ignoreTimezone'])) {
@@ -1448,7 +1448,7 @@ protected function evalTimetenseTypeValue($record, $column, $value)
 
         $options = [
             'defaultValue' => $value,
-            'timeTense' => true
+            'timeTense' => true,
         ];
 
         if (!empty($column->config['ignoreTimezone'])) {
@@ -1533,7 +1533,7 @@ public function setSearchOptions($options = [])
     {
         extract(array_merge([
             'mode' => null,
-            'scope' => null
+            'scope' => null,
         ], $options));
 
         $this->searchMode = $mode;
@@ -1855,7 +1855,7 @@ protected function isColumnRelated(ListColumn $column, bool $multi = false): boo
             'morphedByMany',
             'morphMany',
             'attachMany',
-            'hasManyThrough'
+            'hasManyThrough',
         ]);
     }
 
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index 1b1f26842f..5364e0ad1e 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -2,17 +2,17 @@
 
 namespace Backend\Widgets;
 
-use Str;
-use Lang;
-use Input;
-use Event;
-use Config;
-use Backend;
-use ApplicationException;
 use Backend\Classes\WidgetBase;
+use Backend\Facades\Backend;
+use Illuminate\Support\Facades\Lang;
 use System\Classes\ImageResizer;
 use System\Classes\MediaLibrary;
 use System\Classes\MediaLibraryItem;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Str;
 
 /**
  * Media Manager widget.
@@ -122,7 +122,7 @@ public function onSearch(): array
 
         return [
             '#' . $this->getId('item-list') => $this->makePartial('item-list'),
-            '#' . $this->getId('folder-path') => $this->makePartial('folder-path')
+            '#' . $this->getId('folder-path') => $this->makePartial('folder-path'),
         ];
     }
 
@@ -146,7 +146,7 @@ public function onGoToFolder(): array
 
         return [
             '#' . $this->getId('item-list') => $this->makePartial('item-list'),
-            '#' . $this->getId('folder-path') => $this->makePartial('folder-path')
+            '#' . $this->getId('folder-path') => $this->makePartial('folder-path'),
         ];
     }
 
@@ -166,7 +166,7 @@ public function onGenerateThumbnails(): array
         }
 
         return [
-            'generatedThumbnails' => $result
+            'generatedThumbnails' => $result,
         ];
     }
 
@@ -213,7 +213,7 @@ public function onChangeView(): array
         return [
             '#' . $this->getId('item-list') => $this->makePartial('item-list'),
             '#' . $this->getId('folder-path') => $this->makePartial('folder-path'),
-            '#' . $this->getId('view-mode-buttons') => $this->makePartial('view-mode-buttons')
+            '#' . $this->getId('view-mode-buttons') => $this->makePartial('view-mode-buttons'),
         ];
     }
 
@@ -233,7 +233,7 @@ public function onSetFilter(): array
         return [
             '#' . $this->getId('item-list') => $this->makePartial('item-list'),
             '#' . $this->getId('folder-path') => $this->makePartial('folder-path'),
-            '#' . $this->getId('filters') => $this->makePartial('filters')
+            '#' . $this->getId('filters') => $this->makePartial('filters'),
         ];
     }
 
@@ -254,7 +254,7 @@ public function onSetSorting(): array
 
         return [
             '#' . $this->getId('item-list') => $this->makePartial('item-list'),
-            '#' . $this->getId('folder-path') => $this->makePartial('folder-path')
+            '#' . $this->getId('folder-path') => $this->makePartial('folder-path'),
         ];
     }
 
@@ -352,7 +352,7 @@ public function onDeleteItem(): array
         $this->prepareVars();
 
         return [
-            '#' . $this->getId('item-list') => $this->makePartial('item-list')
+            '#' . $this->getId('item-list') => $this->makePartial('item-list'),
         ];
     }
 
@@ -518,7 +518,7 @@ public function onCreateFolder(): array
         $this->prepareVars();
 
         return [
-            '#' . $this->getId('item-list') => $this->makePartial('item-list')
+            '#' . $this->getId('item-list') => $this->makePartial('item-list'),
         ];
     }
 
@@ -646,7 +646,7 @@ public function onMoveItems(): array
         $this->prepareVars();
 
         return [
-            '#' . $this->getId('item-list') => $this->makePartial('item-list')
+            '#' . $this->getId('item-list') => $this->makePartial('item-list'),
         ];
     }
 
@@ -831,7 +831,7 @@ public function onResizeImage(): array
 
         return [
             'url' => $resizedUrl,
-            'dimensions' => [$width, $height]
+            'dimensions' => [$width, $height],
         ];
     }
 
@@ -933,7 +933,7 @@ protected function setFilter(string $filter): void
             MediaLibraryItem::FILE_TYPE_IMAGE,
             MediaLibraryItem::FILE_TYPE_AUDIO,
             MediaLibraryItem::FILE_TYPE_DOCUMENT,
-            MediaLibraryItem::FILE_TYPE_VIDEO
+            MediaLibraryItem::FILE_TYPE_VIDEO,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -995,7 +995,7 @@ protected function setSortBy(string $sortBy): void
             !in_array($sortBy, [
             MediaLibrary::SORT_BY_TITLE,
             MediaLibrary::SORT_BY_SIZE,
-            MediaLibrary::SORT_BY_MODIFIED
+            MediaLibrary::SORT_BY_MODIFIED,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1025,7 +1025,7 @@ protected function setSortDirection($sortDirection): void
         if (
             !in_array($sortDirection, [
             MediaLibrary::SORT_DIRECTION_ASC,
-            MediaLibrary::SORT_DIRECTION_DESC
+            MediaLibrary::SORT_DIRECTION_DESC,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1071,7 +1071,7 @@ protected function getSelectionParams(): array
         return [
             'mode'   => self::SELECTION_MODE_NORMAL,
             'width'  => null,
-            'height' => null
+            'height' => null,
         ];
     }
 
@@ -1088,7 +1088,7 @@ protected function setSelectionParams($selectionMode, $selectionWidth, $selectio
             !in_array($selectionMode, [
             self::SELECTION_MODE_NORMAL,
             self::SELECTION_MODE_FIXED_RATIO,
-            self::SELECTION_MODE_FIXED_SIZE
+            self::SELECTION_MODE_FIXED_SIZE,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1105,7 +1105,7 @@ protected function setSelectionParams($selectionMode, $selectionWidth, $selectio
         $this->putSession('media_crop_selection_params', [
             'mode'   => $selectionMode,
             'width'  => $selectionWidth,
-            'height' => $selectionHeight
+            'height' => $selectionHeight,
         ]);
     }
 
@@ -1180,7 +1180,7 @@ protected function setViewMode(string $viewMode): void
             !in_array($viewMode, [
             self::VIEW_MODE_GRID,
             self::VIEW_MODE_LIST,
-            self::VIEW_MODE_TILES
+            self::VIEW_MODE_TILES,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1206,7 +1206,7 @@ protected function getViewMode(): string
     protected function getThumbnailParams(string $viewMode = null): array
     {
         $result = [
-            'mode' => 'crop'
+            'mode' => 'crop',
         ];
 
         if (!$viewMode) {
@@ -1216,13 +1216,13 @@ protected function getThumbnailParams(string $viewMode = null): array
         if ($viewMode === self::VIEW_MODE_LIST) {
             return array_merge($result, [
                 'width' => 75,
-                'height' => 75
+                'height' => 75,
             ]);
         }
 
         return array_merge($result, [
             'width' => 165,
-            'height' => 165
+            'height' => 165,
         ]);
     }
 
diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php
index 92a6d77d26..6679e76d2a 100644
--- a/modules/backend/widgets/ReportContainer.php
+++ b/modules/backend/widgets/ReportContainer.php
@@ -2,16 +2,16 @@
 
 namespace Backend\Widgets;
 
-use File;
-use Lang;
-use Flash;
-use Request;
-use BackendAuth;
 use Backend\Classes\WidgetBase;
 use Backend\Classes\WidgetManager;
+use Backend\Facades\BackendAuth;
 use Backend\Models\UserPreference;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
 use System\Models\Parameter as SystemParameters;
-use ApplicationException;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Report Container Widget
@@ -169,7 +169,7 @@ public function onUpdateWidget()
         $this->saveWidgetProperties($alias, $widget->getProperties());
 
         return [
-            '#' . $alias => $widget->render()
+            '#' . $alias => $widget->render(),
         ];
     }
 
@@ -217,8 +217,8 @@ public function onAddWidget()
             '@#' . $this->getId('container-list') => $this->makePartial('widget', [
                 'widget'      => $widget,
                 'widgetAlias' => $widgetInfo['alias'],
-                'sortOrder'   => $widgetInfo['sortOrder']
-            ])
+                'sortOrder'   => $widgetInfo['sortOrder'],
+            ]),
         ];
     }
 
@@ -251,14 +251,14 @@ public function addWidget($widget, $size)
         $widgets[$alias] = [
             'class'         => get_class($widget),
             'configuration' => $widget->getProperties(),
-            'sortOrder'     => $sortOrder
+            'sortOrder'     => $sortOrder,
         ];
 
         $this->setWidgetsToUserPreferences($widgets);
 
         return [
             'alias'     => $alias,
-            'sortOrder' => $widgets[$alias]['sortOrder']
+            'sortOrder' => $widgets[$alias]['sortOrder'],
         ];
     }
 
@@ -409,8 +409,8 @@ protected function getWidgetPropertyConfig($widget)
                 9  => '9 ' . Lang::choice('backend::lang.dashboard.columns', 9),
                 10 => '10 ' . Lang::choice('backend::lang.dashboard.columns', 10),
                 11 => '11 ' . Lang::choice('backend::lang.dashboard.columns', 11),
-                12 => '12 ' . Lang::choice('backend::lang.dashboard.columns', 12)
-            ]
+                12 => '12 ' . Lang::choice('backend::lang.dashboard.columns', 12),
+            ],
         ];
         $result[] = $property;
 
@@ -418,7 +418,7 @@ protected function getWidgetPropertyConfig($widget)
             'property'    => 'ocWidgetNewRow',
             'title'       => Lang::get('backend::lang.dashboard.widget_new_row_label'),
             'description' => Lang::get('backend::lang.dashboard.widget_new_row_description'),
-            'type'        => 'checkbox'
+            'type'        => 'checkbox',
         ];
 
         $result[] = $property;
@@ -426,7 +426,7 @@ protected function getWidgetPropertyConfig($widget)
             $property = [
                 'property' => $name,
                 'title'    => isset($params['title']) ? Lang::get($params['title']) : $name,
-                'type'     => $params['type'] ?? 'string'
+                'type'     => $params['type'] ?? 'string',
             ];
 
             foreach ($params as $name => $value) {
diff --git a/modules/backend/widgets/Search.php b/modules/backend/widgets/Search.php
index e46261d738..b64d662748 100644
--- a/modules/backend/widgets/Search.php
+++ b/modules/backend/widgets/Search.php
@@ -2,8 +2,8 @@
 
 namespace Backend\Widgets;
 
-use Lang;
 use Backend\Classes\WidgetBase;
+use Illuminate\Support\Facades\Lang;
 
 /**
  * Search Widget
diff --git a/modules/backend/widgets/Table.php b/modules/backend/widgets/Table.php
index 750cd10086..2bd95373e5 100644
--- a/modules/backend/widgets/Table.php
+++ b/modules/backend/widgets/Table.php
@@ -2,14 +2,14 @@
 
 namespace Backend\Widgets;
 
-use Config;
-use Backend;
-use Lang;
-use Input;
-use Request;
 use Backend\Classes\WidgetBase;
+use Backend\Facades\Backend;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Html\Helper as HtmlHelper;
-use SystemException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Input;
 
 /**
  * Table Widget.
@@ -53,7 +53,7 @@ class Table extends WidgetBase
 
     protected $dataSourceAliases = [
         'client' => '\Backend\Widgets\Table\ClientMemoryDataSource',
-        'server' => '\Backend\Widgets\Table\ServerEventDataSource'
+        'server' => '\Backend\Widgets\Table\ServerEventDataSource',
     ];
 
     /**
@@ -233,7 +233,7 @@ public function onServerGetRecords()
 
         return [
             'records' => $this->dataSource->getRecords(post('offset'), $count),
-            'count' => $this->dataSource->getCount()
+            'count' => $this->dataSource->getCount(),
         ];
     }
 
@@ -255,7 +255,7 @@ public function onServerSearchRecords()
 
         return [
             'records' => $this->dataSource->searchRecords(post('query'), post('offset'), $count),
-            'count' => $this->dataSource->getCount()
+            'count' => $this->dataSource->getCount(),
         ];
     }
 
@@ -307,7 +307,7 @@ public function onGetDropdownOptions()
         }
 
         return [
-            'options' => $options
+            'options' => $options,
         ];
     }
 
@@ -324,7 +324,7 @@ public function onGetAutocompleteOptions()
         }
 
         return [
-            'options' => $options
+            'options' => $options,
         ];
     }
 }
diff --git a/modules/backend/widgets/form/partials/_field_hint.php b/modules/backend/widgets/form/partials/_field_hint.php
index 13f66594fd..f0503b46cc 100644
--- a/modules/backend/widgets/form/partials/_field_hint.php
+++ b/modules/backend/widgets/form/partials/_field_hint.php
@@ -4,5 +4,5 @@
     'formValue' => $field->value,
     'model'     => $formModel,
     'field'     => $field,
-    'value'     => $field->value
+    'value'     => $field->value,
 ]) ?>
diff --git a/modules/backend/widgets/form/partials/_field_partial.php b/modules/backend/widgets/form/partials/_field_partial.php
index 85c3bce76d..3b594ca0a7 100644
--- a/modules/backend/widgets/form/partials/_field_partial.php
+++ b/modules/backend/widgets/form/partials/_field_partial.php
@@ -5,5 +5,5 @@
     'formValue'  => $field->value,
     'model'      => $formModel,
     'field'      => $field,
-    'value'      => $field->value
+    'value'      => $field->value,
 ]) ?>
diff --git a/modules/backend/widgets/lists/partials/_list_body_row.php b/modules/backend/widgets/lists/partials/_list_body_row.php
index 9c94c1c49f..b9c4a414db 100644
--- a/modules/backend/widgets/lists/partials/_list_body_row.php
+++ b/modules/backend/widgets/lists/partials/_list_body_row.php
@@ -12,7 +12,7 @@
         <?= $this->makePartial('list_body_tree', [
             'record' => $record,
             'expanded' => $expanded,
-            'childCount' => $record->getChildCount()
+            'childCount' => $record->getChildCount(),
         ]) ?>
     <?php endif ?>
 
diff --git a/modules/backend/widgets/mediamanager/partials/_crop-toolbar.php b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.php
index ebcb0f530f..338e584ce0 100644
--- a/modules/backend/widgets/mediamanager/partials/_crop-toolbar.php
+++ b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.php
@@ -2,7 +2,7 @@
 $selectionModes = [
     Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('backend::lang.media.selection_mode_normal'),
     Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('backend::lang.media.selection_mode_fixed_ratio'),
-    Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('backend::lang.media.selection_mode_fixed_size')
+    Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('backend::lang.media.selection_mode_fixed_size'),
 ];
 
 $sizeDisabledAttr = $currentSelectionMode == Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
diff --git a/modules/backend/widgets/mediamanager/partials/_rename-form.php b/modules/backend/widgets/mediamanager/partials/_rename-form.php
index 5e73ac5d58..641249cddb 100644
--- a/modules/backend/widgets/mediamanager/partials/_rename-form.php
+++ b/modules/backend/widgets/mediamanager/partials/_rename-form.php
@@ -1,7 +1,7 @@
 <?= Form::ajax($this->getEventHandler('onApplyName'), [
     'success' => "\$el.trigger('close.oc.popup'); \$('#" . $listId . "').trigger('mediarefresh');",
     'data-stripe-load-indicator' => 1,
-    'id' => 'media-rename-popup-form'
+    'id' => 'media-rename-popup-form',
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/backend/widgets/mediamanager/partials/_sorting.php b/modules/backend/widgets/mediamanager/partials/_sorting.php
index 948f7ef88a..8cf414bfae 100644
--- a/modules/backend/widgets/mediamanager/partials/_sorting.php
+++ b/modules/backend/widgets/mediamanager/partials/_sorting.php
@@ -2,12 +2,12 @@
 $sortModes = [
     System\Classes\MediaLibrary::SORT_BY_TITLE => trans('backend::lang.media.title'),
     System\Classes\MediaLibrary::SORT_BY_SIZE => trans('backend::lang.media.size'),
-    System\Classes\MediaLibrary::SORT_BY_MODIFIED => trans('backend::lang.media.last_modified')
+    System\Classes\MediaLibrary::SORT_BY_MODIFIED => trans('backend::lang.media.last_modified'),
 ];
 
 $sortDirections = [
     System\Classes\MediaLibrary::SORT_DIRECTION_ASC => trans('backend::lang.media.direction_asc'),
-    System\Classes\MediaLibrary::SORT_DIRECTION_DESC => trans('backend::lang.media.direction_desc')
+    System\Classes\MediaLibrary::SORT_DIRECTION_DESC => trans('backend::lang.media.direction_desc'),
 ];
 ?>
 
diff --git a/modules/backend/widgets/reportcontainer/partials/_new_widget_popup.php b/modules/backend/widgets/reportcontainer/partials/_new_widget_popup.php
index c77593a205..4d66df9148 100644
--- a/modules/backend/widgets/reportcontainer/partials/_new_widget_popup.php
+++ b/modules/backend/widgets/reportcontainer/partials/_new_widget_popup.php
@@ -1,7 +1,7 @@
 <?= Form::open([
     'data-request' => $this->getEventHandler('onAddWidget'),
     'data-request-success' => "\$(this).trigger('close.oc.popup'); \$(window).trigger('oc.reportWidgetAdded')",
-    'data-popup-load-indicator' => 1
+    'data-popup-load-indicator' => 1,
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/backend/widgets/reportcontainer/partials/_widget_list.php b/modules/backend/widgets/reportcontainer/partials/_widget_list.php
index c7be7059da..1e393c009a 100644
--- a/modules/backend/widgets/reportcontainer/partials/_widget_list.php
+++ b/modules/backend/widgets/reportcontainer/partials/_widget_list.php
@@ -2,6 +2,6 @@
     <?= $this->makePartial('widget', [
         'widgetAlias' => $widgetAlias,
         'widget' => $widgetInfo['widget'],
-        'sortOrder' => $widgetInfo['sortOrder']
+        'sortOrder' => $widgetInfo['sortOrder'],
     ]) ?>
 <?php endforeach ?>
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index b410024f9c..5b25a35dca 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -2,11 +2,11 @@
 
 namespace Cms;
 
-use Backend;
 use Backend\Classes\WidgetManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
 use Backend\Models\UserRole;
-use BackendAuth;
-use BackendMenu;
 use Cms\Classes\CmsObject;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\Page as CmsPage;
@@ -16,15 +16,13 @@
 use Cms\Twig\DebugExtension;
 use Cms\Twig\Extension as CmsTwigExtension;
 use Cms\Twig\Loader as CmsTwigLoader;
-use Config;
-use Event;
-use File;
-use Lang;
+use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
 use System\Classes\MarkupManager;
 use System\Classes\SettingsManager;
 use Twig\Cache\FilesystemCache as TwigCacheFilesystem;
-use Url;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\ModuleServiceProvider;
 
 class ServiceProvider extends ModuleServiceProvider
@@ -203,7 +201,7 @@ protected function registerBackendNavigation()
                         'cms.manage_assets',
                         'cms.manage_pages',
                         'cms.manage_layouts',
-                        'cms.manage_partials'
+                        'cms.manage_partials',
                     ],
                     'sideMenu' => [
                         'pages' => [
@@ -212,7 +210,7 @@ protected function registerBackendNavigation()
                             'url'          => 'javascript:;',
                             'attributes'   => ['data-menu-item' => 'pages'],
                             'permissions'  => ['cms.manage_pages'],
-                            'counterLabel' => 'cms::lang.page.unsaved_label'
+                            'counterLabel' => 'cms::lang.page.unsaved_label',
                         ],
                         'partials' => [
                             'label'        => 'cms::lang.partial.menu_label',
@@ -220,7 +218,7 @@ protected function registerBackendNavigation()
                             'url'          => 'javascript:;',
                             'attributes'   => ['data-menu-item' => 'partials'],
                             'permissions'  => ['cms.manage_partials'],
-                            'counterLabel' => 'cms::lang.partial.unsaved_label'
+                            'counterLabel' => 'cms::lang.partial.unsaved_label',
                         ],
                         'layouts' => [
                             'label'        => 'cms::lang.layout.menu_label',
@@ -228,7 +226,7 @@ protected function registerBackendNavigation()
                             'url'          => 'javascript:;',
                             'attributes'   => ['data-menu-item' => 'layouts'],
                             'permissions'  => ['cms.manage_layouts'],
-                            'counterLabel' => 'cms::lang.layout.unsaved_label'
+                            'counterLabel' => 'cms::lang.layout.unsaved_label',
                         ],
                         'content' => [
                             'label'        => 'cms::lang.content.menu_label',
@@ -236,7 +234,7 @@ protected function registerBackendNavigation()
                             'url'          => 'javascript:;',
                             'attributes'   => ['data-menu-item' => 'content'],
                             'permissions'  => ['cms.manage_content'],
-                            'counterLabel' => 'cms::lang.content.unsaved_label'
+                            'counterLabel' => 'cms::lang.content.unsaved_label',
                         ],
                         'assets' => [
                             'label'        => 'cms::lang.asset.menu_label',
@@ -244,17 +242,17 @@ protected function registerBackendNavigation()
                             'url'          => 'javascript:;',
                             'attributes'   => ['data-menu-item' => 'assets'],
                             'permissions'  => ['cms.manage_assets'],
-                            'counterLabel' => 'cms::lang.asset.unsaved_label'
+                            'counterLabel' => 'cms::lang.asset.unsaved_label',
                         ],
                         'components' => [
                             'label'       => 'cms::lang.component.menu_label',
                             'icon'        => 'icon-puzzle-piece',
                             'url'         => 'javascript:;',
                             'attributes'  => ['data-menu-item' => 'components'],
-                            'permissions' => ['cms.manage_pages', 'cms.manage_layouts', 'cms.manage_partials']
-                        ]
-                    ]
-                ]
+                            'permissions' => ['cms.manage_pages', 'cms.manage_layouts', 'cms.manage_partials'],
+                        ],
+                    ],
+                ],
             ]);
             $manager->registerQuickActions('Winter.Cms', [
                 'preview' => [
@@ -280,7 +278,7 @@ protected function registerBackendReportWidgets()
         WidgetManager::instance()->registerReportWidgets(function ($manager) {
             $manager->registerReportWidget(\Cms\ReportWidgets\ActiveTheme::class, [
                 'label'   => 'cms::lang.dashboard.active_theme.widget_title_default',
-                'context' => 'dashboard'
+                'context' => 'dashboard',
             ]);
         });
     }
@@ -296,43 +294,43 @@ protected function registerBackendPermissions()
                     'label' => 'cms::lang.permissions.manage_content',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER],
-                    'order' => 100
+                    'order' => 100,
                 ],
                 'cms.manage_assets' => [
                     'label' => 'cms::lang.permissions.manage_assets',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER],
-                    'order' => 100
+                    'order' => 100,
                 ],
                 'cms.manage_pages' => [
                     'label' => 'cms::lang.permissions.manage_pages',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER],
-                    'order' => 100
+                    'order' => 100,
                 ],
                 'cms.manage_layouts' => [
                     'label' => 'cms::lang.permissions.manage_layouts',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER],
-                    'order' => 100
+                    'order' => 100,
                 ],
                 'cms.manage_partials' => [
                     'label' => 'cms::lang.permissions.manage_partials',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER],
-                    'order' => 100
+                    'order' => 100,
                 ],
                 'cms.manage_themes' => [
                     'label' => 'cms::lang.permissions.manage_themes',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER],
-                    'order' => 100
+                    'order' => 100,
                 ],
                 'cms.manage_theme_options' => [
                     'label' => 'cms::lang.permissions.manage_theme_options',
                     'tab' => 'cms::lang.permissions.name',
                     'roles' => [UserRole::CODE_DEVELOPER, UserRole::CODE_PUBLISHER],
-                    'order' => 100
+                    'order' => 100,
                 ],
             ]);
             $manager->registerPermissionOwnerAlias('Winter.Cms', 'October.Cms');
@@ -363,7 +361,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-picture-o',
                     'url'         => Backend::url('cms/themes'),
                     'permissions' => ['cms.manage_themes', 'cms.manage_theme_options'],
-                    'order'       => 200
+                    'order'       => 200,
                 ],
                 'maintenance_settings' => [
                     'label'       => 'cms::lang.maintenance.settings_menu',
@@ -372,7 +370,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-plug',
                     'class'       => Models\MaintenanceSetting::class,
                     'permissions' => ['cms.manage_themes'],
-                    'order'       => 300
+                    'order'       => 300,
                 ],
                 'theme_logs' => [
                     'label'       => 'cms::lang.theme_log.menu_label',
@@ -382,8 +380,8 @@ protected function registerBackendSettings()
                     'url'         => Backend::url('cms/themelogs'),
                     'permissions' => ['system.access_logs'],
                     'order'       => 910,
-                    'keywords'    => 'theme change log'
-                ]
+                    'keywords'    => 'theme change log',
+                ],
             ]);
             $manager->registerOwnerAlias('Winter.Cms', 'October.Cms');
         });
@@ -396,7 +394,7 @@ protected function bootMenuItemEvents()
     {
         Event::listen('pages.menuitem.listTypes', function () {
             return [
-                'cms-page' => 'cms::lang.page.cms_page'
+                'cms-page' => 'cms::lang.page.cms_page',
             ];
         });
 
@@ -420,7 +418,7 @@ protected function bootRichEditorEvents()
     {
         Event::listen('backend.richeditor.listTypes', function () {
             return [
-                'cms-page' => 'cms::lang.page.cms_page'
+                'cms-page' => 'cms::lang.page.cms_page',
             ];
         });
 
@@ -443,7 +441,7 @@ protected function registerHalcyonModels()
                 Classes\Page::class,
                 Classes\Layout::class,
                 Classes\Content::class,
-                Classes\Partial::class
+                Classes\Partial::class,
             ];
         });
     }
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index 843156438c..96f9faea04 100644
--- a/modules/cms/classes/Asset.php
+++ b/modules/cms/classes/Asset.php
@@ -2,15 +2,15 @@
 
 namespace Cms\Classes;
 
-use File;
-use Lang;
-use Config;
-use Request;
-use ApplicationException;
-use ValidationException;
 use Cms\Helpers\File as FileHelper;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\ValidationException;
 use Winter\Storm\Extension\Extendable;
 use Winter\Storm\Filesystem\PathResolver;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * The CMS theme asset file class.
@@ -55,7 +55,7 @@ class Asset extends Extendable
      */
     protected $fillable = [
         'fileName',
-        'content'
+        'content',
     ];
 
     /**
@@ -245,8 +245,8 @@ protected function validateFileName($fileName = null)
             throw new ValidationException(['fileName' =>
                 Lang::get('cms::lang.cms_object.file_name_required', [
                     'allowed' => implode(', ', $this->allowedExtensions),
-                    'invalid' => pathinfo($fileName, PATHINFO_EXTENSION)
-                ])
+                    'invalid' => pathinfo($fileName, PATHINFO_EXTENSION),
+                ]),
             ]);
         }
 
@@ -254,16 +254,16 @@ protected function validateFileName($fileName = null)
             throw new ValidationException(['fileName' =>
                 Lang::get('cms::lang.cms_object.invalid_file_extension', [
                     'allowed' => implode(', ', $this->allowedExtensions),
-                    'invalid' => pathinfo($fileName, PATHINFO_EXTENSION)
-                ])
+                    'invalid' => pathinfo($fileName, PATHINFO_EXTENSION),
+                ]),
             ]);
         }
 
         if (!FileHelper::validatePath($fileName, null)) {
             throw new ValidationException(['fileName' =>
                 Lang::get('cms::lang.cms_object.invalid_file', [
-                    'name' => $fileName
-                ])
+                    'name' => $fileName,
+                ]),
             ]);
         }
     }
diff --git a/modules/cms/classes/AutoDatasource.php b/modules/cms/classes/AutoDatasource.php
index 9264392727..c0d950bf4e 100644
--- a/modules/cms/classes/AutoDatasource.php
+++ b/modules/cms/classes/AutoDatasource.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Classes;
 
-use ApplicationException;
-use Cache;
 use Exception;
+use Illuminate\Support\Facades\Cache;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Halcyon\Datasource\Datasource;
 use Winter\Storm\Halcyon\Datasource\DatasourceInterface;
 use Winter\Storm\Halcyon\Exception\DeleteFileException;
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index d838bae6ee..00b9a300f1 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -2,16 +2,16 @@
 
 namespace Cms\Classes;
 
-use App;
-use Ini;
-use Lang;
-use Cache;
-use Config;
 use Cms\Components\ViewBag;
 use Cms\Helpers\Cms as CmsHelpers;
-use Winter\Storm\Halcyon\Processors\SectionParser;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
 use Twig\Source as TwigSource;
-use ApplicationException;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Halcyon\Processors\SectionParser;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Ini;
 
 /**
  * This is a base class for CMS objects that have multiple sections - pages, partials and layouts.
@@ -34,7 +34,7 @@ class CmsCompoundObject extends CmsObject
      * to their own array inside the 'components' key.
      */
     public $settings = [
-        'components' => []
+        'components' => [],
     ];
 
     /**
@@ -49,7 +49,7 @@ class CmsCompoundObject extends CmsObject
     protected $fillable = [
         'markup',
         'settings',
-        'code'
+        'code',
     ];
 
     /**
@@ -62,7 +62,7 @@ class CmsCompoundObject extends CmsObject
         'where',
         'sortBy',
         'whereComponent',
-        'withComponent'
+        'withComponent',
     ];
 
     /**
diff --git a/modules/cms/classes/CmsController.php b/modules/cms/classes/CmsController.php
index 931dda54c6..0cc69b47af 100644
--- a/modules/cms/classes/CmsController.php
+++ b/modules/cms/classes/CmsController.php
@@ -2,9 +2,8 @@
 
 namespace Cms\Classes;
 
-use App;
-use Closure;
 use Illuminate\Routing\Controller as ControllerBase;
+use Illuminate\Support\Facades\App;
 
 /**
  * This is the master controller for all front-end pages.
diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php
index 9045832856..0c725f3b5d 100644
--- a/modules/cms/classes/CmsException.php
+++ b/modules/cms/classes/CmsException.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Classes;
 
-use File;
+use Throwable;
 use Twig\Error\Error as TwigError;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Halcyon\Processors\SectionParser;
-use Throwable;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * The CMS exception class.
@@ -30,7 +30,7 @@ class CmsException extends ApplicationException
         100 => 'General',
         200 => 'INI Settings',
         300 => 'PHP Content',
-        400 => 'Twig Template'
+        400 => 'Twig Template',
     ];
 
     /**
diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index 333b5ca541..a35cdc13c2 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -2,16 +2,16 @@
 
 namespace Cms\Classes;
 
-use App;
-use Lang;
-use Event;
-use Config;
-use Exception;
-use ValidationException;
-use ApplicationException;
 use Cms\Contracts\CmsObject as CmsObjectContract;
+use Exception;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\ValidationException;
 use Winter\Storm\Filesystem\PathResolver;
 use Winter\Storm\Halcyon\Model as HalcyonModel;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * This is a base class for all CMS objects - content files, pages, partials and layouts.
@@ -50,7 +50,7 @@ class CmsObject extends HalcyonModel implements CmsObjectContract
      * @var array The attributes that are mass assignable.
      */
     protected $fillable = [
-        'content'
+        'content',
     ];
 
     /**
@@ -329,18 +329,18 @@ protected function throwHalcyonSaveException(Exception $ex)
     {
         if ($ex instanceof \Winter\Storm\Halcyon\Exception\MissingFileNameException) {
             throw new ValidationException([
-                'fileName' => Lang::get('cms::lang.cms_object.file_name_required')
+                'fileName' => Lang::get('cms::lang.cms_object.file_name_required'),
             ]);
         } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidExtensionException) {
             throw new ValidationException(['fileName' =>
                 Lang::get('cms::lang.cms_object.invalid_file_extension', [
                     'allowed' => implode(', ', $ex->getAllowedExtensions()),
-                    'invalid' => $ex->getInvalidExtension()
-                ])
+                    'invalid' => $ex->getInvalidExtension(),
+                ]),
             ]);
         } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidFileNameException) {
             throw new ValidationException([
-               'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name' => $ex->getInvalidFileName()])
+               'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name' => $ex->getInvalidFileName()]),
             ]);
         } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\FileExistsException) {
             throw new ApplicationException(
diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
index cc4dd71b1c..2592b5c483 100644
--- a/modules/cms/classes/CmsObjectCollection.php
+++ b/modules/cms/classes/CmsObjectCollection.php
@@ -2,7 +2,7 @@
 
 namespace Cms\Classes;
 
-use ApplicationException;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Support\Collection as CollectionBase;
 
 /**
diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php
index bd67b45667..10624ca4fe 100644
--- a/modules/cms/classes/CodeParser.php
+++ b/modules/cms/classes/CodeParser.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Classes;
 
-use File;
-use Lang;
-use Cache;
-use Config;
-use SystemException;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Str;
 
 /**
@@ -75,7 +75,7 @@ public function parse()
             'filePath' => $path,
             'className' => null,
             'source' => null,
-            'offset' => 0
+            'offset' => 0,
         ];
 
         /*
diff --git a/modules/cms/classes/ComponentBase.php b/modules/cms/classes/ComponentBase.php
index c20a4f6ea2..366621893c 100644
--- a/modules/cms/classes/ComponentBase.php
+++ b/modules/cms/classes/ComponentBase.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Classes;
 
-use Str;
-use Lang;
-use Config;
-use Winter\Storm\Extension\Extendable;
 use BadMethodCallException;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Extension\Extendable;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Str;
 
 /**
  * Component base class
@@ -323,7 +323,7 @@ public function __call($method, $parameters)
 
         throw new BadMethodCallException(Lang::get('cms::lang.component.method_not_found', [
             'name' => get_class($this),
-            'method' => $method
+            'method' => $method,
         ]));
     }
 
diff --git a/modules/cms/classes/ComponentHelpers.php b/modules/cms/classes/ComponentHelpers.php
index a3e9273b91..e558453937 100644
--- a/modules/cms/classes/ComponentHelpers.php
+++ b/modules/cms/classes/ComponentHelpers.php
@@ -2,7 +2,7 @@
 
 namespace Cms\Classes;
 
-use Lang;
+use Illuminate\Support\Facades\Lang;
 
 /**
  * Defines some component helpers for the CMS UI.
@@ -32,7 +32,7 @@ public static function getComponentsPropertyConfig($component, $addAliasProperty
                 'validationPattern'     => '^(@)?[a-zA-Z]+[0-9a-z\_]*$',
                 'validationMessage'     => Lang::get('cms::lang.component.validation_message'),
                 'required'              => true,
-                'showExternalParam'     => false
+                'showExternalParam'     => false,
             ];
             $result[] = $property;
         }
@@ -44,7 +44,7 @@ public static function getComponentsPropertyConfig($component, $addAliasProperty
                     'property'              => $name,
                     'title'                 => array_get($params, 'title', $name),
                     'type'                  => array_get($params, 'type', 'string'),
-                    'showExternalParam'     => array_get($params, 'showExternalParam', true)
+                    'showExternalParam'     => array_get($params, 'showExternalParam', true),
                 ];
 
                 foreach ($params as $name => $value) {
diff --git a/modules/cms/classes/ComponentManager.php b/modules/cms/classes/ComponentManager.php
index 419d40f171..01858ce7c1 100644
--- a/modules/cms/classes/ComponentManager.php
+++ b/modules/cms/classes/ComponentManager.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Classes;
 
-use Str;
-use System\Classes\PluginManager;
-use SystemException;
 use Illuminate\Support\Facades\App;
+use System\Classes\PluginManager;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Str;
 
 /**
  * Component manager
diff --git a/modules/cms/classes/ComponentPartial.php b/modules/cms/classes/ComponentPartial.php
index 9b06bf3afa..6a66f7842f 100644
--- a/modules/cms/classes/ComponentPartial.php
+++ b/modules/cms/classes/ComponentPartial.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Classes;
 
-use File;
-use Lang;
 use Cms\Contracts\CmsObject as CmsObjectContract;
 use Cms\Helpers\File as FileHelper;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Extension\Extendable;
-use ApplicationException;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * The CMS component partial class. These objects are read-only.
@@ -164,7 +164,7 @@ protected function validateFileName($fileName)
     {
         if (!FileHelper::validatePath($fileName, $this->maxNesting)) {
             throw new ApplicationException(Lang::get('cms::lang.cms_object.invalid_file', [
-                'name' => $fileName
+                'name' => $fileName,
             ]));
         }
 
diff --git a/modules/cms/classes/Content.php b/modules/cms/classes/Content.php
index 48b06bd2b5..df59b95afe 100644
--- a/modules/cms/classes/Content.php
+++ b/modules/cms/classes/Content.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Classes;
 
-use File;
-use Markdown;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Markdown;
 
 /**
  * The CMS content file class.
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 250348a200..1cb0af6068 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -2,13 +2,22 @@
 
 namespace Cms\Classes;
 
-use Exception;
 use Backend\Facades\BackendAuth;
 use Cms\Facades\Cms;
 use Cms\Models\MaintenanceSetting;
-use System\Models\RequestLog;
-use System\Helpers\View as ViewHelper;
+use Exception;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
 use System\Classes\CombineAssets;
+use System\Helpers\View as ViewHelper;
+use System\Models\RequestLog;
 use Twig\Environment as TwigEnvironment;
 use Winter\Storm\Exception\AjaxException;
 use Winter\Storm\Exception\SystemException;
@@ -18,15 +27,6 @@
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\Facades\Url;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\View;
 
 /**
  * The CMS controller class.
@@ -1357,7 +1357,7 @@ protected function themeCombineAssets(array $url): string
         if (!($assets = Cache::get($cacheKey))) {
             $assets = [];
             $sources = [
-                $themesPath . '/' . $themeDir
+                $themesPath . '/' . $themeDir,
             ];
 
             if ($parentTheme) {
diff --git a/modules/cms/classes/MediaViewHelper.php b/modules/cms/classes/MediaViewHelper.php
index c5659ae1f4..89f88a074a 100644
--- a/modules/cms/classes/MediaViewHelper.php
+++ b/modules/cms/classes/MediaViewHelper.php
@@ -2,7 +2,7 @@
 
 namespace Cms\Classes;
 
-use ApplicationException;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Helper class for processing video and audio tags inserted by the Media Manager.
@@ -44,7 +44,7 @@ protected function extractMediaTags($html)
 
         $tagDefinitions = [
             'audio' => '/data\-audio\s*=\s*"([^"]+)"/',
-            'video' => '/data\-video\s*=\s*"([^"]+)"/'
+            'video' => '/data\-video\s*=\s*"([^"]+)"/',
         ];
 
         if (preg_match_all('/\<figure\s+[^\>]+\>[^\<]*\<\/figure\>/i', $html, $matches)) {
@@ -55,7 +55,7 @@ protected function extractMediaTags($html)
                         $result[] = [
                             'declaration' => $mediaDeclaration,
                             'type' => $type,
-                            'src' => $nameMatch[1]
+                            'src' => $nameMatch[1],
                         ];
                     }
                 }
diff --git a/modules/cms/classes/Meta.php b/modules/cms/classes/Meta.php
index 5dca5183fe..c7ca8db468 100644
--- a/modules/cms/classes/Meta.php
+++ b/modules/cms/classes/Meta.php
@@ -2,7 +2,7 @@
 
 namespace Cms\Classes;
 
-use Yaml;
+use Winter\Storm\Support\Facades\Yaml;
 
 /**
  * The CMS meta file class, used for interacting with YAML files within the Halcyon datasources
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 1d65fccc39..fef8e035b3 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Classes;
 
-use Lang;
-use BackendAuth;
-use ApplicationException;
+use Backend\Facades\BackendAuth;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
 
 /**
@@ -33,7 +33,7 @@ class Page extends CmsCompoundObject
         'meta_description',
         'markup',
         'settings',
-        'code'
+        'code',
     ];
 
     /**
@@ -47,7 +47,7 @@ class Page extends CmsCompoundObject
      */
     public $rules = [
         'title' => 'required',
-        'url'   => ['required', 'regex:/^\/[a-z0-9\/\:_\-\*\[\]\+\?\|\.\^\\\$]*$/i']
+        'url'   => ['required', 'regex:/^\/[a-z0-9\/\:_\-\*\[\]\+\?\|\.\^\\\$]*$/i'],
     ];
 
     /**
@@ -166,7 +166,7 @@ public static function getMenuTypeInfo(string $type)
             $result = [
                 'references'   => $references,
                 'nesting'      => false,
-                'dynamicItems' => false
+                'dynamicItems' => false,
             ];
         }
 
diff --git a/modules/cms/classes/PartialStack.php b/modules/cms/classes/PartialStack.php
index 7fa2ac21f8..1823f85112 100644
--- a/modules/cms/classes/PartialStack.php
+++ b/modules/cms/classes/PartialStack.php
@@ -32,7 +32,7 @@ public function stackPartial()
         }
 
         $this->activePartial = [
-            'components' => []
+            'components' => [],
         ];
     }
 
@@ -51,7 +51,7 @@ public function addComponent($alias, $componentObj)
     {
         array_push($this->activePartial['components'], [
             'name' => $alias,
-            'obj' => $componentObj
+            'obj' => $componentObj,
         ]);
     }
 
diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
index b0d63e6919..55284b51a3 100644
--- a/modules/cms/classes/Router.php
+++ b/modules/cms/classes/Router.php
@@ -2,13 +2,13 @@
 
 namespace Cms\Classes;
 
-use Lang;
-use File;
-use Cache;
-use Config;
-use Event;
-use Winter\Storm\Router\Router as StormRouter;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Router\Router as StormRouter;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * The router parses page URL patterns and finds pages by URLs.
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index f172db87d5..1839aba7cd 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -2,23 +2,23 @@
 
 namespace Cms\Classes;
 
-use App;
-use ApplicationException;
-use Cache;
 use Cms\Models\ThemeData;
-use Config;
 use DirectoryIterator;
-use Event;
 use Exception;
-use File;
-use Lang;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\URL;
 use System\Models\Parameter;
-use SystemException;
-use Url;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Halcyon\Datasource\DatasourceInterface;
 use Winter\Storm\Halcyon\Datasource\DbDatasource;
 use Winter\Storm\Halcyon\Datasource\FileDatasource;
-use Yaml;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Yaml;
 
 /**
  * This class represents the CMS theme.
@@ -347,7 +347,7 @@ public function getConfig(): array
 
         // Attempt to load the theme's config file from whatever datasources are available.
         $sources = [
-            'filesystem' => new FileDatasource(themes_path($this->getDirName()), App::make('files'))
+            'filesystem' => new FileDatasource(themes_path($this->getDirName()), App::make('files')),
         ];
         if (static::databaseLayerEnabled()) {
             $sources['database'] = new DbDatasource($this->getDirName(), 'cms_theme_templates');
diff --git a/modules/cms/classes/ThemeManager.php b/modules/cms/classes/ThemeManager.php
index 7ad3f338d6..97038e975f 100644
--- a/modules/cms/classes/ThemeManager.php
+++ b/modules/cms/classes/ThemeManager.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Classes;
 
-use File;
-use ApplicationException;
-use System\Models\Parameter;
 use Cms\Classes\Theme as CmsTheme;
+use System\Models\Parameter;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Theme manager
diff --git a/modules/cms/components/Resources.php b/modules/cms/components/Resources.php
index c417d8170f..29af528883 100644
--- a/modules/cms/components/Resources.php
+++ b/modules/cms/components/Resources.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Components;
 
-use File;
 use Cms\Classes\ComponentBase;
 use System\Classes\CombineAssets;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Resources component
@@ -52,32 +52,32 @@ public function defineProperties()
                 'title'             => 'JavaScript',
                 'description'       => 'JavaScript file(s) in the assets/js folder',
                 'type'              => 'stringList',
-                'showExternalParam' => false
+                'showExternalParam' => false,
             ],
             'less' => [
                 'title'             => 'LESS',
                 'description'       => 'LESS file(s) in the assets/less folder',
                 'type'              => 'stringList',
-                'showExternalParam' => false
+                'showExternalParam' => false,
             ],
             'sass' => [
                 'title'             => 'SASS',
                 'description'       => 'SASS file(s) in the assets/sass folder',
                 'type'              => 'stringList',
-                'showExternalParam' => false
+                'showExternalParam' => false,
             ],
             'css' => [
                 'title'             => 'CSS',
                 'description'       => 'Stylesheet file(s) in the assets/css folder',
                 'type'              => 'stringList',
-                'showExternalParam' => false
+                'showExternalParam' => false,
             ],
             'vars' => [
                 'title'             => 'Variables',
                 'description'       => 'Page variables name(s) and value(s)',
                 'type'              => 'dictionary',
-                'showExternalParam' => false
-            ]
+                'showExternalParam' => false,
+            ],
         ];
     }
 
diff --git a/modules/cms/components/SoftComponent.php b/modules/cms/components/SoftComponent.php
index 5e70a8b82f..34c6e95e08 100644
--- a/modules/cms/components/SoftComponent.php
+++ b/modules/cms/components/SoftComponent.php
@@ -29,7 +29,7 @@ public function componentDetails()
     {
         return [
             'name'        => 'cms::lang.component.soft_component',
-            'description' => 'cms::lang.component.soft_component_description'
+            'description' => 'cms::lang.component.soft_component_description',
         ];
     }
 }
diff --git a/modules/cms/components/UnknownComponent.php b/modules/cms/components/UnknownComponent.php
index 5cc6a6e066..6cd482eabf 100644
--- a/modules/cms/components/UnknownComponent.php
+++ b/modules/cms/components/UnknownComponent.php
@@ -30,7 +30,7 @@ public function componentDetails()
     {
         return [
             'name'        => 'Unknown component',
-            'description' => $this->errorMessage
+            'description' => $this->errorMessage,
         ];
     }
 }
diff --git a/modules/cms/components/ViewBag.php b/modules/cms/components/ViewBag.php
index 2b2250fe8e..df4fdf89c6 100644
--- a/modules/cms/components/ViewBag.php
+++ b/modules/cms/components/ViewBag.php
@@ -25,7 +25,7 @@ public function componentDetails()
     {
         return [
             'name'        => 'viewBag',
-            'description' => 'Stores custom template properties.'
+            'description' => 'Stores custom template properties.',
         ];
     }
 
@@ -76,7 +76,7 @@ public function defineProperties()
         foreach ($this->properties as $name => $value) {
             $result[$name] = [
                 'title' => $name,
-                'type' => 'string'
+                'type' => 'string',
             ];
         }
 
diff --git a/modules/cms/console/ThemeInstall.php b/modules/cms/console/ThemeInstall.php
index 1aefb5010f..a6eefaa772 100644
--- a/modules/cms/console/ThemeInstall.php
+++ b/modules/cms/console/ThemeInstall.php
@@ -4,9 +4,9 @@
 
 use Cms\Classes\Theme;
 use Cms\Classes\ThemeManager;
-use File;
 use System\Classes\UpdateManager;
 use Winter\Storm\Console\Command;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Console command to install a new theme.
diff --git a/modules/cms/console/ThemeSync.php b/modules/cms/console/ThemeSync.php
index 255456896d..a8930c1dae 100644
--- a/modules/cms/console/ThemeSync.php
+++ b/modules/cms/console/ThemeSync.php
@@ -3,9 +3,9 @@
 namespace Cms\Console;
 
 use Cms\Classes\Theme;
-use Event;
 use Exception;
 use Winter\Storm\Console\Command;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * Console command to sync a theme between the DB and Filesystem layers.
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index fce5ddb1ac..8e98298b73 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -2,33 +2,33 @@
 
 namespace Cms\Controllers;
 
-use Url;
-use Lang;
-use Flash;
-use Config;
-use Event;
-use Request;
-use Exception;
-use BackendMenu;
-use Cms\Widgets\AssetList;
-use Cms\Widgets\TemplateList;
-use Cms\Widgets\ComponentList;
-use Cms\Classes\Page;
-use Cms\Classes\Theme;
-use Cms\Classes\Router;
-use Cms\Classes\Layout;
-use Cms\Classes\Partial;
-use Cms\Classes\Content;
-use Cms\Classes\CmsObject;
+use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
+use Cms\Classes\Asset;
 use Cms\Classes\CmsCompoundObject;
+use Cms\Classes\CmsObject;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentPartial;
+use Cms\Classes\Content;
+use Cms\Classes\Layout;
+use Cms\Classes\Page;
+use Cms\Classes\Partial;
+use Cms\Classes\Router;
+use Cms\Classes\Theme;
 use Cms\Helpers\Cms as CmsHelpers;
-use Backend\Classes\Controller;
+use Cms\Widgets\AssetList;
+use Cms\Widgets\ComponentList;
+use Cms\Widgets\TemplateList;
+use Exception;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\URL;
 use System\Helpers\DateTime;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Router\Router as StormRouter;
-use ApplicationException;
-use Cms\Classes\Asset;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * CMS index
@@ -53,7 +53,7 @@ class Index extends Controller
         'cms.manage_assets',
         'cms.manage_pages',
         'cms.manage_layouts',
-        'cms.manage_partials'
+        'cms.manage_partials',
     ];
 
     /**
@@ -170,8 +170,8 @@ public function index_onOpenTemplate()
                 'form'          => $widget,
                 'templateType'  => $type,
                 'templateTheme' => $this->theme->getDirName(),
-                'templateMtime' => $template->mtime
-            ])
+                'templateMtime' => $template->mtime,
+            ]),
         ];
     }
 
@@ -285,8 +285,8 @@ public function onCreateTemplate()
                 'form'          => $widget,
                 'templateType'  => $type,
                 'templateTheme' => $this->theme->getDirName(),
-                'templateMtime' => null
-            ])
+                'templateMtime' => null,
+            ]),
         ];
     }
 
@@ -336,7 +336,7 @@ public function onDeleteTemplates()
         return [
             'deleted' => $deleted,
             'error'   => $error,
-            'theme'   => Request::input('theme')
+            'theme'   => Request::input('theme'),
         ];
     }
 
@@ -368,7 +368,7 @@ public function onGetTemplateList()
 
         $page = Page::inTheme($this->theme);
         return [
-            'layouts' => $page->getLayoutOptions()
+            'layouts' => $page->getLayoutOptions(),
         ];
     }
 
@@ -474,7 +474,7 @@ protected function getUpdateResponse($template, string $type)
         $result = [
             'templatePath'  => $template->fileName,
             'templateMtime' => $template->mtime,
-            'tabTitle'      => $this->getTabTitle($type, $template)
+            'tabTitle'      => $this->getTabTitle($type, $template),
         ];
 
         if ($type === 'page') {
@@ -572,7 +572,7 @@ protected function resolveTypeClassName($type)
             'partial' => Partial::class,
             'layout'  => Layout::class,
             'content' => Content::class,
-            'asset'   => Asset::class
+            'asset'   => Asset::class,
         ];
 
         if (!array_key_exists($type, $types)) {
@@ -677,7 +677,7 @@ protected function makeTemplateFormWidget($type, $template, $alias = null)
             'partial' => '~/modules/cms/classes/partial/fields.yaml',
             'layout'  => '~/modules/cms/classes/layout/fields.yaml',
             'content' => '~/modules/cms/classes/content/fields.yaml',
-            'asset'   => '~/modules/cms/classes/asset/fields.yaml'
+            'asset'   => '~/modules/cms/classes/asset/fields.yaml',
         ];
 
         if (!array_key_exists($type, $formConfigs)) {
@@ -838,7 +838,7 @@ protected function findComponentByAlias(string $aliasQuery, array $components =
                 $found = [
                     'name' => ltrim($name, '@'),
                     'alias' => $alias,
-                    'properties' => $properties
+                    'properties' => $properties,
                 ];
                 break;
             }
diff --git a/modules/cms/controllers/ThemeLogs.php b/modules/cms/controllers/ThemeLogs.php
index 27dc9ca1d8..434968de20 100644
--- a/modules/cms/controllers/ThemeLogs.php
+++ b/modules/cms/controllers/ThemeLogs.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Controllers;
 
-use Lang;
-use Flash;
-use BackendMenu;
 use Backend\Classes\Controller;
-use System\Classes\SettingsManager;
+use Backend\Facades\BackendMenu;
 use Cms\Models\ThemeLog;
+use Illuminate\Support\Facades\Lang;
+use System\Classes\SettingsManager;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Request Logs controller
diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php
index 00e1a8b1da..83dc60f317 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -2,14 +2,14 @@
 
 namespace Cms\Controllers;
 
-use Backend;
-use BackendMenu;
-use ApplicationException;
-use Cms\Models\ThemeData;
-use Cms\Classes\Theme as CmsTheme;
-use System\Classes\SettingsManager;
 use Backend\Classes\Controller;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
+use Cms\Classes\Theme as CmsTheme;
+use Cms\Models\ThemeData;
 use Exception;
+use System\Classes\SettingsManager;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Theme customization controller
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index 789a7e20e7..9ef451846c 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -2,26 +2,26 @@
 
 namespace Cms\Controllers;
 
-use ApplicationException;
-use Artisan;
-use Backend;
 use Backend\Classes\Controller;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
 use Backend\Models\BrandSetting;
 use Backend\Widgets\Form;
-use BackendMenu;
 use Cms\Classes\Theme as CmsTheme;
 use Cms\Classes\ThemeManager;
 use Cms\Helpers\Cms as CmsHelper;
 use Cms\Models\ThemeExport;
 use Cms\Models\ThemeImport;
 use Exception;
-use File;
-use Flash;
-use Lang;
-use Redirect;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\URL;
 use System\Classes\SettingsManager;
-use Url;
-use ValidationException;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\ValidationException;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\Str;
 
 /**
@@ -81,7 +81,7 @@ public function index_onSetActiveTheme()
         CmsTheme::setActiveTheme(post('theme'));
 
         return [
-            '#theme-list' => $this->makePartial('theme_list')
+            '#theme-list' => $this->makePartial('theme_list'),
         ];
     }
 
@@ -173,7 +173,7 @@ public function index_onCreate()
                 try {
                     Artisan::call('create:theme', [
                         'theme' => $newDirName,
-                        'scaffold' => $data['scaffold']
+                        'scaffold' => $data['scaffold'],
                     ]);
                 } catch (\Exception $ex) {
                     throw new ApplicationException($ex->getMessage());
diff --git a/modules/cms/controllers/index/_form_page.php b/modules/cms/controllers/index/_form_page.php
index 74d1b2fc96..8e59d1ebec 100644
--- a/modules/cms/controllers/index/_form_page.php
+++ b/modules/cms/controllers/index/_form_page.php
@@ -2,7 +2,7 @@
         'class' => 'layout',
         'data-change-monitor' => 'true',
         'data-window-close-confirm' => e(trans('backend::lang.form.confirm_tab_close')),
-        'data-inspector-external-parameters' => true
+        'data-inspector-external-parameters' => true,
 ]) ?>
     <?= $form->render() ?>
 
diff --git a/modules/cms/controllers/themes/_theme_create_form.php b/modules/cms/controllers/themes/_theme_create_form.php
index 5ec6184b74..5ae8afa03b 100644
--- a/modules/cms/controllers/themes/_theme_create_form.php
+++ b/modules/cms/controllers/themes/_theme_create_form.php
@@ -1,6 +1,6 @@
 <?= Form::ajax('onCreate', [
     'id' => 'themeCreateForm',
-    'data-popup-load-indicator' => true
+    'data-popup-load-indicator' => true,
 ]) ?>
 
     <div class="modal-header">
diff --git a/modules/cms/controllers/themes/_theme_export_form.php b/modules/cms/controllers/themes/_theme_export_form.php
index 8d3e77873d..2e36d0450c 100644
--- a/modules/cms/controllers/themes/_theme_export_form.php
+++ b/modules/cms/controllers/themes/_theme_export_form.php
@@ -1,7 +1,7 @@
 <?= Form::ajax('onExport', [
     'id' => 'themeExportForm',
     'data-popup-load-indicator' => true,
-    'data-request-success' => 'closeExportThemePopup()'
+    'data-request-success' => 'closeExportThemePopup()',
 ]) ?>
 
     <input type="hidden" name="theme" value="<?= $themeDir ?>" />
diff --git a/modules/cms/controllers/themes/_theme_fields_form.php b/modules/cms/controllers/themes/_theme_fields_form.php
index eb8ea1e569..4d844f9533 100644
--- a/modules/cms/controllers/themes/_theme_fields_form.php
+++ b/modules/cms/controllers/themes/_theme_fields_form.php
@@ -1,6 +1,6 @@
 <?= Form::ajax('onSaveFields', [
     'id' => 'themeFieldsForm',
-    'data-popup-load-indicator' => true
+    'data-popup-load-indicator' => true,
 ]) ?>
 
     <input type="hidden" name="theme" value="<?= $themeDir ?>" />
diff --git a/modules/cms/formwidgets/Components.php b/modules/cms/formwidgets/Components.php
index fec2a8cc2c..c4e0295990 100644
--- a/modules/cms/formwidgets/Components.php
+++ b/modules/cms/formwidgets/Components.php
@@ -3,8 +3,8 @@
 namespace Cms\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
-use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentHelpers;
+use Cms\Classes\ComponentManager;
 use Cms\Components\SoftComponent;
 use Cms\Components\UnknownComponent;
 use Exception;
diff --git a/modules/cms/helpers/Cms.php b/modules/cms/helpers/Cms.php
index 6483c8893b..732248a265 100644
--- a/modules/cms/helpers/Cms.php
+++ b/modules/cms/helpers/Cms.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Helpers;
 
-use Url;
-use Route;
-use Config;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\URL;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * CMS Helper
diff --git a/modules/cms/helpers/File.php b/modules/cms/helpers/File.php
index 80653ab571..a4ed01414a 100644
--- a/modules/cms/helpers/File.php
+++ b/modules/cms/helpers/File.php
@@ -2,9 +2,6 @@
 
 namespace Cms\Helpers;
 
-use Config;
-use File as Filesystem;
-
 /**
  * Defines some file-system helpers for the CMS system.
  *
diff --git a/modules/cms/lang/ar/lang.php b/modules/cms/lang/ar/lang.php
index aca084296f..21ee119747 100644
--- a/modules/cms/lang/ar/lang.php
+++ b/modules/cms/lang/ar/lang.php
@@ -7,8 +7,8 @@
             'online' => 'أونلاين',
             'maintenance' => 'تحت الصيانة',
             'manage_themes' => 'إدارة القوالب',
-            'customize_theme' => 'تخصيص القالب'
-        ]
+            'customize_theme' => 'تخصيص القالب',
+        ],
     ],
     'page' => [
         'menu_label' => 'الصفحات',
@@ -23,7 +23,7 @@
         'menu_label' => 'المحتوى',
     ],
     'cms' => [
-        'menu_label' => 'المحتوى'
+        'menu_label' => 'المحتوى',
     ],
     'editor' => [
         'settings' => 'الإعدادات',
diff --git a/modules/cms/lang/be/lang.php b/modules/cms/lang/be/lang.php
index 8e05b00f15..94094c5ad5 100644
--- a/modules/cms/lang/be/lang.php
+++ b/modules/cms/lang/be/lang.php
@@ -19,18 +19,18 @@
             'online' => "Анлайн",
             'maintenance' => "У абслугоўванні",
             'manage_themes' => "Кіраванне тэмамі",
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Тэма \":name\" не знойдзена",
         'active' => [
             'not_set' => "Актыўная тэма не ўстаноўлена",
-            'not_found' => "Актыўная тэма не знойдзена"
+            'not_found' => "Актыўная тэма не знойдзена",
         ],
         'edit' => [
             'not_set' => "Тэма для рэдагавання не ўстаноўлена",
             'not_found' => "Тэма для рэдагавання не знойдзена",
-            'not_match' => "Аб'ект, які Вы спрабуеце адкрыць, не належыць рэдагуемай тэме. Калі ласка, перазагрузіце старонку"
+            'not_match' => "Аб'ект, які Вы спрабуеце адкрыць, не належыць рэдагуемай тэме. Калі ласка, перазагрузіце старонку",
         ],
         'settings_menu' => "Інтэрфейсная тэма",
         'settings_menu_description' => "Прагляд усталяваных тэм і выбар актыўнай тэмы",
@@ -101,11 +101,11 @@
         'not_found_name' => "Старонка \":name\" не знойдзена",
         'not_found' => [
             'label' => "Старонка не знойдзена",
-            'help' => "Запрошаная старонка не можа быць знойдзена"
+            'help' => "Запрошаная старонка не можа быць знойдзена",
         ],
         'custom_error' => [
             'label' => "Памылка на старонцы",
-            'help' => "Прабачце, але нешта здарылася і старонка не можа быць адлюстравана"
+            'help' => "Прабачце, але нешта здарылася і старонка не можа быць адлюстравана",
         ],
         'menu_label' => "Старонкі",
         'unsaved_label' => "Незахаваныя старонкі",
@@ -115,7 +115,7 @@
         'delete_confirm_multiple' => "Выдаліць абраныя старонкі?",
         'delete_confirm_single' => "Выдаліць гэтую старонку?",
         'no_layout' => "-- няма макету --",
-        'cms_page' => "Старонка CMS"
+        'cms_page' => "Старонка CMS",
     ],
     'layout' => [
         'not_found_name' => "Макет \":name\" не знойдзены",
@@ -124,7 +124,7 @@
         'no_list_records' => "Няма макетаў",
         'new' => "Новы макет",
         'delete_confirm_multiple' => "Выдаліць абраныя макеты?",
-        'delete_confirm_single' => "Выдаліць гэты макет?"
+        'delete_confirm_single' => "Выдаліць гэты макет?",
     ],
     'partial' => [
         'not_found_name' => "Частковы шаблон \":name\" не знойдзены",
@@ -134,7 +134,7 @@
         'no_list_records' => "Няма частковых шаблонаў",
         'delete_confirm_multiple' => "Выдаліць абраныя шаблоны?",
         'delete_confirm_single' => "Выдаліць гэты частковы шаблон?",
-        'new' => "Новы частковы шаблон"
+        'new' => "Новы частковы шаблон",
     ],
     'content' => [
         'not_found_name' => "Зместавы файл \":name\" не знойдзены",
@@ -143,18 +143,18 @@
         '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' => "Налады",
@@ -178,7 +178,7 @@
         'open_searchbox' => "Адчыніць пошук",
         'close_searchbox'  => "Зачыніць пошук",
         'open_replacebox' => "Адчыніць налады для замены",
-        'close_replacebox'  => "Зачыніць налады для замены"
+        'close_replacebox'  => "Зачыніць налады для замены",
     ],
     'asset' => [
         'menu_label' => "Рэсурсы",
@@ -218,7 +218,7 @@
         'error_deleting_directory' => "Памылка падчас выдалення зыходнага каталогу \":dir\"",
         'no_list_records' => "Файлы не знойдзены",
         'delete_confirm' => "Выдаліць абраныя файлы альбо каталогі?",
-        'path' => "Шлях"
+        'path' => "Шлях",
     ],
     'component' => [
         'menu_label' => "Кампаненты",
@@ -230,14 +230,14 @@
         'invalid_request' => "Шаблон не можа быць захаваны з-за няправільных дадзеных кампаненту",
         'no_records' => "Няма кампанентаў",
         'not_found' => "Кампанент \":name\" не знойдзены",
-        'method_not_found' => "Кампанент \":name\" не мае метада \":method\""
+        'method_not_found' => "Кампанент \":name\" не мае метада \":method\"",
     ],
     'template' => [
         'invalid_type' => "Невядомы тып шаблону",
         'not_found' => "Шаблон не знойдзены",
         'saved' => "Шаблон захаваны",
         'no_list_records' => "Запісы не знойдзены",
-        'delete_confirm' => "Выдаліць абраныя шаблоны?"
+        'delete_confirm' => "Выдаліць абраныя шаблоны?",
     ],
     'permissions' => [
         'name' => "CMS",
@@ -247,5 +247,5 @@
         'manage_layouts' => "Стварэнне, змяненне і выдаленне CMS макетаў",
         'manage_partials' => "Стварэнне, змяненне і выдаленне частковых шаблонаў CMS",
         'manage_themes' => "Актывацыя, дэактывацыя і налады тэмаў CMS",
-    ]
+    ],
 ];
diff --git a/modules/cms/lang/bg/lang.php b/modules/cms/lang/bg/lang.php
index 8c01e28a99..b25bf2f03e 100644
--- a/modules/cms/lang/bg/lang.php
+++ b/modules/cms/lang/bg/lang.php
@@ -10,18 +10,18 @@
         'invalid_file_extension' => 'Невалидно разширение на файл: :invalid. Позволени разширения са: :allowed.',
         'error_deleting' => "Грешка при изтриване на шаблонен файл ':name'. Моля, проверете правата за записване.",
         'delete_success' => 'Шаблоните са успешно изтрити: :count.',
-        'file_name_required' => 'Полето Име на Файл е задължително.'
+        'file_name_required' => 'Полето Име на Файл е задължително.',
     ],
     'theme' => [
         'not_found_name' => "Темата ':name' не е намерена.",
         'active' => [
             'not_set' => 'Активната тема не е зададена.',
-            'not_found' => 'Активната тема не е намерена.'
+            'not_found' => 'Активната тема не е намерена.',
         ],
         'edit' => [
             'not_set' => 'Темата за редактиране не е зададена.',
             'not_found' => 'Темата за редактиране не е намерена.',
-            'not_match' => 'Обектът, който се опитвате да достъпите, не принадлежи към темата да се редактира. Моля, презаредете страницата.'
+            'not_match' => 'Обектът, който се опитвате да достъпите, не принадлежи към темата да се редактира. Моля, презаредете страницата.',
         ],
         'settings_menu' => 'Front-end Тема',
         'settings_menu_description' => 'Преглед на списъка с инсталирани теми и изберете активна тема.',
@@ -85,17 +85,17 @@
         'settings_menu' => 'Режим на поддръжка',
         'settings_menu_description' => 'Конфигуриране на страницата в Режим на поддръжка и превключване на настройката.',
         'is_enabled' => 'Активиране на Режим на поддръжка',
-        'is_enabled_comment' => 'Когато е активиран, посетителите на сайта ще виждат само страницата по-долу.'
+        'is_enabled_comment' => 'Когато е активиран, посетителите на сайта ще виждат само страницата по-долу.',
     ],
     'page' => [
         'not_found_name' => "Страницата ':name' не намерена.",
         'not_found' => [
             'label' => 'Страницата не е намерена.',
-            'help' => 'Заявената страница не може да бъде намерена.'
+            'help' => 'Заявената страница не може да бъде намерена.',
         ],
         'custom_error' => [
             'label' => 'Грешка на страницата.',
-            'help' => "Съжаляваме, но нещо се обърка и на страницата не може да бъде показана."
+            'help' => "Съжаляваме, но нещо се обърка и на страницата не може да бъде показана.",
         ],
         'menu_label' => 'Страници',
         'unsaved_label' => 'Незапазена страница(и)',
@@ -104,7 +104,7 @@
         'invalid_url' => 'Невалиден формат за URL. Той трябва да започне със символа за наклонена черта и може да съдържат цифри, латински букви и следните символи: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Наистина ли искате да изтриете избраните страници?',
         'delete_confirm_single' => 'Наистина ли искате да изтриете страницата?',
-        'no_layout' => '-- няма оформление --'
+        'no_layout' => '-- няма оформление --',
     ],
     'layout' => [
         'not_found_name' => "Оформлението ':name' не намерено.",
@@ -113,7 +113,7 @@
         'no_list_records' => 'Няма намерени оформления',
         'new' => 'Ново оформление',
         'delete_confirm_multiple' => 'Наистина ли искате да изтриете избраните оформления?',
-        'delete_confirm_single' => 'Наистина ли искате да изтриете това оформление?'
+        'delete_confirm_single' => 'Наистина ли искате да изтриете това оформление?',
     ],
     'partial' => [
         'not_found_name' => "Частична страница ':name' не е намерена.",
@@ -123,7 +123,7 @@
         'no_list_records' => 'No partials found',
         'delete_confirm_multiple' => 'Наистина ли искате да изтриете избраните частични страници?',
         'delete_confirm_single' => 'Наистина ли искате да изтриете тази частична страница?',
-        'new' => 'Нова частична страница'
+        'new' => 'Нова частична страница',
     ],
     'content' => [
         'not_found_name' => "Файлът със съдържание ':name' не е намерен.",
@@ -132,18 +132,18 @@
         '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' => 'Настройки',
@@ -163,7 +163,7 @@
         'hidden' => 'Скрит',
         'hidden_comment' => 'Скрити страници са достъпни само от логнатите регистрирани потребители.',
         'enter_fullscreen' => 'Премини в режим на цял екран',
-        'exit_fullscreen' => 'Изход от режим на цял екран'
+        'exit_fullscreen' => 'Изход от режим на цял екран',
     ],
     'asset' => [
         'menu_label' => 'Ресурси',
@@ -201,7 +201,7 @@
         'error_moving_file' => 'Грешка при преместването на файл :file',
         'error_moving_directory' => 'Грешка при преместването на директория :dir',
         'error_deleting_directory' => 'Грешка при изтриване на оригинална директория :dir',
-        'path' => 'Път'
+        'path' => 'Път',
     ],
     'component' => [
         'menu_label' => 'Компоненти',
@@ -213,12 +213,12 @@
         'invalid_request' => 'Шаблонът не може да бъде спасен, защото от невалиден данни на компонент.',
         'no_records' => 'Няма намерени компоненти',
         'not_found' => "Компонентът ':name' не е намерен.",
-        'method_not_found' => "Компонентът ':name' не съдържа метод ':method'."
+        'method_not_found' => "Компонентът ':name' не съдържа метод ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Неизвестен тип шаблон.',
         'not_found' => 'Заявения шаблон не е намерен.',
-        'saved' => 'Шаблонът е запазен успешно.'
+        'saved' => 'Шаблонът е запазен успешно.',
     ],
     'permissions' => [
         'name' => 'Cms',
@@ -228,5 +228,5 @@
         'manage_layouts' => 'Управление на оформления',
         'manage_partials' => 'Управление на частични страници',
         'manage_themes' => 'Управление на теми',
-    ]
+    ],
 ];
diff --git a/modules/cms/lang/ca/lang.php b/modules/cms/lang/ca/lang.php
index 2d7f6566dd..5f57914d08 100644
--- a/modules/cms/lang/ca/lang.php
+++ b/modules/cms/lang/ca/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => "Error eliminant l'arxiu de plantilla ':name'. Si us plau revisa els permisos d'escriptura.",
         'delete_success' => 'Plantilles eliminades: :count.',
         'file_name_required' => "El camp 'Nom d'arxiu' és obligatori.",
-        'safe_mode_enabled' => 'El mode segur està activat.'
+        'safe_mode_enabled' => 'El mode segur està activat.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,20 +19,20 @@
             'online' => 'Online',
             'maintenance' => 'En manteniment',
             'manage_themes' => 'Gestionar temes',
-            'customize_theme' => 'Personalitzar tema'
-        ]
+            'customize_theme' => 'Personalitzar tema',
+        ],
     ],
     'theme' => [
         'not_found_name' => "No s'ha trobat el tema ':name'.",
         'by_author' => 'Per :name',
         'active' => [
             'not_set' => "No s'ha establit un tema actiu.",
-            'not_found' => "No s'ha trobat el tema actiu."
+            'not_found' => "No s'ha trobat el tema actiu.",
         ],
         'edit' => [
             'not_set' => "No s'ha establit un tema d'edició.",
             'not_found' => "No s'ha trobat el tema d'edició.",
-            'not_match' => "L'objecte al que estàs intentant accedir no pertany al tema que estàs editant. Si us plau recarrega la pàgina."
+            'not_match' => "L'objecte al que estàs intentant accedir no pertany al tema que estàs editant. Si us plau recarrega la pàgina.",
         ],
         'settings_menu' => 'Tema de front-end',
         'settings_menu_description' => 'Gestionar el tema de front-end i les opcions de personalització.',
@@ -92,24 +92,24 @@
         'dir_name_taken' => 'El nom de directori desitjat ja existeix.',
         'find_more_themes' => 'Trobar més temes',
         'saving' => 'Guardant tema...',
-        'return' => 'Tornar a la llista de temes'
+        'return' => 'Tornar a la llista de temes',
     ],
     'maintenance' => [
         'settings_menu' => 'Mode de manteniment',
         'settings_menu_description' => "Configura el mode de manteniment i canvia l'activació.",
         'is_enabled' => 'Activar el mode de manteniment',
         'is_enabled_comment' => 'Selecciona la pàgina per mostrar quan el mode de manteniment està activat.',
-        'hint' => "El mode de manteniment mostrarà la pàgina de manteniment als visitants que no hagin accedit a l'àrea d'administració."
+        'hint' => "El mode de manteniment mostrarà la pàgina de manteniment als visitants que no hagin accedit a l'àrea d'administració.",
     ],
     'page' => [
         'not_found_name' => "La pàgina ':name' no s'ha trobat",
         'not_found' => [
             'label' => 'Pàgina no trobada',
-            'help' => 'La pàgina demanada no es pot trobar.'
+            'help' => 'La pàgina demanada no es pot trobar.',
         ],
         'custom_error' => [
             'label' => 'Error de pàgina',
-            'help' => "Ens sap greu, però alguna cosa ha anat malament i la pàgina no es pot mostrar."
+            'help' => "Ens sap greu, però alguna cosa ha anat malament i la pàgina no es pot mostrar.",
         ],
         'menu_label' => 'Pàgines',
         'unsaved_label' => 'Pàgines no guardades',
@@ -122,7 +122,7 @@
         'cms_page' => 'Pàgina de CMS',
         'title' => 'Títol de pàgina',
         'url' => 'URL de pàgina',
-        'file_name' => "Nom de l'arxiu de pàgina"
+        'file_name' => "Nom de l'arxiu de pàgina",
     ],
     'layout' => [
         'not_found_name' => "La plantilla ':name' no s'ha trobat",
@@ -131,7 +131,7 @@
         'no_list_records' => "No s'han trobat plantilles",
         'new' => 'Nova plantilla',
         'delete_confirm_multiple' => 'Eliminar plantilles seleccionades?',
-        'delete_confirm_single' => 'Eliminar aquesta plantilla?'
+        'delete_confirm_single' => 'Eliminar aquesta plantilla?',
     ],
     'partial' => [
         'not_found_name' => "El parcial ':name' no s'ha trobat.",
@@ -141,7 +141,7 @@
         'no_list_records' => "No s'han trobat parcials",
         'delete_confirm_multiple' => 'Eliminar parcials seleccionats?',
         'delete_confirm_single' => 'Eliminar aquest parcial?',
-        'new' => 'Nou parcial'
+        'new' => 'Nou parcial',
     ],
     'content' => [
         'not_found_name' => "L'arxiu de contingut ':name' no s'ha trobat.",
@@ -150,18 +150,18 @@
         'no_list_records' => "No s'han trobat arxius de contingut",
         'delete_confirm_multiple' => 'Eliminar arxius o directoris de contingut seleccionats?',
         'delete_confirm_single' => 'Eliminar aquest arxiu de contingut?',
-        'new' => 'Nou arxiu de contingut'
+        'new' => 'Nou arxiu de contingut',
     ],
     'ajax_handler' => [
         'invalid_name' => "Nom de manipulador d'AJAX invàlid: :name.",
-        'not_found' => "El manipulador d'AJAX ':name' no s'ha trobat."
+        'not_found' => "El manipulador d'AJAX ':name' no s'ha trobat.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Afegir',
-        'search' => 'Cercar...'
+        'search' => 'Cercar...',
     ],
     'editor' => [
         'settings' => 'Opcions',
@@ -185,7 +185,7 @@
         'open_searchbox' => 'Obrir caixa de cerca',
         'close_searchbox'  => 'Tancar caixa de cerca',
         'open_replacebox' => 'Obrir caixa de substitució',
-        'close_replacebox'  => 'Tancar caixa de substitució'
+        'close_replacebox'  => 'Tancar caixa de substitució',
     ],
     'asset' => [
         'menu_label' => 'Recursos',
@@ -225,7 +225,7 @@
         'error_deleting_directory' => 'Error eliminant el directori original :dir',
         'no_list_records' => "No s'han trobat arxius",
         'delete_confirm' => 'Eliminar els arxius o directoris seleccionats?',
-        'path' => 'Ruta'
+        'path' => 'Ruta',
     ],
     'component' => [
         'menu_label' => 'Components',
@@ -237,7 +237,7 @@
         'invalid_request' => 'La plantilla no es pot guardar perquè conté dades de components invàlides.',
         'no_records' => "No s'han trobat components",
         'not_found' => "No s'ha trobat el component ':name'.",
-        'method_not_found' => "El component ':name' no conté un mètode ':method'."
+        'method_not_found' => "El component ':name' no conté un mètode ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Tipus de plantilla desconegut.',
@@ -245,7 +245,7 @@
         'saved' => 'Plantilla guardada.',
         'no_list_records' => "No s'han trobat registres",
         'delete_confirm' => 'Eliminar les plantilles seleccionades?',
-        'order_by' => 'Ordenar per'
+        'order_by' => 'Ordenar per',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/cs/lang.php b/modules/cms/lang/cs/lang.php
index 6398b29ccf..d0361238cf 100644
--- a/modules/cms/lang/cs/lang.php
+++ b/modules/cms/lang/cs/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => "Chyba mazání souboru s šablonou ':name'. Zkontrolujte práva k zápisu.",
         'delete_success' => 'Šablony úspěšně smazány: :count.',
         'file_name_required' => 'Je nutno vyplnit Název souboru.',
-        'safe_mode_enabled' => 'Bezpěčný režim (safe mode) je aktivní.'
+        'safe_mode_enabled' => 'Bezpěčný režim (safe mode) je aktivní.',
 
     ],
     'dashboard' => [
@@ -20,20 +20,20 @@
             'online' => 'Online',
             'maintenance' => 'Probíhá údržba',
             'manage_themes' => 'Spravovat témata vzhledu',
-            'customize_theme' => 'Upravit téma vzhledu'
-        ]
+            'customize_theme' => 'Upravit téma vzhledu',
+        ],
     ],
     'theme' => [
         'not_found_name' => "Téma ':name' nebylo nalezeno.",
         'by_author' => 'Vytvořil :name',
         'active' => [
             'not_set' => 'Aktivní téma nebylo nastaveno.',
-            'not_found' => 'Aktivní téma nebylo nalezeno.'
+            'not_found' => 'Aktivní téma nebylo nalezeno.',
         ],
         'edit' => [
             'not_set' => 'Editované téma nebylo uloženo.',
             'not_found' => 'Editované téma nebylo nalezeno.',
-            'not_match' => "Objekt který chcete právě zobrazit nepatří do téma, které nyní editujete. Prosím obnovte stránku."
+            'not_match' => "Objekt který chcete právě zobrazit nepatří do téma, které nyní editujete. Prosím obnovte stránku.",
         ],
         'settings_menu' => 'Témata vzhledu',
         'settings_menu_description' => 'Náhledy instalovaných témat a výběr aktivního téma.',
@@ -100,18 +100,18 @@
         'settings_menu_description' => 'Nastavte stránku režimu údržby a její nastavení.',
         'is_enabled' => 'Aktivovat režim údržby',
         'is_enabled_comment' => 'Pokud je režim údržby aktivní, uživatelé uvidí stránku vybranou níže.',
-        'hint' => 'Režim údržby zobrazí stránku údržby návštěvníkům, kteří nejsou přihlášeni do administrace.'
+        'hint' => 'Režim údržby zobrazí stránku údržby návštěvníkům, kteří nejsou přihlášeni do administrace.',
 
     ],
     'page' => [
         'not_found_name' => "Stránka ':name' nebyla nalezena",
         'not_found' => [
             'label' => 'Stránka nenalezena',
-            'help' => 'Požadovaná stránka nebyla nalezena.'
+            'help' => 'Požadovaná stránka nebyla nalezena.',
         ],
         'custom_error' => [
             'label' => 'Chyba stránky',
-            'help' => "Omlouváme se, ale požadovaná stránka nelze zobrazit z důvodu nějaké chyby."
+            'help' => "Omlouváme se, ale požadovaná stránka nelze zobrazit z důvodu nějaké chyby.",
         ],
         'menu_label' => 'Stránky',
         'unsaved_label' => 'Neuložené stránky',
@@ -124,7 +124,7 @@
         'cms_page' => 'CMS stránka',
         'title' => 'Název stránky',
         'url' => 'URL stránky',
-        'file_name' => 'Název souboru stránky'
+        'file_name' => 'Název souboru stránky',
     ],
     'layout' => [
         'not_found_name' => "Layout ':name' nebyl nalezen",
@@ -133,7 +133,7 @@
         'no_list_records' => 'Žádné layouty nebyly nalezeny',
         'new' => 'Nový layout',
         'delete_confirm_multiple' => 'Opravdu chcete odstranit vybrané layouty?',
-        'delete_confirm_single' => 'Opravdu chcete odstranit tento layout?'
+        'delete_confirm_single' => 'Opravdu chcete odstranit tento layout?',
     ],
     'partial' => [
         'not_found_name' => "Dílčí šablona ':name' nebyla nalezena.",
@@ -143,7 +143,7 @@
         'no_list_records' => 'Žádné dílčí šablony',
         'delete_confirm_multiple' => 'Opravdu chcete smazat tyto dílčí šablony?',
         'delete_confirm_single' => 'Opravdu chcete smazat tuto dílčí šablonu?',
-        'new' => 'Nová šablona'
+        'new' => 'Nová šablona',
     ],
     'content' => [
         'not_found_name' => "Obsahový soubor ':name' nebyl nalezen.",
@@ -152,18 +152,18 @@
         'no_list_records' => 'Žádné obsahové soubory',
         'delete_confirm_multiple' => 'Opravdu chcete smazat tyto obsahové soubory nebo složky?',
         'delete_confirm_single' => 'Opravdu chcete smazat tento obsahový soubor?',
-        'new' => 'Žádný obsahový soubor'
+        'new' => 'Žádný obsahový soubor',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Neplatný název AJAX handleru: :name.',
-        'not_found' => "AJAX handler ':name' nebyl nalezen."
+        'not_found' => "AJAX handler ':name' nebyl nalezen.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Přidat',
-        'search' => 'Hledat...'
+        'search' => 'Hledat...',
     ],
     'editor' => [
         'settings' => 'Nastavení',
@@ -187,7 +187,7 @@
         'open_searchbox' => 'Otevřít box hledávání',
         'close_searchbox'  => 'Zavřít box hledání',
         'open_replacebox' => 'Otevřít box nahrazování',
-        'close_replacebox'  => 'Zavřít box nahrazování'
+        'close_replacebox'  => 'Zavřít box nahrazování',
     ],
     'asset' => [
         'menu_label' => 'Soubory',
@@ -227,7 +227,7 @@
         'error_deleting_directory' => 'Chyba přesunu původní složky :dir',
         'no_list_records' => 'Žádné soubory nebyly nalezeny',
         'delete_confirm' => 'Opravdu chcete smazat vybrané soubory nebo adresáře?',
-        'path' => 'Cesta'
+        'path' => 'Cesta',
     ],
     'component' => [
         'menu_label' => 'Komponenty',
@@ -239,7 +239,7 @@
         'invalid_request' => 'Šablona nemohla být uložena, protože jedna z komponent nemá správně vyplněná data.',
         'no_records' => 'Žádná komponenta',
         'not_found' => "Komponenta ':name' nebyla nalezena.",
-        'method_not_found' => "Komponenta ':name' nemá metodu ':method'."
+        'method_not_found' => "Komponenta ':name' nemá metodu ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Neznámý typ šablony.',
@@ -247,7 +247,7 @@
         'saved' => 'Šablona byla úspěšně uložena.',
         'no_list_records' => 'Žádné záznamy nebyly nalezeny',
         'delete_confirm' => 'Smazat vybraná témata?',
-        'order_by' => 'Řadit podle'
+        'order_by' => 'Řadit podle',
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/da/lang.php b/modules/cms/lang/da/lang.php
index 97228fb8d9..71cf68a8f1 100644
--- a/modules/cms/lang/da/lang.php
+++ b/modules/cms/lang/da/lang.php
@@ -19,18 +19,18 @@
             'online' => 'Online',
             'maintenance' => 'Under vedligeholdelse',
             'manage_themes' => 'Administrer temaer',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Temaet ':name' blev ikke fundet.",
         'active' => [
             'not_set' => 'Det aktive tema er ikke sat.',
-            'not_found' => 'Det aktive tema kunne ikke findes.'
+            'not_found' => 'Det aktive tema kunne ikke findes.',
         ],
         'edit' => [
             'not_set' => 'The edit theme is not set.',
             'not_found' => 'The edit theme is not found.',
-            'not_match' => "The object you're trying to access doesn't belong to the theme being edited. Please reload the page."
+            'not_match' => "The object you're trying to access doesn't belong to the theme being edited. Please reload the page.",
         ],
         'settings_menu' => 'Frontend tema',
         'settings_menu_description' => 'Se oversigt over temaer, og vælg et aktivt tema.',
@@ -94,17 +94,17 @@
         'settings_menu' => 'Vedligeholdelsestilstand',
         'settings_menu_description' => 'Konfigurer vedligeholdelsestilstand og aktiver/deaktiver.',
         'is_enabled' => 'Aktiver vedligeholdelsestilstand',
-        'is_enabled_comment' => 'Når vedligeholdelsestilstand er aktiveret, vil gæster se den nedfor valgte side.'
+        'is_enabled_comment' => 'Når vedligeholdelsestilstand er aktiveret, vil gæster se den nedfor valgte side.',
     ],
     'page' => [
         'not_found_name' => "Sidenavnet ':name' kunne ikke findes",
         'not_found' => [
             'label' => 'Siden findes ikke',
-            'help' => 'Den efterspurgte side findes ikke.'
+            'help' => 'Den efterspurgte side findes ikke.',
         ],
         'custom_error' => [
             'label' => 'Side fejl',
-            'help' => "Der skete desværre en fejl, og siden kan derfor ikke vises."
+            'help' => "Der skete desværre en fejl, og siden kan derfor ikke vises.",
         ],
         'menu_label' => 'Sider',
         'unsaved_label' => 'Ugemte side(r)',
@@ -113,7 +113,7 @@
         'invalid_url' => 'Ugyldigt URL format. URL\'en skal starte med en skråstreg og kan indeholde tal, latinske bogstaver og følgende symboler: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Slet de valgte sider?',
         'delete_confirm_single' => 'Slet denne side?',
-        'no_layout' => '-- Intet layout --'
+        'no_layout' => '-- Intet layout --',
     ],
     'layout' => [
         'not_found_name' => "Layoutet ':name' kunne ikke findes",
@@ -122,7 +122,7 @@
         'no_list_records' => 'Ingen layouts fundet',
         'new' => 'Nyt layout',
         'delete_confirm_multiple' => 'Slet de valgte layouts?',
-        'delete_confirm_single' => 'Slet dette layout?'
+        'delete_confirm_single' => 'Slet dette layout?',
     ],
     'partial' => [
         'not_found_name' => "Partialen ':name' kunne ikke findes.",
@@ -132,7 +132,7 @@
         'no_list_records' => 'Ingen partials fundet',
         'delete_confirm_multiple' => 'Slet de valgte partials?',
         'delete_confirm_single' => 'Slet denne partial?',
-        'new' => 'Ny partial'
+        'new' => 'Ny partial',
     ],
     'content' => [
         'not_found_name' => "Indholdsfilen ':name' kunne ikke findes.",
@@ -141,18 +141,18 @@
         'no_list_records' => 'Ingen indholdsfiler fundet',
         'delete_confirm_multiple' => 'Slet valgte indholdsfiler eller mapper?',
         'delete_confirm_single' => 'Slet denne indholdsfil?',
-        'new' => 'Ny indholdsfil'
+        'new' => 'Ny indholdsfil',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Ugyldig AJAX handler navn: :name.',
-        'not_found' => "AJAX handler ':name' kunne ikke findes."
+        'not_found' => "AJAX handler ':name' kunne ikke findes.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Tilføj',
-        'search' => 'Søg...'
+        'search' => 'Søg...',
     ],
     'editor' => [
         'settings' => 'Indstillinger',
@@ -176,7 +176,7 @@
         'open_searchbox' => 'Åben søgeboks',
         'close_searchbox'  => 'Luk søgeboks',
         'open_replacebox' => 'Åben erstartningsboks',
-        'close_replacebox'  => 'Luk erstatningsboks'
+        'close_replacebox'  => 'Luk erstatningsboks',
     ],
     'asset' => [
         'menu_label' => 'Assets',
@@ -214,7 +214,7 @@
         'error_moving_file' => 'Fejl ved flytning af fil :file',
         'error_moving_directory' => 'Fejl ved flytning af mappe :dir',
         'error_deleting_directory' => 'Fejl ved sletning af den originale mappe :dir',
-        'path' => 'Sti'
+        'path' => 'Sti',
     ],
     'component' => [
         'menu_label' => 'Komponenter',
@@ -226,12 +226,12 @@
         'invalid_request' => 'Skabelonen kan ikke gemmes, pga. ugyldigt komponentdata.',
         'no_records' => 'Ingen komponenter fundet',
         'not_found' => "Komponentet ':name' kunne ikke findes.",
-        'method_not_found' => "Komponentet ':name' indeholder ikke metoden ':method'."
+        'method_not_found' => "Komponentet ':name' indeholder ikke metoden ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Ukendt skabelontype.',
         'not_found' => 'Skabelon kunne ikke findes.',
-        'saved' => 'Skabelon blev gemt.'
+        'saved' => 'Skabelon blev gemt.',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
index 8ba5afb02c..ab60e54ebe 100644
--- a/modules/cms/lang/de/lang.php
+++ b/modules/cms/lang/de/lang.php
@@ -32,7 +32,7 @@
         'edit' => [
             'not_set' => 'Themenverwaltung nicht definiert.',
             'not_found' => 'Themenverwaltung nicht gefunden.',
-            'not_match' => 'Das Objekt, das Sie anzupassen versuchen gehört nicht zum zu bearbeitenden Theme. Bitte laden Sie die Seite erneut.'
+            'not_match' => 'Das Objekt, das Sie anzupassen versuchen gehört nicht zum zu bearbeitenden Theme. Bitte laden Sie die Seite erneut.',
         ],
         'settings_menu' => 'Frontend Theme',
         'settings_menu_description' => 'Verwalten und passen Sie das Frontend-Theme an.',
@@ -138,7 +138,7 @@
         'no_list_records' => 'Keine Layouts gefunden',
         'new' => 'Neues Layout',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Layouts wirklich löschen?',
-        'delete_confirm_single' => 'Wollen Sie das ausgewählte Layout wirklich löschen?'
+        'delete_confirm_single' => 'Wollen Sie das ausgewählte Layout wirklich löschen?',
     ],
     'partial' => [
         'not_found_name' => 'Das Partial ":name" wurde nicht gefunden.',
@@ -148,7 +148,7 @@
         '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?',
-        'new' => 'Neues Partial'
+        'new' => 'Neues Partial',
     ],
     'content' => [
         'not_found_name' => 'Die Inhaltsdatei ":name" wurde nicht gefunden.',
@@ -157,18 +157,18 @@
         '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?',
-        'new' => 'Neue Inhaltsdatei'
+        'new' => 'Neue Inhaltsdatei',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Ungültiger Name für AJAX Handler: :name.',
         'not_found' => 'AJAX-Handler ":name" wurde nicht gefunden.',
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Hinzufügen',
-        'search' => 'Suchen...'
+        'search' => 'Suchen...',
     ],
     'editor' => [
         'settings' => 'Einstellungen',
@@ -240,7 +240,7 @@
         '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'
+        'path' => 'Pfad',
     ],
     'component' => [
         'menu_label' => 'Komponenten',
diff --git a/modules/cms/lang/el/lang.php b/modules/cms/lang/el/lang.php
index 1abcc01b99..d75e624f95 100644
--- a/modules/cms/lang/el/lang.php
+++ b/modules/cms/lang/el/lang.php
@@ -20,7 +20,7 @@
             'online' => 'Σε λειτουργία',
             'maintenance' => 'Σε συντήρηση',
             'manage_themes' => 'Διαχείριση θεμάτων',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Το θέμα ':name' δεν βρέθηκε.",
diff --git a/modules/cms/lang/es-ar/lang.php b/modules/cms/lang/es-ar/lang.php
index caa8eb3fdc..f4c84d445b 100644
--- a/modules/cms/lang/es-ar/lang.php
+++ b/modules/cms/lang/es-ar/lang.php
@@ -10,7 +10,7 @@
         'invalid_file_extension' => 'Extensión de archivo inválida: :invalid. Las extensiones permitidas son: :allowed.',
         'error_deleting' => 'Error borrando el archivo template ":name". Por favor revisar los permisos de escritura.',
         'delete_success' => 'Los templates fueron borrados exitosamente: :count.',
-        'file_name_required' => 'Falta el nombre del campo del archivo.'
+        'file_name_required' => 'Falta el nombre del campo del archivo.',
     ],
     'theme' => [
         'active' => [
@@ -20,7 +20,7 @@
         'edit' => [
             'not_set' => "El tema de edición no se ha establecido.",
             'not_found' => "El tema de edición no se encuentra.",
-            'not_match' => "El objeto que está intentando acceder no pertenece al tema que se está editando. Vuelve a cargar la página."
+            'not_match' => "El objeto que está intentando acceder no pertenece al tema que se está editando. Vuelve a cargar la página.",
         ],
         'settings_menu' => 'Plantilla',
         'settings_menu_description' => 'Vista previa de la lista de las plantillas instaladas.',
@@ -43,7 +43,7 @@
         'invalid_url' => 'Formato de URL inválido. El URL debe comenzar con el símbolo de barra diagonal y puede contener dígitos, letras latinas y los siguientes símbolos: _-[]:?|/+*^$',
         'delete_confirm_multiple' => '¿Realmente quiere eliminar las páginas seleccionadas?',
         'delete_confirm_single' => '¿Realmente quieres eliminar esta página?',
-        'no_layout' => '-- ninguna disposición --'
+        'no_layout' => '-- ninguna disposición --',
     ],
     'layout' => [
         'not_found_name' => "El diseño ':name' no se encuentra",
@@ -51,7 +51,7 @@
         'no_list_records' => 'No se ecnontraron diseños',
         'new' => 'Nuevo diseño',
         'delete_confirm_multiple' => 'Realmente quiere borrar los diseños seleccionados?',
-        'delete_confirm_single' => 'Realmente quiere borrar este diseño?'
+        'delete_confirm_single' => 'Realmente quiere borrar este diseño?',
     ],
     'partial' => [
         'not_found_name' => "El nombre parcial ':name' no se encuentra.",
@@ -60,7 +60,7 @@
         'no_list_records' => 'No se encontraron parciales',
         'delete_confirm_multiple' => 'Realmente quiere borrar los parciales seleccionados?',
         'delete_confirm_single' => 'Realmente quiere borrar este parcial?',
-        'new' => 'Nuevo parcial'
+        'new' => 'Nuevo parcial',
     ],
     'content' => [
         'not_found_name' => "El contenido del archivo ':name' no se encuentra.",
@@ -68,18 +68,18 @@
         'no_list_records' => 'No se encuentra el conteinod de los archivos',
         'delete_confirm_multiple' => 'Realmente desea borrar los contenidos seleccionados de los archivos o directorios?',
         'delete_confirm_single' => 'Realmente desea borrar el contenido de este archivo?',
-        'new' => 'Nuevo contenido de archivo'
+        'new' => 'Nuevo contenido de archivo',
     ],
     'ajax_handler' => [
         'invalid_name' => "Manejador de AJAX inválido: :name.",
         'not_found' => "El manejador de AJAX ':name' no se encuentra.",
     ],
     'cms' => [
-        'menu_label' => "Gestión"
+        'menu_label' => "Gestión",
     ],
     'sidebar' => [
         'add' => 'Agregar',
-        'search' => 'Buscar...'
+        'search' => 'Buscar...',
     ],
     'editor' => [
         'settings' => 'Configuración',
@@ -99,7 +99,7 @@
         'hidden' => 'Oculto',
         'hidden_comment' => 'A las páginas ocultas solamente pueden acceder los usuarios del back-end que se encuentren logueados.',
         'enter_fullscreen' => 'Ingresar en el modo pantalla completa',
-        'exit_fullscreen' => 'Salir de pantalla completa'
+        'exit_fullscreen' => 'Salir de pantalla completa',
     ],
     'asset' => [
         'menu_label' => "Assets",
@@ -136,7 +136,7 @@
         'error_moving_file' => 'Error moviendo archivo :file',
         'error_moving_directory' => 'Error moviendo el directorio :dir',
         'error_deleting_directory' => 'Error borrando el directorio original :dir',
-        'path' => 'Path'
+        'path' => 'Path',
     ],
     'component' => [
         'menu_label' => "Componentes",
@@ -153,7 +153,7 @@
     'template' => [
         'invalid_type' => "Tipo de plantilla Desconocido.",
         'not_found' => "No se encontró la plantilla solicitada.",
-        'saved' => "La plantilla se ha guardado correctamente."
+        'saved' => "La plantilla se ha guardado correctamente.",
     ],
     'permissions' => [
         'manage_content' => 'Gestionar contenido',
@@ -161,6 +161,6 @@
         'manage_pages' => 'Gestionar páginas',
         'manage_layouts' => 'Gestionar diseños',
         'manage_partials' => 'Gestionar parciales',
-        'manage_themes' => 'Gestionar plantilla'
-    ]
+        'manage_themes' => 'Gestionar plantilla',
+    ],
 ];
diff --git a/modules/cms/lang/es/lang.php b/modules/cms/lang/es/lang.php
index 11cb604f0a..26b637fb45 100644
--- a/modules/cms/lang/es/lang.php
+++ b/modules/cms/lang/es/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => 'Error eliminando el archivo de plantilla ":name". Por favor, revisa los permisos de escritura.',
         'delete_success' => 'Las plantillas fueron eliminadas satisfactoriamente: :count.',
         'file_name_required' => 'El campo Nombre es obligatorio.',
-        'safe_mode_enabled' => 'El modo seguro está activado actualmente.'
+        'safe_mode_enabled' => 'El modo seguro está activado actualmente.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,19 +19,19 @@
             'online' => 'en línea',
             'maintenance' => 'en mantenimiento',
             'manage_themes' => 'Gestionar temas',
-            'customize_theme' => 'Personalizar tema'
-        ]
+            'customize_theme' => 'Personalizar tema',
+        ],
     ],
     'theme' => [
         'not_found_name' => "El tema ':name' no se encuentra.",
         'active' => [
             'not_set' => 'El tema activo no se ha establecido.',
-            'not_found' => 'El tema activo no se encuentra.'
+            'not_found' => 'El tema activo no se encuentra.',
         ],
         'edit' => [
             'not_set' => 'El tema de edición no se ha establecido.',
             'not_found' => 'El tema de edición no se encuentra.',
-            'not_match' => 'El objeto que está intentando acceder no pertenece al tema que se está editando. Porfavor recarga la página.'
+            'not_match' => 'El objeto que está intentando acceder no pertenece al tema que se está editando. Porfavor recarga la página.',
         ],
         'settings_menu' => 'Tema para el Front-end',
         'settings_menu_description' => 'Previsualiza la lista de temas instalados y selecciona un tema activo.',
@@ -91,24 +91,24 @@
         'dir_name_taken' => 'Este directorio ya existe.',
         'find_more_themes' => 'Buscar nuevos temas',
         'saving' => 'Guardando tema...',
-        'return' => 'Volver a la lista de temas'
+        'return' => 'Volver a la lista de temas',
     ],
     'maintenance' => [
         'settings_menu' => 'Modo de mantenimiento',
         'settings_menu_description' => 'Configura la página del modo de mantenimiento y cambia su configuración',
         'is_enabled' => 'Activar el modo de mantenimiento',
         'is_enabled_comment' => 'Selecciona la página para mostrar cuando el modo de mantenimiento esté activado.',
-        'hint' => 'El modo de mantenimiento mostrará la página de mantenimiento a los visitantes que no estén conectados en el área de back-end.'
+        'hint' => 'El modo de mantenimiento mostrará la página de mantenimiento a los visitantes que no estén conectados en el área de back-end.',
     ],
     'page' => [
         'not_found_name' => "La página ':name' no se encuentra",
         'not_found' => [
             'label' => 'Página no encontrada',
-            'help' => 'La página solicitada no se encuentra.'
+            'help' => 'La página solicitada no se encuentra.',
         ],
         'custom_error' => [
             'label' => 'Error en la página',
-            'help' => 'Lo sentimos, pero algo salió mal y la página no se puede mostrar.'
+            'help' => 'Lo sentimos, pero algo salió mal y la página no se puede mostrar.',
         ],
         'menu_label' => 'Páginas',
         'unsaved_label' => 'Página(s) sin guardar',
@@ -121,7 +121,7 @@
         'cms_page' => 'Página de CMS',
         'title' => 'Título de página',
         'url' => 'URL de página',
-        'file_name' => 'Nombre de archivo de página'
+        'file_name' => 'Nombre de archivo de página',
     ],
     'layout' => [
         'not_found_name' => "El diseño ':name' no se encuentra",
@@ -130,7 +130,7 @@
         'no_list_records' => 'No se encuentran diseños',
         'new' => 'Nuevo diseño',
         'delete_confirm_multiple' => '¿Deseas eliminar los diseños seleccionados?',
-        'delete_confirm_single' => '¿Deseas eliminar este diseño?'
+        'delete_confirm_single' => '¿Deseas eliminar este diseño?',
     ],
     'partial' => [
         'not_found_name' => "El nombre de parcial ':name' no se encuentra.",
@@ -140,7 +140,7 @@
         'no_list_records' => 'No se encontraron parciales',
         'delete_confirm_multiple' => '¿Deseas eliminar los parciales seleccionados?',
         'delete_confirm_single' => '¿Deseas eliminar este parcial?',
-        'new' => 'Nuevo parcial'
+        'new' => 'Nuevo parcial',
     ],
     'content' => [
         'not_found_name' => "El archivo de contenido ':name' no se encuentra.",
@@ -149,18 +149,18 @@
         'no_list_records' => 'No se encuentran archivos de contenido',
         'delete_confirm_multiple' => '¿Deseas eliminar los archivos o directorios de contenido seleccionados?',
         'delete_confirm_single' => '¿Deseas eliminar este archivo de contenido?',
-        'new' => 'Nuevo archivo de contenido'
+        'new' => 'Nuevo archivo de contenido',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Manejador de AJAX inválido: :name.',
-        'not_found' => "El manejador de AJAX ':name' no se encuentra."
+        'not_found' => "El manejador de AJAX ':name' no se encuentra.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Agregar',
-        'search' => 'Buscar...'
+        'search' => 'Buscar...',
     ],
     'editor' => [
         'settings' => 'Configuración',
@@ -184,7 +184,7 @@
         'open_searchbox' => 'Abrir caja de búsqueda',
         'close_searchbox' => 'Cerrar caja de búsqueda',
         'open_replacebox' => 'Abrir caja de reemplazo',
-        'close_replacebox'  => 'Cerrar caja de reemplazo'
+        'close_replacebox'  => 'Cerrar caja de reemplazo',
     ],
     'asset' => [
         'menu_label' => 'Recursos',
@@ -224,7 +224,7 @@
         'error_deleting_directory' => 'Error borrando el directorio original :dir',
         'no_list_records' => 'No se encontraron archivos',
         'delete_confirm' => '¿Deseas eliminar los archivos o directorios seleccionados?',
-        'path' => 'Ruta'
+        'path' => 'Ruta',
     ],
     'component' => [
         'menu_label' => 'Componentes',
@@ -236,7 +236,7 @@
         'invalid_request' => 'La plantilla no puede ser guardada porque tiene datos de componente inválidos.',
         'no_records' => 'No se encontraron componentes',
         'not_found' => "El componente ':name' no se encuentra.",
-        'method_not_found' => "El componente ':name' no contiene un método ':method'."
+        'method_not_found' => "El componente ':name' no contiene un método ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Tipo de plantilla desconocido.',
@@ -244,7 +244,7 @@
         'saved' => 'La plantilla se guardó correctamente.',
         'no_list_records' => 'No se encontraron registros',
         'delete_confirm' => '¿Deseas eliminar las plantillas seleccionadas?',
-        'order_by' => 'Ordenar por'
+        'order_by' => 'Ordenar por',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/et/lang.php b/modules/cms/lang/et/lang.php
index 084a0b3614..30fc0c3bd3 100644
--- a/modules/cms/lang/et/lang.php
+++ b/modules/cms/lang/et/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => "Error deleting the template file ':name'. Please check write permissions.",
         'delete_success' => 'Templates deleted: :count.',
         'file_name_required' => 'The File Name field is required.',
-        'safe_mode_enabled' => 'Safe mode is currently enabled.'
+        'safe_mode_enabled' => 'Safe mode is currently enabled.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,20 +19,20 @@
             'online' => 'Online',
             'maintenance' => 'Hooldusrežiimis',
             'manage_themes' => 'Halda teemasid',
-            'customize_theme' => 'Kohanda teemat'
-        ]
+            'customize_theme' => 'Kohanda teemat',
+        ],
     ],
     'theme' => [
         'not_found_name' => "Teemat ':name' ei leitud.",
         'by_author' => 'Autor: :name',
         'active' => [
             'not_set' => 'Aktiivset teemat pole määratud.',
-            'not_found' => 'Aktiivset teemat ei leitud.'
+            'not_found' => 'Aktiivset teemat ei leitud.',
         ],
         'edit' => [
             'not_set' => 'Muutmise teemat pole määratud.',
             'not_found' => 'Muutmise teemat ei leitud.',
-            'not_match' => "Objekt, mida üritad muuta ei kuulu hetkel muudetava teema alla. Palun laadi leht uuesti."
+            'not_match' => "Objekt, mida üritad muuta ei kuulu hetkel muudetava teema alla. Palun laadi leht uuesti.",
         ],
         'settings_menu' => 'Kodulehe teema',
         'settings_menu_description' => 'Vaata paigaldatud teemasid ja vali endale sobiv.',
@@ -92,24 +92,24 @@
         'dir_name_taken' => 'Soovitud kataloog on juba olemas.',
         'find_more_themes' => 'Otsi uusi teemasid',
         'saving' => 'Salvestan teemat...',
-        'return' => 'Tagasi teemade nimekirja'
+        'return' => 'Tagasi teemade nimekirja',
     ],
     'maintenance' => [
         'settings_menu' => 'Maintenance mode',
         'settings_menu_description' => 'Configure the maintenance mode page and toggle the setting.',
         'is_enabled' => 'Enable maintenance mode',
         'is_enabled_comment' => 'Select the page to show when maintenance mode is activated.',
-        'hint' => 'Maintenance mode will display the maintenance page to visitors who are not signed in to the back-end area.'
+        'hint' => 'Maintenance mode will display the maintenance page to visitors who are not signed in to the back-end area.',
     ],
     'page' => [
         'not_found_name' => "The page ':name' is not found",
         'not_found' => [
             'label' => 'Page not found',
-            'help' => 'The requested page cannot be found.'
+            'help' => 'The requested page cannot be found.',
         ],
         'custom_error' => [
             'label' => 'Page error',
-            'help' => "We're sorry, but something went wrong and the page cannot be displayed."
+            'help' => "We're sorry, but something went wrong and the page cannot be displayed.",
         ],
         'menu_label' => 'Pages',
         'unsaved_label' => 'Unsaved page(s)',
@@ -122,7 +122,7 @@
         'cms_page' => 'CMS page',
         'title' => 'Page title',
         'url' => 'Page URL',
-        'file_name' => 'Page file name'
+        'file_name' => 'Page file name',
     ],
     'layout' => [
         'not_found_name' => "The layout ':name' is not found",
@@ -131,7 +131,7 @@
         'no_list_records' => 'No layouts found',
         'new' => 'New layout',
         'delete_confirm_multiple' => 'Delete selected layouts?',
-        'delete_confirm_single' => 'Delete this layout?'
+        'delete_confirm_single' => 'Delete this layout?',
     ],
     'partial' => [
         'not_found_name' => "The partial ':name' is not found.",
@@ -141,7 +141,7 @@
         'no_list_records' => 'No partials found',
         'delete_confirm_multiple' => 'Delete selected partials?',
         'delete_confirm_single' => 'Delete this partial?',
-        'new' => 'New partial'
+        'new' => 'New partial',
     ],
     'content' => [
         'not_found_name' => "The content file ':name' is not found.",
@@ -150,18 +150,18 @@
         'no_list_records' => 'No content files found',
         'delete_confirm_multiple' => 'Delete selected content files or directories?',
         'delete_confirm_single' => 'Delete this content file?',
-        'new' => 'New content file'
+        'new' => 'New content file',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Invalid AJAX handler name: :name.',
-        'not_found' => "AJAX handler ':name' was not found."
+        'not_found' => "AJAX handler ':name' was not found.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Add',
-        'search' => 'Search...'
+        'search' => 'Search...',
     ],
     'editor' => [
         'settings' => 'Settings',
@@ -185,7 +185,7 @@
         'open_searchbox' => 'Open Search box',
         'close_searchbox'  => 'Close Search box',
         'open_replacebox' => 'Open Replace box',
-        'close_replacebox'  => 'Close Replace box'
+        'close_replacebox'  => 'Close Replace box',
     ],
     'asset' => [
         'menu_label' => 'Assets',
@@ -225,7 +225,7 @@
         'error_deleting_directory' => 'Error deleting the original directory :dir',
         'no_list_records' => 'No files found',
         'delete_confirm' => 'Delete selected files or directories?',
-        'path' => 'Path'
+        'path' => 'Path',
     ],
     'component' => [
         'menu_label' => 'Components',
@@ -237,7 +237,7 @@
         'invalid_request' => 'The template cannot be saved because of invalid component data.',
         'no_records' => 'No components found',
         'not_found' => "The component ':name' is not found.",
-        'method_not_found' => "The component ':name' does not contain a method ':method'."
+        'method_not_found' => "The component ':name' does not contain a method ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Unknown template type.',
@@ -245,7 +245,7 @@
         'saved' => 'Template saved.',
         'no_list_records' => 'No records found',
         'delete_confirm' => 'Delete selected templates?',
-        'order_by' => 'Order by'
+        'order_by' => 'Order by',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index 6e9eb5b2e9..929057507d 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -19,8 +19,8 @@
             'online' => 'برخط',
             'maintenance' => 'در حال به روز رسانی',
             'manage_themes' => 'مدیریت قالب ها',
-            'customize_theme' => 'سفارشی سازی قالب'
-        ]
+            'customize_theme' => 'سفارشی سازی قالب',
+        ],
     ],
     'theme' => [
         'not_found_name' => "یافتن قالبی با نام  ':name یافت نشد.'",
@@ -32,7 +32,7 @@
         'edit' => [
             'not_set' => "قالب ویرایش مشخص نشده است.",
             'not_found' => "قالب ویرایش یافت نشد.",
-            'not_match' => "شی مورد نظر شما در قالبی که ویرایش می کنید یافت نشد. لطفا صفحه را مجددا بارگذاری نمایید."
+            'not_match' => "شی مورد نظر شما در قالبی که ویرایش می کنید یافت نشد. لطفا صفحه را مجددا بارگذاری نمایید.",
         ],
         'settings_menu' => 'قالب نمایشی',
         'settings_menu_description' => 'پیش نمایش قالب های موجود و انتخاب قالب فعال.',
@@ -129,7 +129,7 @@
         'cms_page' => 'صفحات مدیریت محتوی',
         'title' => 'عنوان صفحه',
         'url' => 'آدرس صفحه',
-        'file_name' => 'نام فایل'
+        'file_name' => 'نام فایل',
     ],
     'layout' => [
         'not_found_name' => "طرح بندی ی ':name' یافت نشد",
@@ -138,7 +138,7 @@
         'no_list_records' => 'طرح بندی یافت نشد',
         'new' => 'طرح بندی جدید',
         'delete_confirm_multiple' => 'آیا از حذف طرح بندی های انتخاب شده اطمینان دارید؟',
-        'delete_confirm_single' => 'آیا از حذف این طرح بندی اطمینان دارید؟'
+        'delete_confirm_single' => 'آیا از حذف این طرح بندی اطمینان دارید؟',
     ],
     'partial' => [
         'not_found_name' => "بخشی با نام ':name' یافت نشد.",
@@ -148,7 +148,7 @@
         'no_list_records' => 'بخشی وجود ندارد',
         'delete_confirm_multiple' => 'آیا از حذف بخش های انتخاب شده اطمینان دارید؟',
         'delete_confirm_single' => 'آیا از حذف این بخش بندی اطمینان دارید؟',
-        'new' => 'بخش بندی جدید'
+        'new' => 'بخش بندی جدید',
     ],
     'content' => [
         'not_found_name' => "فایل محتوای ':name' یافت نشد.",
@@ -157,18 +157,18 @@
         'no_list_records' => 'هیچ فایل محتوایی وجود ندارد',
         'delete_confirm_multiple' => 'آیا از حذف فایل ها و یا پوشه های انتخاب شده اطمینان دارید؟',
         'delete_confirm_single' => 'آیا از حذف این فایل اطمینان دارید؟',
-        'new' => 'فایل محتوی جدید'
+        'new' => 'فایل محتوی جدید',
     ],
     'ajax_handler' => [
         'invalid_name' => "نام کنترل کننده آژاکس نا معتبر است: :name.",
         'not_found' => "کنترل کننده آژاکس ':name' یافت نشد.",
     ],
     'cms' => [
-        'menu_label' => "مدیریت محتوی"
+        'menu_label' => "مدیریت محتوی",
     ],
     'sidebar' => [
         'add' => 'افزودن',
-        'search' => 'جستجو...'
+        'search' => 'جستجو...',
     ],
     'editor' => [
         'settings' => 'تنظیمات',
@@ -240,7 +240,7 @@
         'error_deleting_directory' => 'خطایی در حذف :dir رخ داده است',
         'no_list_records' => 'فایلی وجود ندارد',
         'delete_confirm' => 'آیا از حذف فایل ها یا پوشه های انتخاب شده اطمینان دارید؟',
-        'path' => 'محل قرار گیری'
+        'path' => 'محل قرار گیری',
     ],
     'component' => [
         'menu_label' => "ابزارها",
@@ -263,7 +263,7 @@
         'saved' => "قالب با موفقیت ذخیره شد.",
         'no_list_records' => 'موردی یافت نشد',
         'delete_confirm' => 'آیا از حذف قالب های انتخاب شده اطمینان دارید؟',
-        'order_by' => 'مرتب سازی با'
+        'order_by' => 'مرتب سازی با',
     ],
     'permissions' => [
         'name' => 'مدیریت محتوی',
diff --git a/modules/cms/lang/fi/lang.php b/modules/cms/lang/fi/lang.php
index 97ebe9907c..61e493df08 100644
--- a/modules/cms/lang/fi/lang.php
+++ b/modules/cms/lang/fi/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => "Virhe poistaessa teemaa ':name'. Tarkista kirjoitusoikeudet.",
         'delete_success' => 'Poistetut teemat: :count.',
         'file_name_required' => 'Tiedoston nimi -kenttä on vaadittu.',
-        'safe_mode_enabled' => 'Turvatila on käytössä.'
+        'safe_mode_enabled' => 'Turvatila on käytössä.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,20 +19,20 @@
             'online' => 'Online',
             'maintenance' => 'Ylläpitotila',
             'manage_themes' => 'Hallitse teemoja',
-            'customize_theme' => 'Kustomoi teema'
-        ]
+            'customize_theme' => 'Kustomoi teema',
+        ],
     ],
     'theme' => [
         'not_found_name' => "Teemaa ':name' ei löydy.",
         'by_author' => 'Tekijä: :name',
         'active' => [
             'not_set' => 'Aktiivista teemaa ei ole asetettu.',
-            'not_found' => 'Aktiivista teemaa ei löytynyt.'
+            'not_found' => 'Aktiivista teemaa ei löytynyt.',
         ],
         'edit' => [
             'not_set' => 'Muokattavaa teemaa ei ole asetettu.',
             'not_found' => 'Muokattavaa teemaa ei löydy.',
-            'not_match' => 'Objektia, jota yrität muokata, ei kuulu muokattavaan teemaan. Päivitä sivu uudelleen.'
+            'not_match' => 'Objektia, jota yrität muokata, ei kuulu muokattavaan teemaan. Päivitä sivu uudelleen.',
         ],
         'settings_menu' => 'Sivuston teema',
         'settings_menu_description' => 'Esikatsele luettelo asennetuista teemoista ja valitse aktiivinen teema.',
@@ -92,24 +92,24 @@
         'dir_name_taken' => 'Haluttu teemakansio on jo olemassa.',
         'find_more_themes' => 'Etsi lisää teemoja',
         'saving' => 'Tallennetaan teemaa...',
-        'return' => 'Palaa teemalistaan'
+        'return' => 'Palaa teemalistaan',
     ],
     'maintenance' => [
         'settings_menu' => 'Ylläpitotila',
         'settings_menu_description' => 'Muokkaa huoltotilan sivua ja valitse asetus.',
         'is_enabled' => 'Ota huoltotila käyttöön',
         'is_enabled_comment' => 'Valitse sivu näytettäväksi kun huoltotila on käytössä.',
-        'hint' => 'Huoltotila näyttää huoltosivun vierailijoille, jotka eivät ole kirjautuneena hallintapaneeliin.'
+        'hint' => 'Huoltotila näyttää huoltosivun vierailijoille, jotka eivät ole kirjautuneena hallintapaneeliin.',
     ],
     'page' => [
         'not_found_name' => "Sivua ':name' ei löytynyt",
         'not_found' => [
             'label' => 'Sivua ei löytynyt',
-            'help' => 'Haettua sivua ei löydy.'
+            'help' => 'Haettua sivua ei löydy.',
         ],
         'custom_error' => [
             'label' => 'Sivuvirhe',
-            'help' => "Olemme pahoillamme, mutta joku meni vikaan ja sivua ei voida näyttää."
+            'help' => "Olemme pahoillamme, mutta joku meni vikaan ja sivua ei voida näyttää.",
         ],
         'menu_label' => 'Sivut',
         'unsaved_label' => 'Tallenntamattomat sivu(t)',
@@ -122,7 +122,7 @@
         'cms_page' => 'CMS-sivu',
         'title' => 'Sivun nimi',
         'url' => 'Sivun URL-osoite',
-        'file_name' => 'Sivun tiedostonimi'
+        'file_name' => 'Sivun tiedostonimi',
     ],
     'layout' => [
         'not_found_name' => "Ulkoasua ':name' ei löytynyt",
@@ -131,7 +131,7 @@
         'no_list_records' => 'Ei ulkoasuja',
         'new' => 'Uusi ulkoasu',
         'delete_confirm_multiple' => 'Poista valitut ulkoasut?',
-        'delete_confirm_single' => 'Poista tämä ulkoasu?'
+        'delete_confirm_single' => 'Poista tämä ulkoasu?',
     ],
     'partial' => [
         'not_found_name' => "Osiota ':name' ei löydy.",
@@ -141,7 +141,7 @@
         'no_list_records' => 'Osioita ei löydy',
         'delete_confirm_multiple' => 'Poista valitut osiot?',
         'delete_confirm_single' => 'Poista tämä osio?',
-        'new' => 'Uusio osio'
+        'new' => 'Uusio osio',
     ],
     'content' => [
         'not_found_name' => "Sisältötiedostoa ':name' ei löydy.",
@@ -150,18 +150,18 @@
         'no_list_records' => 'Sisältötiedostoja ei löydy',
         'delete_confirm_multiple' => 'Poista valitut sisältötiedostot tai hakemistot?',
         'delete_confirm_single' => 'Poista tämä sisältötiedosto?',
-        'new' => 'Uusi sisältötiedosto'
+        'new' => 'Uusi sisältötiedosto',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Ajax käsittelijän nimi: :name ei ole kelvollinen.',
-        'not_found' => "AJAX käsittelijää ':name' ei löydy."
+        'not_found' => "AJAX käsittelijää ':name' ei löydy.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Lisää',
-        'search' => 'Etsi...'
+        'search' => 'Etsi...',
     ],
     'editor' => [
         'settings' => 'Asetukset',
@@ -185,7 +185,7 @@
         'open_searchbox' => 'Avaa haku',
         'close_searchbox'  => 'Sulje haku',
         'open_replacebox' => 'Avaa korvaa',
-        'close_replacebox'  => 'Sulje korvaa'
+        'close_replacebox'  => 'Sulje korvaa',
     ],
     'asset' => [
         'menu_label' => 'Aineistot',
@@ -225,7 +225,7 @@
         'error_deleting_directory' => 'Virhe poistettaessa alkuperäinen kansio :dir',
         'no_list_records' => 'Tiedostoja ei löytynyt',
         'delete_confirm' => 'Poista valitut tiedostot ja/tai kansiot?',
-        'path' => 'Polku'
+        'path' => 'Polku',
     ],
     'component' => [
         'menu_label' => 'Komponentit',
@@ -237,7 +237,7 @@
         'invalid_request' => 'Mallia ei voida tallentaa koska komponentin tiedot eivät ole kelvollisia.',
         'no_records' => 'Komponentteja ei löytynyt',
         'not_found' => "Komponenttia ':name' ei löydy.",
-        'method_not_found' => "Komponentti ':name' ei sisällä metodia ':method'."
+        'method_not_found' => "Komponentti ':name' ei sisällä metodia ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Tuntematon teeman tyyppi.',
@@ -245,7 +245,7 @@
         'saved' => 'Teema tallennettu.',
         'no_list_records' => 'Tietueita ei löytynyt',
         'delete_confirm' => 'Poista valitut teemat?',
-        'order_by' => 'Järjestä'
+        'order_by' => 'Järjestä',
     ],
     'permissions' => [
         'name' => 'CMS',
@@ -255,7 +255,7 @@
         'manage_layouts' => 'Luo, muokkaa ja poista sivuston ulkoasuja',
         'manage_partials' => 'Luo, muokkaa ja poista CMS-järjestelmän osioita',
         'manage_themes' => 'Ota käyttöön ja poista käytöstä CMS-järjestelmän teemoja',
-        'manage_media' => 'Siirrä ja hallinnoi mediatiedostoja - kuvia, videoita, ääniä, dokumentteja'
+        'manage_media' => 'Siirrä ja hallinnoi mediatiedostoja - kuvia, videoita, ääniä, dokumentteja',
     ],
     'theme_log' => [
         'hint' => 'Tämä loki näyttää muutokset teemaan järjestelmänvalvojilta hallintapaneelissa.',
diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php
index 7febf540fc..f540a198c6 100644
--- a/modules/cms/lang/fr/lang.php
+++ b/modules/cms/lang/fr/lang.php
@@ -20,7 +20,7 @@
             'maintenance' => 'En cours de maintenance',
             'manage_themes' => 'Gestion des thèmes',
             'customize_theme' => 'Personnaliser le thème',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => 'Le thème ":name" n\'a pas été trouvé.',
@@ -32,7 +32,7 @@
         'edit' => [
             'not_set' => 'Le thème à modifier n\'est pas activé.',
             'not_found' => 'Le thème à modifier est introuvable.',
-            'not_match' => 'L\'objet auquel vous souhaitez accéder n\'appartient pas au thème en cours de modification. Veuillez recharger la page.'
+            'not_match' => 'L\'objet auquel vous souhaitez accéder n\'appartient pas au thème en cours de modification. Veuillez recharger la page.',
         ],
         'settings_menu' => 'Thème frontal',
         'settings_menu_description' => 'Aperçu des thèmes installés et sélection du thème actif.',
@@ -129,7 +129,7 @@
         'cms_page' => 'Page CMS',
         'title' => 'Titre de la page',
         'url' => 'URL de la page',
-        'file_name' => 'Nom du fichier de la page'
+        'file_name' => 'Nom du fichier de la page',
     ],
     'layout' => [
         'not_found_name' => 'La maquette ":name" est introuvable',
@@ -138,7 +138,7 @@
         'no_list_records' => 'Aucune maquette n\'a été trouvée',
         'new' => 'Nouvelle maquette',
         'delete_confirm_multiple' => 'Confirmer la suppression des maquettes sélectionnées ?',
-        'delete_confirm_single' => 'Confirmer la suppression de cette maquette ?'
+        'delete_confirm_single' => 'Confirmer la suppression de cette maquette ?',
     ],
     'partial' => [
         'not_found_name' => 'Le modèle partiel ":name" est introuvable.',
@@ -148,7 +148,7 @@
         'no_list_records' => 'Aucun modèle partiel n\'a été trouvé',
         'delete_confirm_multiple' => 'Confirmer la suppression des modèles partiels sélectionnés ?',
         'delete_confirm_single' => 'Confirmer la suppression de ce modèle partiel ?',
-        'new' => 'Nouveau modèle partiel'
+        'new' => 'Nouveau modèle partiel',
     ],
     'content' => [
         'not_found_name' => 'Le fichier de contenu ":name" est introuvable.',
@@ -157,18 +157,18 @@
         'no_list_records' => 'Aucun fichier de contenu n\'a été trouvé',
         'delete_confirm_multiple' => 'Confirmer la suppression des fichiers de contenu ou répertoires sélectionnés ?',
         'delete_confirm_single' => 'Confirmer la suppression de ce fichier de contenu ?',
-        'new' => 'Nouveau fichier de contenu'
+        'new' => 'Nouveau fichier de contenu',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Nom du gestionnaire AJAX invalide : :name.',
         'not_found' => 'Le gestionnaire AJAX ":name" est introuvable.',
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Ajouter',
-        'search' => 'Rechercher…'
+        'search' => 'Rechercher…',
     ],
     'editor' => [
         'settings' => 'Configuration',
@@ -240,7 +240,7 @@
         'error_deleting_directory' => 'Erreur lors de la suppression du répertoire d\'origine :dir',
         'no_list_records' => 'Aucun fichier trouvé',
         'delete_confirm' => 'Supprimer les fichiers ou répertoires sélectionnés ?',
-        'path' => 'Chemin'
+        'path' => 'Chemin',
     ],
     'component' => [
         'menu_label' => 'Composants',
@@ -263,7 +263,7 @@
         'saved' => 'Le modèle a été sauvegardé avec succès.',
         'no_list_records' => 'Aucun enregistrement trouvé',
         'delete_confirm' => 'Supprimer les modèles sélectionnés ?',
-        'order_by' => 'Trier par'
+        'order_by' => 'Trier par',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/id/lang.php b/modules/cms/lang/id/lang.php
index 108740fa59..f5e4b90087 100644
--- a/modules/cms/lang/id/lang.php
+++ b/modules/cms/lang/id/lang.php
@@ -10,45 +10,45 @@
         'invalid_file_extension' => 'Ekstensi berkas: :invalid tidak valid. Ekstensi yang diperbolehkan: :allowed.',
         'error_deleting' => "Galat menghapus berkas acuan ':name'. Silakan periksa izin tulis.",
         'delete_success' => 'Acuan: :count berhasil dihapus.',
-        'file_name_required' => 'Bidang nama berkas diperlukan.'
+        'file_name_required' => 'Bidang nama berkas diperlukan.',
     ],
     'dashboard' => [
         'active_theme' => [
             'online' => 'daring',
             'maintenance' => 'dalam perawatan',
-        ]
+        ],
     ],
     'theme' => [
         'active' => [
             'not_set' => 'Tema aktif tidak diatur.',
-            'not_found' => 'Tema aktif tidak ditemukan.'
+            'not_found' => 'Tema aktif tidak ditemukan.',
         ],
         'edit' => [
             'not_set' => 'Tema tersunting tidak diatur.',
             'not_found' => 'Tema tersunting tidak ditemukan.',
-            'not_match' => "Objek yang Anda coba akses tidak dimiliki oleh tema yang akan disunting. Silakan muat ulang laman."
+            'not_match' => "Objek yang Anda coba akses tidak dimiliki oleh tema yang akan disunting. Silakan muat ulang laman.",
         ],
         'settings_menu' => 'Tema front-end',
         'settings_menu_description' => 'Tinjau senarai tema terpasang dan pilih tema aktif.',
         'find_more_themes' => 'Temukan lebih banyak tema pada Toko Tema Winter CMS.',
         'activate_button' => 'Aktifkan',
         'active_button' => 'Aktif',
-        'customize_button' => 'Ubah suai'
+        'customize_button' => 'Ubah suai',
     ],
     'maintenance' => [
         'settings_menu' => 'Mode perbaikan',
         'settings_menu_description' => 'Penyusunan laman mode perbaikan dan tukar pengaturan.',
         'is_enabled' => 'Berdayakan mode perbaikan',
-        'is_enabled_comment' => 'Bila diaktifkan, pengunjung website akan melihat laman terpilih berikut.'
+        'is_enabled_comment' => 'Bila diaktifkan, pengunjung website akan melihat laman terpilih berikut.',
     ],
     'page' => [
         'not_found' => [
             'label' => 'Laman tidak ditemukan',
-            'help' => 'Laman yang diminta tidak dapat ditemukan.'
+            'help' => 'Laman yang diminta tidak dapat ditemukan.',
         ],
         'custom_error' => [
             'label' => 'Lamat galat',
-            'help' => "Mohon maaf, ada sesuatu yang salah dan laman tidak dapat ditampilkan."
+            'help' => "Mohon maaf, ada sesuatu yang salah dan laman tidak dapat ditampilkan.",
         ],
         'menu_label' => 'Laman',
         'unsaved_label' => 'Laman tak tersimpan',
@@ -57,7 +57,7 @@
         'invalid_url' => 'Format URL tidak valid. URL harus diawali dengan garis miring terbalik dan memuat huruf latin, angka dan simbol-simbol ini: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Anda yakin akan menghapus laman terpilih?',
         'delete_confirm_single' => 'Anda yakin akan menghapus laman ini?',
-        'no_layout' => '-- tanpa tata letak --'
+        'no_layout' => '-- tanpa tata letak --',
     ],
     'layout' => [
         'not_found' => "Tata letak ':name' tidak ditemukan",
@@ -66,7 +66,7 @@
         'no_list_records' => 'Tidak ada tata letak ditemukan',
         'new' => 'Tata letak baru',
         'delete_confirm_multiple' => 'Anda yakin akan menghapus tata letak terpilih?',
-        'delete_confirm_single' => 'Anda yakin akan menghapus tata letak ini?'
+        'delete_confirm_single' => 'Anda yakin akan menghapus tata letak ini?',
     ],
     'partial' => [
         'invalid_name' => 'Nama bagian: :name tidak valid.',
@@ -76,7 +76,7 @@
         'no_list_records' => 'Tidak ada bagian ditemukan',
         'delete_confirm_multiple' => 'Anda yakin akan menghapus bagian terpilih?',
         'delete_confirm_single' => 'Anda yakin akan menghapus bagian ini?',
-        'new' => 'Bagian baru'
+        'new' => 'Bagian baru',
     ],
     'content' => [
         'not_found' => "Berkas muatan ':name' tidak ditemukan.",
@@ -85,18 +85,18 @@
         'no_list_records' => 'Tidak ada muatan ditemukan',
         'delete_confirm_multiple' => 'Anda yakin akan menghapus berkas atau direktori muatan terpilih?',
         'delete_confirm_single' => 'Anda yakin akan menghapus berkas muatan ini?',
-        'new' => 'Berkas muatan baru'
+        'new' => 'Berkas muatan baru',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Nama AJAX handler: :name tidak valid.',
-        'not_found' => "AJAX handler ':name' tidak ditemukan."
+        'not_found' => "AJAX handler ':name' tidak ditemukan.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Tambah',
-        'search' => 'Pencarian...'
+        'search' => 'Pencarian...',
     ],
     'editor' => [
         'settings' => 'Pengaturan',
@@ -116,7 +116,7 @@
         'hidden' => 'Tersembunyi',
         'hidden_comment' => 'Laman tersembunyi hanya dapat diakses oleh pengguna back-end yang telah catat masuk.',
         'enter_fullscreen' => 'Masuk mode layar penuh',
-        'exit_fullscreen' => 'Keluar mode layar penuh'
+        'exit_fullscreen' => 'Keluar mode layar penuh',
     ],
     'asset' => [
         'menu_label' => 'Aset',
@@ -154,7 +154,7 @@
         'error_moving_file' => 'Galat memindahkan berkas :file',
         'error_moving_directory' => 'Galat memindahkan direktori :dir',
         'error_deleting_directory' => 'Galat menghapus direktori asal :dir',
-        'path' => 'Jalur'
+        'path' => 'Jalur',
     ],
     'component' => [
         'menu_label' => 'Komponen',
@@ -166,12 +166,12 @@
         'invalid_request' => 'Acuan tidak dapat disimpan dikarenakan data komponen tidak valid.',
         'no_records' => 'Tidak ada komponen ditemukan',
         'not_found' => "Komponen ':name' tidak ditemukan.",
-        'method_not_found' => "Komponen ':name' tidak berisi metode ':method'."
+        'method_not_found' => "Komponen ':name' tidak berisi metode ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Jenis acuan tidak diketahui.',
         'not_found' => 'Acuan yang diminta tidak ditemukan.',
-        'saved' => 'Acuan berhasil disimpan.'
+        'saved' => 'Acuan berhasil disimpan.',
     ],
     'permissions' => [
         'name' => 'Cms',
@@ -180,6 +180,6 @@
         'manage_pages' => 'Kelola laman',
         'manage_layouts' => 'Kelola tata letak',
         'manage_partials' => 'Kelola bagian',
-        'manage_themes' => 'Kelola tema'
-    ]
+        'manage_themes' => 'Kelola tema',
+    ],
 ];
diff --git a/modules/cms/lang/it/lang.php b/modules/cms/lang/it/lang.php
index 5b52e826c2..99d71c4062 100644
--- a/modules/cms/lang/it/lang.php
+++ b/modules/cms/lang/it/lang.php
@@ -19,7 +19,7 @@
             'online' => 'Online',
             'maintenance' => 'In manutenzione',
             'manage_themes' => 'Gestione temi',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Tema ':name' non trovato.",
@@ -30,7 +30,7 @@
         'edit' => [
             'not_set' => 'Il tema modificato non è impostato.',
             'not_found' => 'Il tema modificato non è stato trovato.',
-            'not_match' => "L'oggetto a cui stai cercando di accedere non appartiene al tema che stai modificando. Si prega di ricaricare la pagina."
+            'not_match' => "L'oggetto a cui stai cercando di accedere non appartiene al tema che stai modificando. Si prega di ricaricare la pagina.",
         ],
         'settings_menu' => 'Tema del sito',
         'settings_menu_description' => 'Visualizza l\'anteprima dei temi installati e seleziona un tema attivo.',
@@ -94,7 +94,7 @@
         'settings_menu' => 'Modalità di manutenzione',
         'settings_menu_description' => 'Configura la pagina da visualizzare in modalità di manutenzione e cambia l\'impostazione.',
         'is_enabled' => 'Abilita modalità di manutenzione',
-        'is_enabled_comment' => 'Se attivo i visitatori del sito vedranno la pagina selezionata sotto.'
+        'is_enabled_comment' => 'Se attivo i visitatori del sito vedranno la pagina selezionata sotto.',
     ],
     'page' => [
         'not_found_name' => "Pagina ':name' non trovata",
@@ -113,7 +113,7 @@
         'invalid_url' => 'Formato URL non valido. L\'URL deve iniziare con una barra e può contenere numeri, lettere latine e i seguenti simboli: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Sei sicuro di voler eliminare le pagine selezionate?',
         'delete_confirm_single' => 'Sei sicuro di voler eliminare questa pagina?',
-        'no_layout' => '-- nessun layout --'
+        'no_layout' => '-- nessun layout --',
     ],
     'layout' => [
         'not_found_name' => "Il layout ':name' non è stato trovato",
@@ -122,7 +122,7 @@
         'no_list_records' => 'Nessun layout trovato',
         'new' => 'Nuovo layout',
         'delete_confirm_multiple' => 'Sei sicuro di voler eliminare i layouts selezionati?',
-        'delete_confirm_single' => 'Sei sicuro di voler eliminare questo layout?'
+        'delete_confirm_single' => 'Sei sicuro di voler eliminare questo layout?',
     ],
     'partial' => [
         'not_found_name' => "La vista parziale ':name' non è stata trovata.",
@@ -132,7 +132,7 @@
         'no_list_records' => 'Nessuna vista parziale trovata',
         'delete_confirm_multiple' => 'Sei sicuro di voler eliminare le viste parziali selezionate?',
         'delete_confirm_single' => 'Sei sicuro di voler eliminare questa vista parziale?',
-        'new' => 'Nuova vista parziale'
+        'new' => 'Nuova vista parziale',
     ],
     'content' => [
         'not_found_name' => "Il file di contenuti ':name' non è stato trovato.",
@@ -141,18 +141,18 @@
         'no_list_records' => 'Nessun file di contenuto trovato',
         'delete_confirm_multiple' => 'Sei sicuro di voler eliminare i file o le cartelle di contenuti selezionate?',
         'delete_confirm_single' => 'Sei sicuro di voler eliminare questo file di contenuti?',
-        'new' => 'Nuovo file di contenuti'
+        'new' => 'Nuovo file di contenuti',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Nome del gestore AJAX non valido: :name.',
         'not_found' => "Il gestore AJAX ':name' non è stato trovato.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Aggiungi',
-        'search' => 'Cerca...'
+        'search' => 'Cerca...',
     ],
     'editor' => [
         'settings' => 'Impostazioni',
@@ -176,7 +176,7 @@
         'open_searchbox' => 'Apri casella di ricerca',
         'close_searchbox'  => 'Chiudi casella di ricerca',
         'open_replacebox' => 'Apri casella di sostituzione',
-        'close_replacebox'  => 'Chiudi casella di sostituzione'
+        'close_replacebox'  => 'Chiudi casella di sostituzione',
     ],
     'asset' => [
         'menu_label' => 'Assets',
@@ -214,7 +214,7 @@
         'error_moving_file' => 'Errore durante lo spostamento del file :file',
         'error_moving_directory' => 'Errore durante lo spostamento della cartella :dir',
         'error_deleting_directory' => 'Errore durante l\'eliminazione della cartella originale :dir',
-        'path' => 'Percorso'
+        'path' => 'Percorso',
     ],
     'component' => [
         'menu_label' => 'Componenti',
@@ -226,12 +226,12 @@
         'invalid_request' => 'Il template non può essere salvato a causa di dati dei componenti non validi.',
         'no_records' => 'Nessun componente trovato',
         'not_found' => "Il componente ':name' non è stato trovato.",
-        'method_not_found' => "Il componente ':name' non contiene il metodo ':method'."
+        'method_not_found' => "Il componente ':name' non contiene il metodo ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Tipo di template sconosciuto.',
         'not_found' => 'Il template richiesto non è stato trovato.',
-        'saved' => 'Il template è stato salvato con successo'
+        'saved' => 'Il template è stato salvato con successo',
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/ja/lang.php b/modules/cms/lang/ja/lang.php
index 82a2f8fbb8..1d704a876f 100644
--- a/modules/cms/lang/ja/lang.php
+++ b/modules/cms/lang/ja/lang.php
@@ -19,7 +19,7 @@
             'maintenance' => 'メンテナンスモード',
             'manage_themes' => 'テーマの管理',
             'customize_theme' => 'テーマのカスタマイズ',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => 'テーマ":name"が見つかりませんでした。',
diff --git a/modules/cms/lang/kr/lang.php b/modules/cms/lang/kr/lang.php
index e69b09670a..e2de66ef63 100644
--- a/modules/cms/lang/kr/lang.php
+++ b/modules/cms/lang/kr/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => '":name" 파일 삭제 오류',
         'delete_success' => ':count 개의 템플릿을 삭제했습니다.',
         'file_name_required' => '파일명 필드가 필요합니다.',
-        'safe_mode_enabled' => '안전모드가 활성화 되었습니다.'
+        'safe_mode_enabled' => '안전모드가 활성화 되었습니다.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,8 +19,8 @@
             'online' => '온라인',
             'maintenance' => '유지보수중',
             'manage_themes' => '테마관리',
-            'customize_theme' => '테마변경'
-        ]
+            'customize_theme' => '테마변경',
+        ],
     ],
     'theme' => [
         'not_found_name' => "':name' 테마를 찾을 수 없습니다.",
@@ -92,14 +92,14 @@
         'dir_name_taken' => '원하는 디렉토리가 이미 있습니다.',
         'find_more_themes' => '테마 더 찾아보기',
         'saving' => '테마를 저장하는 중입니다...',
-        'return' => '테마 목록으로 돌아가기'
+        'return' => '테마 목록으로 돌아가기',
     ],
     'maintenance' => [
         'settings_menu' => '유지보수모드',
         'settings_menu_description' => '유지보수모드 페이지의 설정과 변경을 합니다.',
         'is_enabled' => '유지보수모드 활성화',
         'is_enabled_comment' => '유지보수모드일때 웹사이트 방문자가 보는 페이지를 선택해주세요.',
-        'hint' => '유지보수모드는 백엔드에 로그인하지않은 방문자에 유지보수안내 페이지를 표시합니다.'
+        'hint' => '유지보수모드는 백엔드에 로그인하지않은 방문자에 유지보수안내 페이지를 표시합니다.',
     ],
     'page' => [
         'not_found_name' => "':name' 페이지가 없습니다.",
@@ -122,7 +122,7 @@
         'cms_page' => 'CMS 페이지',
         'title' => '페이지 제목',
         'url' => '페이지 URL',
-        'file_name' => '페이지 파일 이름'
+        'file_name' => '페이지 파일 이름',
     ],
     'layout' => [
         'not_found_name' => "':name' 레이아웃이 없습니다.",
@@ -185,7 +185,7 @@
         'open_searchbox' => '검색 열기',
         'close_searchbox'  => '검색 닫기',
         'open_replacebox' => '교체 열기',
-        'close_replacebox'  => '교체 닫기'
+        'close_replacebox'  => '교체 닫기',
     ],
     'asset' => [
         'menu_label' => "자산",
@@ -245,7 +245,7 @@
         'saved' => "템플릿을 저장합니다.",
         'no_list_records' => '템플릿을 찾을 수 없습니다',
         'delete_confirm' => '선택한 템플릿을 삭제하시겠습니까?',
-        'order_by' => '정렬방법'
+        'order_by' => '정렬방법',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/lt/lang.php b/modules/cms/lang/lt/lang.php
index 8cd36e9a7b..5f742f4e9a 100644
--- a/modules/cms/lang/lt/lang.php
+++ b/modules/cms/lang/lt/lang.php
@@ -11,26 +11,26 @@
         'error_deleting' => "Nepavyko ištrinti šablono ':name'. Patikrinkite katalogo įrašymo nustatymus serveryje.",
         'delete_success' => 'Ištrinta šablonų: :count.',
         'file_name_required' => 'Failko pavadinimo laukelis yra būtinas.',
-        'safe_mode_enabled' => 'Saugusis režimas šiuo metu įjungtas.'
+        'safe_mode_enabled' => 'Saugusis režimas šiuo metu įjungtas.',
     ],
     'dashboard' => [
         'active_theme' => [
             'widget_title_default' => 'Tinklalapis',
             'online' => 'Įjungtas',
             'maintenance' => 'Aptarnavimo režime',
-            'manage_themes' => 'Tvarkyti dizainus'
-        ]
+            'manage_themes' => 'Tvarkyti dizainus',
+        ],
     ],
     'theme' => [
         'not_found_name' => "Dizainas ':name' nerastas.",
         'active' => [
             'not_set' => 'Aktyvusis dizainas yra nenustatytas.',
-            'not_found' => 'Aktyvusis dizainas nerastas.'
+            'not_found' => 'Aktyvusis dizainas nerastas.',
         ],
         'edit' => [
             'not_set' => 'Redaguojamas dizainas nenustatytas.',
             'not_found' => 'Redaguojamas dizainas nerastas.',
-            'not_match' => "Objektas, kurį bandote prieiti nepriklauso redaguojamam dizainui. Perkraukite puslapį."
+            'not_match' => "Objektas, kurį bandote prieiti nepriklauso redaguojamam dizainui. Perkraukite puslapį.",
         ],
         'settings_menu' => 'Svetainės dizainas',
         'settings_menu_description' => 'Peržiūrėkite įdiegtų dizainų sąrašą ir pasirinkite aktyvųjį dizainą.',
@@ -90,24 +90,24 @@
         'dir_name_taken' => 'Norimo dizaino direktorija jau egzistuoja.',
         'find_more_themes' => 'Raskite daugiau dizainų',
         'saving' => 'Išsaugome dizainą...',
-        'return' => 'Grįžti į dizainų sąrašą'
+        'return' => 'Grįžti į dizainų sąrašą',
     ],
     'maintenance' => [
         'settings_menu' => 'Aptarnavimo režimas',
         'settings_menu_description' => 'Konfigūruokite aptarnavimo režimo puslapį bei perjunkite režimo statusą.',
         'is_enabled' => 'Įjungti aptarnavimo režimą',
         'is_enabled_comment' => 'Parinkite kurį puslapį rodysite lankytojams aptarnavimo režimo metu.',
-        'hint' => 'Aptarnavimo režimo metu lankytojams, kurie nėra prisijungę į administracinę zoną, bus rodomas Jūsų nustatytas puslapis.'
+        'hint' => 'Aptarnavimo režimo metu lankytojams, kurie nėra prisijungę į administracinę zoną, bus rodomas Jūsų nustatytas puslapis.',
     ],
     'page' => [
         'not_found_name' => "Puslapis ':name' nerastas",
         'not_found' => [
             'label' => 'Puslapis nerstas',
-            'help' => 'Negalime rasti užklaustojo puslapio.'
+            'help' => 'Negalime rasti užklaustojo puslapio.',
         ],
         'custom_error' => [
             'label' => 'Puslapio klaida',
-            'help' => "Atsiprašome, tačiau dėl galimų klaidų užklaustojo puslapio rodyti nepavyko."
+            'help' => "Atsiprašome, tačiau dėl galimų klaidų užklaustojo puslapio rodyti nepavyko.",
         ],
         'menu_label' => 'Puslapiai',
         'unsaved_label' => 'Neišsaugoti puslapiai',
@@ -120,7 +120,7 @@
         'cms_page' => 'CMS puslapis',
         'title' => 'Puslapio pavadinimas',
         'url' => 'Puslapio URL',
-        'file_name' => 'Puslapio failo pavadinimas'
+        'file_name' => 'Puslapio failo pavadinimas',
     ],
     'layout' => [
         'not_found_name' => "Šablonas ':name' nerastas",
@@ -129,7 +129,7 @@
         'no_list_records' => 'Šablonų nėra',
         'new' => 'Naujas šablonas',
         'delete_confirm_multiple' => 'Trinti pasirinktus šablonus?',
-        'delete_confirm_single' => 'Trinti šį šabloną?'
+        'delete_confirm_single' => 'Trinti šį šabloną?',
     ],
     'partial' => [
         'not_found_name' => "Priedėlis ':name' nerastas.",
@@ -139,7 +139,7 @@
         'no_list_records' => 'Priedėlių nėra',
         'delete_confirm_multiple' => 'Trinti pasirinktus priedėlius?',
         'delete_confirm_single' => 'Trinti šį priedėlį?',
-        'new' => 'Naujas priedėlis'
+        'new' => 'Naujas priedėlis',
     ],
     'content' => [
         'not_found_name' => "Turinio failas ':name' nerastas.",
@@ -148,18 +148,18 @@
         'no_list_records' => 'Turinio failų nėra',
         'delete_confirm_multiple' => 'Trinti pasirinktus turinio failus ar direktorijas?',
         'delete_confirm_single' => 'Trinti šį turinio failą?',
-        'new' => 'Nauajs turinio failas'
+        'new' => 'Nauajs turinio failas',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Netinkamas AJAX tvarkiklis pavadinimas: :name.',
-        'not_found' => "AJAX tvarkiklis ':name' nerastas."
+        'not_found' => "AJAX tvarkiklis ':name' nerastas.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Pridėti',
-        'search' => 'Ieškoti...'
+        'search' => 'Ieškoti...',
     ],
     'editor' => [
         'settings' => 'Nustatymai',
@@ -183,7 +183,7 @@
         'open_searchbox' => 'Atidaryti paieškos laukelį',
         'close_searchbox'  => 'Uždaryti paieškos laukelį',
         'open_replacebox' => 'Atidaryti pakeitimo laukelį',
-        'close_replacebox'  => 'Uždaryti pakeitimo laukelį'
+        'close_replacebox'  => 'Uždaryti pakeitimo laukelį',
     ],
     'asset' => [
         'menu_label' => 'Aktyvai',
@@ -223,7 +223,7 @@
         'error_deleting_directory' => 'Klaida trinant pirminę direktoriją :dir',
         'no_list_records' => 'Failų nėra',
         'delete_confirm' => 'Trinti pasirinktus failus ar direktorijas?',
-        'path' => 'Kelias'
+        'path' => 'Kelias',
     ],
     'component' => [
         'menu_label' => 'Komponentai',
@@ -235,7 +235,7 @@
         'invalid_request' => 'Šablono išsaugoti nepavyko dėl netinkamų komponento savybių.',
         'no_records' => 'Komponentų nėra',
         'not_found' => "Komponento ':name' neradome.",
-        'method_not_found' => "Komponente ':name' nėra metodo ':method'."
+        'method_not_found' => "Komponente ':name' nėra metodo ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Nežinomas šablono tipas.',
@@ -243,7 +243,7 @@
         'saved' => 'Šablonas išsaugotas.',
         'no_list_records' => 'Įrašų nėra',
         'delete_confirm' => 'Ištrinti pasirinktus šablonus?',
-        'order_by' => 'Rūšiuoti pagal'
+        'order_by' => 'Rūšiuoti pagal',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/lv/lang.php b/modules/cms/lang/lv/lang.php
index d903336b79..83151e0816 100644
--- a/modules/cms/lang/lv/lang.php
+++ b/modules/cms/lang/lv/lang.php
@@ -20,7 +20,7 @@
             'maintenance' => 'Uzturēšanas režīmā',
             'manage_themes' => 'Pārvaldīt tēmas',
             'customize_theme' => 'Pielāgot tēmu',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Tēma ':name' netika atrasta.",
diff --git a/modules/cms/lang/nb-no/lang.php b/modules/cms/lang/nb-no/lang.php
index 0fee7b5232..6ca5e4c9b8 100644
--- a/modules/cms/lang/nb-no/lang.php
+++ b/modules/cms/lang/nb-no/lang.php
@@ -19,18 +19,18 @@
             'online' => 'Online',
             'maintenance' => 'Vedlikeholdsmodus',
             'manage_themes' => 'Administrer temaer',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Tema ':name' ble ikke funnet.",
         'active' => [
             'not_set' => 'Aktivt tema er ikke valgt.',
-            'not_found' => 'Aktivt tema ikke funnet.'
+            'not_found' => 'Aktivt tema ikke funnet.',
         ],
         'edit' => [
             'not_set' => 'Redigeringstema er ikke valgt.',
             'not_found' => 'Redigeringstema ikke funnet.',
-            'not_match' => "Objektet du prøver å åpne tilhører ikke temaet som endres. Vennligst oppdater siden."
+            'not_match' => "Objektet du prøver å åpne tilhører ikke temaet som endres. Vennligst oppdater siden.",
         ],
         'settings_menu' => 'Frontend tema',
         'settings_menu_description' => 'Forhåndsvis en liste over installerte temaer og velg et aktivt tema.',
@@ -101,11 +101,11 @@
         'not_found_name' => "Siden ':name' ble ikke funnet",
         'not_found' => [
             'label' => 'Side ikke funnet',
-            'help' => 'Den forespurte siden ble ikke funnet.'
+            'help' => 'Den forespurte siden ble ikke funnet.',
         ],
         'custom_error' => [
             'label' => 'Side-feil',
-            'help' => "Noe gikk galt. Siden kan ikke vises."
+            'help' => "Noe gikk galt. Siden kan ikke vises.",
         ],
         'menu_label' => 'Sider',
         'unsaved_label' => 'Ulagrede sider',
@@ -114,7 +114,7 @@
         'invalid_url' => 'Ugyldig URL-format. URL-en skal starte med skråstrek og kan inneholde tall, latinske bokstaver og følgende symbol: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Vil du virkelig slette valgte sider?',
         'delete_confirm_single' => 'Vil du virkelig slette denne siden?',
-        'no_layout' => '-- ingen layout --'
+        'no_layout' => '-- ingen layout --',
     ],
     'layout' => [
         'not_found_name' => "Layouten ':name' ble ikke funnet",
@@ -123,7 +123,7 @@
         'no_list_records' => 'Ingen layouts funnet',
         'new' => 'Ny layout',
         'delete_confirm_multiple' => 'Vil du virkelig slette valgte layouts?',
-        'delete_confirm_single' => 'Vil du virkelig slette denne layout?'
+        'delete_confirm_single' => 'Vil du virkelig slette denne layout?',
     ],
     'partial' => [
         'not_found_name' => "Partial ':name' ble ikke funnet.",
@@ -133,7 +133,7 @@
         'no_list_records' => 'Ingen partials funnet',
         'delete_confirm_multiple' => 'Vil du virkelig slette valgte partials?',
         'delete_confirm_single' => 'Vil du virkelig slette denne partialen?',
-        'new' => 'Ny partial'
+        'new' => 'Ny partial',
     ],
     'content' => [
         'not_found_name' => "Innholdsfilen ':name' ble ikke funnet.",
@@ -142,18 +142,18 @@
         'no_list_records' => 'No content files found',
         'delete_confirm_multiple' => 'Vil du virkelig slette valgte innholdsfiler eller -mapper?',
         'delete_confirm_single' => 'Vil du virkelig slette denne innholdsfilen eller -mappen?',
-        'new' => 'Ny innholdsfil'
+        'new' => 'Ny innholdsfil',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Ugyldig AJAX handler navn: :name.',
-        'not_found' => "AJAX handler ':name' ble ikke funnet."
+        'not_found' => "AJAX handler ':name' ble ikke funnet.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Legg til',
-        'search' => 'Søk...'
+        'search' => 'Søk...',
     ],
     'editor' => [
         'settings' => 'Innstillinger',
@@ -177,7 +177,7 @@
         'open_searchbox' => 'Vis søkefelt',
         'close_searchbox'  => 'Skjul søkefelt',
         'open_replacebox' => 'Vis erstatt-felt',
-        'close_replacebox'  => 'Skjul erstatt-felt'
+        'close_replacebox'  => 'Skjul erstatt-felt',
     ],
     'asset' => [
         'menu_label' => 'Ressurser',
@@ -215,7 +215,7 @@
         'error_moving_file' => 'Kunne ikke flytte filen :file',
         'error_moving_directory' => 'Kunne ikke flytte mappen :dir',
         'error_deleting_directory' => 'Kunne ikke slette original mappe :dir',
-        'path' => 'Mål'
+        'path' => 'Mål',
     ],
     'component' => [
         'menu_label' => 'Komponenter',
@@ -227,12 +227,12 @@
         'invalid_request' => 'Templaten kan ikke lagres på grunn av ugyldig komponentdata.',
         'no_records' => 'Ingen komponenter funnet',
         'not_found' => "Komponenten ':name' ble ikke funnet.",
-        'method_not_found' => "Komponenten ':name' inneholder ikke en metode ':method'."
+        'method_not_found' => "Komponenten ':name' inneholder ikke en metode ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Ukjent template-type.',
         'not_found' => 'Forespurt template ikke funnet.',
-        'saved' => 'Templaten har blitt lagret.'
+        'saved' => 'Templaten har blitt lagret.',
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/pl/lang.php b/modules/cms/lang/pl/lang.php
index a92f0d8585..09b4025675 100644
--- a/modules/cms/lang/pl/lang.php
+++ b/modules/cms/lang/pl/lang.php
@@ -19,18 +19,18 @@
             'online' => 'Online',
             'maintenance' => 'W konserwacji',
             'manage_themes' => 'Zarządzaj motywami',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Motyw ':name' nie został odnaleziony.",
         'active' => [
             'not_set' => 'Brak aktywnego motywu.',
-            'not_found' => 'Aktywny motyw nie został odnaleziony.'
+            'not_found' => 'Aktywny motyw nie został odnaleziony.',
         ],
         'edit' => [
             'not_set' => 'Edytowany motyw nie jest ustawiony.',
             'not_found' => 'Edytowany motyw nie został znaleziony.',
-            'not_match' => "Obiekt który próbujesz edytować nie należy do wybranego motywu. Proszę przeładować stronę."
+            'not_match' => "Obiekt który próbujesz edytować nie należy do wybranego motywu. Proszę przeładować stronę.",
         ],
         'settings_menu' => 'Motyw strony',
         'settings_menu_description' => 'Zobacz listę zainstalowanych motywów i wybierz, który aktywować.',
@@ -101,11 +101,11 @@
         'not_found_name' => "Strona ':name' nie została znaleziona",
         'not_found' => [
             'label' => 'Nie znaleziono strony',
-            'help' => 'Żądana strona nie została znaleziona.'
+            'help' => 'Żądana strona nie została znaleziona.',
         ],
         'custom_error' => [
             'label' => 'Błąd strony',
-            'help' => "Bardzo przepraszamy, jednak coś poszło nie tak i strona nie może zostać wyświetlona."
+            'help' => "Bardzo przepraszamy, jednak coś poszło nie tak i strona nie może zostać wyświetlona.",
         ],
         'menu_label' => 'Strony',
         'unsaved_label' => 'Niezapisane strony',
@@ -114,7 +114,7 @@
         'invalid_url' => 'Nieprawidłowy format URL. Powinien rozpoczynać się od ukośnika (/) i może zawierać cyfry, znaki oraz następujące symbole: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Czy na pewno chcesz usunąć zaznaczone strony?',
         'delete_confirm_single' => 'Czy na pewno chcesz usunąć tę stronę?',
-        'no_layout' => '-- brak układu --'
+        'no_layout' => '-- brak układu --',
     ],
     'layout' => [
         'not_found_name' => "Nie znaleziono układu ':name'",
@@ -123,7 +123,7 @@
         'no_list_records' => 'Nie znaleziono układów',
         'new' => 'Nowy układ',
         'delete_confirm_multiple' => 'Czy na pewno chcesz usunąć zaznaczone układy?',
-        'delete_confirm_single' => 'Czy na pewno chcesz usunąć ten układ?'
+        'delete_confirm_single' => 'Czy na pewno chcesz usunąć ten układ?',
     ],
     'partial' => [
         'not_found_name' => "Fragment ':name' nie został znaleziony.",
@@ -133,7 +133,7 @@
         'no_list_records' => 'Nie znaleziono fragmentów',
         'delete_confirm_multiple' => 'Czy na pewno chcesz usunąć zaznaczone fragmenty?',
         'delete_confirm_single' => 'Czy na pewno chcesz usunąć ten fragment?',
-        'new' => 'Nowy fragment'
+        'new' => 'Nowy fragment',
     ],
     'content' => [
         'not_found_name' => "Plik treści ':name' nie został znaleziony.",
@@ -142,18 +142,18 @@
         'no_list_records' => 'Nie znaleziono plików treści',
         'delete_confirm_multiple' => 'Czy na pewno chcesz usunąć zaznaczone pliki treści?',
         'delete_confirm_single' => 'Czy na pewno chcesz usunąć ten plik treści?',
-        'new' => 'Nowy plik treści'
+        'new' => 'Nowy plik treści',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Nieprawidłowa nazwa handlera AJAX: :name.',
-        'not_found' => "Handler AJAX ':name' nie został znaleziony."
+        'not_found' => "Handler AJAX ':name' nie został znaleziony.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Dodaj',
-        'search' => 'Szukaj...'
+        'search' => 'Szukaj...',
     ],
     'editor' => [
         'settings' => 'Ustawienia',
@@ -177,7 +177,7 @@
         'open_searchbox' => 'Otwórz wyszukiwanie',
         'close_searchbox'  => 'Zamknij wyszukiwanie',
         'open_replacebox' => 'Otwórz zamienianie tekstu',
-        'close_replacebox'  => 'Zamknij zamienianie tekstu'
+        'close_replacebox'  => 'Zamknij zamienianie tekstu',
     ],
     'asset' => [
         'menu_label' => 'Zasoby',
@@ -215,7 +215,7 @@
         'error_moving_file' => 'Błąd przy przenoszeniu pliku :file',
         'error_moving_directory' => 'Błąd przy przenoszeniu folderu :dir',
         'error_deleting_directory' => 'Błąd przy usuwaniu oryginalnego folderu :dir',
-        'path' => 'Ścieżka'
+        'path' => 'Ścieżka',
     ],
     'component' => [
         'menu_label' => 'Komponenty',
@@ -227,12 +227,12 @@
         'invalid_request' => 'The template cannot be saved because of invalid component data.',
         'no_records' => 'Nie znaleziono komponentów',
         'not_found' => "Komponent ':name' nie został znaleziony.",
-        'method_not_found' => "Komponent ':name' nie zawiera metody ':method'."
+        'method_not_found' => "Komponent ':name' nie zawiera metody ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Nieznany typ szablonu.',
         'not_found' => 'Szablon nie został znaleziony.',
-        'saved' => 'Szablon został zapisany pomyślnie.'
+        'saved' => 'Szablon został zapisany pomyślnie.',
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/pt-br/lang.php b/modules/cms/lang/pt-br/lang.php
index 1e05b84849..30ade54e2a 100644
--- a/modules/cms/lang/pt-br/lang.php
+++ b/modules/cms/lang/pt-br/lang.php
@@ -19,8 +19,8 @@
             'online' => 'online',
             'maintenance' => 'em manutenção',
             'manage_themes' => 'Gerenciar temas',
-            'customize_theme' => 'Customizar tema'
-        ]
+            'customize_theme' => 'Customizar tema',
+        ],
     ],
     'theme' => [
         'not_found_name' => 'O tema ":name" não foi encontrado.',
@@ -99,7 +99,7 @@
         'settings_menu_description' => 'Configurar modo de manutenção e a página exibida.',
         'is_enabled' => 'Ativar modo de manutenção',
         'is_enabled_comment' => 'Quando ativado visitantes do site vão ver a página selecionada.',
-        'hint' => 'O modo de manutenção exibirá a página de manutenção para visitantes que não estão conectados à área de back-end.'
+        'hint' => 'O modo de manutenção exibirá a página de manutenção para visitantes que não estão conectados à área de back-end.',
     ],
     'page' => [
         'not_found_name' => 'A página ":name" não foi encontrada',
@@ -122,7 +122,7 @@
         'cms_page' => 'Página do CMS',
         'title' => 'Título da página',
         'url' => 'URL da página',
-        'file_name' => 'Nome do arquivo da página'
+        'file_name' => 'Nome do arquivo da página',
     ],
     'layout' => [
         'not_found_name' => 'O esboço ":name" não foi encontrado',
@@ -256,7 +256,7 @@
         'saved' => 'O modelo foi salvo com sucesso.',
         'no_list_records' => 'Nenhum registro foi encontrado',
         'delete_confirm' => 'Excluir modelos selecionados?',
-        'order_by' => 'Ordenar por'
+        'order_by' => 'Ordenar por',
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/pt-pt/lang.php b/modules/cms/lang/pt-pt/lang.php
index afa41ec204..700146d704 100644
--- a/modules/cms/lang/pt-pt/lang.php
+++ b/modules/cms/lang/pt-pt/lang.php
@@ -19,8 +19,8 @@
             'online' => 'Online',
             'maintenance' => 'em manutenção',
             'manage_themes' => 'Gerir temas',
-            'customize_theme' => 'Personalizar tema'
-        ]
+            'customize_theme' => 'Personalizar tema',
+        ],
     ],
     'theme' => [
         'not_found_name' => 'O tema ":name" não foi encontrado.',
@@ -98,7 +98,7 @@
         'settings_menu_description' => 'Configurar modo de manutenção e a página exibida.',
         'is_enabled' => 'Activar modo de manutenção',
         'is_enabled_comment' => 'Quando activado visitantes do site vão ver a página selecionada.',
-        'hint' => 'Modo de manutenção mostra a página de manutenção aos visitantes que não tenham feito acesso na área de backend.'
+        'hint' => 'Modo de manutenção mostra a página de manutenção aos visitantes que não tenham feito acesso na área de backend.',
     ],
     'page' => [
         'not_found_name' => 'A página ":name" não foi encontrada',
@@ -121,7 +121,7 @@
         'cms_page' => 'Página do CMS',
         'title' => 'Título da página',
         'url' => 'URL da página',
-        'file_name' => 'Nome ficheiro da página'
+        'file_name' => 'Nome ficheiro da página',
     ],
     'layout' => [
         'not_found_name' => 'O esboço ":name" não foi encontrado',
@@ -184,7 +184,7 @@
         'open_searchbox' => 'Abrir caixa de pesquisa',
         'close_searchbox'  => 'Fechar caixa de pesquisa',
         'open_replacebox' => 'Abrir caixa de substituição',
-        'close_replacebox'  => 'Fechar caixa de substituição'
+        'close_replacebox'  => 'Fechar caixa de substituição',
     ],
     'asset' => [
         'menu_label' => 'Ficheiros',
@@ -244,7 +244,7 @@
         'saved' => 'O modelo foi salvo com sucesso.',
         'no_list_records' => 'Não foram encontrados registos',
         'delete_confirm' => 'Apagar modelos selecionados?',
-        'order_by' => 'Ordenar por'
+        'order_by' => 'Ordenar por',
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/ro/lang.php b/modules/cms/lang/ro/lang.php
index 96150a12ab..32e9cbc8a7 100644
--- a/modules/cms/lang/ro/lang.php
+++ b/modules/cms/lang/ro/lang.php
@@ -32,7 +32,7 @@
         'edit' => [
             'not_set' => "Tema de editare nu este setată.",
             'not_found' => "Tema de editare nu a fost gasită.",
-            'not_match' => "Obiectul pe care încercați să-l accesați nu aparține temei care este în curs de editare. Vă rugăm să reîncărcați pagina."
+            'not_match' => "Obiectul pe care încercați să-l accesați nu aparține temei care este în curs de editare. Vă rugăm să reîncărcați pagina.",
         ],
         'settings_menu' => 'Tema front-end',
         'settings_menu_description' => 'Gestionați tema front-end și opțiunile de personalizare.',
@@ -131,7 +131,7 @@
         'no_list_records' => 'Nu au fost găsite machete',
         'new' => 'Machetă nouă',
         'delete_confirm_multiple' => 'Vreți să ștergeți machetele selectate?',
-        'delete_confirm_single' => 'Vreți să ștergeți macheta selectată?'
+        'delete_confirm_single' => 'Vreți să ștergeți macheta selectată?',
     ],
     'partial' => [
         'not_found_name' => "Parțialul ':name' nu a fost gasit.",
@@ -141,7 +141,7 @@
         'no_list_records' => 'Nu au fost găsite parțiale',
         'delete_confirm_multiple' => 'Vreți să ștergeți partialele selectate?',
         'delete_confirm_single' => 'Vreți să ștergeți acest parțial?',
-        'new' => 'Parțial nou'
+        'new' => 'Parțial nou',
     ],
     'content' => [
         'not_found_name' => "Fișierul de conținut ':name' nu a fost găsit.",
@@ -157,11 +157,11 @@
         'not_found' => "Funcția AJAX ':name' nu a fost gasită.",
     ],
     'cms' => [
-        'menu_label' => "CMS"
+        'menu_label' => "CMS",
     ],
     'sidebar' => [
         'add' => 'Adăugare',
-        'search' => 'Căutare...'
+        'search' => 'Căutare...',
     ],
     'editor' => [
         'settings' => 'Setări',
diff --git a/modules/cms/lang/sk/lang.php b/modules/cms/lang/sk/lang.php
index f6a42875ad..a082cb839b 100644
--- a/modules/cms/lang/sk/lang.php
+++ b/modules/cms/lang/sk/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => "Chyba pri mazaní šablony ':name'. kontrolujte oprávnenia na zápis.",
         'delete_success' => 'Šablony zmazané: :count.',
         'file_name_required' => 'Je nutné vyplniť Meno súboru.',
-        'safe_mode_enabled' => 'Bezpečný režim (Safe mode) je aktívny.'
+        'safe_mode_enabled' => 'Bezpečný režim (Safe mode) je aktívny.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,20 +19,20 @@
             'online' => 'Online',
             'maintenance' => 'Prebieha údržba',
             'manage_themes' => 'Spravovať témy',
-            'customize_theme' => 'Prispôsobiť tému'
-        ]
+            'customize_theme' => 'Prispôsobiť tému',
+        ],
     ],
     'theme' => [
         'not_found_name' => "Téma ':name' nebola nájdená.",
         'by_author' => 'Vytvoril :name',
         'active' => [
             'not_set' => 'Aktívna téma nie je nastavená.',
-            'not_found' => 'Aktívna téma nebola nájdená.'
+            'not_found' => 'Aktívna téma nebola nájdená.',
         ],
         'edit' => [
             'not_set' => 'Editovaná téma nie je nastavená.',
             'not_found' => 'Editovaná téma nebola nájdená.',
-            'not_match' => "Objekt, ktorý chcete práve zobraziť nepatrí k upravovanej téme. Prosím obnovte stránku."
+            'not_match' => "Objekt, ktorý chcete práve zobraziť nepatrí k upravovanej téme. Prosím obnovte stránku.",
         ],
         'settings_menu' => 'Téma vzhľadu',
         'settings_menu_description' => 'Spravujte témy vzhľadu a možnosti prispôsobenia.',
@@ -92,24 +92,24 @@
         'dir_name_taken' => 'Zadaný priečinok s témou už existuje.',
         'find_more_themes' => 'Vyhľadať ďalšie témy',
         'saving' => 'Ukladám tému...',
-        'return' => 'Návrat na zoznam tém'
+        'return' => 'Návrat na zoznam tém',
     ],
     'maintenance' => [
         'settings_menu' => 'Režim údržby',
         'settings_menu_description' => 'Nastavte stránku režimu údržby a jej nastavenia.',
         'is_enabled' => 'Aktivovať režim údržby',
         'is_enabled_comment' => 'Zvoľte stránku, ktorá bude zobrazená pri aktivovanom režime údržby.',
-        'hint' => 'Režim údržby zobrazí stránku údržby návštevníkom, ktorí nie sú prihlásení do adminstrácie.'
+        'hint' => 'Režim údržby zobrazí stránku údržby návštevníkom, ktorí nie sú prihlásení do adminstrácie.',
     ],
     'page' => [
         'not_found_name' => "Stránka ':name' nebola nájdená",
         'not_found' => [
             'label' => 'Stránka nenájdená',
-            'help' => 'Požadovaná stránka nebola nájdená.'
+            'help' => 'Požadovaná stránka nebola nájdená.',
         ],
         'custom_error' => [
             'label' => 'Chyba stránky',
-            'help' => "Ospravedlňujeme sa, niečo sa pokazilo a stránka nemôže byť zobrazená."
+            'help' => "Ospravedlňujeme sa, niečo sa pokazilo a stránka nemôže byť zobrazená.",
         ],
         'menu_label' => 'Stránky',
         'unsaved_label' => 'Neuložené stránky',
@@ -122,7 +122,7 @@
         'cms_page' => 'CMS stránka',
         'title' => 'Názov stránky',
         'url' => 'URL stránky',
-        'file_name' => 'Názov súboru stránky'
+        'file_name' => 'Názov súboru stránky',
     ],
     'layout' => [
         'not_found_name' => "Layout ':name' nebol nájdený",
@@ -131,7 +131,7 @@
         'no_list_records' => 'Žiadne layouty',
         'new' => 'Nový layout',
         'delete_confirm_multiple' => 'Skutočne zmazať zvolené layouty?',
-        'delete_confirm_single' => 'Skutočne zmazať tento layout?'
+        'delete_confirm_single' => 'Skutočne zmazať tento layout?',
     ],
     'partial' => [
         'not_found_name' => "Čiastková šablóna ':name' nebola nájdená.",
@@ -141,7 +141,7 @@
         'no_list_records' => 'Žiadne čiastkové šablóny',
         'delete_confirm_multiple' => 'Skutočne zmazať zvolené čiastkové šablóny?',
         'delete_confirm_single' => 'Skutočne zmazať túto čiastkovú šablónu?',
-        'new' => 'Nová čiastková šablóna'
+        'new' => 'Nová čiastková šablóna',
     ],
     'content' => [
         'not_found_name' => "Obsahový súbor ':name' nebol nájdený.",
@@ -150,18 +150,18 @@
         'no_list_records' => 'Žiadne obsahové súbory',
         'delete_confirm_multiple' => 'Skutočne zmazať zvolené obsahové súbory alebo priečinky?',
         'delete_confirm_single' => 'Skutočne zmazať tento obsahový súbor?',
-        'new' => 'Nový obsahový súbor'
+        'new' => 'Nový obsahový súbor',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Neplatný názov AJAX handlera: :name.',
-        'not_found' => "AJAX handler ':name' nebol nájdený."
+        'not_found' => "AJAX handler ':name' nebol nájdený.",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Pridať',
-        'search' => 'Hľadať...'
+        'search' => 'Hľadať...',
     ],
     'editor' => [
         'settings' => 'Nastavenia',
@@ -185,7 +185,7 @@
         'open_searchbox' => 'Otvoriť box hľadania',
         'close_searchbox'  => 'Zavrieť box hľadania',
         'open_replacebox' => 'Otvoriť box nahradzovania',
-        'close_replacebox'  => 'Zavrieť box nahradzovania'
+        'close_replacebox'  => 'Zavrieť box nahradzovania',
     ],
     'asset' => [
         'menu_label' => 'Súbory',
@@ -225,7 +225,7 @@
         'error_deleting_directory' => 'Chyba pri mazaní pôvodného priečinka :dir',
         'no_list_records' => 'Žiadne súbory',
         'delete_confirm' => 'Skutočne zmazať vybrané súbory alebo priečinky?',
-        'path' => 'Cesta'
+        'path' => 'Cesta',
     ],
     'component' => [
         'menu_label' => 'Komponenty',
@@ -237,7 +237,7 @@
         'invalid_request' => 'Šablóna nemôže byť uložená kvôli neplatným dátam kompentntu.',
         'no_records' => 'Žiadne komponenty',
         'not_found' => "Komponent ':name' nebol nájdený.",
-        'method_not_found' => "Komponent ':name' neobsahuje metódu ':method'."
+        'method_not_found' => "Komponent ':name' neobsahuje metódu ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Neznámy typ šablóny.',
@@ -245,7 +245,7 @@
         'saved' => 'Šablóna uložená.',
         'no_list_records' => 'Žiadne záznamy',
         'delete_confirm' => 'Skutočne zmazať vybrané šablóny?',
-        'order_by' => 'Zoradiť podľa'
+        'order_by' => 'Zoradiť podľa',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/sl/lang.php b/modules/cms/lang/sl/lang.php
index 2a3cd3d26f..63f89f39ca 100644
--- a/modules/cms/lang/sl/lang.php
+++ b/modules/cms/lang/sl/lang.php
@@ -157,7 +157,7 @@
         'not_found'    => "Ni mogoče najti AJAX akcije ':name'.",
     ],
     'cms'          => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar'      => [
         'add'    => 'Dodaj',
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index 1f7ee2a9f8..00a5d69d8c 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -10,19 +10,19 @@
         'invalid_file_extension' => 'Felaktig filändelse: :invalid. Tillåtna filändelser är: :allowed.',
         'error_deleting' => 'Det gick inte att radera mallfilen: ":name".',
         'delete_success' => 'Mallarna är nu raderade: :count.',
-        'file_name_required' => 'Filnamnsfältet är obligatoriskt.'
+        'file_name_required' => 'Filnamnsfältet är obligatoriskt.',
     ],
     'dashboard' => [
         'active_theme' => [
             'online' => 'online',
             'maintenance' => 'i underhåll',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "Kunde inte hitta temat ':name'.",
         'active' => [
             'not_set' => "Ett aktivt tema är ej valt",
-            'not_found' => 'Kunde inte hitta det aktiva temat.'
+            'not_found' => 'Kunde inte hitta det aktiva temat.',
         ],
         'edit' => [
             'not_set' => "Redigeringstemat är ej valt",
@@ -91,7 +91,7 @@
         'settings_menu' => 'Underhållsläge',
         'settings_menu_description' => 'Konfigurera underhållsläge-sidan och växla inställningen.',
         'is_enabled' => 'Akrivera underhållsläge-läget',
-        'is_enabled_comment' => 'När den är aktiverad så kommer besökare att se sidan som väljs nedan.'
+        'is_enabled_comment' => 'När den är aktiverad så kommer besökare att se sidan som väljs nedan.',
     ],
     'page' => [
         'not_found_name' => "The page ':name' is not found",
@@ -110,7 +110,7 @@
         'invalid_url' => 'Felaktigt URL-format. URLen skall starta med ett / och kan innehålla siffror, bokstäver och följande tecken: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Vill du verkligen radera markerade sidor?',
         'delete_confirm_single' => 'Vill du verkligen radera denna sida?',
-        'no_layout' => '-- ingen layout --'
+        'no_layout' => '-- ingen layout --',
     ],
     'layout' => [
         'not_found_name' => "Layouten ':name' hittades ej",
@@ -119,7 +119,7 @@
         'no_list_records' => 'Inga layouter funna',
         'new' => 'Ny layout',
         'delete_confirm_multiple' => 'Vill du verkligen radera valda layouter?',
-        'delete_confirm_single' => 'Vill du verkligen radera denna layouter?'
+        'delete_confirm_single' => 'Vill du verkligen radera denna layouter?',
     ],
     'partial' => [
         'not_found_name' => "En partial med namnet ':name' kunde ej hittas",
@@ -129,7 +129,7 @@
         'no_list_records' => 'Inga partials funna',
         'delete_confirm_multiple' => 'Vill du verkligen radera markerade partials?',
         'delete_confirm_single' => 'Vill du verkligen radera denna partial?',
-        'new' => 'Ny partial'
+        'new' => 'Ny partial',
     ],
     'content' => [
         'not_found_name' => "Innehållet ':name' kunde ej hittas",
@@ -138,18 +138,18 @@
         'no_list_records' => 'Inga innehållsfiler funna',
         'delete_confirm_multiple' => 'Vill du verkligen radera markerade filer eller mappar?',
         'delete_confirm_single' => 'Vill du verkligen radera detta innehållsfil?',
-        'new' => 'Ny innehållsfil'
+        'new' => 'Ny innehållsfil',
     ],
     'ajax_handler' => [
         'invalid_name' => "Felaktig AJAX-hanterare: :name",
         'not_found' => "AJAX-hanterare ':name' kunde ej hittas",
     ],
     'cms' => [
-        'menu_label' => "CMS"
+        'menu_label' => "CMS",
     ],
     'sidebar' => [
         'add' => 'Lägg till',
-        'search' => 'Sök...'
+        'search' => 'Sök...',
     ],
     'editor' => [
         'settings' => 'Inställningar',
@@ -169,7 +169,7 @@
         'hidden' => 'Dold',
         'hidden_comment' => 'Dolda sidor är endast tillgängliga genom inloggade back-end användare.',
         'enter_fullscreen' => 'Starta helskärmsläge',
-        'exit_fullscreen' => 'Avsluta helskärmsläge'
+        'exit_fullscreen' => 'Avsluta helskärmsläge',
     ],
     'asset' => [
         'menu_label' => "Filsystem",
@@ -207,7 +207,7 @@
         'error_moving_file' => 'Ett fel uppstod vid flytt av fil :file',
         'error_moving_directory' => 'Ett fel uppstod vid flytt av mapp :dir',
         'error_deleting_directory' => 'Ett fel uppstod vid radering av orginalmapp :dir',
-        'path' => 'Sökväg'
+        'path' => 'Sökväg',
     ],
     'component' => [
         'menu_label' => "Komponenter",
@@ -224,7 +224,7 @@
     'template' => [
         'invalid_type' => "Felaktig malltyp",
         'not_found' => "Den angivna mallen kunde ej hittas",
-        'saved' => "Mallen har sparats"
+        'saved' => "Mallen har sparats",
     ],
     'permissions' => [
         'name' => 'Cms',
diff --git a/modules/cms/lang/uk/lang.php b/modules/cms/lang/uk/lang.php
index 98a83e7d96..321170c6cc 100644
--- a/modules/cms/lang/uk/lang.php
+++ b/modules/cms/lang/uk/lang.php
@@ -303,5 +303,5 @@
         'template_updated' => 'Шаблон було оновлено',
         'template_created' => 'Шаблон був створений',
         'template_deleted' => 'Шаблон був видалений',
-    ]
+    ],
 ];
diff --git a/modules/cms/lang/vn/lang.php b/modules/cms/lang/vn/lang.php
index 8aab596a4e..76504edb1c 100644
--- a/modules/cms/lang/vn/lang.php
+++ b/modules/cms/lang/vn/lang.php
@@ -11,7 +11,7 @@
         'error_deleting' => "Không thể xóa template file ':name'. Vui lòng kiểm tra write permission.",
         'delete_success' => 'Đã xóa template: :count.',
         'file_name_required' => 'Tên file là bắt buộc.',
-        'safe_mode_enabled' => 'Safe mode đã được bật.'
+        'safe_mode_enabled' => 'Safe mode đã được bật.',
     ],
     'dashboard' => [
         'active_theme' => [
@@ -19,20 +19,20 @@
             'online' => 'Trực tuyến',
             'maintenance' => 'Đang bảo trì',
             'manage_themes' => 'Quản lý giao diện',
-            'customize_theme' => 'Tùy chỉnh giao diện'
-        ]
+            'customize_theme' => 'Tùy chỉnh giao diện',
+        ],
     ],
     'theme' => [
         'not_found_name' => "Giao diện ':name' không tồn tại",
         'by_author' => 'Tạo bởi :name',
         'active' => [
             'not_set' => 'Giao diện đang kích hoạt chưa được cài đặt.',
-            'not_found' => 'Không tìm thấy giao diện đang kích hoạt.'
+            'not_found' => 'Không tìm thấy giao diện đang kích hoạt.',
         ],
         'edit' => [
             'not_set' => 'Giao diện chưa được cài đặt.',
             'not_found' => 'Không tìm thấy giao diện.',
-            'not_match' => "Giao diện này đang trong chế độ chỉnh sửa. Vui lòng tải lại trang"
+            'not_match' => "Giao diện này đang trong chế độ chỉnh sửa. Vui lòng tải lại trang",
         ],
         'settings_menu' => 'Giao diện website',
         'settings_menu_description' => 'Cấu hình giao diện website và các tùy chỉnh',
@@ -92,24 +92,24 @@
         'dir_name_taken' => 'Đường dẫn này đã tồn tại.',
         'find_more_themes' => 'Tìm kiếm giao diện',
         'saving' => 'Đang lưu giao diện...',
-        'return' => 'Quay lại trang quản lý giao diện'
+        'return' => 'Quay lại trang quản lý giao diện',
     ],
     'maintenance' => [
         'settings_menu' => 'Chế độ bảo trì',
         'settings_menu_description' => 'Bật chế độ bảo trì và chỉ định trang sẽ hiển thị ở chế độ bảo trì.',
         'is_enabled' => 'Bật chế độ bảo trì',
         'is_enabled_comment' => 'Chọn trang sẽ hiển thị ở chế độ bảo trì.',
-        'hint' => 'Chế độ bảo trì sẽ hiển thị trang bảo trì đối với khách truy cập trang'
+        'hint' => 'Chế độ bảo trì sẽ hiển thị trang bảo trì đối với khách truy cập trang',
     ],
     'page' => [
         'not_found_name' => "Trang ':name' không tồn tại",
         'not_found' => [
             'label' => 'Trang không tồn tại',
-            'help' => 'Không tìm thấy trang bạn yêu cầu.'
+            'help' => 'Không tìm thấy trang bạn yêu cầu.',
         ],
         'custom_error' => [
             'label' => 'Lỗi trang',
-            'help' => "Có lỗi xảy ra khiến trang này không thể hiển thị"
+            'help' => "Có lỗi xảy ra khiến trang này không thể hiển thị",
         ],
         'menu_label' => 'Danh sách trang',
         'unsaved_label' => 'Trang chưa được lưu',
@@ -122,7 +122,7 @@
         'cms_page' => 'CMS page',
         'title' => 'Tiêu đề trang',
         'url' => 'URL trang',
-        'file_name' => 'Tên file của trang'
+        'file_name' => 'Tên file của trang',
     ],
     'layout' => [
         'not_found_name' => "Mẫu giao diện ':name' không tìm thấy",
@@ -131,7 +131,7 @@
         'no_list_records' => 'Không tìm thấy mẫu giao diện nào',
         'new' => 'Mẫu giao diện mới',
         'delete_confirm_multiple' => 'Xóa các mẫu giao diện đã chọn?',
-        'delete_confirm_single' => 'Xóa mẫu giao diện này?'
+        'delete_confirm_single' => 'Xóa mẫu giao diện này?',
     ],
     'partial' => [
         'not_found_name' => "Không tìm thấy partial ':name'.",
@@ -141,7 +141,7 @@
         'no_list_records' => 'Không tìm thấy partial nào',
         'delete_confirm_multiple' => 'Xóa các Partital đã chọn?',
         'delete_confirm_single' => 'Xóa partial này?',
-        'new' => 'Partital mới'
+        'new' => 'Partital mới',
     ],
     'content' => [
         'not_found_name' => "Không tìm thấy tệp tin nội dung ':name'.",
@@ -150,18 +150,18 @@
         'no_list_records' => 'Không tìm thấy tệp tin nội dung nào',
         'delete_confirm_multiple' => 'Xóa các tệp tin nội dung hoặc đường dẫn đã chọn?',
         'delete_confirm_single' => 'Xóa tệp tin nội dung này?',
-        'new' => 'Tẹo tệp mới'
+        'new' => 'Tẹo tệp mới',
     ],
     'ajax_handler' => [
         'invalid_name' => 'Tên AJAX handler không hợp lệ: :name.',
-        'not_found' => "Không tìm thấy AJAX handler ':name'"
+        'not_found' => "Không tìm thấy AJAX handler ':name'",
     ],
     'cms' => [
-        'menu_label' => 'CMS'
+        'menu_label' => 'CMS',
     ],
     'sidebar' => [
         'add' => 'Thêm mới',
-        'search' => 'Tìm kiếm...'
+        'search' => 'Tìm kiếm...',
     ],
     'editor' => [
         'settings' => 'Cài đặt',
@@ -185,7 +185,7 @@
         'open_searchbox' => 'Mở hộp tìm kiếm',
         'close_searchbox'  => 'Đóng hộp tìm kiếm',
         'open_replacebox' => 'Mở hộp Replace',
-        'close_replacebox'  => 'Đóng hộp Replace'
+        'close_replacebox'  => 'Đóng hộp Replace',
     ],
     'asset' => [
         'menu_label' => 'Assets',
@@ -225,7 +225,7 @@
         'error_deleting_directory' => 'Lỗi xóa thư mục gốc :dir',
         'no_list_records' => 'Không tìm thấy tệp tin nào',
         'delete_confirm' => 'Xóa các tệp tin hoặc thư mục đã chọn?',
-        'path' => 'Path'
+        'path' => 'Path',
     ],
     'component' => [
         'menu_label' => 'Components',
@@ -237,7 +237,7 @@
         'invalid_request' => 'Không thể lưu template vì chứa component không hợp lệ.',
         'no_records' => 'Không tìm thấy components nào',
         'not_found' => "Component ':name' không tồn tại.",
-        'method_not_found' => "Component ':name' không có method ':method'."
+        'method_not_found' => "Component ':name' không có method ':method'.",
     ],
     'template' => [
         'invalid_type' => 'Không xác định được định dạng template.',
@@ -245,7 +245,7 @@
         'saved' => 'Đã lưu template.',
         'no_list_records' => 'Không có kết quả',
         'delete_confirm' => 'Xóa các template đã chọn?',
-        'order_by' => 'Order by'
+        'order_by' => 'Order by',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/zh-cn/lang.php b/modules/cms/lang/zh-cn/lang.php
index 08e80d6d2c..1b5d7e8c95 100644
--- a/modules/cms/lang/zh-cn/lang.php
+++ b/modules/cms/lang/zh-cn/lang.php
@@ -20,19 +20,19 @@
             'maintenance' => '维护',
             'manage_themes' => '管理主题',
             'customize_theme' => '自定义主题',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "未找到主题 ':name'",
         'by_author' => '作者 :name',
         'active' => [
             'not_set' => '未设置活动主题',
-            'not_found' => '无法找到活动主题'
+            'not_found' => '无法找到活动主题',
         ],
         'edit' => [
             'not_set' => '未设置编辑主题.',
             'not_found' => '无法找到编辑主题',
-            'not_match' => "您所尝试访问的对象不属于正在编辑的主题。请重载页面。"
+            'not_match' => "您所尝试访问的对象不属于正在编辑的主题。请重载页面。",
         ],
         'settings_menu' => '前端主题',
         'settings_menu_description' => '选择一个活动主题以预览。',
@@ -105,11 +105,11 @@
         'not_found_name' => "无法找到页面 ':name'",
         'not_found' => [
             'label' => '无法找到页面',
-            'help' => '无法找到所请求的页面'
+            'help' => '无法找到所请求的页面',
         ],
         'custom_error' => [
             'label' => '页面错误',
-            'help' => "很抱歉，发生了错误导致页面不能显示."
+            'help' => "很抱歉，发生了错误导致页面不能显示.",
         ],
         'menu_label' => '页面',
         'unsaved_label' => '未保存页面',
@@ -122,7 +122,7 @@
         'cms_page' => 'CMS 页面',
         'title' => '页面标题',
         'url' => '页面URL',
-        'file_name' => '页面文件名'
+        'file_name' => '页面文件名',
     ],
     'layout' => [
         'not_found_name' => "布局 ':name' 找不到",
@@ -131,7 +131,7 @@
         'no_list_records' => '找不到布局',
         'new' => '新布局',
         'delete_confirm_multiple' => '您真的想要删除选中的布局?',
-        'delete_confirm_single' => '您真的想要删除这个布局?'
+        'delete_confirm_single' => '您真的想要删除这个布局?',
     ],
     'partial' => [
         'not_found_name' => "部件 ':name' 找不到.",
@@ -141,7 +141,7 @@
         'no_list_records' => '无法找到部件',
         'delete_confirm_multiple' => '您真的想要删除选择的部件?',
         'delete_confirm_single' => '您真的想要删除这个部件?',
-        'new' => '新部件'
+        'new' => '新部件',
     ],
     'content' => [
         'not_found_name' => "无法找到内容文件 ':name'",
@@ -150,18 +150,18 @@
         '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' => '内容管理系统'
+        'menu_label' => '内容管理系统',
     ],
     'sidebar' => [
         'add' => '增加',
-        'search' => '搜索...'
+        'search' => '搜索...',
     ],
     'editor' => [
         'settings' => '设置',
@@ -233,7 +233,7 @@
         'error_deleting_directory' => '删除原始目录 :dir 错误',
         'no_list_records' => '资源文件为空',
         'delete_confirm' => '确定删除选中的文件或文件夹?',
-        'path' => '路径'
+        'path' => '路径',
     ],
     'component' => [
         'menu_label' => '组件',
@@ -245,7 +245,7 @@
         'invalid_request' => '组件数据非法，无法保存',
         'no_records' => '无法找到找不到',
         'not_found' => "无法找到组件 ':name'",
-        'method_not_found' => "组件 ':name' 中无方法 ':method'."
+        'method_not_found' => "组件 ':name' 中无方法 ':method'.",
     ],
     'template' => [
         'invalid_type' => '未知模板类型.',
@@ -253,7 +253,7 @@
         'saved' => '模板保存成功.',
         'no_list_records' => '模板文件为空',
         'delete_confirm' => '确认删除选中的模板?',
-        'order_by' => '排序方式'
+        'order_by' => '排序方式',
     ],
     'permissions' => [
         'name' => 'CMS',
diff --git a/modules/cms/lang/zh-tw/lang.php b/modules/cms/lang/zh-tw/lang.php
index d2ed034fc0..b08a22bc5a 100644
--- a/modules/cms/lang/zh-tw/lang.php
+++ b/modules/cms/lang/zh-tw/lang.php
@@ -10,24 +10,24 @@
         'invalid_file_extension' => '不合法的檔案擴展: :invalid. 允許的擴展: :allowed.',
         'error_deleting' => "刪除模板檔案 ':name' 錯誤. 請檢查寫權限.",
         'delete_success' => '模板成功刪除: :count.',
-        'file_name_required' => '需要檔案名字串.'
+        'file_name_required' => '需要檔案名字串.',
     ],
     'dashboard' => [
         'active_theme' => [
             'online' => '在線',
             'maintenance' => '維護中',
-        ]
+        ],
     ],
     'theme' => [
         'not_found_name' => "主題 ':name' 沒找到.",
         'active' => [
             'not_set' => '活動主題沒設定.',
-            'not_found' => '活動主題找不到.'
+            'not_found' => '活動主題找不到.',
         ],
         'edit' => [
             'not_set' => '編輯主題沒設定.',
             'not_found' => '編輯主題沒找到.',
-            'not_match' => "您嘗試訪問的對象不屬於正在編輯的主題. 請重載頁面."
+            'not_match' => "您嘗試訪問的對象不屬於正在編輯的主題. 請重載頁面.",
         ],
         'settings_menu' => '前端主題',
         'settings_menu_description' => '預覽安裝的主題, 選擇一個活動主題.',
@@ -91,17 +91,17 @@
         'settings_menu' => '維護模式',
         'settings_menu_description' => '設定維護模式頁面和開關設定.',
         'is_enabled' => '啟用維護模式',
-        'is_enabled_comment' => '當啟用時, 網站訪問者會看到下述頁面.'
+        'is_enabled_comment' => '當啟用時, 網站訪問者會看到下述頁面.',
     ],
     'page' => [
         'not_found_name' => "頁面 ':name' 找不到",
         'not_found' => [
             'label' => '頁面找不到',
-            'help' => '請求的頁面找不到.'
+            'help' => '請求的頁面找不到.',
         ],
         'custom_error' => [
             'label' => '頁面錯誤',
-            'help' => "很抱歉, 有一些地方發生了錯誤導致頁面不能顯示."
+            'help' => "很抱歉, 有一些地方發生了錯誤導致頁面不能顯示.",
         ],
         'menu_label' => '頁面',
         'unsaved_label' => '未保存頁面',
@@ -122,7 +122,7 @@
         'no_list_records' => '找不到佈局',
         'new' => '新佈局',
         'delete_confirm_multiple' => '您真的想要刪除選取的佈局?',
-        'delete_confirm_single' => '您真的想要刪除這個佈局?'
+        'delete_confirm_single' => '您真的想要刪除這個佈局?',
     ],
     'partial' => [
         'not_found_name' => "部件 ':name' 找不到.",
@@ -132,7 +132,7 @@
         'no_list_records' => '找不到部件',
         'delete_confirm_multiple' => '您真的想要刪除選擇的部件?',
         'delete_confirm_single' => '您真的想要刪除這個部件?',
-        'new' => '新部件'
+        'new' => '新部件',
     ],
     'content' => [
         'not_found_name' => "內容檔案 ':name' 找不到.",
@@ -141,18 +141,18 @@
         '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' => '設定',
@@ -210,7 +210,7 @@
         'error_moving_file' => '移動檔案 :file 錯誤',
         'error_moving_directory' => '移動目錄 :dir 錯誤',
         'error_deleting_directory' => '刪除原始目錄 :dir 錯誤',
-        'path' => '路徑'
+        'path' => '路徑',
     ],
     'component' => [
         'menu_label' => '組件',
@@ -222,12 +222,12 @@
         'invalid_request' => '模板不能保存, 因為非法組件數據.',
         'no_records' => '找不到組件',
         'not_found' => "組件 ':name' 找不到.",
-        'method_not_found' => "組件 ':name' 不包含方法 ':method'."
+        'method_not_found' => "組件 ':name' 不包含方法 ':method'.",
     ],
     'template' => [
         'invalid_type' => '未知模板類型.',
         'not_found' => '請求模板找不到.',
-        'saved' => '模板保存成功.'
+        'saved' => '模板保存成功.',
     ],
     'permissions' => [
         'name' => 'Cms',
@@ -236,6 +236,6 @@
         'manage_pages' => '管理頁面',
         'manage_layouts' => '管理佈局',
         'manage_partials' => '管理部件',
-        'manage_themes' => '管理主題'
+        'manage_themes' => '管理主題',
     ],
 ];
diff --git a/modules/cms/models/MaintenanceSetting.php b/modules/cms/models/MaintenanceSetting.php
index f96e49e1d6..8552c1bb41 100644
--- a/modules/cms/models/MaintenanceSetting.php
+++ b/modules/cms/models/MaintenanceSetting.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Models;
 
-use Model;
 use Cms\Classes\Page;
 use Cms\Classes\Theme;
-use Winter\Storm\Support\Arr;
 use Symfony\Component\HttpFoundation\IpUtils;
-use ApplicationException;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Arr;
 
 /**
  * Maintenance mode settings
@@ -23,7 +23,7 @@ class MaintenanceSetting extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \System\Behaviors\SettingsModel::class
+        \System\Behaviors\SettingsModel::class,
     ];
 
     /**
diff --git a/modules/cms/models/ThemeData.php b/modules/cms/models/ThemeData.php
index e76ccdf5af..c37f6a34f0 100644
--- a/modules/cms/models/ThemeData.php
+++ b/modules/cms/models/ThemeData.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Models;
 
-use Lang;
-use Model;
 use Cms\Classes\Theme as CmsTheme;
-use System\Classes\CombineAssets;
 use Exception;
+use Illuminate\Support\Facades\Lang;
+use System\Classes\CombineAssets;
 use System\Models\File;
+use Winter\Storm\Database\Model;
 
 /**
  * Customization data used by a theme
diff --git a/modules/cms/models/ThemeExport.php b/modules/cms/models/ThemeExport.php
index 7f235cf204..0e06a99266 100644
--- a/modules/cms/models/ThemeExport.php
+++ b/modules/cms/models/ThemeExport.php
@@ -2,13 +2,13 @@
 
 namespace Cms\Models;
 
-use File;
-use Model;
-use Response;
-use ApplicationException;
-use Winter\Storm\Filesystem\Zip;
 use Cms\Classes\Theme as CmsTheme;
 use Exception;
+use Illuminate\Support\Facades\Response;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Filesystem\Zip;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Theme export model
@@ -53,7 +53,7 @@ class ThemeExport extends Model
             'layouts'  => true,
             'partials' => true,
             'content'  => true,
-        ]
+        ],
     ];
 
     /**
diff --git a/modules/cms/models/ThemeImport.php b/modules/cms/models/ThemeImport.php
index b4ae9eef72..0f6a1fc618 100644
--- a/modules/cms/models/ThemeImport.php
+++ b/modules/cms/models/ThemeImport.php
@@ -2,13 +2,13 @@
 
 namespace Cms\Models;
 
-use File;
-use Model;
-use ApplicationException;
-use Winter\Storm\Filesystem\Zip;
 use Cms\Classes\Theme as CmsTheme;
-use FilesystemIterator;
 use Exception;
+use FilesystemIterator;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Filesystem\Zip;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Theme import model
@@ -41,7 +41,7 @@ class ThemeImport extends Model
     protected $fillable = [];
 
     public $attachOne = [
-        'uploaded_file' => \System\Models\File::class
+        'uploaded_file' => \System\Models\File::class,
     ];
 
     /**
@@ -58,7 +58,7 @@ class ThemeImport extends Model
             'layouts'  => true,
             'partials' => true,
             'content'  => true,
-        ]
+        ],
     ];
 
     /**
diff --git a/modules/cms/models/ThemeLog.php b/modules/cms/models/ThemeLog.php
index fad1105143..4cceaabc36 100644
--- a/modules/cms/models/ThemeLog.php
+++ b/modules/cms/models/ThemeLog.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Models;
 
-use BackendAuth;
+use Backend\Facades\BackendAuth;
 use Cms\Classes\Theme;
 use Exception;
-use Model;
 use System\Models\LogSetting;
+use Winter\Storm\Database\Model;
 use Winter\Storm\Halcyon\Model as HalcyonModel;
 
 /**
@@ -30,7 +30,7 @@ class ThemeLog extends Model
      * @var array Relations
      */
     public $belongsTo = [
-        'user' => \Backend\Models\User::class
+        'user' => \Backend\Models\User::class,
     ];
 
     protected $themeCache;
@@ -115,7 +115,7 @@ public function getTypeOptions()
         return [
             self::TYPE_CREATE => 'cms::lang.theme_log.type_create',
             self::TYPE_UPDATE => 'cms::lang.theme_log.type_update',
-            self::TYPE_DELETE => 'cms::lang.theme_log.type_delete'
+            self::TYPE_DELETE => 'cms::lang.theme_log.type_delete',
         ];
     }
 
diff --git a/modules/cms/reportwidgets/ActiveTheme.php b/modules/cms/reportwidgets/ActiveTheme.php
index d09c7091a4..e4ec74cdab 100644
--- a/modules/cms/reportwidgets/ActiveTheme.php
+++ b/modules/cms/reportwidgets/ActiveTheme.php
@@ -2,13 +2,13 @@
 
 namespace Cms\ReportWidgets;
 
-use Lang;
-use BackendAuth;
+use Backend\Classes\ReportWidgetBase;
+use Backend\Facades\BackendAuth;
 use Cms\Classes\Theme;
 use Cms\Models\MaintenanceSetting;
-use Backend\Classes\ReportWidgetBase;
-use ApplicationException;
 use Exception;
+use Illuminate\Support\Facades\Lang;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Active theme report widget.
@@ -46,7 +46,7 @@ public function defineProperties()
                 'type'              => 'string',
                 'validationPattern' => '^.+$',
                 'validationMessage' => 'backend::lang.dashboard.widget_title_error',
-            ]
+            ],
         ];
     }
 
diff --git a/modules/cms/tests/classes/AssetTest.php b/modules/cms/tests/classes/AssetTest.php
index c7be820af1..42177ee553 100644
--- a/modules/cms/tests/classes/AssetTest.php
+++ b/modules/cms/tests/classes/AssetTest.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\Asset;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 
 class AssetTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/AutoDatasourceTest.php b/modules/cms/tests/classes/AutoDatasourceTest.php
index b481c2afc9..e6247ee1f3 100644
--- a/modules/cms/tests/classes/AutoDatasourceTest.php
+++ b/modules/cms/tests/classes/AutoDatasourceTest.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Cms\Classes\AutoDatasource;
+use System\Tests\Bootstrap\PluginTestCase;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Halcyon\Datasource\DbDatasource;
 use Winter\Storm\Halcyon\Datasource\FileDatasource;
@@ -44,21 +44,21 @@ public function setUp(): void
             'source' => 'test',
             'path' => 'partials/page-partial.htm',
             'content' => 'AutoDatasource partials/page-partial.htm',
-            'file_size' => 40
+            'file_size' => 40,
         ]);
 
         $this->fixtures[] = CmsThemeTemplateFixture::create([
             'source' => 'test',
             'path' => 'partials/testpost/default.htm',
             'content' => 'AutoDatasource partials/testpost/default.htm',
-            'file_size' => 44
+            'file_size' => 44,
         ]);
 
         $this->fixtures[] = CmsThemeTemplateFixture::create([
             'source' => 'test',
             'path' => 'partials/subdir/test.htm',
             'content' => 'AutoDatasource partials/subdir/test.htm',
-            'file_size' => 39
+            'file_size' => 39,
         ]);
 
         $this->fixtures[] = CmsThemeTemplateFixture::create([
@@ -66,7 +66,7 @@ public function setUp(): void
             'path' => 'partials/nesting/level2.htm',
             'content' => 'AutoDatasource partials/nesting/level2.htm',
             'file_size' => 42,
-            'deleted_at' => '2019-01-01 00:00:00'
+            'deleted_at' => '2019-01-01 00:00:00',
         ]);
 
         // Create AutoDatasource
diff --git a/modules/cms/tests/classes/CmsCompoundObjectTest.php b/modules/cms/tests/classes/CmsCompoundObjectTest.php
index 412ca146b9..3299401cc1 100644
--- a/modules/cms/tests/classes/CmsCompoundObjectTest.php
+++ b/modules/cms/tests/classes/CmsCompoundObjectTest.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\CmsCompoundObject;
 use Cms\Classes\CmsObject;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Halcyon\Model;
 
 class TestCmsCompoundObject extends CmsCompoundObject
@@ -212,7 +212,7 @@ public function testSaveMarkup()
         $obj = TestCmsCompoundObject::inTheme($theme);
         $obj->fill([
             'markup' => '<p>Hello, world!</p>',
-            'fileName' => 'compound-markup'
+            'fileName' => 'compound-markup',
         ]);
         $obj->save();
 
@@ -238,7 +238,7 @@ public function testSaveMarkupAndSettings()
         $obj->fill([
             'settings' => ['var' => 'value'],
             'markup' => '<p>Hello, world!</p>',
-            'fileName' => 'compound-markup-settings'
+            'fileName' => 'compound-markup-settings',
         ]);
         $obj->save();
 
@@ -265,7 +265,7 @@ public function testSaveFull()
             'fileName' => 'compound',
             'settings' => ['var' => 'value'],
             'code' => 'function a() {return true;}',
-            'markup' => '<p>Hello, world!</p>'
+            'markup' => '<p>Hello, world!</p>',
         ]);
         $obj->save();
 
diff --git a/modules/cms/tests/classes/CmsExceptionTest.php b/modules/cms/tests/classes/CmsExceptionTest.php
index 2dc127f845..a7dc117162 100644
--- a/modules/cms/tests/classes/CmsExceptionTest.php
+++ b/modules/cms/tests/classes/CmsExceptionTest.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\CmsException;
 use Cms\Classes\Router;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\SystemException;
 
 class CmsExceptionTest extends TestCase
diff --git a/modules/cms/tests/classes/CmsObjectQueryTest.php b/modules/cms/tests/classes/CmsObjectQueryTest.php
index 4f1ca68947..1c97ae182f 100644
--- a/modules/cms/tests/classes/CmsObjectQueryTest.php
+++ b/modules/cms/tests/classes/CmsObjectQueryTest.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\Layout;
 use Cms\Classes\Page;
+use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Halcyon\Model;
 
 class CmsObjectQueryTest extends TestCase
diff --git a/modules/cms/tests/classes/CmsObjectTest.php b/modules/cms/tests/classes/CmsObjectTest.php
index 61bacb711a..19e69ef49a 100644
--- a/modules/cms/tests/classes/CmsObjectTest.php
+++ b/modules/cms/tests/classes/CmsObjectTest.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\CmsObject;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 
 class TestCmsObject extends CmsObject
 {
@@ -132,7 +132,7 @@ public function testFillFillable()
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
             'fileName' => 'mytestobj',
-            'content' => $testContents
+            'content' => $testContents,
         ]);
 
         $this->assertEquals($testContents, $obj->getContent());
@@ -147,7 +147,7 @@ public function testFillNotFillable()
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
             'something' => 'mytestobj',
-            'content' => $testContents
+            'content' => $testContents,
         ]);
 
         $this->assertNull($obj->something);
@@ -163,7 +163,7 @@ public function testFillInvalidFileNameSymbol()
         $testContents = 'mytestcontent';
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
-            'fileName' => '@name'
+            'fileName' => '@name',
         ]);
         $obj->save();
     }
@@ -178,7 +178,7 @@ public function testFillInvalidFileNamePath()
         $testContents = 'mytestcontent';
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
-            'fileName' => '../somefile'
+            'fileName' => '../somefile',
         ]);
         $obj->save();
     }
@@ -193,7 +193,7 @@ public function testFillInvalidFileSlash()
         $testContents = 'mytestcontent';
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
-            'fileName' => '/somefile'
+            'fileName' => '/somefile',
         ]);
         $obj->save();
     }
@@ -208,7 +208,7 @@ public function testFillEmptyFileName()
         $testContents = 'mytestcontent';
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
-            'fileName' => ' '
+            'fileName' => ' ',
         ]);
         $obj->save();
     }
@@ -228,7 +228,7 @@ public function testSave()
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
             'fileName' => 'mytestobj',
-            'content' => $testContents
+            'content' => $testContents,
         ]);
         $obj->save();
 
@@ -256,7 +256,7 @@ public function testRename()
         $this->assertEquals($testContents, $obj->getContent());
 
         $obj->fill([
-            'fileName' => 'anotherobj'
+            'fileName' => 'anotherobj',
         ]);
         $obj->save();
 
@@ -280,7 +280,7 @@ public function testSaveSameName()
 
         $obj->fill([
             'fileName' => 'anotherobj',
-            'content' => $testContents
+            'content' => $testContents,
         ]);
         $obj->save();
 
@@ -333,7 +333,7 @@ public function testSaveNewDir()
         $obj = TestCmsObject::inTheme($theme);
         $obj->fill([
             'fileName' => 'testsubdir/mytestobj.htm',
-            'content' => $testContents
+            'content' => $testContents,
         ]);
         $obj->save();
 
diff --git a/modules/cms/tests/classes/CodeParserTest.php b/modules/cms/tests/classes/CodeParserTest.php
index 519d0dcc59..d46a0e4dab 100644
--- a/modules/cms/tests/classes/CodeParserTest.php
+++ b/modules/cms/tests/classes/CodeParserTest.php
@@ -2,7 +2,6 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\CodeParser;
 use Cms\Classes\Controller;
 use Cms\Classes\Layout;
@@ -10,8 +9,9 @@
 use Cms\Classes\Page;
 use Cms\Classes\PageCode;
 use Cms\Classes\Theme;
-use File;
 use ReflectionClass;
+use System\Tests\Bootstrap\TestCase;
+use Winter\Storm\Support\Facades\File;
 
 class CodeParserTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/ComponentManagerTest.php b/modules/cms/tests/classes/ComponentManagerTest.php
index a28abbf646..2e6c98aca4 100644
--- a/modules/cms/tests/classes/ComponentManagerTest.php
+++ b/modules/cms/tests/classes/ComponentManagerTest.php
@@ -2,13 +2,13 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\CodeParser;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\Controller;
 use Cms\Classes\Layout;
 use Cms\Classes\Page;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 
 class ComponentManagerTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/ContentTest.php b/modules/cms/tests/classes/ContentTest.php
index 773d86a38a..0530d8a05e 100644
--- a/modules/cms/tests/classes/ContentTest.php
+++ b/modules/cms/tests/classes/ContentTest.php
@@ -2,9 +2,9 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\Content;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 
 class ContentTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/ControllerTest.php b/modules/cms/tests/classes/ControllerTest.php
index 16d72cb9ce..16cbbaecd8 100644
--- a/modules/cms/tests/classes/ControllerTest.php
+++ b/modules/cms/tests/classes/ControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Tests\Classes;
 
-use Cms;
-use Request;
-use System\Tests\Bootstrap\TestCase;
-use Cms\Classes\Theme;
 use Cms\Classes\Controller;
+use Cms\Classes\Theme;
+use Cms\Facades\Cms;
+use Illuminate\Support\Facades\Request;
 use System\Helpers\View;
+use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Halcyon\Model;
 use Winter\Storm\Support\Facades\Config;
 
diff --git a/modules/cms/tests/classes/PageTest.php b/modules/cms/tests/classes/PageTest.php
index 4fdf2c3e39..3f4f381880 100644
--- a/modules/cms/tests/classes/PageTest.php
+++ b/modules/cms/tests/classes/PageTest.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\Controller;
 use Cms\Classes\Page;
 use Cms\Classes\Theme;
+use System\Tests\Bootstrap\TestCase;
 
 class PageTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/PartialStackTest.php b/modules/cms/tests/classes/PartialStackTest.php
index 4376020d4d..0c214267ba 100644
--- a/modules/cms/tests/classes/PartialStackTest.php
+++ b/modules/cms/tests/classes/PartialStackTest.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\PartialStack;
+use System\Tests\Bootstrap\TestCase;
 
 class PartialStackTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/RouterTest.php b/modules/cms/tests/classes/RouterTest.php
index 0cb61343cb..e706ef8eed 100644
--- a/modules/cms/tests/classes/RouterTest.php
+++ b/modules/cms/tests/classes/RouterTest.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\Router;
 use Cms\Classes\Theme;
 use ReflectionClass;
+use System\Tests\Bootstrap\TestCase;
 
 class RouterTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/ThemeTest.php b/modules/cms/tests/classes/ThemeTest.php
index 4b680e74e6..7a2aaf3bc6 100644
--- a/modules/cms/tests/classes/ThemeTest.php
+++ b/modules/cms/tests/classes/ThemeTest.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Cms\Classes\Theme;
-use Config;
-use Event;
+use System\Tests\Bootstrap\TestCase;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
 
 class ThemeTest extends TestCase
 {
diff --git a/modules/cms/tests/classes/TwigExtensionTest.php b/modules/cms/tests/classes/TwigExtensionTest.php
index 7f6efb98d1..f8be8b9d68 100644
--- a/modules/cms/tests/classes/TwigExtensionTest.php
+++ b/modules/cms/tests/classes/TwigExtensionTest.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Tests\Classes;
 
-use Cms\Twig\Extension;
 use Cms\Classes\Controller;
+use Cms\Twig\Extension;
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\SystemException;
 
diff --git a/modules/cms/traits/UrlMaker.php b/modules/cms/traits/UrlMaker.php
index 2cabf5e33f..2f68f68702 100644
--- a/modules/cms/traits/UrlMaker.php
+++ b/modules/cms/traits/UrlMaker.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Traits;
 
-use File;
-use Cache;
-use Config;
-use Cms\Classes\Page;
 use Cms\Classes\Controller;
-use ApplicationException;
+use Cms\Classes\Page;
+use Illuminate\Support\Facades\Cache;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * URL Maker Trait
@@ -189,7 +189,7 @@ public function getUrlPageName()
         $cached = [
             'path'     => $filePath,
             'fileName' => $baseFileName,
-            'mtime'    => @File::lastModified($filePath)
+            'mtime'    => @File::lastModified($filePath),
         ];
 
         $expiresAt = now()->addMinutes(Config::get('cms.parsedPageCacheTTL', 1440));
diff --git a/modules/cms/twig/ComponentNode.php b/modules/cms/twig/ComponentNode.php
index 2ffe8acbe8..8076273e49 100644
--- a/modules/cms/twig/ComponentNode.php
+++ b/modules/cms/twig/ComponentNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a component node
diff --git a/modules/cms/twig/ComponentTokenParser.php b/modules/cms/twig/ComponentTokenParser.php
index d7661749c0..313c5d988a 100644
--- a/modules/cms/twig/ComponentTokenParser.php
+++ b/modules/cms/twig/ComponentTokenParser.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Twig;
 
+use Twig\Error\SyntaxError as TwigErrorSyntax;
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
-use Twig\Error\SyntaxError as TwigErrorSyntax;
 
 /**
  * Parser for the `{% component %}` Twig tag.
diff --git a/modules/cms/twig/ContentNode.php b/modules/cms/twig/ContentNode.php
index 63db64eab0..7eedcc3b1a 100644
--- a/modules/cms/twig/ContentNode.php
+++ b/modules/cms/twig/ContentNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a content node
diff --git a/modules/cms/twig/ContentTokenParser.php b/modules/cms/twig/ContentTokenParser.php
index aaa99a79cb..c58b2ee6dc 100644
--- a/modules/cms/twig/ContentTokenParser.php
+++ b/modules/cms/twig/ContentTokenParser.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Twig;
 
+use Twig\Error\SyntaxError as TwigErrorSyntax;
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
-use Twig\Error\SyntaxError as TwigErrorSyntax;
 
 /**
  * Parser for the `{% content %}` Twig tag.
diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php
index cdc627858f..5724bf348e 100644
--- a/modules/cms/twig/DebugExtension.php
+++ b/modules/cms/twig/DebugExtension.php
@@ -2,15 +2,15 @@
 
 namespace Cms\Twig;
 
-use Twig\Template as TwigTemplate;
-use Twig\Extension\AbstractExtension as TwigExtension;
-use Twig\Environment as TwigEnvironment;
-use Twig\TwigFunction as TwigSimpleFunction;
 use Cms\Classes\ComponentBase;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
-use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Twig\Environment as TwigEnvironment;
+use Twig\Extension\AbstractExtension as TwigExtension;
+use Twig\Template as TwigTemplate;
+use Twig\TwigFunction as TwigSimpleFunction;
 use Winter\Storm\Database\Model;
 
 class DebugExtension extends TwigExtension
@@ -45,7 +45,7 @@ class DebugExtension extends TwigExtension
         'offsetExists',
         'offsetGet',
         'offsetSet',
-        'offsetUnset'
+        'offsetUnset',
     ];
 
     /**
@@ -58,7 +58,7 @@ public function getFunctions()
             new TwigSimpleFunction('dump', [$this, 'runDump'], [
                 'is_safe' => ['html'],
                 'needs_context' => true,
-                'needs_environment' => true
+                'needs_environment' => true,
             ]),
         ];
     }
diff --git a/modules/cms/twig/DefaultNode.php b/modules/cms/twig/DefaultNode.php
index 958adbcb72..b61e59f3b5 100644
--- a/modules/cms/twig/DefaultNode.php
+++ b/modules/cms/twig/DefaultNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a "default" node
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 45503baf27..4398052a37 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -2,13 +2,13 @@
 
 namespace Cms\Twig;
 
-use Block;
 use Cms\Classes\Controller;
-use Event;
 use System\Classes\Asset\Vite;
 use Twig\Extension\AbstractExtension as TwigExtension;
 use Twig\TwigFilter as TwigSimpleFilter;
 use Twig\TwigFunction as TwigSimpleFunction;
+use Winter\Storm\Support\Facades\Block;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * The CMS Twig extension class implements the basic CMS Twig functions and filters.
diff --git a/modules/cms/twig/FlashNode.php b/modules/cms/twig/FlashNode.php
index 824a43ff31..4c3e244454 100644
--- a/modules/cms/twig/FlashNode.php
+++ b/modules/cms/twig/FlashNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a flash node
diff --git a/modules/cms/twig/FrameworkNode.php b/modules/cms/twig/FrameworkNode.php
index fe3a7061a5..3b3c496b95 100644
--- a/modules/cms/twig/FrameworkNode.php
+++ b/modules/cms/twig/FrameworkNode.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Twig;
 
-use System\Models\Parameter;
+use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
-use Twig\Node\Node as TwigNode;
+use System\Models\Parameter;
 use Twig\Compiler as TwigCompiler;
-use Url;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a "framework" node
diff --git a/modules/cms/twig/Loader.php b/modules/cms/twig/Loader.php
index fd33423088..353be619cc 100644
--- a/modules/cms/twig/Loader.php
+++ b/modules/cms/twig/Loader.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Twig;
 
-use Event;
-use Twig\Source as TwigSource;
-use Twig\Loader\LoaderInterface as TwigLoaderInterface;
+use Cms\Classes\Partial as CmsPartial;
 use Cms\Contracts\CmsObject;
 use System\Twig\Loader as LoaderBase;
-use Cms\Classes\Partial as CmsPartial;
+use Twig\Loader\LoaderInterface as TwigLoaderInterface;
+use Twig\Source as TwigSource;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * This class implements a Twig template loader for the CMS.
diff --git a/modules/cms/twig/PageNode.php b/modules/cms/twig/PageNode.php
index c385a911b4..560917fd22 100644
--- a/modules/cms/twig/PageNode.php
+++ b/modules/cms/twig/PageNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a page node
diff --git a/modules/cms/twig/PartialNode.php b/modules/cms/twig/PartialNode.php
index 064cfa087c..e7e36e4265 100644
--- a/modules/cms/twig/PartialNode.php
+++ b/modules/cms/twig/PartialNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a partial node
diff --git a/modules/cms/twig/PartialTokenParser.php b/modules/cms/twig/PartialTokenParser.php
index defa601527..7e26efd261 100644
--- a/modules/cms/twig/PartialTokenParser.php
+++ b/modules/cms/twig/PartialTokenParser.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Twig;
 
+use Twig\Error\SyntaxError as TwigErrorSyntax;
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
-use Twig\Error\SyntaxError as TwigErrorSyntax;
 
 /**
  * Parser for the `{% partial %}` Twig tag.
diff --git a/modules/cms/twig/PlaceholderNode.php b/modules/cms/twig/PlaceholderNode.php
index c286737e85..f98191d6a6 100644
--- a/modules/cms/twig/PlaceholderNode.php
+++ b/modules/cms/twig/PlaceholderNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a placeholder node
diff --git a/modules/cms/twig/PlaceholderTokenParser.php b/modules/cms/twig/PlaceholderTokenParser.php
index 399940af0d..cf270a5dbc 100644
--- a/modules/cms/twig/PlaceholderTokenParser.php
+++ b/modules/cms/twig/PlaceholderTokenParser.php
@@ -2,10 +2,10 @@
 
 namespace Cms\Twig;
 
+use Twig\Error\SyntaxError as TwigErrorSyntax;
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
-use Twig\Error\SyntaxError as TwigErrorSyntax;
 
 /**
  * Parser for the `{% placeholder %}` Twig tag.
diff --git a/modules/cms/twig/PutNode.php b/modules/cms/twig/PutNode.php
index b466fa7e3d..019b05bd78 100644
--- a/modules/cms/twig/PutNode.php
+++ b/modules/cms/twig/PutNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a put node
diff --git a/modules/cms/twig/ScriptsNode.php b/modules/cms/twig/ScriptsNode.php
index 5eeb9feeff..cc19491605 100644
--- a/modules/cms/twig/ScriptsNode.php
+++ b/modules/cms/twig/ScriptsNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a "scripts" node
diff --git a/modules/cms/twig/SnowboardNode.php b/modules/cms/twig/SnowboardNode.php
index d9247808d6..f0b78913ea 100644
--- a/modules/cms/twig/SnowboardNode.php
+++ b/modules/cms/twig/SnowboardNode.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Twig;
 
-use Config;
+use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
 use System\Models\Parameter;
 use Twig\Compiler as TwigCompiler;
 use Twig\Node\Node as TwigNode;
-use Url;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Represents a "snowboard" node
diff --git a/modules/cms/twig/StylesNode.php b/modules/cms/twig/StylesNode.php
index 521088ee7e..7b6e0b90a4 100644
--- a/modules/cms/twig/StylesNode.php
+++ b/modules/cms/twig/StylesNode.php
@@ -2,8 +2,8 @@
 
 namespace Cms\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a "styles" node
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index 69c870cc5e..429a2ec193 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -2,23 +2,23 @@
 
 namespace Cms\Widgets;
 
-use Str;
-use Url;
-use File;
-use Lang;
-use Input;
-use Request;
-use Response;
-use Cms\Classes\Theme;
-use Cms\Classes\Asset;
 use Backend\Classes\WidgetBase;
-use ApplicationException;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Winter\Storm\Filesystem\Definitions as FileDefinitions;
-use RecursiveIteratorIterator;
-use RecursiveDirectoryIterator;
+use Cms\Classes\Asset;
+use Cms\Classes\Theme;
 use DirectoryIterator;
 use Exception;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\URL;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Filesystem\Definitions as FileDefinitions;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Str;
 
 /**
  * CMS asset list widget.
@@ -77,7 +77,7 @@ protected function loadAssets()
     public function render()
     {
         return $this->makePartial('body', [
-           'data' => $this->getData()
+           'data' => $this->getData(),
         ]);
     }
 
@@ -100,14 +100,14 @@ public function onOpenDirectory()
         $this->putSession('currentPath', $path);
 
         return [
-            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()]),
         ];
     }
 
     public function onRefresh()
     {
         return [
-            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()]),
         ];
     }
 
@@ -173,7 +173,7 @@ public function onDeleteFiles()
         return [
             'deleted' => $deleted,
             'error'   => $error,
-            'theme'   => Request::input('theme')
+            'theme'   => Request::input('theme'),
         ];
     }
 
@@ -236,7 +236,7 @@ public function onApplyName()
         }
 
         return [
-            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()]),
         ];
     }
 
@@ -277,7 +277,7 @@ public function onNewDirectory()
         }
 
         return [
-            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()]),
         ];
     }
 
@@ -384,7 +384,7 @@ public function onMove()
         }
 
         return [
-            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('asset-list') => $this->makePartial('items', ['items' => $this->getData()]),
         ];
     }
 
@@ -526,14 +526,14 @@ protected function getDirectoryContents($dir)
                     'type'     => 'directory',
                     'path'     => File::normalizePath($this->getRelativePath($node->getPathname())),
                     'name'     => $node->getFilename(),
-                    'editable' => false
+                    'editable' => false,
                 ];
             } elseif ($node->isFile()) {
                 $files[] = (object)[
                     'type'     => 'file',
                     'path'     => File::normalizePath($this->getRelativePath($node->getPathname())),
                     'name'     => $node->getFilename(),
-                    'editable' => in_array(strtolower($node->getExtension()), $editableAssetTypes)
+                    'editable' => in_array(strtolower($node->getExtension()), $editableAssetTypes),
                 ];
             }
         }
@@ -728,7 +728,7 @@ protected function findFiles()
                         'type'     => 'file',
                         'path'     => File::normalizePath($path),
                         'name'     => $item->getFilename(),
-                        'editable' => in_array(strtolower($item->getExtension()), $editableAssetTypes)
+                        'editable' => in_array(strtolower($item->getExtension()), $editableAssetTypes),
                     ];
                 }
             }
diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php
index 4324aa5154..43c925b457 100644
--- a/modules/cms/widgets/ComponentList.php
+++ b/modules/cms/widgets/ComponentList.php
@@ -2,13 +2,13 @@
 
 namespace Cms\Widgets;
 
-use App;
-use Str;
-use Lang;
-use Input;
-use System\Classes\PluginManager;
-use Cms\Classes\ComponentHelpers;
 use Backend\Classes\WidgetBase;
+use Cms\Classes\ComponentHelpers;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+use System\Classes\PluginManager;
+use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Str;
 
 /**
  * Component list widget.
@@ -39,7 +39,7 @@ public function __construct($controller, $alias)
     public function render()
     {
         return $this->makePartial('body', [
-            'data' => $this->getData()
+            'data' => $this->getData(),
         ]);
     }
 
@@ -110,7 +110,7 @@ protected function getData()
                     'alias'          => $alias,
                     'name'           => $componentInfo->duplicateAlias
                         ? $componentInfo->className
-                        : $componentInfo->alias
+                        : $componentInfo->alias,
                 ];
 
                 if ($searchWords && !$this->itemMatchesSearch($searchWords, $item)) {
@@ -123,7 +123,7 @@ protected function getData()
                         'description' => $pluginDescription,
                         'pluginClass' => $pluginClass,
                         'icon'        => $pluginIcon,
-                        'items'       => []
+                        'items'       => [],
                     ];
 
                     $items[$pluginClass] = $group;
@@ -173,7 +173,7 @@ protected function prepareComponentList()
                     'className'      => $className,
                     'alias'          => $alias,
                     'duplicateAlias' => $duplicateAlias,
-                    'pluginClass'    => get_class($plugin)
+                    'pluginClass'    => get_class($plugin),
                 ];
             }
         }
@@ -209,8 +209,8 @@ protected function updateList()
     {
         return [
             '#' . $this->getId('component-list') => $this->makePartial('items', [
-                'items' => $this->getData()
-            ])
+                'items' => $this->getData(),
+            ]),
         ];
     }
 
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index 65111be1d2..457a518774 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Widgets;
 
-use Str;
-use File;
-use Input;
-use Request;
-use Cms\Classes\Theme;
 use Backend\Classes\WidgetBase;
+use Cms\Classes\Theme;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Str;
 
 /**
  * Template list widget.
@@ -118,7 +118,7 @@ public function render()
         $this->vars['toolbarClass'] = $toolbarClass;
 
         return $this->makePartial('body', [
-            'data' => $this->getData()
+            'data' => $this->getData(),
         ]);
     }
 
@@ -215,7 +215,7 @@ protected function getData()
                 if (!array_key_exists($group, $foundGroups)) {
                     $newGroup = (object)[
                         'title' => $group,
-                        'items' => []
+                        'items' => [],
                     ];
 
                     $foundGroups[$group] = $newGroup;
@@ -295,7 +295,7 @@ protected function normalizeItem($item)
             'fileName'     => $item->getFileName(),
             'description'  => $description,
             'descriptions' => $descriptions,
-            'dragValue'    => $this->getItemDragValue($item)
+            'dragValue'    => $this->getItemDragValue($item),
         ];
 
         foreach ($this->sortingProperties as $property => $name) {
@@ -347,7 +347,7 @@ protected function getSearchTerm()
     protected function updateList()
     {
         return [
-            '#' . $this->getId('template-list') => $this->makePartial('items', ['items' => $this->getData()])
+            '#' . $this->getId('template-list') => $this->makePartial('items', ['items' => $this->getData()]),
         ];
     }
 
diff --git a/modules/cms/widgets/assetlist/partials/_move_form.php b/modules/cms/widgets/assetlist/partials/_move_form.php
index 7e009dd9b1..05d5d1254f 100644
--- a/modules/cms/widgets/assetlist/partials/_move_form.php
+++ b/modules/cms/widgets/assetlist/partials/_move_form.php
@@ -2,7 +2,7 @@
     'data-request' => $this->getEventHandler('onMove'),
     'data-request-success' => "\$(this).trigger('close.oc.popup')",
     'data-stripe-load-indicator' => 1,
-    'id' => 'asset-move-popup-form'
+    'id' => 'asset-move-popup-form',
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/cms/widgets/assetlist/partials/_new_dir_form.php b/modules/cms/widgets/assetlist/partials/_new_dir_form.php
index 69be9af5fd..d244bfb881 100644
--- a/modules/cms/widgets/assetlist/partials/_new_dir_form.php
+++ b/modules/cms/widgets/assetlist/partials/_new_dir_form.php
@@ -2,7 +2,7 @@
     'data-request' => $this->getEventHandler('onNewDirectory'),
     'data-request-success' => "\$(this).trigger('close.oc.popup')",
     'data-stripe-load-indicator' => 1,
-    'id' => 'asset-new-dir-popup-form'
+    'id' => 'asset-new-dir-popup-form',
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/cms/widgets/assetlist/partials/_rename_form.php b/modules/cms/widgets/assetlist/partials/_rename_form.php
index 2828bfacd3..1a65654971 100644
--- a/modules/cms/widgets/assetlist/partials/_rename_form.php
+++ b/modules/cms/widgets/assetlist/partials/_rename_form.php
@@ -1,7 +1,7 @@
 <?= Form::ajax($this->getEventHandler('onApplyName'), [
     'success' => "\$el.trigger('close.oc.popup');",
     'data-stripe-load-indicator' => 1,
-    'id' => 'asset-rename-popup-form'
+    'id' => 'asset-rename-popup-form',
 ]) ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 8e42329e2a..346f57f5d6 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -2,19 +2,17 @@
 
 namespace System;
 
-use Backend;
 use Backend\Classes\WidgetManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
 use Backend\Models\UserRole;
-use BackendAuth;
-use BackendMenu;
-use Config;
 use DateInterval;
-use Event;
 use Illuminate\Foundation\Vite as LaravelVite;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Schema;
-use Markdown;
-use Request;
+use Illuminate\Support\Facades\View;
 use System\Classes\CombineAssets;
 use System\Classes\ErrorHandler;
 use System\Classes\MailManager;
@@ -26,13 +24,15 @@
 use System\Models\EventLog;
 use System\Models\MailSetting;
 use System\Twig\Engine as TwigEngine;
-use SystemException;
 use Twig\Environment;
 use Twig\Extension\CoreExtension;
-use Validator;
-use View;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Router\Helper as RouterHelper;
 use Winter\Storm\Support\ClassLoader;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Markdown;
+use Winter\Storm\Support\Facades\Validator;
 use Winter\Storm\Support\ModuleServiceProvider;
 
 class ServiceProvider extends ModuleServiceProvider
@@ -232,7 +232,7 @@ protected function registerMarkupTags()
                 'url_*'          => ['Url', '*'],
                 'html_*'         => ['Html', '*'],
                 'form_*'         => ['Form', '*'],
-                'form_macro'     => ['Form', '__call']
+                'form_macro'     => ['Form', '__call'],
             ]);
 
             $manager->registerFilters([
@@ -443,8 +443,8 @@ protected function registerBackendNavigation()
                     'iconSvg'     => 'modules/system/assets/images/cog-icon.svg',
                     'url'         => Backend::url('system/settings'),
                     'permissions' => [],
-                    'order'       => 1000
-                ]
+                    'order'       => 1000,
+                ],
             ]);
             $manager->registerOwnerAlias('Winter.System', 'October.System');
         });
@@ -479,7 +479,7 @@ protected function registerBackendReportWidgets()
         WidgetManager::instance()->registerReportWidgets(function ($manager) {
             $manager->registerReportWidget(\System\ReportWidgets\Status::class, [
                 'label'   => 'backend::lang.dashboard.status.widget_title_default',
-                'context' => 'dashboard'
+                'context' => 'dashboard',
             ]);
         });
     }
@@ -534,7 +534,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-cloud-download',
                     'url'         => Backend::url('system/updates'),
                     'permissions' => ['system.manage_updates'],
-                    'order'       => 300
+                    'order'       => 300,
                 ],
                 'administrators' => [
                     'label'       => 'backend::lang.user.menu_label',
@@ -543,7 +543,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-users',
                     'url'         => Backend::url('backend/users'),
                     'permissions' => ['backend.manage_users'],
-                    'order'       => 400
+                    'order'       => 400,
                 ],
                 'mail_templates' => [
                     'label'       => 'system::lang.mail_templates.menu_label',
@@ -552,7 +552,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-envelope-square',
                     'url'         => Backend::url('system/mailtemplates'),
                     'permissions' => ['system.manage_mail_templates'],
-                    'order'       => 610
+                    'order'       => 610,
                 ],
                 'mail_settings' => [
                     'label'       => 'system::lang.mail.menu_label',
@@ -561,7 +561,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-envelope',
                     'class'       => 'System\Models\MailSetting',
                     'permissions' => ['system.manage_mail_settings'],
-                    'order'       => 620
+                    'order'       => 620,
                 ],
                 'mail_brand_settings' => [
                     'label'       => 'system::lang.mail_brand.menu_label',
@@ -570,7 +570,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-paint-brush',
                     'url'         => Backend::url('system/mailbrandsettings'),
                     'permissions' => ['system.manage_mail_templates'],
-                    'order'       => 630
+                    'order'       => 630,
                 ],
                 'event_logs' => [
                     'label'       => 'system::lang.event_log.menu_label',
@@ -580,7 +580,7 @@ protected function registerBackendSettings()
                     'url'         => Backend::url('system/eventlogs'),
                     'permissions' => ['system.access_logs'],
                     'order'       => 900,
-                    'keywords'    => 'error exception'
+                    'keywords'    => 'error exception',
                 ],
                 'request_logs' => [
                     'label'       => 'system::lang.request_log.menu_label',
@@ -590,7 +590,7 @@ protected function registerBackendSettings()
                     'url'         => Backend::url('system/requestlogs'),
                     'permissions' => ['system.access_logs'],
                     'order'       => 910,
-                    'keywords'    => '404 error'
+                    'keywords'    => '404 error',
                 ],
                 'log_settings' => [
                     'label'       => 'system::lang.log.menu_label',
@@ -599,7 +599,7 @@ protected function registerBackendSettings()
                     'icon'        => 'icon-dot-circle-o',
                     'class'       => 'System\Models\LogSetting',
                     'permissions' => ['system.manage_logs'],
-                    'order'       => 990
+                    'order'       => 990,
                 ],
             ]);
             $manager->registerOwnerAlias('Winter.System', 'October.System');
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 50f1fe6a88..217d24c56f 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -2,12 +2,12 @@
 
 namespace System\Behaviors;
 
-use App;
-use Artisan;
-use Cache;
-use Log;
 use Exception;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
 use System\Classes\ModelBehavior;
 
 /**
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index bd6cb2cc99..b59b0e8223 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -2,31 +2,30 @@
 
 namespace System\Classes;
 
-use App;
-use Url;
-use File;
-use Lang;
-use Event;
-use Cache;
-use Route;
-use Config;
-use Request;
-use Response;
-use Assetic\Asset\FileAsset;
 use Assetic\Asset\AssetCache;
 use Assetic\Asset\AssetCollection;
+use Assetic\Asset\FileAsset;
 use Assetic\Factory\AssetFactory;
 use Assetic\Filter\CssImportFilter;
 use Assetic\Filter\CssRewriteFilter;
 use Assetic\Filter\JavaScriptMinifierFilter;
 use Assetic\Filter\StylesheetMinifyFilter;
+use DateTime;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\URL;
+use System\Helpers\Cache as CacheHelper;
 use Winter\Storm\Parse\Assetic\Cache\FilesystemCache;
+use Winter\Storm\Parse\Assetic\Filter\JavascriptImporter;
 use Winter\Storm\Parse\Assetic\Filter\LessCompiler;
 use Winter\Storm\Parse\Assetic\Filter\ScssCompiler;
-use Winter\Storm\Parse\Assetic\Filter\JavascriptImporter;
-use System\Helpers\Cache as CacheHelper;
-use ApplicationException;
-use DateTime;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Combiner class used for combining JavaScript and StyleSheet files.
@@ -411,7 +410,7 @@ protected function prepareRequest(array $assets, $localPath = null)
                 'lastMod'   => $lastMod,
                 'files'     => $assets,
                 'path'      => $this->localPath,
-                'extension' => $extension
+                'extension' => $extension,
             ];
 
             $this->putCache($cacheKey, $cacheInfo);
diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php
index e0cceee69f..cc8fe18220 100644
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@@ -2,14 +2,13 @@
 
 namespace System\Classes;
 
-use View;
-use Config;
-use Cms\Classes\Theme;
-use Cms\Classes\Router;
 use Cms\Classes\Controller as CmsController;
-use Winter\Storm\Exception\ErrorHandler as ErrorHandlerBase;
-use Winter\Storm\Exception\SystemException;
+use Cms\Classes\Router;
+use Cms\Classes\Theme;
+use Illuminate\Support\Facades\View;
 use Symfony\Component\HttpFoundation\Response;
+use Winter\Storm\Exception\ErrorHandler as ErrorHandlerBase;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * System Error Handler, this class handles application exception events.
diff --git a/modules/system/classes/FileManifest.php b/modules/system/classes/FileManifest.php
index b22a83d2d2..a6341a3c59 100644
--- a/modules/system/classes/FileManifest.php
+++ b/modules/system/classes/FileManifest.php
@@ -2,10 +2,10 @@
 
 namespace System\Classes;
 
-use ApplicationException;
-use Config;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\Filesystem;
 use Winter\Storm\Halcyon\Datasource\FileDatasource;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Stores the file manifest for this Winter CMS installation.
diff --git a/modules/system/classes/ImageResizer.php b/modules/system/classes/ImageResizer.php
index d416b6adc1..e885b8db31 100644
--- a/modules/system/classes/ImageResizer.php
+++ b/modules/system/classes/ImageResizer.php
@@ -2,19 +2,18 @@
 
 namespace System\Classes;
 
-use Url;
-use Crypt;
-use Cache;
-use Event;
-use Config;
-use Storage;
 use Exception;
-use SystemException;
 use File as FileHelper;
-use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\URL;
+use Storage;
 use System\Models\File as SystemFileModel;
 use Winter\Storm\Database\Attach\File as FileModel;
 use Winter\Storm\Database\Attach\Resizer as DefaultResizer;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * Image Resizing class used for resizing any image resources accessible
diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php
index a5f4ec731d..9e7469dabf 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -2,13 +2,13 @@
 
 namespace System\Classes;
 
-use App;
-use Markdown;
+use Illuminate\Support\Facades\App;
+use System\Helpers\View as ViewHelper;
+use System\Models\MailBrandSetting;
 use System\Models\MailPartial;
 use System\Models\MailTemplate;
-use System\Models\MailBrandSetting;
-use System\Helpers\View as ViewHelper;
 use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
+use Winter\Storm\Support\Facades\Markdown;
 
 /**
  * This class manages Mail sending functions
@@ -127,7 +127,7 @@ protected function addContentToMailerInternal($message, $template, $data, $plain
         }
 
         $data += [
-            'subject' => $symfonyMessage->getSubject()
+            'subject' => $symfonyMessage->getSubject(),
         ];
 
         if (!$plainOnly) {
@@ -233,7 +233,7 @@ public function renderTextTemplate($template, $data = [])
 
         if ($template->layout) {
             $text = $this->renderTwig($template->layout->content_text, [
-                'content' => $text
+                'content' => $text,
             ] + (array) $data);
         }
 
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index f03c410a9d..ca446b4035 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -2,15 +2,15 @@
 
 namespace System\Classes;
 
-use ApplicationException;
-use Cache;
-use Config;
 use Illuminate\Filesystem\FilesystemAdapter;
-use Lang;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\URL;
 use Storage;
-use SystemException;
-use Url;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
+use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Str;
 use Winter\Storm\Support\Svg;
 
@@ -679,7 +679,7 @@ protected function scanFolderContents($fullFolderPath)
     {
         $result = [
             'files' => [],
-            'folders' => []
+            'folders' => [],
         ];
 
         $contents = $this->getStorageDisk()->listContents($fullFolderPath);
diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php
index f5296cdb12..b6566a96d6 100644
--- a/modules/system/classes/MediaLibraryItem.php
+++ b/modules/system/classes/MediaLibraryItem.php
@@ -2,10 +2,10 @@
 
 namespace System\Classes;
 
-use File;
-use Config;
-use Winter\Storm\Filesystem\Definitions as FileDefinitions;
 use Carbon\Carbon;
+use Winter\Storm\Filesystem\Definitions as FileDefinitions;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Represents a file or folder in the Media Library.
diff --git a/modules/system/classes/ModelBehavior.php b/modules/system/classes/ModelBehavior.php
index 7662bf2f62..72447e3dc8 100644
--- a/modules/system/classes/ModelBehavior.php
+++ b/modules/system/classes/ModelBehavior.php
@@ -2,9 +2,9 @@
 
 namespace System\Classes;
 
-use Lang;
-use ApplicationException;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\ModelBehavior as ModelBehaviorBase;
+use Winter\Storm\Exception\ApplicationException;
 
 /**
  * Base class for model behaviors.
@@ -35,7 +35,7 @@ public function __construct($model)
                 throw new ApplicationException(Lang::get('system::lang.behavior.missing_property', [
                     'class' => get_class($model),
                     'property' => $property,
-                    'behavior' => get_called_class()
+                    'behavior' => get_called_class(),
                 ]));
             }
         }
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index 7831d36b98..3a1a77c161 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -2,15 +2,15 @@
 
 namespace System\Classes;
 
-use Str;
-use File;
-use Yaml;
-use Backend;
-use ReflectionClass;
-use SystemException;
+use Backend\Facades\Backend;
 use Composer\Semver\Semver;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Support\ServiceProvider as ServiceProviderBase;
+use ReflectionClass;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Yaml;
+use Winter\Storm\Support\Str;
 
 /**
  * Plugin base class
diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 2889d35536..60e4d16636 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -2,24 +2,23 @@
 
 namespace System\Classes;
 
-use Db;
-use App;
-use Str;
-use Log;
-use File;
-use Lang;
-use View;
-use Cache;
-use Config;
-use Schema;
-use SystemException;
+use Backend\Classes\NavigationManager;
 use FilesystemIterator;
-use RecursiveIteratorIterator;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\View;
 use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use System\Models\PluginVersion;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Foundation\Application;
 use Winter\Storm\Support\ClassLoader;
-use Backend\Classes\NavigationManager;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * Plugin manager
@@ -171,7 +170,7 @@ public function loadPlugin(string $namespace, string $path): ?PluginBase
                 'message' => $e->getMessage(),
                 'file' => $e->getFile(),
                 'line' => $e->getLine(),
-                'trace' => $e->getTraceAsString()
+                'trace' => $e->getTraceAsString(),
             ]);
             return null;
         }
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index ad0f52b872..c8b7bda076 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -2,10 +2,10 @@
 
 namespace System\Classes;
 
-use Event;
-use Backend;
-use BackendAuth;
-use SystemException;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * Manages the system settings.
@@ -78,7 +78,7 @@ class SettingsManager
         'permissions' => [],
         'order'       => 500,
         'context'     => 'system',
-        'keywords'    => null
+        'keywords'    => null,
     ];
 
     /**
@@ -289,7 +289,7 @@ public function addSettingItem($owner, $code, array $definition)
 
         $item = array_merge(self::$itemDefaults, array_merge($definition, [
             'code' => $code,
-            'owner' => $owner
+            'owner' => $owner,
         ]));
 
         /*
diff --git a/modules/system/classes/SourceManifest.php b/modules/system/classes/SourceManifest.php
index 49613b0dbc..d51c47333f 100644
--- a/modules/system/classes/SourceManifest.php
+++ b/modules/system/classes/SourceManifest.php
@@ -2,10 +2,10 @@
 
 namespace System\Classes;
 
-use Http;
-use Config;
-use ApplicationException;
 use Winter\Storm\Argon\Argon;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Http;
 
 /**
  * Reads and stores the Winter CMS source manifest information.
@@ -381,7 +381,7 @@ public function compare(FileManifest $manifest, bool $detailed = false): array
         $details = [
             'build' => $likelyBuild,
             'modified' => true,
-            'confident' => ($buildMatch[$likelyBuild] >= 60)
+            'confident' => ($buildMatch[$likelyBuild] >= 60),
         ];
 
         if ($detailed) {
diff --git a/modules/system/classes/SystemController.php b/modules/system/classes/SystemController.php
index 5ededabd09..f74f5d436a 100644
--- a/modules/system/classes/SystemController.php
+++ b/modules/system/classes/SystemController.php
@@ -2,13 +2,12 @@
 
 namespace System\Classes;
 
-use Lang;
-use Config;
-use Response;
 use Exception;
-use SystemException;
-use ApplicationException;
 use Illuminate\Routing\Controller as ControllerBase;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Response;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * The is the master controller for system related routing.
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index e04985199c..7bbf4bb533 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -2,24 +2,24 @@
 
 namespace System\Classes;
 
-use App;
-use Url;
-use File;
-use Lang;
-use Http;
-use Cache;
-use Schema;
-use Config;
-use Exception;
-use ApplicationException;
+use Carbon\Carbon;
 use Cms\Classes\ThemeManager;
+use Exception;
+use Illuminate\Console\View\Components\Error;
+use Illuminate\Console\View\Components\Info;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\URL;
+use System\Helpers\Cache as CacheHelper;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
-use System\Helpers\Cache as CacheHelper;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\Zip;
-use Carbon\Carbon;
-use Illuminate\Console\View\Components\Error;
-use Illuminate\Console\View\Components\Info;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Http;
+use Winter\Storm\Support\Facades\Schema;
 
 /**
  * Update manager
@@ -194,7 +194,7 @@ public function update()
             foreach ($this->pluginManager->getReplacementMap() as $alias => $plugin) {
                 if ($this->pluginManager->getActiveReplacementMap($alias)) {
                     $this->addMessage($plugin, Lang::get('system::lang.updates.update_warnings_plugin_replace_cli', [
-                        'alias' => '<info>' . $alias . '</info>'
+                        'alias' => '<info>' . $alias . '</info>',
                     ]));
                 }
             }
@@ -279,7 +279,7 @@ public function requestUpdateList($force = false)
             'plugins' => serialize($versions),
             'themes'  => serialize($themes),
             'build'   => $build,
-            'force'   => $force
+            'force'   => $force,
         ];
 
         $result = $this->requestServerData('core/update', $params);
@@ -654,7 +654,7 @@ public function downloadPlugin($name, $hash, $installation = false)
         $fileCode = $name . $hash;
         $this->requestServerFile('plugin/get', $fileCode, $hash, [
             'name'         => $name,
-            'installation' => $installation ? 1 : 0
+            'installation' => $installation ? 1 : 0,
         ]);
     }
 
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index a85882ea47..cb4c40115e 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -2,14 +2,14 @@
 
 namespace System\Classes;
 
-use File;
-use Yaml;
-use Db;
 use Carbon\Carbon;
 use Illuminate\Console\View\Components\Error;
 use Illuminate\Console\View\Components\Info;
 use Illuminate\Console\View\Components\Task;
 use Winter\Storm\Database\Updater;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Yaml;
 
 /**
  * Version manager
@@ -156,7 +156,7 @@ public function replacePlugin(PluginBase $plugin, string $replace)
             Db::table('system_plugin_versions')
                 ->where('code', '=', $replace)
                 ->update([
-                    'code' => $code
+                    'code' => $code,
                 ]);
         }
     }
@@ -457,12 +457,12 @@ protected function setDatabaseVersion($code, $version = null)
             Db::table('system_plugin_versions')->insert([
                 'code'       => $code,
                 'version'    => $version,
-                'created_at' => new Carbon()
+                'created_at' => new Carbon(),
             ]);
         } elseif ($version && $currentVersion) {
             Db::table('system_plugin_versions')->where('code', $code)->update([
                 'version'    => $version,
-                'created_at' => new Carbon()
+                'created_at' => new Carbon(),
             ]);
         } elseif ($currentVersion) {
             Db::table('system_plugin_versions')->where('code', $code)->delete();
@@ -481,7 +481,7 @@ protected function applyDatabaseComment($code, $version, $comment)
             'type'       => self::HISTORY_TYPE_COMMENT,
             'version'    => $version,
             'detail'     => $comment,
-            'created_at' => new Carbon()
+            'created_at' => new Carbon(),
         ]);
     }
 
@@ -519,7 +519,7 @@ protected function applyDatabaseScript($code, $version, $script)
             'type'       => self::HISTORY_TYPE_SCRIPT,
             'version'    => $version,
             'detail'     => $script,
-            'created_at' => new Carbon()
+            'created_at' => new Carbon(),
         ]);
     }
 
diff --git a/modules/system/classes/asset/BundleManager.php b/modules/system/classes/asset/BundleManager.php
index c6d54afec0..9c1e38b239 100644
--- a/modules/system/classes/asset/BundleManager.php
+++ b/modules/system/classes/asset/BundleManager.php
@@ -37,7 +37,7 @@ class BundleManager
         'vue' => [
             'vue' => '^3.4.0',
             'vite' => [
-                '@vitejs/plugin-vue' => '^5.0.5'
+                '@vitejs/plugin-vue' => '^5.0.5',
             ],
         ],
     ];
diff --git a/modules/system/classes/asset/PackageManager.php b/modules/system/classes/asset/PackageManager.php
index edb04c8571..1645103a90 100644
--- a/modules/system/classes/asset/PackageManager.php
+++ b/modules/system/classes/asset/PackageManager.php
@@ -34,11 +34,11 @@ class PackageManager
      */
     protected array $compilableConfigs = [
         'mix' => [
-            'configFile' => 'winter.mix.js'
+            'configFile' => 'winter.mix.js',
         ],
         'vite' => [
-            'configFile' => 'vite.config.mjs'
-        ]
+            'configFile' => 'vite.config.mjs',
+        ],
     ];
 
     /**
diff --git a/modules/system/console/CreateCommand.php b/modules/system/console/CreateCommand.php
index 8f730b9da4..f2395a9f1c 100644
--- a/modules/system/console/CreateCommand.php
+++ b/modules/system/console/CreateCommand.php
@@ -3,7 +3,6 @@
 namespace System\Console;
 
 use InvalidArgumentException;
-use System\Console\BaseScaffoldCommand;
 
 class CreateCommand extends BaseScaffoldCommand
 {
diff --git a/modules/system/console/CreateJob.php b/modules/system/console/CreateJob.php
index 48811a75e2..8db98e8881 100644
--- a/modules/system/console/CreateJob.php
+++ b/modules/system/console/CreateJob.php
@@ -2,8 +2,6 @@
 
 namespace System\Console;
 
-use System\Console\BaseScaffoldCommand;
-
 class CreateJob extends BaseScaffoldCommand
 {
     /**
diff --git a/modules/system/console/CreateMigration.php b/modules/system/console/CreateMigration.php
index 30a8057b20..9cf82818ee 100644
--- a/modules/system/console/CreateMigration.php
+++ b/modules/system/console/CreateMigration.php
@@ -2,13 +2,11 @@
 
 namespace System\Console;
 
-use File;
 use InvalidArgumentException;
 use System\Classes\VersionManager;
-use System\Console\BaseScaffoldCommand;
 use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\Yaml;
 use Winter\Storm\Support\Str;
-use Yaml;
 
 /**
  * Scaffolds a new migration file
diff --git a/modules/system/console/CreateModel.php b/modules/system/console/CreateModel.php
index e37973dbbe..dd012a0f5a 100644
--- a/modules/system/console/CreateModel.php
+++ b/modules/system/console/CreateModel.php
@@ -3,7 +3,6 @@
 namespace System\Console;
 
 use Winter\Storm\Support\Str;
-use System\Console\BaseScaffoldCommand;
 
 class CreateModel extends BaseScaffoldCommand
 {
diff --git a/modules/system/console/CreatePlugin.php b/modules/system/console/CreatePlugin.php
index c3c0c3ed5d..c517829e9e 100644
--- a/modules/system/console/CreatePlugin.php
+++ b/modules/system/console/CreatePlugin.php
@@ -2,8 +2,6 @@
 
 namespace System\Console;
 
-use System\Console\BaseScaffoldCommand;
-
 class CreatePlugin extends BaseScaffoldCommand
 {
     /**
diff --git a/modules/system/console/CreateSettings.php b/modules/system/console/CreateSettings.php
index cc7737ae3f..e652155839 100644
--- a/modules/system/console/CreateSettings.php
+++ b/modules/system/console/CreateSettings.php
@@ -2,8 +2,6 @@
 
 namespace System\Console;
 
-use System\Console\BaseScaffoldCommand;
-
 class CreateSettings extends BaseScaffoldCommand
 {
     /**
@@ -41,7 +39,7 @@ class CreateSettings extends BaseScaffoldCommand
      */
     protected $stubs = [
         'scaffold/settings/model.stub' => 'models/{{studly_name}}.php',
-        'scaffold/settings/fields.stub'   => 'models/{{lower_name}}/fields.yaml'
+        'scaffold/settings/fields.stub'   => 'models/{{lower_name}}/fields.yaml',
     ];
 
     /**
diff --git a/modules/system/console/CreateTest.php b/modules/system/console/CreateTest.php
index c973299252..13eb7352d6 100644
--- a/modules/system/console/CreateTest.php
+++ b/modules/system/console/CreateTest.php
@@ -2,7 +2,6 @@
 
 namespace System\Console;
 
-use System\Console\BaseScaffoldCommand;
 use Winter\Storm\Support\Str;
 
 class CreateTest extends BaseScaffoldCommand
diff --git a/modules/system/console/PluginDisable.php b/modules/system/console/PluginDisable.php
index 3ed675e624..222867ec6b 100644
--- a/modules/system/console/PluginDisable.php
+++ b/modules/system/console/PluginDisable.php
@@ -2,9 +2,8 @@
 
 namespace System\Console;
 
-use Winter\Storm\Console\Command;
 use System\Classes\PluginManager;
-use System\Models\PluginVersion;
+use Winter\Storm\Console\Command;
 
 /**
  * Console command to disable a plugin.
diff --git a/modules/system/console/PluginEnable.php b/modules/system/console/PluginEnable.php
index 8091a1c412..f65ace422d 100644
--- a/modules/system/console/PluginEnable.php
+++ b/modules/system/console/PluginEnable.php
@@ -2,9 +2,8 @@
 
 namespace System\Console;
 
-use Winter\Storm\Console\Command;
 use System\Classes\PluginManager;
-use System\Models\PluginVersion;
+use Winter\Storm\Console\Command;
 
 /**
  * Console command to enable a plugin.
diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php
index 4ee3363557..5ac22a0c4c 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/PluginInstall.php
@@ -2,9 +2,9 @@
 
 namespace System\Console;
 
-use Winter\Storm\Console\Command;
-use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
+use System\Classes\UpdateManager;
+use Winter\Storm\Console\Command;
 
 /**
  * Console command to install a new plugin.
diff --git a/modules/system/console/PluginList.php b/modules/system/console/PluginList.php
index 1daa154bf1..88c83c431f 100644
--- a/modules/system/console/PluginList.php
+++ b/modules/system/console/PluginList.php
@@ -2,8 +2,6 @@
 
 namespace System\Console;
 
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableSeparator;
 use System\Models\PluginVersion;
 use Winter\Storm\Console\Command;
 
diff --git a/modules/system/console/PluginRefresh.php b/modules/system/console/PluginRefresh.php
index e42b137551..da8cb064dd 100644
--- a/modules/system/console/PluginRefresh.php
+++ b/modules/system/console/PluginRefresh.php
@@ -2,8 +2,8 @@
 
 namespace System\Console;
 
-use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
+use Winter\Storm\Console\Command;
 
 /**
  * Console command to refresh a plugin.
diff --git a/modules/system/console/PluginRemove.php b/modules/system/console/PluginRemove.php
index 08fa14173c..b9e5bf8f2d 100644
--- a/modules/system/console/PluginRemove.php
+++ b/modules/system/console/PluginRemove.php
@@ -2,10 +2,10 @@
 
 namespace System\Console;
 
-use File;
-use Winter\Storm\Console\Command;
-use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
+use System\Classes\UpdateManager;
+use Winter\Storm\Console\Command;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Console command to remove a plugin.
diff --git a/modules/system/console/PluginRollback.php b/modules/system/console/PluginRollback.php
index 5f091a8fdd..819ac76615 100644
--- a/modules/system/console/PluginRollback.php
+++ b/modules/system/console/PluginRollback.php
@@ -3,9 +3,9 @@
 namespace System\Console;
 
 use InvalidArgumentException;
-use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
 use System\Classes\VersionManager;
+use Winter\Storm\Console\Command;
 
 /**
  * Console command to rollback a plugin.
diff --git a/modules/system/console/WinterDown.php b/modules/system/console/WinterDown.php
index 03e2915544..ef98eb916a 100644
--- a/modules/system/console/WinterDown.php
+++ b/modules/system/console/WinterDown.php
@@ -2,8 +2,8 @@
 
 namespace System\Console;
 
-use Winter\Storm\Console\Command;
 use System\Classes\UpdateManager;
+use Winter\Storm\Console\Command;
 
 /**
  * Console command to tear down the database.
diff --git a/modules/system/console/WinterEnv.php b/modules/system/console/WinterEnv.php
index 84fa97ba06..59f05b7ec0 100644
--- a/modules/system/console/WinterEnv.php
+++ b/modules/system/console/WinterEnv.php
@@ -2,9 +2,9 @@
 
 namespace System\Console;
 
-use App;
-use Winter\Storm\Parse\EnvFile;
+use Illuminate\Support\Facades\App;
 use Winter\Storm\Console\Command;
+use Winter\Storm\Parse\EnvFile;
 use Winter\Storm\Parse\PHP\ArrayFile;
 
 /**
diff --git a/modules/system/console/WinterFresh.php b/modules/system/console/WinterFresh.php
index 019bca5fce..8b71220f6a 100644
--- a/modules/system/console/WinterFresh.php
+++ b/modules/system/console/WinterFresh.php
@@ -2,10 +2,10 @@
 
 namespace System\Console;
 
-use File;
-use Artisan;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
 use Symfony\Component\Console\Input\InputOption;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Console command to remove boilerplate.
diff --git a/modules/system/console/WinterInstall.php b/modules/system/console/WinterInstall.php
index 1bd15b3441..a964ded1d2 100644
--- a/modules/system/console/WinterInstall.php
+++ b/modules/system/console/WinterInstall.php
@@ -3,17 +3,17 @@
 namespace System\Console;
 
 use Backend\Database\Seeds\SeedSetupAdmin;
-use Config;
-use Db;
 use Exception;
-use File;
 use Illuminate\Encryption\Encrypter;
 use PDO;
-use Str;
 use Symfony\Component\Console\Input\InputOption;
 use System\Classes\UpdateManager;
 use Winter\Storm\Config\ConfigWriter;
 use Winter\Storm\Console\Command;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * Console command to install Winter.
@@ -98,7 +98,7 @@ public function handle()
         foreach ($chosenToInstall as $pluginCode) {
             $this->output->writeln('<info>Installing plugin ' . $pluginCode . '</info>');
             $this->callSilent('plugin:install', [
-                'plugin' => $pluginCode
+                'plugin' => $pluginCode,
             ]);
             $this->output->writeln('<info>' . $pluginCode . ' installed successfully.</info>');
         }
diff --git a/modules/system/console/WinterManifest.php b/modules/system/console/WinterManifest.php
index 67b0adbf18..12398d5f7f 100644
--- a/modules/system/console/WinterManifest.php
+++ b/modules/system/console/WinterManifest.php
@@ -2,11 +2,11 @@
 
 namespace System\Console;
 
-use ApplicationException;
-use Http;
-use ZipArchive;
 use System\Classes\FileManifest;
 use System\Classes\SourceManifest;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Http;
+use ZipArchive;
 
 /**
  * Console command to generate a release/tag manifest for Winter CMS version checks.
@@ -120,7 +120,7 @@ public function handle()
                 if ($versionInt >= $minBuild && $versionInt <= $maxBuild) {
                     $sourceBuilds[] = [
                         'version' => $version,
-                        'download' => $build->zipball_url
+                        'download' => $build->zipball_url,
                     ];
                 }
             }
diff --git a/modules/system/console/WinterMirror.php b/modules/system/console/WinterMirror.php
index 2d1f802208..655f188b99 100644
--- a/modules/system/console/WinterMirror.php
+++ b/modules/system/console/WinterMirror.php
@@ -2,12 +2,12 @@
 
 namespace System\Console;
 
-use File;
-use Event;
-use StdClass;
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputOption;
+use StdClass;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Console command to implement a "public" folder.
diff --git a/modules/system/console/WinterTest.php b/modules/system/console/WinterTest.php
index 8e2c7e8f02..7b01c3bb05 100644
--- a/modules/system/console/WinterTest.php
+++ b/modules/system/console/WinterTest.php
@@ -2,7 +2,6 @@
 
 namespace System\Console;
 
-use Config;
 use Illuminate\Console\Command;
 use Symfony\Component\Process\Exception\ProcessSignaledException;
 use Symfony\Component\Process\ExecutableFinder;
@@ -10,6 +9,7 @@
 use System\Classes\PluginManager;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\PathResolver;
+use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Str;
 
 /**
@@ -227,7 +227,7 @@ protected function getPhpUnitConfigs(): array
     {
         $configs = [
             'modules' => [],
-            'plugins' => []
+            'plugins' => [],
         ];
 
         foreach (Config::get('cms.loadModules', ['System', 'Cms', 'Backend']) as $module) {
diff --git a/modules/system/console/WinterUpdate.php b/modules/system/console/WinterUpdate.php
index 7c157122d1..9921a22b45 100644
--- a/modules/system/console/WinterUpdate.php
+++ b/modules/system/console/WinterUpdate.php
@@ -2,10 +2,10 @@
 
 namespace System\Console;
 
-use Str;
 use Illuminate\Console\Command;
-use System\Classes\UpdateManager;
 use Symfony\Component\Console\Input\InputOption;
+use System\Classes\UpdateManager;
+use Winter\Storm\Support\Str;
 
 /**
  * Console command to perform a system update.
diff --git a/modules/system/console/WinterUtil.php b/modules/system/console/WinterUtil.php
index 6404b103a8..59074b2b3e 100644
--- a/modules/system/console/WinterUtil.php
+++ b/modules/system/console/WinterUtil.php
@@ -2,17 +2,17 @@
 
 namespace System\Console;
 
-use Lang;
-use File;
-use Config;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use System\Classes\UpdateManager;
+use Symfony\Component\Console\Input\InputOption;
 use System\Classes\CombineAssets;
-use System\Models\Parameter;
+use System\Classes\UpdateManager;
 use System\Models\File as FileModel;
+use System\Models\Parameter;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * Console command for other utility commands.
diff --git a/modules/system/console/asset/AssetCompile.php b/modules/system/console/asset/AssetCompile.php
index 3fca7f8e9c..aaeab175a2 100644
--- a/modules/system/console/asset/AssetCompile.php
+++ b/modules/system/console/asset/AssetCompile.php
@@ -3,8 +3,8 @@
 namespace System\Console\Asset;
 
 use Symfony\Component\Process\Process;
-use System\Classes\Asset\PackageManager;
 use System\Classes\Asset\PackageJson;
+use System\Classes\Asset\PackageManager;
 use Winter\Storm\Console\Command;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Str;
diff --git a/modules/system/console/asset/NpmRun.php b/modules/system/console/asset/NpmRun.php
index 8297cd41cd..40d63d7b7d 100644
--- a/modules/system/console/asset/NpmRun.php
+++ b/modules/system/console/asset/NpmRun.php
@@ -3,8 +3,8 @@
 namespace System\Console\Asset;
 
 use Symfony\Component\Process\Process;
-use System\Classes\Asset\PackageManager;
 use System\Classes\Asset\PackageJson;
+use System\Classes\Asset\PackageManager;
 use Winter\Storm\Console\Command;
 
 class NpmRun extends Command
@@ -33,7 +33,7 @@ class NpmRun extends Command
      * @var array List of commands that this command replaces (aliases)
      */
     protected $replaces = [
-        'mix:run'
+        'mix:run',
     ];
 
     /**
diff --git a/modules/system/console/asset/NpmUpdate.php b/modules/system/console/asset/NpmUpdate.php
index 66665bca1a..b2d17e85ad 100644
--- a/modules/system/console/asset/NpmUpdate.php
+++ b/modules/system/console/asset/NpmUpdate.php
@@ -2,8 +2,6 @@
 
 namespace System\Console\Asset;
 
-use System\Console\Asset\AssetInstall;
-
 class NpmUpdate extends AssetInstall
 {
     /**
@@ -41,6 +39,6 @@ class NpmUpdate extends AssetInstall
      * @inheritDoc
      */
     public $replaces = [
-        'mix:update'
+        'mix:update',
     ];
 }
diff --git a/modules/system/console/asset/mix/MixCompile.php b/modules/system/console/asset/mix/MixCompile.php
index ba6ece5442..b33496b796 100644
--- a/modules/system/console/asset/mix/MixCompile.php
+++ b/modules/system/console/asset/mix/MixCompile.php
@@ -35,7 +35,7 @@ class MixCompile extends AssetCompile
      * @var array List of commands that this command replaces (aliases)
      */
     protected $replaces = [
-        'mix:build'
+        'mix:build',
     ];
 
     /**
@@ -84,7 +84,7 @@ protected function beforeExecution(string $configPath): void
             '%pluginsPath%' => addslashes(plugins_path()),
             '%appPath%' => addslashes(base_path()),
             '%silent%' => (int) $this->option('silent'),
-            '%noProgress%' => (int) $this->option('no-progress')
+            '%noProgress%' => (int) $this->option('no-progress'),
         ], $fixture);
 
         File::put($this->getJsConfigPath($configPath), $config);
diff --git a/modules/system/console/asset/mix/MixWatch.php b/modules/system/console/asset/mix/MixWatch.php
index 0bcd213899..c9287c43d5 100644
--- a/modules/system/console/asset/mix/MixWatch.php
+++ b/modules/system/console/asset/mix/MixWatch.php
@@ -30,7 +30,7 @@ class MixWatch extends MixCompile
      * @var array List of commands that this command replaces (aliases)
      */
     protected $replaces = [
-        'mix:dev'
+        'mix:dev',
     ];
 
     /**
diff --git a/modules/system/console/asset/vite/ViteCompile.php b/modules/system/console/asset/vite/ViteCompile.php
index 6e10447844..ddff5339b0 100644
--- a/modules/system/console/asset/vite/ViteCompile.php
+++ b/modules/system/console/asset/vite/ViteCompile.php
@@ -34,7 +34,7 @@ class ViteCompile extends AssetCompile
      * @var array List of commands that this command replaces (aliases)
      */
     protected $replaces = [
-        'vite:build'
+        'vite:build',
     ];
 
     /**
diff --git a/modules/system/console/asset/vite/ViteWatch.php b/modules/system/console/asset/vite/ViteWatch.php
index aee89ac1db..8ca1d3fddf 100644
--- a/modules/system/console/asset/vite/ViteWatch.php
+++ b/modules/system/console/asset/vite/ViteWatch.php
@@ -32,7 +32,7 @@ class ViteWatch extends ViteCompile
      * @var array List of commands that this command replaces (aliases)
      */
     protected $replaces = [
-        'vite:dev'
+        'vite:dev',
     ];
 
     /**
diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php
index ddd03c4b38..df65ec0672 100644
--- a/modules/system/controllers/EventLogs.php
+++ b/modules/system/controllers/EventLogs.php
@@ -2,13 +2,13 @@
 
 namespace System\Controllers;
 
-use App;
-use Lang;
-use Flash;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
 use System\Classes\SettingsManager;
 use System\Models\EventLog;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Event Logs controller
diff --git a/modules/system/controllers/MailBrandSettings.php b/modules/system/controllers/MailBrandSettings.php
index 47a1d0de64..515339362c 100644
--- a/modules/system/controllers/MailBrandSettings.php
+++ b/modules/system/controllers/MailBrandSettings.php
@@ -2,18 +2,18 @@
 
 namespace System\Controllers;
 
-use Lang;
-use File;
-use Flash;
-use Config;
-use Redirect;
-use BackendMenu;
-use System\Models\MailBrandSetting;
-use System\Classes\SettingsManager;
-use System\Classes\MailManager;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use System\Classes\MailManager;
+use System\Classes\SettingsManager;
+use System\Models\MailBrandSetting;
 use System\Models\MailLayout;
 use System\Models\MailTemplate;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Mail brand customization controller
@@ -97,7 +97,7 @@ public function renderSampleMessage()
         $data = [
             'subject' => Config::get('app.name'),
             'appName' => Config::get('app.name'),
-            'texts' => Lang::get('system::lang.mail_brand.sample_template')
+            'texts' => Lang::get('system::lang.mail_brand.sample_template'),
         ];
 
         $layout = new MailLayout();
diff --git a/modules/system/controllers/MailLayouts.php b/modules/system/controllers/MailLayouts.php
index 09bba536ef..4dd401dc1f 100644
--- a/modules/system/controllers/MailLayouts.php
+++ b/modules/system/controllers/MailLayouts.php
@@ -2,12 +2,12 @@
 
 namespace System\Controllers;
 
-use Lang;
-use Flash;
-use Redirect;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
 use System\Classes\SettingsManager;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Mail layouts controller
diff --git a/modules/system/controllers/MailPartials.php b/modules/system/controllers/MailPartials.php
index 07696cb396..51b01ff669 100644
--- a/modules/system/controllers/MailPartials.php
+++ b/modules/system/controllers/MailPartials.php
@@ -2,8 +2,8 @@
 
 namespace System\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 use System\Classes\SettingsManager;
 
 /**
diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php
index 604f63b996..c0db5b815d 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -2,13 +2,13 @@
 
 namespace System\Controllers;
 
-use Mail;
-use Flash;
-use BackendMenu;
 use Backend\Classes\Controller;
-use System\Models\MailTemplate;
-use System\Classes\SettingsManager;
+use Backend\Facades\BackendMenu;
 use Exception;
+use System\Classes\SettingsManager;
+use System\Models\MailTemplate;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Mail templates controller
@@ -32,7 +32,7 @@ class MailTemplates extends Controller
     public $listConfig = [
         'templates' => 'config_templates_list.yaml',
         'layouts' => 'config_layouts_list.yaml',
-        'partials' => 'config_partials_list.yaml'
+        'partials' => 'config_partials_list.yaml',
     ];
 
     /**
diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
index 3ea7a98519..80bebec434 100644
--- a/modules/system/controllers/RequestLogs.php
+++ b/modules/system/controllers/RequestLogs.php
@@ -2,12 +2,12 @@
 
 namespace System\Controllers;
 
-use Lang;
-use Flash;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
+use Illuminate\Support\Facades\Lang;
 use System\Classes\SettingsManager;
 use System\Models\RequestLog;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Request Logs controller
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index d417e71b5e..7b7dc4eff4 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -2,18 +2,18 @@
 
 namespace System\Controllers;
 
-use Mail;
-use Lang;
-use Flash;
-use Config;
-use Request;
-use Backend;
-use BackendMenu;
-use System\Classes\SettingsManager;
-use System\Behaviors\SettingsModel;
 use Backend\Classes\Controller;
-use ApplicationException;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
 use Exception;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use System\Behaviors\SettingsModel;
+use System\Classes\SettingsManager;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Settings controller
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index d5cd1f0dad..2027f5759b 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -2,24 +2,24 @@
 
 namespace System\Controllers;
 
-use ApplicationException;
-use Backend;
 use Backend\Classes\Controller;
-use BackendMenu;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
 use Cms\Classes\ThemeManager;
 use Exception;
-use File;
-use Flash;
-use Html;
-use Lang;
-use Markdown;
-use Redirect;
-use Response;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
 use System\Classes\PluginManager;
 use System\Classes\SettingsManager;
 use System\Classes\UpdateManager;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Html;
+use Winter\Storm\Support\Facades\Markdown;
 
 /**
  * Updates controller
@@ -42,7 +42,7 @@ class Updates extends Controller
      */
     public $listConfig = [
         'list' => 'config_list.yaml',
-        'manage' => 'config_manage_list.yaml'
+        'manage' => 'config_manage_list.yaml',
     ];
 
     /**
@@ -211,7 +211,7 @@ protected function getWarnings()
             foreach ($plugin as $missingPluginCode) {
                 $warnings[] = Lang::get('system::lang.updates.update_warnings_plugin_missing', [
                     'code' => '<strong>' . $missingPluginCode . '</strong>',
-                    'parent_code' => '<strong>' . $pluginCode . '</strong>'
+                    'parent_code' => '<strong>' . $pluginCode . '</strong>',
                 ]);
             }
         }
@@ -222,7 +222,7 @@ protected function getWarnings()
             if (PluginManager::instance()->getActiveReplacementMap($alias)) {
                 $warnings[] = Lang::get('system::lang.updates.update_warnings_plugin_replace', [
                     'plugin' => '<strong>' . $plugin . '</strong>',
-                    'alias' => '<strong>' . $alias . '</strong>'
+                    'alias' => '<strong>' . $alias . '</strong>',
                 ]);
             }
         }
@@ -545,7 +545,7 @@ public function onApplyUpdates()
 
                 if ($pluginAction == 'ignore') {
                     PluginVersion::whereCode($code)->update([
-                        'is_frozen' => true
+                        'is_frozen' => true,
                     ]);
                 }
             }
@@ -595,7 +595,7 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
             $updateSteps[] = [
                 'code'  => 'downloadCore',
                 'label' => Lang::get('system::lang.updates.core_downloading'),
-                'hash'  => $coreHash
+                'hash'  => $coreHash,
             ];
         }
 
@@ -604,7 +604,7 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
                 'code'  => 'downloadTheme',
                 'label' => Lang::get('system::lang.updates.theme_downloading', compact('name')),
                 'name'  => $name,
-                'hash'  => $hash
+                'hash'  => $hash,
             ];
         }
 
@@ -614,7 +614,7 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
                 'label' => Lang::get('system::lang.updates.plugin_downloading', compact('name')),
                 'name'  => $name,
                 'hash'  => $hash,
-                'install' => $isInstallationRequest ? 1 : 0
+                'install' => $isInstallationRequest ? 1 : 0,
             ];
         }
 
@@ -624,14 +624,14 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
         if ($coreHash) {
             $updateSteps[] = [
                 'code'  => 'extractCore',
-                'label' => Lang::get('system::lang.updates.core_extracting')
+                'label' => Lang::get('system::lang.updates.core_extracting'),
             ];
 
             $updateSteps[] = [
                 'code'  => 'setBuild',
                 'label' => Lang::get('system::lang.updates.core_set_build'),
                 'hash'  => $coreHash,
-                'build' => $coreBuild
+                'build' => $coreBuild,
             ];
         }
 
@@ -640,7 +640,7 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
                 'code' => 'extractTheme',
                 'label' => Lang::get('system::lang.updates.theme_extracting', compact('name')),
                 'name' => $name,
-                'hash' => $hash
+                'hash' => $hash,
             ];
         }
 
@@ -649,7 +649,7 @@ protected function buildUpdateSteps($core, $plugins, $themes, $isInstallationReq
                 'code' => 'extractPlugin',
                 'label' => Lang::get('system::lang.updates.plugin_extracting', compact('name')),
                 'name' => $name,
-                'hash' => $hash
+                'hash' => $hash,
             ];
         }
 
diff --git a/modules/system/database/migrations/2017_08_04_121309_Db_Deferred_Bindings_Add_Index_Session.php b/modules/system/database/migrations/2017_08_04_121309_Db_Deferred_Bindings_Add_Index_Session.php
index 7362159b39..8648282bdb 100644
--- a/modules/system/database/migrations/2017_08_04_121309_Db_Deferred_Bindings_Add_Index_Session.php
+++ b/modules/system/database/migrations/2017_08_04_121309_Db_Deferred_Bindings_Add_Index_Session.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class DbDeferredBindingsAddIndexSession extends Migration
 {
diff --git a/modules/system/database/migrations/2022_08_06_000026_Db_System_Add_App_Birthday_Date.php b/modules/system/database/migrations/2022_08_06_000026_Db_System_Add_App_Birthday_Date.php
index 25aaf9b993..cbbf079e6b 100644
--- a/modules/system/database/migrations/2022_08_06_000026_Db_System_Add_App_Birthday_Date.php
+++ b/modules/system/database/migrations/2022_08_06_000026_Db_System_Add_App_Birthday_Date.php
@@ -1,9 +1,9 @@
 <?php
 
-use Winter\Storm\Database\Updates\Migration;
 use Carbon\Carbon;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
+use Winter\Storm\Database\Updates\Migration;
 
 return new class extends Migration
 {
diff --git a/modules/system/database/migrations/2023_09_24_000028_Db_System_Sessions_Indexes.php b/modules/system/database/migrations/2023_09_24_000028_Db_System_Sessions_Indexes.php
index 2eecc3c6d3..12fe3943f6 100644
--- a/modules/system/database/migrations/2023_09_24_000028_Db_System_Sessions_Indexes.php
+++ b/modules/system/database/migrations/2023_09_24_000028_Db_System_Sessions_Indexes.php
@@ -1,8 +1,5 @@
 <?php
 
-use Winter\Storm\Database\Schema\Blueprint;
-use Winter\Storm\Support\Str;
-
 return new class extends \Winter\Storm\Database\Updates\Migration
 {
     public function up()
diff --git a/modules/system/database/seeds/DatabaseSeeder.php b/modules/system/database/seeds/DatabaseSeeder.php
index 9ed27c1818..1149b99f69 100644
--- a/modules/system/database/seeds/DatabaseSeeder.php
+++ b/modules/system/database/seeds/DatabaseSeeder.php
@@ -2,8 +2,8 @@
 
 namespace System\Database\Seeds;
 
-use Seeder;
-use Eloquent;
+use Illuminate\Database\Eloquent\Model as Eloquent;
+use Winter\Storm\Database\Updates\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
diff --git a/modules/system/database/seeds/SeedSetupMailLayouts.php b/modules/system/database/seeds/SeedSetupMailLayouts.php
index 2c2d9ace57..f2a95dfde4 100644
--- a/modules/system/database/seeds/SeedSetupMailLayouts.php
+++ b/modules/system/database/seeds/SeedSetupMailLayouts.php
@@ -2,8 +2,8 @@
 
 namespace System\Database\Seeds;
 
-use Seeder;
 use System\Models\MailLayout;
+use Winter\Storm\Database\Updates\Seeder;
 
 class SeedSetupMailLayouts extends Seeder
 {
diff --git a/modules/system/helpers/Cache.php b/modules/system/helpers/Cache.php
index bc32a6dfad..7f83d563e8 100644
--- a/modules/system/helpers/Cache.php
+++ b/modules/system/helpers/Cache.php
@@ -2,10 +2,10 @@
 
 namespace System\Helpers;
 
-use App;
-use File;
 use Cache as CacheFacade;
-use Config;
+use Illuminate\Support\Facades\App;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 class Cache
 {
diff --git a/modules/system/helpers/DateTime.php b/modules/system/helpers/DateTime.php
index 7a17d69426..a6709323c3 100644
--- a/modules/system/helpers/DateTime.php
+++ b/modules/system/helpers/DateTime.php
@@ -4,9 +4,9 @@
 
 use Carbon\Carbon;
 use DateTime as PhpDateTime;
-use InvalidArgumentException;
 use Exception;
-use Lang;
+use Illuminate\Support\Facades\Lang;
+use InvalidArgumentException;
 
 class DateTime
 {
diff --git a/modules/system/lang/ar/lang.php b/modules/system/lang/ar/lang.php
index c1ed3df95c..9d043e55f9 100644
--- a/modules/system/lang/ar/lang.php
+++ b/modules/system/lang/ar/lang.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'name' => 'نظام إدارة المحتوى أكتوبر',
-        'tagline' => 'عودة إلى الأساس'
+        'tagline' => 'عودة إلى الأساس',
     ],
     'locale' => [
         'ar' => 'العربية',
@@ -45,7 +45,7 @@
         'tr' => 'Türkçe',
         'uk' => 'Українська мова',
         'zh-cn' => '简体中文',
-        'zh-tw' => '繁體中文'
+        'zh-tw' => '繁體中文',
     ],
     'settings' => [
         'menu_label' => 'الإعدادات',
diff --git a/modules/system/lang/be/client.php b/modules/system/lang/be/client.php
index 0eb372b62c..6e50c44795 100644
--- a/modules/system/lang/be/client.php
+++ b/modules/system/lang/be/client.php
@@ -47,18 +47,18 @@
     'alert' => [
         'confirm_button_text' => "Добра",
         'cancel_button_text' => "Адмена",
-        'widget_remove_confirm' => 'Remove this widget?'
+        'widget_remove_confirm' => 'Remove this widget?',
     ],
     'datepicker' => [
         'previousMonth' => "Папярэдні месяц",
         'nextMonth' => "Наступны месяц",
         'months' => ["Студзень", "Люты", "Сакавік", "Красавік", "Травень", "Чэрвень", "Ліпень", "Жнівень", "Верасень", "Кастрычнік", "Лістапад", "Снежань"],
         'weekdays' => ["Нядзеля", "Панядзелак", "Аўторак", "Серада", "Чацвер", "Пятніца", "Субота"],
-        'weekdaysShort' => ["Нд", "Пн", "Аўт", "Ср", "Чацв", "Пн", "Сб"]
+        'weekdaysShort' => ["Нд", "Пн", "Аўт", "Ср", "Чацв", "Пн", "Сб"],
     ],
     'filter' => [
         'group' => [
-            'all' => "ўсе"
+            'all' => "ўсе",
         ],
         'dates' => [
             'all' => "ўсе",
@@ -66,8 +66,8 @@
             'reset_button_text'  => "Скінуць",
             'date_placeholder' => "Дата",
             'after_placeholder' => "Папярэдняя",
-            'before_placeholder' => "Наступная"
-        ]
+            'before_placeholder' => "Наступная",
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => "Паказаць трасіроўку стэка",
@@ -82,7 +82,7 @@
             'openWith' => "Адчыніць з дапамогай",
             'remember_choice' => "Запомніць абраны варыянт для гэтай сесіі",
             'open' => "Адчыніць",
-            'cancel' => "Адмяніць"
-        ]
-    ]
+            'cancel' => "Адмяніць",
+        ],
+    ],
 ];
diff --git a/modules/system/lang/be/lang.php b/modules/system/lang/be/lang.php
index 92e5fb7ac4..433483416f 100644
--- a/modules/system/lang/be/lang.php
+++ b/modules/system/lang/be/lang.php
@@ -3,16 +3,16 @@
 return [
     'app' => [
         'name' => "Winter CMS",
-        'tagline' => "Вяртанне да вытокаў"
+        'tagline' => "Вяртанне да вытокаў",
     ],
     'directory' => [
-        'create_fail' => "Немагчыма стварыць каталог: \":name\""
+        'create_fail' => "Немагчыма стварыць каталог: \":name\"",
     ],
     'file' => [
-        'create_fail' => "Немагчыма стварыць файл: \":name\""
+        'create_fail' => "Немагчыма стварыць файл: \":name\"",
     ],
     'combiner' => [
-        'not_found' => "Аб'яднальны файл \":name\" не знойдзены"
+        'not_found' => "Аб'яднальны файл \":name\" не знойдзены",
     ],
     'page' => [
         'invalid_token' => [
@@ -34,15 +34,15 @@
             'social' => "Сацыяльнае",
             'events' => "Падзеі",
             'customers' => "Кліенты",
-            'my_settings' => "Маі налады"
-        ]
+            'my_settings' => "Маі налады",
+        ],
     ],
     'theme' => [
         'label' => "Тэма",
         'unnamed' => "Тэма без назвы",
         'name' => [
             'label' => "Імя тэма",
-            'help' => "Назавіце тэму па яе ўнікальнаму коду. Напрыклад, Winter.Vanilla"
+            'help' => "Назавіце тэму па яе ўнікальнаму коду. Напрыклад, Winter.Vanilla",
         ],
     ],
     'themes' => [
@@ -51,15 +51,15 @@
         'installed' => "Усталяваныя тэмы",
         'no_themes' => "Няма тэм, ўсталяваных з крамы",
         'recommended' => "Рэкамендаваныя",
-        'remove_confirm' => "Вы ўпэўнены, што жадаеце выдаліць гэтую тэму?"
+        'remove_confirm' => "Вы ўпэўнены, што жадаеце выдаліць гэтую тэму?",
     ],
     'plugin' => [
         'label' => "Плагін",
         'unnamed' => "Плагін без назвы",
         'name' => [
             'label' => "Назва плагіну",
-            'help' => "Назавіце плагін па яго ўнікальнаму коду. Напрыклад, Winter.Blog"
-        ]
+            'help' => "Назавіце плагін па яго ўнікальнаму коду. Напрыклад, Winter.Blog",
+        ],
     ],
     'plugins' => [
         'manage' => "Кіраванне плагінамі",
@@ -85,7 +85,7 @@
         'disable_confirm' => "Вы ўпэўнены?",
         'disable_success' => "Плагіны паспяхова выключаныя",
         'enable_success' => "Плагіны паспяхова ўключаныя",
-        'unknown_plugin' => "Плагін быў выдалены з файлавай сістэмы"
+        'unknown_plugin' => "Плагін быў выдалены з файлавай сістэмы",
     ],
     'project' => [
         'name' => "Праект",
@@ -96,10 +96,10 @@
         'id' => [
             'label' => "ID праекту",
             'help' => "Як адшукаць ID праекту",
-            'missing' => "Калі ласка, укажыце ID праекту, які Вы жадаеце выкарыстоўваць"
+            'missing' => "Калі ласка, укажыце ID праекту, які Вы жадаеце выкарыстоўваць",
         ],
         'detach_confirm' => "Вы ўпэўнены, што жадаеце аддзяліць гэты праект?",
-        'unbind_success' => "Праект быў аддзелены"
+        'unbind_success' => "Праект быў аддзелены",
     ],
     'settings' => [
         'menu_label' => "Налады",
@@ -107,7 +107,7 @@
         'missing_model' => "На старонцы налад не вызначана мадэль",
         'update_success' => ":name налады абноўленыя",
         'return' => "Вярнуцца да сістэмных налад",
-        'search' => "Пошук"
+        'search' => "Пошук",
     ],
     'mail' => [
         'log_file' => "Log file",
@@ -162,7 +162,7 @@
         'deleting' => "Выдаленне шаблону...",
         'deleting_layout' => "Выдаленне макету...",
         'sending' => "Адпраўленне тэставага паведамлення...",
-        'return' => "Вярнуцца да спісу шаблонаў"
+        'return' => "Вярнуцца да спісу шаблонаў",
     ],
     'install' => [
         'project_label' => "Далучыць да праекту",
@@ -171,7 +171,7 @@
         'missing_plugin_name' => "Калі ласка, укажыце назву плагіна, каб усталяваць",
         'missing_theme_name' => "Калі ласка, укажыце назву тэмы, каб усталяваць",
         'install_completing' => "Завяршэнне працэсу ўсталявання",
-        'install_success' => "Плагін быў паспяхова ўсталяваны"
+        'install_success' => "Плагін быў паспяхова ўсталяваны",
     ],
     'updates' => [
         'title' => "Кіраванне абнаўленнямі",
@@ -209,17 +209,17 @@
         'force_label' => "Прымусіць абнаўленне",
         'found' => [
             'label' => "Знойдзены новыя абнаўленні!",
-            'help' => "Націсніце \"Абнавіць праграму\", каб пачаць абнаўленне"
+            'help' => "Націсніце \"Абнавіць праграму\", каб пачаць абнаўленне",
         ],
         'none' => [
             'label' => "Няма абнаўленняў",
-            'help' => "Не было знойдзена абнаўленняў"
+            'help' => "Не было знойдзена абнаўленняў",
         ],
         'important_action' => [
             'empty' => "Выберыце дзеянне",
             'confirm' => "Пацвердзіць абнаўленне",
             'skip' => "Прапусціць гэты плагін (аднойчы)",
-            'ignore' => "Прапусціць гэта плагін (заўсёды)"
+            'ignore' => "Прапусціць гэта плагін (заўсёды)",
         ],
         'important_action_required' => "Патрабуецца дзеянне",
         'important_view_guide' => "Прагледзець кіраўніцтва па абнаўленні",
@@ -235,7 +235,7 @@
         'details_licence' => "Ліцэнзія",
         'details_licence_missing' => "Няма тэксту ліцэнзіі",
         'details_current_version' => "Бягучая версія",
-        'details_author' => "Аўтар"
+        'details_author' => "Аўтар",
     ],
     'server' => [
         'connect_error' => "Памылка падключэння да серверу",
@@ -243,17 +243,17 @@
         'response_invalid' => "Няправільны адказ з сервера",
         'response_empty' => "Пусты адказ с сервера",
         'file_error' => "Сервер не змог даставіць пакет",
-        'file_corrupt' => "Файл з сервера прыйшоў сапсаваны"
+        'file_corrupt' => "Файл з сервера прыйшоў сапсаваны",
     ],
     'behavior' => [
-        'missing_property' => "Клас \":class\" павінен вызначаць уласцівасць \"$:property\", якая выкарыстоўваецца паводзінамі \":behavior\""
+        'missing_property' => "Клас \":class\" павінен вызначаць уласцівасць \"$:property\", якая выкарыстоўваецца паводзінамі \":behavior\"",
     ],
     'config' => [
         'not_found' => "Немагчыма адшукаць файл канфігурацыі \":file\", вызначаны ў \":location\"",
-        'required' => "Выкарастаная ў \":location\" канфігурацыя павінна мець значэнне для \":property\""
+        'required' => "Выкарастаная ў \":location\" канфігурацыя павінна мець значэнне для \":property\"",
     ],
     'zip' => [
-        'extract_failed' => "Немагчыма выняць файл \":file\""
+        'extract_failed' => "Немагчыма выняць файл \":file\"",
     ],
     'event_log' => [
         'hint' => "Гэты ліст адлюстроўвае спіс магчымых памылак, якія могуць ўзнікнуць у прыкладанні, напрыклад, выключэнні і адладкавая інфармацыя",
@@ -268,7 +268,7 @@
         'created_at' => "Дата і час",
         'message' => "Паведамленне",
         'level' => "Узровень",
-        'preview_title' => "Падзея"
+        'preview_title' => "Падзея",
     ],
     'request_log' => [
         'hint' => "Гэтыя запісы паказваюць спіс браузерных запытаў, якія могуць патрабаваць увагі. Напрыклад, калі наведвальнік адчыняе старонку, якой няма, будзе створаны запіс з кодам 404",
@@ -284,7 +284,7 @@
         'referer' => "Крыніцы",
         'url' => "URL",
         'status_code' => "Статус",
-        'preview_title' => "Запыт"
+        'preview_title' => "Запыт",
     ],
     'permissions' => [
         'name' => "Сістэма",
@@ -297,7 +297,7 @@
         'manage_preferences' => "Кіраванне перавагамі панэлі кіравання",
         'manage_editor' => "Кіраванне перавагамі рэдакатару коду",
         'view_the_dashboard' => "Прагледзець панэль кіравання",
-        'manage_branding' => "Наладзіць панэль кіравання"
+        'manage_branding' => "Наладзіць панэль кіравання",
     ],
     'media' => [
         'invalid_path' => "Няправільны шлях да файлу: \":path\"",
diff --git a/modules/system/lang/bg/lang.php b/modules/system/lang/bg/lang.php
index b16fb70f79..b527650bce 100644
--- a/modules/system/lang/bg/lang.php
+++ b/modules/system/lang/bg/lang.php
@@ -3,16 +3,16 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Връщане към основите'
+        'tagline' => 'Връщане към основите',
     ],
     'directory' => [
-        'create_fail' => 'Не може да създаде директория(папка): :name'
+        'create_fail' => 'Не може да създаде директория(папка): :name',
     ],
     'file' => [
-        'create_fail' => 'Не може да създаде файл: :name'
+        'create_fail' => 'Не може да създаде файл: :name',
     ],
     'combiner' => [
-        'not_found' => "Комбинираният файл ':name' не е намерен."
+        'not_found' => "Комбинираният файл ':name' не е намерен.",
     ],
     'page' => [
         'invalid_token' => [
@@ -34,15 +34,15 @@
             'social' => 'Социален',
             'events' => 'Събития',
             'customers' => 'Клиенти',
-            'my_settings' => 'Моите настройки'
-        ]
+            'my_settings' => 'Моите настройки',
+        ],
     ],
     'theme' => [
         'label' => 'Тема',
         'unnamed' => 'Тема без име',
         'name' => [
             'label' => 'Име на тема',
-            'help' => 'Именувайте темата с уникално име. Например: Winter.Vanilla'
+            'help' => 'Именувайте темата с уникално име. Например: Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -51,15 +51,15 @@
         'installed' => 'Инсталирани теми',
         'no_themes' => 'Няма инсталирани теми от маркета.',
         'recommended' => 'Препоръчано',
-        'remove_confirm' => 'Наистина ли искате да премахнете тази тема?'
+        'remove_confirm' => 'Наистина ли искате да премахнете тази тема?',
     ],
     'plugin' => [
         'label' => 'Добавки',
         'unnamed' => 'Без име добавка',
         'name' => [
             'label' => 'Име на добавка',
-            'help' => 'Именувайте добавката с уникално име. Например: Winter.Blog'
-        ]
+            'help' => 'Именувайте добавката с уникално име. Например: Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => 'Управление на добавки',
@@ -85,7 +85,7 @@
         'disable_confirm' => 'Наистина ли искате да ги изключите?',
         'disable_success' => 'Успешно изключени на добавките.',
         'enable_success' => 'Успешно включване на добавките.',
-        'unknown_plugin' => 'Добавката е премахната от системата.'
+        'unknown_plugin' => 'Добавката е премахната от системата.',
     ],
     'project' => [
         'name' => 'Проект',
@@ -96,10 +96,10 @@
         'id' => [
             'label' => 'Проект ID',
             'help' => 'Как да намерите своя Проект ID',
-            'missing' => 'Моля, задайте Проект ID за да го използвате.'
+            'missing' => 'Моля, задайте Проект ID за да го използвате.',
         ],
         'detach_confirm' => 'Сигурни ли сте, че искате да премахнете този Проект?',
-        'unbind_success' => 'Този Проект е премахнат успешно.'
+        'unbind_success' => 'Този Проект е премахнат успешно.',
     ],
     'settings' => [
         'menu_label' => 'Настройки',
@@ -107,7 +107,7 @@
         'missing_model' => 'Страницата за Настройки липсва дефиниция на модел.',
         'update_success' => 'Настройките за :name бяха успешно променени.',
         'return' => 'Връщане към системните настройки.',
-        'search' => 'Търсене'
+        'search' => 'Търсене',
     ],
     'mail' => [
         'log_file' => 'Регистрационен файл',
@@ -162,7 +162,7 @@
         'deleting' => 'Изтриване на Шаблон...',
         'deleting_layout' => 'Изтриване на Оформление...',
         'sending' => 'Изпращане на тестово съобщение...',
-        'return' => 'Назад към списъка с шаблон'
+        'return' => 'Назад към списъка с шаблон',
     ],
     'install' => [
         'project_label' => 'Закачете за Проект',
@@ -171,7 +171,7 @@
         'missing_plugin_name' => 'Моля, укажете име на Добавката за инсталиране.',
         'missing_theme_name' => 'Моля, укажете име на Темата за инсталиране.',
         'install_completing' => 'Завършване на инсталационния процес.',
-        'install_success' => 'Добавката е инсталирана успешно.'
+        'install_success' => 'Добавката е инсталирана успешно.',
     ],
     'updates' => [
         'title' => 'Управление Актуализации',
@@ -210,11 +210,11 @@
         'force_label' => 'Принудителна актуализация',
         'found' => [
             'label' => 'Намерени нови актуализации!',
-            'help' => 'Кликнете "Софтуерна Актуализация", за да започнете процеса на актуализиране.'
+            'help' => 'Кликнете "Софтуерна Актуализация", за да започнете процеса на актуализиране.',
         ],
         'none' => [
             'label' => 'Няма актуализации',
-            'help' => 'Няма намерени нови актуализации.'
+            'help' => 'Няма намерени нови актуализации.',
         ],
         'important_action' => [
             'empty' => 'Изберете действие',
@@ -240,17 +240,17 @@
         'response_invalid' => 'Невалиден отговор от сървъра.',
         'response_empty' => 'Празен отговор от сървъра.',
         'file_error' => 'Сървър не успя да достави пакета.',
-        'file_corrupt' => 'Файл от сървъра е развален (разрушен).'
+        'file_corrupt' => 'Файл от сървъра е развален (разрушен).',
     ],
     'behavior' => [
-        'missing_property' => 'Класът :class трябва да има свойството $:property използвано :behavior поведение.'
+        'missing_property' => 'Класът :class трябва да има свойството $:property използвано :behavior поведение.',
     ],
     'config' => [
         'not_found' => 'Не може да се намери конфигурационен файл :file определен за :location.',
-        'required' => "Конфигурация използва в :location трябва да предостави стойност ':property'."
+        'required' => "Конфигурация използва в :location трябва да предостави стойност ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Не може да се разопакова (извлече) ядрото на файл ':file'."
+        'extract_failed' => "Не може да се разопакова (извлече) ядрото на файл ':file'.",
     ],
     'event_log' => [
         'hint' => 'Този дневник (регистър) показва списък на потенциални грешки, които възникват в приложението, като изключения и информацията за грешки.',
@@ -264,7 +264,7 @@
         'id_label' => 'Събитие ID',
         'created_at' => 'Дата и час',
         'message' => 'Съобщение',
-        'level' => 'Ниво'
+        'level' => 'Ниво',
     ],
     'request_log' => [
         'hint' => 'Този дневник показва списък с заявките на браузъра, които могат да изискват внимание. Например, ако един посетител отваря CMS страница, която не може да се намери, се създава запис с код за грешка 404.',
@@ -279,7 +279,7 @@
         'count' => 'Брояч',
         'referer' => 'Референти',
         'url' => 'URL',
-        'status_code' => 'Статус'
+        'status_code' => 'Статус',
     ],
     'permissions' => [
         'name' => 'Система',
@@ -292,7 +292,7 @@
         'manage_preferences' => 'Управление на предпочитанията на админ панела',
         'manage_editor' => 'Управление на предпочитанията на редактор на код',
         'view_the_dashboard' => 'Преглед на таблото',
-        'manage_branding' => 'Персонализиране на админ панела'
+        'manage_branding' => 'Персонализиране на админ панела',
     ],
     'media' => [
         'invalid_path' => "Невалиден път за файл е посочено: ':path'.",
diff --git a/modules/system/lang/ca/client.php b/modules/system/lang/ca/client.php
index f98a2aac01..3609308225 100644
--- a/modules/system/lang/ca/client.php
+++ b/modules/system/lang/ca/client.php
@@ -47,21 +47,21 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Cancel·lar',
-        'widget_remove_confirm' => 'Eliminar aquest widget?'
+        'widget_remove_confirm' => 'Eliminar aquest widget?',
     ],
     'datepicker' => [
         'previousMonth' => 'Mes anterior',
         'nextMonth' => 'Mes següent',
         'months' => ['Gener', 'Febrer', 'Març', 'Abril', 'Maig', 'Juny', 'Juliol', 'Agost', 'Setembre', 'Octubre', 'Novembre', 'Desembre'],
         'weekdays' => ['Diumenge', 'Dilluns', 'Dimarts', 'Dimecres', 'Dijous', 'Divendres', 'Dissabte'],
-        'weekdaysShort' => ['Dg', 'Dl', 'Dm', 'Dx', 'Dj', 'Dv', 'Ds']
+        'weekdaysShort' => ['Dg', 'Dl', 'Dm', 'Dx', 'Dj', 'Dv', 'Ds'],
     ],
     'colorpicker' => [
         'choose' => 'Ok',
     ],
     'filter' => [
         'group' => [
-            'all' => 'tots'
+            'all' => 'tots',
         ],
         'dates' => [
             'all' => 'tots',
@@ -69,15 +69,15 @@
             'reset_button_text'  => 'Reiniciar',
             'date_placeholder' => 'Data',
             'after_placeholder' => 'Després',
-            'before_placeholder' => 'Abans'
+            'before_placeholder' => 'Abans',
         ],
         'numbers' => [
             'all' => 'tots',
             'filter_button_text' => 'Filtrar',
             'reset_button_text'  => 'Reiniciar',
             'min_placeholder' => 'Mín',
-            'max_placeholder' => 'Màx'
-        ]
+            'max_placeholder' => 'Màx',
+        ],
 
     ],
     'eventlog' => [
@@ -93,7 +93,7 @@
             'openWith' => 'Obrir amb',
             'remember_choice' => "Recordar l'opció seleccionada durant aquesta sessió",
             'open' => 'Obrir',
-            'cancel' => 'Cancel·lar'
-        ]
-    ]
+            'cancel' => 'Cancel·lar',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/ca/lang.php b/modules/system/lang/ca/lang.php
index 1f754af157..0d61b38407 100644
--- a/modules/system/lang/ca/lang.php
+++ b/modules/system/lang/ca/lang.php
@@ -3,16 +3,16 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Tornant als bàsics'
+        'tagline' => 'Tornant als bàsics',
     ],
     'directory' => [
-        'create_fail' => 'No es pot crear el directori: :name'
+        'create_fail' => 'No es pot crear el directori: :name',
     ],
     'file' => [
-        'create_fail' => "No es pot crear l'arxiu: :name"
+        'create_fail' => "No es pot crear l'arxiu: :name",
     ],
     'combiner' => [
-        'not_found' => "L'arxiu de combinació ':name' no s'ha trobat."
+        'not_found' => "L'arxiu de combinació ':name' no s'ha trobat.",
     ],
     'system' => [
         'name' => 'Sistema',
@@ -31,15 +31,15 @@
             'events' => 'Esdeveniments',
             'customers' => 'Clients',
             'my_settings' => 'Les meves opcions',
-            'notifications' => 'Notificacions'
-        ]
+            'notifications' => 'Notificacions',
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Tema sense nom',
         'name' => [
             'label' => 'Nom del tema',
-            'help' => 'Anomena el tema amb el seu codi únic. Per exemple, Winter.Vanilla'
+            'help' => 'Anomena el tema amb el seu codi únic. Per exemple, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -48,14 +48,14 @@
         'installed' => 'Temes instal·lats',
         'no_themes' => 'No hi ha temes instal·lats des del mercat.',
         'recommended' => 'Recomanats',
-        'remove_confirm' => 'Estàs segur que vols eliminar aquest tema?'
+        'remove_confirm' => 'Estàs segur que vols eliminar aquest tema?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Plugin sense nom',
         'name' => [
             'label' => 'Nom del plugin',
-            'help' => 'Anomena el tema amb el seu codi únic. Per exemple, Winter.Blog'
+            'help' => 'Anomena el tema amb el seu codi únic. Per exemple, Winter.Blog',
         ],
         'by_author' => 'Per :name',
     ],
@@ -104,10 +104,10 @@
         'id' => [
             'label' => 'ID de projecte',
             'help' => 'Com trobar la teva ID de projecte',
-            'missing' => 'Si us plau indica una ID de projecte.'
+            'missing' => 'Si us plau indica una ID de projecte.',
         ],
         'detach_confirm' => 'Estàs segur que vols desvincular aquest projecte?',
-        'unbind_success' => 'El projecte ha estat desvinculat.'
+        'unbind_success' => 'El projecte ha estat desvinculat.',
     ],
     'settings' => [
         'menu_label' => 'Opcions',
@@ -115,7 +115,7 @@
         'missing_model' => "La pàgina d'opcions no té una definició de Model.",
         'update_success' => 'Opcions de :name actualitzades',
         'return' => 'Tornar a les opcions del sistema',
-        'search' => 'Cercar'
+        'search' => 'Cercar',
     ],
     'mail' => [
         'log_file' => 'Arxiu de registre',
@@ -174,7 +174,7 @@
         'deleting' => 'Eliminant plantilla...',
         'deleting_layout' => 'Eliminant disposició...',
         'sending' => 'Enviant missatge de prova...',
-        'return' => 'Tornar a la llista de plantilles'
+        'return' => 'Tornar a la llista de plantilles',
     ],
     'mail_brand' => [
         'menu_label' => 'Branding del correu',
@@ -188,7 +188,7 @@
                 'description' => 'Descripció',
                 'price' => 'Preu',
                 'centered' => 'Centrat',
-                'right_aligned' => 'Alineat a la dreta'
+                'right_aligned' => 'Alineat a la dreta',
             ],
             'buttons' => [
                 'primary' => 'Botó primari',
@@ -199,7 +199,7 @@
             'more' => 'Una mica més de text',
             'promotion' => 'Codi de cupó: WINTER',
             'subcopy' => "Això és un subcopy de l'email",
-            'thanks' => 'Gràcies'
+            'thanks' => 'Gràcies',
         ],
         'fields' => [
             '_section_background' => 'Fons',
@@ -225,7 +225,7 @@
             'panel_bg' => 'Fons del panell',
             'promotion_bg' => 'Fons de la promoció',
             'promotion_border_color' => 'Color de la vora de la promoció',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Vincular a projecte',
@@ -234,7 +234,7 @@
         'missing_plugin_name' => 'Si us plau indica un nom de plugin per a instal·lar.',
         'missing_theme_name' => 'Si us plau indica un nom de tema per a instal·lar.',
         'install_completing' => "Finalitzant el procès d'instal·lació",
-        'install_success' => 'Plugin instal·lat correctament'
+        'install_success' => 'Plugin instal·lat correctament',
     ],
     'updates' => [
         'title' => 'Gestionar actualitzacions',
@@ -274,17 +274,17 @@
         'force_label' => 'Forçar actualització',
         'found' => [
             'label' => "S'han trobat noves actualitzacions!",
-            'help' => "Clica 'Actualitzar software' per començar el procès d'actualització."
+            'help' => "Clica 'Actualitzar software' per començar el procès d'actualització.",
         ],
         'none' => [
             'label' => 'No hi ha actualitzacions',
-            'help' => "No s'han trobat noves actualitzacions."
+            'help' => "No s'han trobat noves actualitzacions.",
         ],
         'important_action' => [
             'empty' => 'Seleccionar acció',
             'confirm' => 'Confirmar actualització',
             'skip' => 'Saltar aquesta actualització (només aquest cop)',
-            'ignore' => 'Saltar aquesta actualització (sempre)'
+            'ignore' => 'Saltar aquesta actualització (sempre)',
         ],
         'important_action_required' => 'Acció requerida',
         'important_view_guide' => "Veure la guia d'actualització",
@@ -301,7 +301,7 @@
         'details_licence' => 'Llicència',
         'details_licence_missing' => "No s'ha proveït llicència.",
         'details_current_version' => 'Versió actual',
-        'details_author' => 'Autor'
+        'details_author' => 'Autor',
     ],
     'server' => [
         'connect_error' => 'Error connectant al servidor.',
@@ -309,17 +309,17 @@
         'response_invalid' => 'Resposta invàlida del servidor.',
         'response_empty' => 'Resposta buida del servidor.',
         'file_error' => 'El servidor no ha pogut proporcionar el paquet.',
-        'file_corrupt' => "L'arxiu del servidor està corrupte."
+        'file_corrupt' => "L'arxiu del servidor està corrupte.",
     ],
     'behavior' => [
-        'missing_property' => 'La classe :class ha de definir la propietat $:property utilitzada pel comportament :behavior.'
+        'missing_property' => 'La classe :class ha de definir la propietat $:property utilitzada pel comportament :behavior.',
     ],
     'config' => [
         'not_found' => "No ha estat possible trobar l'arxiu de configuració :file definit per :location.",
-        'required' => "La configuració utilitzada a :location ha de proporcionar un valor ':property'."
+        'required' => "La configuració utilitzada a :location ha de proporcionar un valor ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "No ha estat possible extreure el fitxer de core ':file'."
+        'extract_failed' => "No ha estat possible extreure el fitxer de core ':file'.",
     ],
     'event_log' => [
         'hint' => "Aquest registre mostra una llista d'errors potencials que ocorren a l'aplicació, com ara excepcions o informació de depuració.",
@@ -334,7 +334,7 @@
         'created_at' => 'Data i hora',
         'message' => 'Missatge',
         'level' => 'Nivell',
-        'preview_title' => 'Esdeveniment'
+        'preview_title' => 'Esdeveniment',
     ],
     'request_log' => [
         'hint' => "Aquest registre mostra una llista de peticions de navegador que podrien requerir atenció. Per exemple, si un visitant obre una pàgina de CMS que no es pot trobar, es crea un registre amb l'estat 404.",
@@ -350,7 +350,7 @@
         'referer' => 'Referers',
         'url' => 'URL',
         'status_code' => 'Estat',
-        'preview_title' => 'Petició'
+        'preview_title' => 'Petició',
     ],
     'permissions' => [
         'name' => 'Sistema',
@@ -363,7 +363,7 @@
         'manage_preferences' => 'Gestionar preferències del panell',
         'manage_editor' => "Gestionar preferències de l'editor de codi",
         'view_the_dashboard' => "Veure l'escriptori",
-        'manage_branding' => 'Personalitzar el panell'
+        'manage_branding' => 'Personalitzar el panell',
     ],
     'log' => [
         'menu_label' => 'Opcions de registre',
diff --git a/modules/system/lang/cs/lang.php b/modules/system/lang/cs/lang.php
index be78941a12..8755205854 100644
--- a/modules/system/lang/cs/lang.php
+++ b/modules/system/lang/cs/lang.php
@@ -3,13 +3,13 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Návrat ke kořenům'
+        'tagline' => 'Návrat ke kořenům',
     ],
     'directory' => [
-        'create_fail' => 'Nelze vytvořit složku: :name'
+        'create_fail' => 'Nelze vytvořit složku: :name',
     ],
     'file' => [
-        'create_fail' => 'Nelze vytvořit soubor: :name'
+        'create_fail' => 'Nelze vytvořit soubor: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -17,7 +17,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Slučující soubor ':name' nebyl nalezen."
+        'not_found' => "Slučující soubor ':name' nebyl nalezen.",
     ],
     'system' => [
         'name' => 'Systém',
@@ -36,15 +36,15 @@
             'events' => 'Události',
             'customers' => 'Zákazníci',
             'my_settings' => 'Moje nastavení',
-            'notifications' => 'Oznámení'
-        ]
+            'notifications' => 'Oznámení',
+        ],
     ],
     'theme' => [
         'label' => 'Téma',
         'unnamed' => 'Téma bez názvu',
         'name' => [
             'label' => 'Název téma',
-            'help' => 'Název téma podle jeho unikátního názvu, například Winter.Vanilla'
+            'help' => 'Název téma podle jeho unikátního názvu, například Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -53,16 +53,16 @@
         'installed' => 'Instalované téma',
         'no_themes' => 'Žádné téma instalované z tržiště.',
         'recommended' => 'Doporučené',
-        'remove_confirm' => 'Opravdu chcete odstranit toto téma?'
+        'remove_confirm' => 'Opravdu chcete odstranit toto téma?',
     ],
     'plugin' => [
         'label' => 'Pluginy',
         'unnamed' => 'Plugin bez jména',
         'name' => [
             'label' => 'Název pluginu',
-            'help' => 'Pojmenujte plugin unikátním kódem, například Winter.Blog'
+            'help' => 'Pojmenujte plugin unikátním kódem, například Winter.Blog',
         ],
-        'by_author' => 'Vytvořil :name'
+        'by_author' => 'Vytvořil :name',
     ],
     'plugins' => [
         'manage' => 'Správa pluginů',
@@ -88,7 +88,7 @@
         'disable_confirm' => 'Jste si jistí?',
         'disable_success' => 'Pluginy úspěšně deaktivovány.',
         'enable_success' => 'Pluginy úspěšně aktivovány.',
-        'unknown_plugin' => 'Plugin odstraněn ze systému.'
+        'unknown_plugin' => 'Plugin odstraněn ze systému.',
     ],
     'project' => [
         'name' => 'Projekt',
@@ -99,10 +99,10 @@
         'id' => [
             'label' => 'Projekt ID',
             'help' => 'Jak zjistím svoje Projektové ID',
-            'missing' => 'Zadejte vaše Projektové ID.'
+            'missing' => 'Zadejte vaše Projektové ID.',
         ],
         'detach_confirm' => 'Jste si jistí, že chcete odpojit váš projekt?',
-        'unbind_success' => 'Projekt byl úspěšně odpojen.'
+        'unbind_success' => 'Projekt byl úspěšně odpojen.',
     ],
     'settings' => [
         'menu_label' => 'Nastavení',
@@ -110,7 +110,7 @@
         'missing_model' => 'Stránka s nastavením vyžaduje definovat Model.',
         'update_success' => 'Nastavení pro :name byla úspěšně uložena.',
         'return' => 'Zpět do systémového nastavení',
-        'search' => 'Hledat'
+        'search' => 'Hledat',
     ],
     'mail' => [
         'log_file' => 'Soubor protokolu',
@@ -182,7 +182,7 @@
         'missing_plugin_name' => 'Zadejte prosím jméno pluginu které chcete instalovat.',
         'missing_theme_name' => 'Zadejte prosím jméno téma které chcete instalovat.',
         'install_completing' => 'Dokončování instalace',
-        'install_success' => 'Plugin byl úspěšně nainstalován.'
+        'install_success' => 'Plugin byl úspěšně nainstalován.',
     ],
     'updates' => [
         'title' => 'Správa aktualizací',
@@ -221,11 +221,11 @@
         'force_label' => 'Vynutit aktualizaci',
         'found' => [
             'label' => 'Nová aktualizace nalezeny!',
-            'help' => 'Klikněte na Instalovat aktualizace pro spuštění aktualizace.'
+            'help' => 'Klikněte na Instalovat aktualizace pro spuštění aktualizace.',
         ],
         'none' => [
             'label' => 'Žádné aktualizace',
-            'help' => 'Nebyly nalezeny žádné aktualizace.'
+            'help' => 'Nebyly nalezeny žádné aktualizace.',
         ],
         'important_action' => [
             'empty' => 'Vyberte akci',
@@ -256,17 +256,17 @@
         'response_invalid' => 'Špatná odpověď ze serveru.',
         'response_empty' => 'Prázdná odpověď ze serveru.',
         'file_error' => 'Chyba stahování balíčku ze serveru.',
-        'file_corrupt' => 'Soubor stažený ze serveru je chybný.'
+        'file_corrupt' => 'Soubor stažený ze serveru je chybný.',
     ],
     'behavior' => [
-        'missing_property' => 'Třída :class musí definovat parametr $:property použitý v třídě chování :behavior.'
+        'missing_property' => 'Třída :class musí definovat parametr $:property použitý v třídě chování :behavior.',
     ],
     'config' => [
         'not_found' => 'Nepovedlo se najít konfigurační soubor :file, který je definován pro :location.',
-        'required' => "Konfigurace použitá v :location musí obsahovat hodnotu ':property'."
+        'required' => "Konfigurace použitá v :location musí obsahovat hodnotu ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Nepovedlo se rozbalit soubor ':file'."
+        'extract_failed' => "Nepovedlo se rozbalit soubor ':file'.",
     ],
     'event_log' => [
         'hint' => 'Záznam potencionálních chyb v aplikaci, jako třeba vyjímky, nebo ladící informace.',
@@ -280,7 +280,7 @@
         'id_label' => 'ID události',
         'created_at' => 'Datum a čas',
         'message' => 'Zpráva',
-        'level' => 'Úroveň'
+        'level' => 'Úroveň',
     ],
     'request_log' => [
         'hint' => 'Tento záznam obsahuje požadavky na vaše stránky, které vyžadují pozornost, například stránky které nebylo možné najít, nebo vrací chybový kód 404.',
@@ -295,7 +295,7 @@
         'count' => 'Počítadlo',
         'referer' => 'Odkaz',
         'url' => 'URL',
-        'status_code' => 'Status'
+        'status_code' => 'Status',
     ],
     'permissions' => [
         'name' => 'Systém',
@@ -308,7 +308,7 @@
         'manage_preferences' => 'Správa nastavení administrace',
         'manage_editor' => 'Správa nastavení editoru kódu',
         'view_the_dashboard' => 'Zobrazit plochu',
-        'manage_branding' => 'Nastavení administrace'
+        'manage_branding' => 'Nastavení administrace',
     ],
     'log' => [
         'menu_label' => 'Nastavení protokolů',
diff --git a/modules/system/lang/da/client.php b/modules/system/lang/da/client.php
index e9b1a71986..a7dd9f3276 100644
--- a/modules/system/lang/da/client.php
+++ b/modules/system/lang/da/client.php
@@ -56,12 +56,12 @@
         'nextMonth' => 'Næste Måned',
         'months' => ['Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December'],
         'weekdays' => ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
-        'weekdaysShort' => ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør']
+        'weekdaysShort' => ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'],
     ],
 
     'filter' => [
         'group' => [
-            'all' => 'Alle'
+            'all' => 'Alle',
         ],
         'dates' => [
             'all' => 'alle',
@@ -69,8 +69,8 @@
             'reset_button_text'  => 'Nulstil',
             'date_placeholder' => 'Dato',
             'after_placeholder' => 'Efter',
-            'before_placeholder' => 'Før'
-        ]
+            'before_placeholder' => 'Før',
+        ],
     ],
 
     'eventlog' => [
@@ -86,7 +86,7 @@
             'openWith' => 'Åben med',
             'remember_choice' => 'Husk valgte mulighed for denne session',
             'open' => 'Åben',
-            'cancel' => 'Fortryd'
-        ]
-    ]
+            'cancel' => 'Fortryd',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/da/lang.php b/modules/system/lang/da/lang.php
index f4e707e44c..c6a36cdd60 100644
--- a/modules/system/lang/da/lang.php
+++ b/modules/system/lang/da/lang.php
@@ -3,13 +3,13 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Getting back to basics'
+        'tagline' => 'Getting back to basics',
     ],
     'directory' => [
-        'create_fail' => 'Kan ikke oprette mappen: :name'
+        'create_fail' => 'Kan ikke oprette mappen: :name',
     ],
     'file' => [
-        'create_fail' => 'Kan ikke oprette filen: :name'
+        'create_fail' => 'Kan ikke oprette filen: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -17,7 +17,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Kombineringsfilen ':name', kunne ikke findes."
+        'not_found' => "Kombineringsfilen ':name', kunne ikke findes.",
     ],
     'system' => [
         'name' => 'System',
@@ -34,15 +34,15 @@
             'social' => 'Social',
             'events' => 'Begivenheder',
             'customers' => 'Kunder',
-            'my_settings' => 'Mine Indstillinger'
-        ]
+            'my_settings' => 'Mine Indstillinger',
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Unavngivet tema',
         'name' => [
             'label' => 'Temanavn',
-            'help' => 'Navngiv temaet med en unik kode. Feks., Winter.Vanilla'
+            'help' => 'Navngiv temaet med en unik kode. Feks., Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -51,15 +51,15 @@
         'installed' => 'Installerede temaer',
         'no_themes' => 'Der er ikke installeret nogle temaer fra markedspladsen.',
         'recommended' => 'Anbefalede',
-        'remove_confirm' => 'Er du sikker på at du vil fjerne dette tema?'
+        'remove_confirm' => 'Er du sikker på at du vil fjerne dette tema?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Unavngivet plugin',
         'name' => [
             'label' => 'Pluginnavn',
-            'help' => 'Navngiv pluginet med en unik kode. Feks., Winter.Blog'
-        ]
+            'help' => 'Navngiv pluginet med en unik kode. Feks., Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => 'Administrer plugins',
@@ -85,7 +85,7 @@
         'disable_confirm' => 'Er du sikker?',
         'disable_success' => 'Disse plugins blev deaktiveret.',
         'enable_success' => 'Disse plugins blev aktiveret.',
-        'unknown_plugin' => 'Pluginet er blevet fjernet fra filsystemet.'
+        'unknown_plugin' => 'Pluginet er blevet fjernet fra filsystemet.',
     ],
     'project' => [
         'name' => 'Projekt',
@@ -96,10 +96,10 @@
         'id' => [
             'label' => 'Projekt ID',
             'help' => 'Sådan findes dit projekt ID',
-            'missing' => 'Specificer venligst et projekt ID.'
+            'missing' => 'Specificer venligst et projekt ID.',
         ],
         'detach_confirm' => 'Er du sikker på at du vil frakoble dette projekt?',
-        'unbind_success' => 'Projektet er blevet frakoblet.'
+        'unbind_success' => 'Projektet er blevet frakoblet.',
     ],
     'settings' => [
         'menu_label' => 'Indstillinger',
@@ -107,7 +107,7 @@
         'missing_model' => 'Indstillingssiden mangler en Model definition.',
         'update_success' => ':name indstillinger opdateret',
         'return' => 'Tilbage til systemindstillinger',
-        'search' => 'Søg'
+        'search' => 'Søg',
     ],
     'mail' => [
         'log_file' => 'Logfil',
@@ -162,7 +162,7 @@
         'deleting' => 'Sletter Skabelon...',
         'deleting_layout' => 'Sletter Layout...',
         'sending' => 'Sender test besked...',
-        'return' => 'Tilbage til skabelonoversigt'
+        'return' => 'Tilbage til skabelonoversigt',
     ],
     'install' => [
         'project_label' => 'Tilknyt til Projekt',
@@ -171,7 +171,7 @@
         'missing_plugin_name' => 'Angiv venligst et pluginnavn, at installere.',
         'missing_theme_name' => 'Angiv venligst et temanavn, at installere.',
         'install_completing' => 'Afslutter installationsproces',
-        'install_success' => 'Plugin blev installeret'
+        'install_success' => 'Plugin blev installeret',
     ],
     'updates' => [
         'title' => 'Administrer Opdateringer',
@@ -210,11 +210,11 @@
         'force_label' => 'Tvangsopdater',
         'found' => [
             'label' => 'Ny opdateringer blev fundet!',
-            'help' => 'Tryk opdater software, for at begynde opdateringsprocessen.'
+            'help' => 'Tryk opdater software, for at begynde opdateringsprocessen.',
         ],
         'none' => [
             'label' => 'Ingen opdateringer',
-            'help' => 'Der blev ikke fundet nogle nye opdateringer.'
+            'help' => 'Der blev ikke fundet nogle nye opdateringer.',
         ],
         'important_action' => [
             'empty' => 'Vælg handling',
@@ -240,17 +240,17 @@
         'response_invalid' => 'Ugyldigt svar fra serveren.',
         'response_empty' => 'Tomt svar fra serveren.',
         'file_error' => 'Det lykkedes ikke serveren at sende pakken.',
-        'file_corrupt' => 'Filen fra serveren er beskadiget.'
+        'file_corrupt' => 'Filen fra serveren er beskadiget.',
     ],
     'behavior' => [
-        'missing_property' => 'Klassen :class skal definere instansvariablen $:property, som bliver brugt af :behavior behavioren.'
+        'missing_property' => 'Klassen :class skal definere instansvariablen $:property, som bliver brugt af :behavior behavioren.',
     ],
     'config' => [
         'not_found' => 'Kunne ikke finde konfigurationsfilen :file defineret for :location.',
-        'required' => "Konfiguration brugt i :location skal angive værdien for ':property'."
+        'required' => "Konfiguration brugt i :location skal angive værdien for ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Kunne ikke udpakke corefilen ':file'."
+        'extract_failed' => "Kunne ikke udpakke corefilen ':file'.",
     ],
     'event_log' => [
         'hint' => 'Denne log viser en liste af potentielle fejl i applikationen.',
@@ -265,7 +265,7 @@
         'created_at' => 'Dato & Tid',
         'message' => 'Besked',
         'level' => 'Grad',
-        'preview_title' => 'Event'
+        'preview_title' => 'Event',
     ],
     'request_log' => [
         'hint' => 'Denne log viser en liste af browserrequests som måske kræver din opmærksomhed. Feks. hvis en gæst åbner en CMS side der ikke findes, bliver der oprettet en record med statuskode 404.',
@@ -281,7 +281,7 @@
         'referer' => 'Referers',
         'url' => 'URL',
         'status_code' => 'Status',
-        'preview_title' => 'Request'
+        'preview_title' => 'Request',
     ],
     'permissions' => [
         'name' => 'System',
@@ -294,7 +294,7 @@
         'manage_preferences' => 'Administrer backendindstillinger',
         'manage_editor' => 'Administrer kode redigeringsværktøjets indstillinger',
         'view_the_dashboard' => 'Vis administratorpanelet',
-        'manage_branding' => 'Tilpas backenden'
+        'manage_branding' => 'Tilpas backenden',
     ],
     'media' => [
         'invalid_path' => "Ugyldig sti: ':path'.",
diff --git a/modules/system/lang/de/client.php b/modules/system/lang/de/client.php
index c3f0d228b5..bff5344544 100644
--- a/modules/system/lang/de/client.php
+++ b/modules/system/lang/de/client.php
@@ -76,7 +76,7 @@
             'reset_button_text'  => 'Zurücksetzen',
             'date_placeholder' => 'Datum',
             'after_placeholder' => 'Nach',
-            'before_placeholder' => 'Vor'
+            'before_placeholder' => 'Vor',
         ],
         'numbers' => [
             'all' => 'Alle',
diff --git a/modules/system/lang/el/client.php b/modules/system/lang/el/client.php
index b24ad4ed7b..de6e32ccda 100644
--- a/modules/system/lang/el/client.php
+++ b/modules/system/lang/el/client.php
@@ -52,7 +52,7 @@
         'nextMonth' => 'Επόμενος Μήνας',
         'months' => ['Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος'],
         'weekdays' => ['Κυριακή', 'Δευτέρα', 'Τρίτη', 'Τετάρτη', 'Πέμπτη', 'Παρασκευή', 'Σάββατο'],
-        'weekdaysShort' => ['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ']
+        'weekdaysShort' => ['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ'],
     ],
     'filter' => [
         'group' => [
@@ -65,7 +65,7 @@
             'date_placeholder' => 'Ημερομηνία',
             'after_placeholder' => 'Μετά',
             'before_placeholder' => 'Πρίν',
-        ]
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Εμφάνιση stacktrace',
@@ -81,6 +81,6 @@
             'remember_choice' => 'Απομνημόνευση αυτής της επιλογής για αυτήν την περίοδο λειτουργίας',
             'open' => 'Άνοιγμα',
             'cancel' => 'Άκυρο',
-        ]
-    ]
+        ],
+    ],
 ];
diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php
index 7cbcdb902e..19c4d7691f 100644
--- a/modules/system/lang/el/lang.php
+++ b/modules/system/lang/el/lang.php
@@ -4,13 +4,13 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Επιστροφή στα βασικά'
+        'tagline' => 'Επιστροφή στα βασικά',
     ],
     'directory' => [
-        'create_fail' => 'Δεν είναι δυνατή η δημιουργία του καταλόγου: :name'
+        'create_fail' => 'Δεν είναι δυνατή η δημιουργία του καταλόγου: :name',
     ],
     'file' => [
-        'create_fail' => 'Δεν είναι δυνατή η δημιουργία του αρχείου: :name'
+        'create_fail' => 'Δεν είναι δυνατή η δημιουργία του αρχείου: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -18,7 +18,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Το αρχείο συγχώνευσης ':name' δεν βρέθηκε."
+        'not_found' => "Το αρχείο συγχώνευσης ':name' δεν βρέθηκε.",
     ],
     'system' => [
         'name' => 'Σύστημα',
@@ -35,15 +35,15 @@
             'social' => 'Κοινωνικό Δίκτυο',
             'events' => 'Εκδηλώσεις',
             'customers' => 'Πελάτες',
-            'my_settings' => 'Οι Ρυθμίσεις Μου'
-        ]
+            'my_settings' => 'Οι Ρυθμίσεις Μου',
+        ],
     ],
     'theme' => [
         'label' => 'Θέμα',
         'unnamed' => 'Ανώνυμο θέμα',
         'name' => [
             'label' => 'Όνομα Θέματος',
-            'help' => 'Ονομάστε το θέμα με τον μοναδικό κωδικό του. Για παράδειγμα, Winter.Vanilla'
+            'help' => 'Ονομάστε το θέμα με τον μοναδικό κωδικό του. Για παράδειγμα, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -52,7 +52,7 @@
         'installed' => 'Εγκατεστημένο θέματα',
         'no_themes' => 'Δεν υπάρχουν εγκατεστημένα θέματα από το MarketPlace.',
         'recommended' => 'Προτεινόμενα',
-        'remove_confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το θέμα;'
+        'remove_confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το θέμα;',
     ],
     'plugin' => [
         'label' => 'Πρόσθετο',
@@ -60,7 +60,7 @@
         'name' => [
             'label' => 'Όνομα Πρόσθετου',
             'help' =>  'Ονομάστε το πρόσθετο με τον μοναδικό κωδικό του. Για παράδειγμα Winter.Blog',
-        ]
+        ],
     ],
     'plugins' => [
         'manage' => 'Διαχείριση πρόσθετων',
diff --git a/modules/system/lang/en/client.php b/modules/system/lang/en/client.php
index 1d0094bc26..ae157142a4 100644
--- a/modules/system/lang/en/client.php
+++ b/modules/system/lang/en/client.php
@@ -54,7 +54,7 @@
         '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']
+        'weekdaysShort' => ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
     ],
     'colorpicker' => [
         'last_color' => 'Use previously selected color',
diff --git a/modules/system/lang/es-ar/lang.php b/modules/system/lang/es-ar/lang.php
index b2abe06821..1f6cbc43a9 100644
--- a/modules/system/lang/es-ar/lang.php
+++ b/modules/system/lang/es-ar/lang.php
@@ -76,7 +76,7 @@
         'missing_model' => 'La página de configuración no encuentra una definición de modelo.',
         'update_success' => 'Los ajustes para :name han sido actualizados correctamente.',
         'return' => 'Regresar a la configuración del sistema',
-        'search' => 'Buscar'
+        'search' => 'Buscar',
     ],
     'mail' => [
         'menu_label' => 'Administrar Correo',
@@ -118,7 +118,7 @@
         'content_text' => 'Texto plano',
         'test_send' => 'Enviar mensaje de prueba',
         'test_success' => 'El mensaje de prueba ha sido enviado con éxito.',
-        'return' => 'Volver a la lista de plantilla'
+        'return' => 'Volver a la lista de plantilla',
     ],
     'install' => [
         'project_label' => 'Adjuntar al proyecto',
@@ -217,6 +217,6 @@
         'manage_software_updates' => 'Gestionar actualización de software',
         'manage_mail_templates' => 'Gestionar plantillas de correo',
         'manage_other_administrators' => 'Gestionar otros administradores',
-        'view_the_dashboard' => 'Ver el Tablero'
-    ]
+        'view_the_dashboard' => 'Ver el Tablero',
+    ],
 ];
diff --git a/modules/system/lang/es/client.php b/modules/system/lang/es/client.php
index 6b50f28ddf..86fd1a7032 100644
--- a/modules/system/lang/es/client.php
+++ b/modules/system/lang/es/client.php
@@ -31,7 +31,7 @@
         'link' => 'Vínculo',
         'horizontalrule' => 'Insertar Regla Horizontal',
         'fullscreen' => 'Pantalla completa',
-        'preview' => 'Previsualizar'
+        'preview' => 'Previsualizar',
     ],
     'mediamanager' => [
         'insert_link' => "Insertar Media Vínculo",
@@ -46,18 +46,18 @@
     ],
     'alert' => [
         'confirm_button_text' => 'OK',
-        'cancel_button_text' => 'Cancelar'
+        'cancel_button_text' => 'Cancelar',
     ],
     'datepicker' => [
         'previousMonth' => 'Mes Anterior',
         'nextMonth' => 'Mes Siguiente',
         'months' => ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
         'weekdays' => ['Domingo', 'Lunes', 'Martes', 'Miercoles', 'Jueves', 'Viernes', 'Sabado'],
-        'weekdaysShort' => ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab']
+        'weekdaysShort' => ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab'],
     ],
     'filter' => [
         'group' => [
-            'all' => 'todos'
+            'all' => 'todos',
         ],
         'scopes' => [
             'apply_button_text' => 'Aplicar',
@@ -69,7 +69,7 @@
             'reset_button_text' => 'Restablecer',
             'date_placeholder' => 'Fecha',
             'after_placeholder' => 'Desde',
-            'before_placeholder' => 'Hasta'
+            'before_placeholder' => 'Hasta',
         ],
         'numbers' => [
             'all' => 'todos',
@@ -77,7 +77,7 @@
             'reset_button_text' => 'Restablecer',
             'min_placeholder' => 'Mínimo',
             'max_placeholder' => 'Máximo',
-            'number_placeholder' => 'Número'
+            'number_placeholder' => 'Número',
         ],
     ],
     'eventlog' => [
@@ -93,7 +93,7 @@
             'openWith' => 'Abrir con',
             'rememberChoice' => 'Recuerde la opción seleccionada para esta sesión del navegador',
             'open' => 'Abrir',
-            'cancel' => 'Cancelar'
-        ]
-    ]
+            'cancel' => 'Cancelar',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/es/lang.php b/modules/system/lang/es/lang.php
index 8bddae3265..302be78598 100644
--- a/modules/system/lang/es/lang.php
+++ b/modules/system/lang/es/lang.php
@@ -3,13 +3,13 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Volviendo a lo básico'
+        'tagline' => 'Volviendo a lo básico',
     ],
     'directory' => [
-        'create_fail' => 'No es posible crear el directorio: :name'
+        'create_fail' => 'No es posible crear el directorio: :name',
     ],
     'file' => [
-        'create_fail' => 'No es posible crear el archivo: :name'
+        'create_fail' => 'No es posible crear el archivo: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -17,7 +17,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "El archivo combinador ':name' no se encuentra."
+        'not_found' => "El archivo combinador ':name' no se encuentra.",
     ],
     'system' => [
         'name' => 'Sistema',
@@ -35,15 +35,15 @@
             'events' => 'Eventos',
             'customers' => 'Clientes',
             'my_settings' => 'Mis Configuraciones',
-            'notifications' => 'Notificaciones'
-        ]
+            'notifications' => 'Notificaciones',
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Tema sin nombre',
         'name' => [
             'label' => 'Nombre Tema',
-            'help' => 'Nombre del tema por su código único. Por ejemplo, Winter.Vanilla'
+            'help' => 'Nombre del tema por su código único. Por ejemplo, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -52,7 +52,7 @@
         'installed' => 'Temas Instalados',
         'no_themes' => 'No hay temas instalados desde el mercado.',
         'recommended' => 'Recomendado',
-        'remove_confirm' => '¿Seguro que quieres eliminar este tema?'
+        'remove_confirm' => '¿Seguro que quieres eliminar este tema?',
     ],
     'plugin' => [
         'label' => 'Plugin',
@@ -60,7 +60,7 @@
         'name' => [
             'label' => 'Nombre del Plugin',
             'help' => 'Nombra el plugin por su código único. por ejemplo, Winter.Blog',
-        ]
+        ],
     ],
     'plugins' => [
         'manage' => 'Gestionar plugins',
@@ -165,7 +165,7 @@
         'sending' => 'Enviando mensaje de prueba...',
         'return' => 'Volver a lista de plantillas',
         'options' => 'Opciones',
-        'disable_auto_inline_css' => 'Deshabilitar CSS en línea automático'
+        'disable_auto_inline_css' => 'Deshabilitar CSS en línea automático',
     ],
     'mail_brand' => [
         'menu_label' => 'Branding de Correo',
@@ -179,7 +179,7 @@
                 'description' => 'Descripción',
                 'price' => 'Precio',
                 'centered' => 'Centrado',
-                'right_aligned' => 'Alineado-A-La-Derecha'
+                'right_aligned' => 'Alineado-A-La-Derecha',
             ],
             'buttons' => [
                 'primary' => 'Botón Principal',
@@ -190,7 +190,7 @@
             'more' => 'Algo más de texto',
             'promotion' => 'Código de cupón: WINTER',
             'subcopy' => 'Este es el subcopy del correo',
-            'thanks' => 'Gracias'
+            'thanks' => 'Gracias',
         ],
         'fields' => [
             '_section_background' => 'Fondo',
@@ -216,7 +216,7 @@
             'panel_bg' => 'Fondo del Panel',
             'promotion_bg' => 'Fondo de Promoción',
             'promotion_border_color' => 'Color del borde de Promoción',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Adjuntar al proyecto',
@@ -225,7 +225,7 @@
         'missing_plugin_name' => 'Por favor, especifique un nombre de Plugin para instalar',
         'missing_theme_name' => 'Por favor especifique un nombre de Theme a instalar.',
         'install_completing' => 'Finalizó el proceso de instalación',
-        'install_success' => 'El plugin se ha instalado correctamente.'
+        'install_success' => 'El plugin se ha instalado correctamente.',
     ],
     'updates' => [
         'title' => 'Administrar actualizaciones',
@@ -292,7 +292,7 @@
         'details_licence' => 'Licencia',
         'details_licence_missing' => 'No hay licencia proporcionada.',
         'details_current_version' => 'Versión actual',
-        'details_author' => 'Autor'
+        'details_author' => 'Autor',
     ],
     'server' => [
         'connect_error' => 'Error al conectar con el servidor.',
@@ -325,7 +325,7 @@
         'created_at' => 'Fecha y Hora',
         'message' => 'Mensaje',
         'level' => 'Nivel',
-        'preview_title' => 'Evento'
+        'preview_title' => 'Evento',
     ],
     'request_log' => [
         'hint' => 'Este registro muestra una lista de las peticiones del navegador que pueden requerir atención. Por ejemplo, si un usuario abre una página que no se puede encontrar, se crea un registro con el código de estado 404.',
@@ -341,7 +341,7 @@
         'referer' => 'Referencia',
         'url' => 'URL',
         'status_code' => 'Estado',
-        'preview_title' => 'Petición'
+        'preview_title' => 'Petición',
     ],
     'permissions' => [
         'name' => 'Sistema',
@@ -354,7 +354,7 @@
         'manage_preferences' => 'Gestionar preferencias back-end',
         'manage_editor' => 'Gestionar preferencias editor código',
         'view_the_dashboard' => 'Ver el Escritorio',
-        'manage_branding' => 'Perzonalizar el back-end'
+        'manage_branding' => 'Perzonalizar el back-end',
     ],
     'log' => [
         'menu_label' => 'Configuración de Logs',
diff --git a/modules/system/lang/es/validation.php b/modules/system/lang/es/validation.php
index 57702b00ec..e548d70b7e 100644
--- a/modules/system/lang/es/validation.php
+++ b/modules/system/lang/es/validation.php
@@ -25,7 +25,7 @@
         "numeric" => "El campo :attribute debe tener estar entre :min y :max.",
         "file"    => "El campo :attribute debe ocupar entre :min y :max kilobytes.",
         "string"  => "El campo :attribute debe tener entre :min y :max caracteres.",
-        "array"   => "El campo :attribute debe tener entre :min y :max elementos."
+        "array"   => "El campo :attribute debe tener entre :min y :max elementos.",
     ],
     "confirmed"        => "La confirmación del campo:attribute es incorrecta.",
     "date"             => "El campo :attribute no es una fecha válida.",
@@ -43,7 +43,7 @@
         "numeric" => "El campo :attribute no debe ser mayor que :max.",
         "file"    => "El campo :attribute no debe ocupar más de :max kilobytes.",
         "string"  => "El campo :attribute no debe tener más de :max caracteres.",
-        "array"   => "El campo :attribute no debe tener más de :max elementos."
+        "array"   => "El campo :attribute no debe tener más de :max elementos.",
     ],
     "mimes"            => "El campo :attribute debe ser un archivo del tipo: :values.",
     "extensions"       => "El campo :attribute debe tener una extensión de: :values.",
@@ -51,7 +51,7 @@
         "numeric" => "El campo :attribute debe ser :min o más.",
         "file"    => "El campo :attribute debe ocupar :min kilobytes o más.",
         "string"  => "El campo :attribute debe tener :min caracteres o más.",
-        "array"   => "El campo :attribute debe tener :min elementos o más."
+        "array"   => "El campo :attribute debe tener :min elementos o más.",
     ],
     "not_in"           => "El campo :attribute es incorrecto.",
     "numeric"          => "El campo :attribute debe ser un número.",
@@ -65,7 +65,7 @@
         "numeric" => "El campo :attribute debe ser :size.",
         "file"    => "El campo :attribute debe ocupar :size kilobytes.",
         "string"  => "El campo :attribute debe tener :size caracteres.",
-        "array"   => "El campo :attribute debe contener :size elementos."
+        "array"   => "El campo :attribute debe contener :size elementos.",
     ],
     "unique"           => "El campo :attribute ya ha sido tomado.",
     "url"              => "El campo :attribute tiene un formato incorrecto.",
@@ -94,6 +94,6 @@
     |
     */
 
-    'attributes' => []
+    'attributes' => [],
 
 ];
diff --git a/modules/system/lang/et/client.php b/modules/system/lang/et/client.php
index 5866cc1423..e33a42d1ee 100644
--- a/modules/system/lang/et/client.php
+++ b/modules/system/lang/et/client.php
@@ -47,18 +47,18 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Loobu',
-        'widget_remove_confirm' => 'Eemalda see widget?'
+        'widget_remove_confirm' => 'Eemalda see widget?',
     ],
     'datepicker' => [
         'previousMonth' => 'Eelmine kuu',
         'nextMonth' => 'Järgmine kuu',
         'months' => ['Jaanuar', 'Veebruar', 'Märts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'August', 'September', 'Oktoober', 'November', 'Detsember'],
         'weekdays' => ['Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'],
-        'weekdaysShort' => ['P', 'E', 'T', 'K', 'N', 'R', 'L']
+        'weekdaysShort' => ['P', 'E', 'T', 'K', 'N', 'R', 'L'],
     ],
     'filter' => [
         'group' => [
-            'all' => 'kõik'
+            'all' => 'kõik',
         ],
         'dates' => [
             'all' => 'kõik',
@@ -66,8 +66,8 @@
             'reset_button_text'  => 'Lähtesta',
             'date_placeholder' => 'Kuupäev',
             'after_placeholder' => 'Hiljem kui',
-            'before_placeholder' => 'Varem kui'
-        ]
+            'before_placeholder' => 'Varem kui',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Näita stacktrace',
@@ -82,7 +82,7 @@
             'openWith' => 'Ava programmiga',
             'remember_choice' => 'Jäta valik selleks sessiooniks meelde',
             'open' => 'Ava',
-            'cancel' => 'Loobu'
-        ]
-    ]
+            'cancel' => 'Loobu',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/et/lang.php b/modules/system/lang/et/lang.php
index 15a1ece80c..4f1bcf13d8 100644
--- a/modules/system/lang/et/lang.php
+++ b/modules/system/lang/et/lang.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Tagasi põhitõdede juurde'
+        'tagline' => 'Tagasi põhitõdede juurde',
     ],
     'locale' => [
         'be' => 'Беларуская',
@@ -41,13 +41,13 @@
         'tr' => 'Türkçe',
         'zh-cn' => '简体中文',
         'zh-tw' => '繁體中文',
-        'vn' => 'Tiếng việt'
+        'vn' => 'Tiếng việt',
     ],
     'directory' => [
-        'create_fail' => 'Kataloogi :name ei õnnestunud luua'
+        'create_fail' => 'Kataloogi :name ei õnnestunud luua',
     ],
     'file' => [
-        'create_fail' => 'Faili :name ei õnnestunud luua'
+        'create_fail' => 'Faili :name ei õnnestunud luua',
     ],
     'page' => [
         'invalid_token' => [
@@ -55,7 +55,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Ühendaja faili ':name' ei leitud."
+        'not_found' => "Ühendaja faili ':name' ei leitud.",
     ],
     'system' => [
         'name' => 'Süsteem',
@@ -72,15 +72,15 @@
             'social' => 'Suhtlusvõrgustikud',
             'events' => 'Sündmused',
             'customers' => 'Kliendid',
-            'my_settings' => 'Minu seaded'
-        ]
+            'my_settings' => 'Minu seaded',
+        ],
     ],
     'theme' => [
         'label' => 'Teema',
         'unnamed' => 'Nimeta teema',
         'name' => [
             'label' => 'Teema nimi',
-            'help' => 'Anna teemale nimi selle unikaalse koodi järgi, nt Winter.Vanilla'
+            'help' => 'Anna teemale nimi selle unikaalse koodi järgi, nt Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -89,16 +89,16 @@
         'installed' => 'Paigaldatud teemad',
         'no_themes' => 'Ühtegi ostetud teemat pole paigaldatud.',
         'recommended' => 'Soovitatud',
-        'remove_confirm' => 'Oled sa kindel, et soovid selle teema eemaldada?'
+        'remove_confirm' => 'Oled sa kindel, et soovid selle teema eemaldada?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Nimeta plugin',
         'name' => [
             'label' => 'Plugina nimi',
-            'help' => 'Anna pluginale nimi selle unikaalse koodi järgi. Nt Winter.Blog'
+            'help' => 'Anna pluginale nimi selle unikaalse koodi järgi. Nt Winter.Blog',
         ],
-        'by_author' => 'Autor: :name'
+        'by_author' => 'Autor: :name',
     ],
     'plugins' => [
         'manage' => 'Halda pluginaid',
@@ -124,7 +124,7 @@
         'disable_confirm' => 'Oled sa kindel?',
         'disable_success' => 'Valitud plugin on nüüd keelatud.',
         'enable_success' => 'Valitud pluginad on nüüd lubatud.',
-        'unknown_plugin' => 'Plugin on edukalt eemaldatud.'
+        'unknown_plugin' => 'Plugin on edukalt eemaldatud.',
     ],
     'project' => [
         'name' => 'Projekt',
@@ -135,10 +135,10 @@
         'id' => [
             'label' => 'Projekti ID',
             'help' => 'Kuidas leida projekti ID-d',
-            'missing' => 'Palun sisesta projekti ID.'
+            'missing' => 'Palun sisesta projekti ID.',
         ],
         'detach_confirm' => 'Oled sa kindel, et soovid selle projekti eemaldada?',
-        'unbind_success' => 'Projekt on eemaldatud.'
+        'unbind_success' => 'Projekt on eemaldatud.',
     ],
     'settings' => [
         'menu_label' => 'Seaded',
@@ -146,7 +146,7 @@
         'missing_model' => 'Seadete lehel puudub modeli seos.',
         'update_success' => ':name seaded on uuendatud',
         'return' => 'Tagasi süsteemi seadete juurde',
-        'search' => 'Otsi'
+        'search' => 'Otsi',
     ],
     'mail' => [
         'log_file' => 'Logi fail',
@@ -201,7 +201,7 @@
         'deleting' => 'Kustutan malli...',
         'deleting_layout' => 'Kustutan kujundust...',
         'sending' => 'Saadan testkirja...',
-        'return' => 'Tagasi mallide nimekirja'
+        'return' => 'Tagasi mallide nimekirja',
     ],
     'install' => [
         'project_label' => 'Lisa projektile',
@@ -210,7 +210,7 @@
         'missing_plugin_name' => 'Palun sisesta plugina nimi, mida paigaldada.',
         'missing_theme_name' => 'Palun sisesta teema nimi, mida paigaldada.',
         'install_completing' => 'Lõpetan paigaldamise protsessi',
-        'install_success' => 'Plugin on edukalt paigaldatud'
+        'install_success' => 'Plugin on edukalt paigaldatud',
     ],
     'updates' => [
         'title' => 'Halda uuendusi',
@@ -249,17 +249,17 @@
         'force_label' => 'Uuenda igal juhul',
         'found' => [
             'label' => 'Found new updates!',
-            'help' => 'Kliki "Uuenda tarkvara," et alustada uuendamise protsesse.'
+            'help' => 'Kliki "Uuenda tarkvara," et alustada uuendamise protsesse.',
         ],
         'none' => [
             'label' => 'Uuendusi ei ole',
-            'help' => 'Uusi uuendusi ei leitud.'
+            'help' => 'Uusi uuendusi ei leitud.',
         ],
         'important_action' => [
             'empty' => 'Vali tegevus',
             'confirm' => 'Kinnita uuendus',
             'skip' => 'Jäta see uuendus vahele (ainult nüüd)',
-            'ignore' => 'Jäta see uuendus vahele (alati)'
+            'ignore' => 'Jäta see uuendus vahele (alati)',
         ],
         'important_action_required' => 'Vajalik tegevus',
         'important_view_guide' => 'Vaata uuendamise juhendit',
@@ -276,7 +276,7 @@
         'details_licence' => 'Litsents',
         'details_licence_missing' => 'Litsentsi pole lisatud.',
         'details_current_version' => 'Praegune versioon',
-        'details_author' => 'Autor'
+        'details_author' => 'Autor',
     ],
     'server' => [
         'connect_error' => 'Ühendus serveriga nurjus.',
@@ -284,17 +284,17 @@
         'response_invalid' => 'Serverilt saadi vigane vastus.',
         'response_empty' => 'Serverilt saadi tühi vastus.',
         'file_error' => 'Paketi saatmine ebaõnnestus.',
-        'file_corrupt' => 'Saadetud fail on vigane.'
+        'file_corrupt' => 'Saadetud fail on vigane.',
     ],
     'behavior' => [
-        'missing_property' => 'Klass :class peab defineerima atribuudi $:property, mida kasutab käitumine :behavior.'
+        'missing_property' => 'Klass :class peab defineerima atribuudi $:property, mida kasutab käitumine :behavior.',
     ],
     'config' => [
         'not_found' => 'Ei leitud :location jaoks seadete faili :file.',
-        'required' => ":location seade peab sisaldama ':property' väärtust."
+        'required' => ":location seade peab sisaldama ':property' väärtust.",
     ],
     'zip' => [
-        'extract_failed' => "Süsteemifaili ':file' lahtipakkimine ebaõnnestus."
+        'extract_failed' => "Süsteemifaili ':file' lahtipakkimine ebaõnnestus.",
     ],
     'event_log' => [
         'hint' => 'See logi sisaldab veateateid, mis esinevad süsteemi töös.',
@@ -309,7 +309,7 @@
         'created_at' => 'Kuupäev & kellaaeg',
         'message' => 'Sisu',
         'level' => 'Tase',
-        'preview_title' => 'Sündmus'
+        'preview_title' => 'Sündmus',
     ],
     'request_log' => [
         'hint' => 'See logi sisaldab süsteemi juurdepääsuinfot, mis võiks vajada tähelepanu. Näiteks salvestatakse 404 päringud kui kasutaja üritab vaadata lehte, mida ei ole olemas.',
@@ -325,7 +325,7 @@
         'referer' => 'Allikas',
         'url' => 'URL',
         'status_code' => 'Staatus',
-        'preview_title' => 'Päring'
+        'preview_title' => 'Päring',
     ],
     'permissions' => [
         'name' => 'Süsteem',
@@ -338,7 +338,7 @@
         'manage_preferences' => 'Haldusliidese seadete muutmine',
         'manage_editor' => 'Koodi redaktori seadete muutmine',
         'view_the_dashboard' => 'Juurdepääs töölauale',
-        'manage_branding' => 'Haldusliidese kohandamine'
+        'manage_branding' => 'Haldusliidese kohandamine',
     ],
     'log' => [
         'menu_label' => 'Logi seaded',
diff --git a/modules/system/lang/fa/client.php b/modules/system/lang/fa/client.php
index 24f7dfb401..f69f76a0c0 100644
--- a/modules/system/lang/fa/client.php
+++ b/modules/system/lang/fa/client.php
@@ -46,21 +46,21 @@
     'alert' => [
         'confirm_button_text' => 'تایید',
         'cancel_button_text' => 'انصراف',
-        'widget_remove_confirm' => 'این ابزارک حذف شود؟'
+        'widget_remove_confirm' => 'این ابزارک حذف شود؟',
     ],
     'datepicker' => [
         'previousMonth' => 'ماه قبل',
         'nextMonth' => 'ماه بعد',
         'months' => ['فروردین', 'اردیبهشت', 'خرداد', 'تیر', 'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند'],
         'weekdays' => ['یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پنج شنبه', 'جمعه', 'شنبه'],
-        'weekdaysShort' => ['ی', 'د', 'س', 'چ', 'پ', 'ج', 'ش']
+        'weekdaysShort' => ['ی', 'د', 'س', 'چ', 'پ', 'ج', 'ش'],
     ],
     'colorpicker' => [
         'choose' => 'تایید',
     ],
     'filter' => [
         'group' => [
-            'all' => 'همه'
+            'all' => 'همه',
         ],
         'scopes' => [
             'apply_button_text' => 'اعمال',
@@ -72,15 +72,15 @@
             'reset_button_text'  => 'بازنشانی',
             'date_placeholder' => 'تاریخ',
             'after_placeholder' => 'بعد از',
-            'before_placeholder' => 'قبل از'
+            'before_placeholder' => 'قبل از',
         ],
         'numbers' => [
             'all' => 'همه',
             'filter_button_text' => 'فیلتر',
             'reset_button_text'  => 'بازنشانی',
             'min_placeholder' => 'کم',
-            'max_placeholder' => 'زیاد'
-        ]
+            'max_placeholder' => 'زیاد',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'نمایش روند اجرا',
@@ -95,7 +95,7 @@
             'openWith' => 'باز کردن توسط',
             'remember_choice' => 'گزینه انتخاب شده را به خاطر داشته باش',
             'open' => 'باز کردن',
-            'cancel' => 'انصراف'
-        ]
-    ]
+            'cancel' => 'انصراف',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php
index 54b9d9f0aa..1aeac07e8f 100644
--- a/modules/system/lang/fa/lang.php
+++ b/modules/system/lang/fa/lang.php
@@ -76,15 +76,15 @@
             'events' => 'رویداد ها',
             'customers' => 'مشتریان',
             'my_settings' => 'تنظیمات من',
-            'notifications' => 'اطلاعیه ها'
-        ]
+            'notifications' => 'اطلاعیه ها',
+        ],
     ],
     'theme' => [
         'label' => 'قالب',
         'unnamed' => 'قالب بدون نام',
         'name' => [
             'label' => 'نام قالب',
-            'help' => 'یک اسم یکتا برای نام قالب برای مثال Winter.Vanilla'
+            'help' => 'یک اسم یکتا برای نام قالب برای مثال Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -102,7 +102,7 @@
             'label' => 'نام افزونه',
             'help' => 'یک اسم یکتا برای نام افزونه برای مثال: Winter.Blog',
         ],
-        'by_author' => 'توسط :name'
+        'by_author' => 'توسط :name',
     ],
     'plugins' => [
         'manage' => 'مدیریت افزونه ها',
@@ -141,8 +141,8 @@
         'remove_confirm' => 'آیا از حذف این افزونه اطمینان دارید؟',
         'remove_success' => "افزونه ها با موفقیت از سیستم حذف شدند.",
         'replace' => [
-            'multi_install_error' => 'جایگزینی چندین افزونه در حال حاضر پشتیبانی نمی شود'
-        ]
+            'multi_install_error' => 'جایگزینی چندین افزونه در حال حاضر پشتیبانی نمی شود',
+        ],
     ],
     'project' => [
         'name' => 'پروژه',
@@ -164,7 +164,7 @@
         'missing_model' => 'صفحه تنظیمات شامل یک مدل تعریف نشده می باشد.',
         'update_success' => 'تنظیمات برای :name با موفقیت تغییر یافت.',
         'return' => 'بازگشت به تنظیمات سیستم',
-        'search' => 'جستجو'
+        'search' => 'جستجو',
     ],
     'mail' => [
         'log_file' => 'فایل گزارش',
@@ -239,7 +239,7 @@
                 'description' => 'توضیحات',
                 'price' => 'قیمت',
                 'centered' => 'وسط چین',
-                'right_aligned' => 'راست چین'
+                'right_aligned' => 'راست چین',
             ],
             'buttons' => [
                 'primary' => 'دکمه اصلی',
@@ -250,7 +250,7 @@
             'more' => 'متن اضافی',
             'promotion' => 'کد کپن تخفیف: WINTER',
             'subcopy' => 'این یک کپی از پست الکترونیکی می باشد.',
-            'thanks' => 'با تشکر'
+            'thanks' => 'با تشکر',
         ],
         'fields' => [
             '_section_background' => 'پس زمینه',
@@ -276,7 +276,7 @@
             'panel_bg' => 'پس رمینه پنل',
             'promotion_bg' => 'پس زمینه شاخص',
             'promotion_border_color' => 'رنگ حاشیه شاخص',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'ضمیمه کردن به نرم افزار',
@@ -337,7 +337,7 @@
         ],
         'none' => [
             'label' => 'شما از آخرین نسخه استفاده می کنید',
-            'help' => 'هیچ به روز رسانی یافت نشد.'
+            'help' => 'هیچ به روز رسانی یافت نشد.',
         ],
         'important_action' => [
             'empty' => 'اقدام مورد نظر را انتخاب کنید',
@@ -393,7 +393,7 @@
         'created_at' => 'ساعت و تاریخ',
         'message' => 'پیغام',
         'level' => 'مرحله',
-        'preview_title' => 'اتفاق'
+        'preview_title' => 'اتفاق',
     ],
     'request_log' => [
         'hint' => 'این گزارش درخواستهایی از طرف مرورگر را که نیاز به بررسی دارند را نمایش می دهد. به عنوان مثال اگر بازدید کنند صفحه ای را که موجود نیست درخواست کند، یک گزینه با کد وضعیت 404 ایجاد می شود.',
@@ -409,7 +409,7 @@
         'referer' => 'منتقل شده از',
         'url' => 'آدرس',
         'status_code' => 'وضعیت',
-        'preview_title' => 'درخواست'
+        'preview_title' => 'درخواست',
     ],
     'permissions' => [
         'name' => 'سیستم',
@@ -425,7 +425,7 @@
         'manage_own_editor' => 'مدیریت تنظیمات ویژه ویرایشگر کد شخصی',
         'view_the_dashboard' => 'نمایش صفحه مدیریت',
         'manage_default_dashboard' => 'مدیریت داشبورد',
-        'manage_branding' => 'شخصی سازی قسمت مدیریت'
+        'manage_branding' => 'شخصی سازی قسمت مدیریت',
     ],
     'log' => [
         'menu_label' => 'تنظیمات وقایع',
diff --git a/modules/system/lang/fi/client.php b/modules/system/lang/fi/client.php
index df3084f607..614b3eb4d6 100644
--- a/modules/system/lang/fi/client.php
+++ b/modules/system/lang/fi/client.php
@@ -46,25 +46,25 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Peruuta',
-        'widget_remove_confirm' => 'Poista tämä vimpain?'
+        'widget_remove_confirm' => 'Poista tämä vimpain?',
     ],
     'datepicker' => [
         'previousMonth' => 'Edellinen kuukausi',
         'nextMonth' => 'Seuraava kuukausi',
         'months' => ['tammikuu', 'helmikuu', 'maaliskuu', 'huhtikuu', 'toukokuu', 'kesäkuu', 'heinäkuu', 'elokuu', 'syyskuu', 'lokakuu', 'marraskuu', 'joulukuu'],
         'weekdays' => ['sunnutai', 'maanantai', 'tiistai', 'keskiviikko', 'torstai', 'perjantai', 'lauantai'],
-        'weekdaysShort' => ['su', 'ma', 'ti', 'ke', 'to', 'pe', 'la']
+        'weekdaysShort' => ['su', 'ma', 'ti', 'ke', 'to', 'pe', 'la'],
     ],
     'colorpicker' => [
         'choose' => 'Ok',
     ],
     'filter' => [
         'group' => [
-            'all' => 'kaikki'
+            'all' => 'kaikki',
         ],
         'scopes' => [
             'apply_button_text' => 'Ota käyttöön',
-            'clear_button_text'  => 'Tyhjennä'
+            'clear_button_text'  => 'Tyhjennä',
         ],
         'dates' => [
             'all' => 'kaikki',
@@ -72,15 +72,15 @@
             'reset_button_text'  => 'Palauta',
             'date_placeholder' => 'Päivä',
             'after_placeholder' => 'Jälkeen',
-            'before_placeholder' => 'Ennen'
+            'before_placeholder' => 'Ennen',
         ],
         'numbers' => [
             'all' => 'kaikki',
             'filter_button_text' => 'Suodata',
             'reset_button_text'  => 'Palauta',
             'min_placeholder' => 'Väh.',
-            'max_placeholder' => 'Enint.'
-        ]
+            'max_placeholder' => 'Enint.',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Näytä stacktrace',
@@ -95,7 +95,7 @@
             'openWith' => 'Avaa sovelluksessa',
             'remember_choice' => 'Muista valittu vaihtoehto istunnon ajan',
             'open' => 'Avaa',
-            'cancel' => 'Peruuta'
-        ]
-    ]
+            'cancel' => 'Peruuta',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/fi/lang.php b/modules/system/lang/fi/lang.php
index c8604ed5bc..672baf4274 100644
--- a/modules/system/lang/fi/lang.php
+++ b/modules/system/lang/fi/lang.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Takaisin perusteisiin'
+        'tagline' => 'Takaisin perusteisiin',
     ],
     'locale' => [
         'be' => 'Беларуская',
@@ -44,13 +44,13 @@
         'tr' => 'Türkçe',
         'uk' => 'Українська мова',
         'zh-cn' => '简体中文',
-        'zh-tw' => '繁體中文'
+        'zh-tw' => '繁體中文',
     ],
     'directory' => [
-        'create_fail' => 'Ei voida luoda kansiota: :name'
+        'create_fail' => 'Ei voida luoda kansiota: :name',
     ],
     'file' => [
-        'create_fail' => 'Ei voida luoda tiedostoa: :name'
+        'create_fail' => 'Ei voida luoda tiedostoa: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -58,7 +58,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Yhdistelmätiedostoa ':name' ei löydy."
+        'not_found' => "Yhdistelmätiedostoa ':name' ei löydy.",
     ],
     'system' => [
         'name' => 'Järjestelmä',
@@ -77,15 +77,15 @@
             'events' => 'Tapahtumat',
             'customers' => 'Asiakkaat',
             'my_settings' => 'Omat asetukset',
-            'notifications' => 'Notifikaatiot'
-        ]
+            'notifications' => 'Notifikaatiot',
+        ],
     ],
     'theme' => [
         'label' => 'Teema',
         'unnamed' => 'Nimetön teema',
         'name' => [
             'label' => 'Teeman nimi',
-            'help' => 'Nimeä teema uniikilla tunnuksella. Esimerkiksi Winter.Vanilla'
+            'help' => 'Nimeä teema uniikilla tunnuksella. Esimerkiksi Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -94,16 +94,16 @@
         'installed' => 'Asennetut teemat',
         'no_themes' => 'Ei asennettuja teemoja kaupasta.',
         'recommended' => 'Suositellut',
-        'remove_confirm' => 'Haluatko varmasti poistaa tämän teeman?'
+        'remove_confirm' => 'Haluatko varmasti poistaa tämän teeman?',
     ],
     'plugin' => [
         'label' => 'Lisäosa',
         'unnamed' => 'Nimetön lisäosa',
         'name' => [
             'label' => 'Lisäosan nimi',
-            'help' => 'Anna lisäosalle uniikkikoodi. Esimerkiksi: Winter.Blog'
+            'help' => 'Anna lisäosalle uniikkikoodi. Esimerkiksi: Winter.Blog',
         ],
-        'by_author' => 'Tekijä: :name'
+        'by_author' => 'Tekijä: :name',
     ],
     'plugins' => [
         'manage' => 'Hallinnoi lisäosia',
@@ -129,7 +129,7 @@
         'disable_confirm' => 'Oletko varma?',
         'disable_success' => 'Lisäosat poistettu käytöstä onnistuneesti.',
         'enable_success' => 'Lisäosat otettu käyttöön onnistuneesti.',
-        'unknown_plugin' => 'Lisäosa on poistettu järjestelmästä.'
+        'unknown_plugin' => 'Lisäosa on poistettu järjestelmästä.',
     ],
     'project' => [
         'name' => 'Projekti',
@@ -140,10 +140,10 @@
         'id' => [
             'label' => 'Projektin ID',
             'help' => 'Mistä löydän projektin ID:n',
-            'missing' => 'Määrittele projektin ID.'
+            'missing' => 'Määrittele projektin ID.',
         ],
         'detach_confirm' => 'Haluatko varmasti irrottautua projektista?',
-        'unbind_success' => 'Projekti on irrotettu.'
+        'unbind_success' => 'Projekti on irrotettu.',
     ],
     'settings' => [
         'menu_label' => 'Asetukset',
@@ -151,7 +151,7 @@
         'missing_model' => 'The settings page is missing a Model definition.',
         'update_success' => ':name settings updated',
         'return' => 'Palaa järjestelmän asetuksiin',
-        'search' => 'Haku'
+        'search' => 'Haku',
     ],
     'mail' => [
         'log_file' => 'Lokitiedosto',
@@ -210,7 +210,7 @@
         'deleting' => 'Poistetaan teemaa...',
         'deleting_layout' => 'Poistetaan ulkoasua...',
         'sending' => 'Lähetetään testiviestiä...',
-        'return' => 'Palaa teemalistaan'
+        'return' => 'Palaa teemalistaan',
     ],
     'mail_brand' => [
         'menu_label' => 'Sähköpostin brändäys',
@@ -224,7 +224,7 @@
                 'description' => 'Kuvaus',
                 'price' => 'Hinta',
                 'centered' => 'Keskitetty',
-                'right_aligned' => 'Tasattu oikealle'
+                'right_aligned' => 'Tasattu oikealle',
             ],
             'buttons' => [
                 'primary' => 'Ensisijainen nappula',
@@ -235,7 +235,7 @@
             'more' => 'Lisää tekstiä',
             'promotion' => 'Kuponkikoodi: WINTER',
             'subcopy' => 'Tämä on sähköpostin alateksti',
-            'thanks' => 'Kiitos'
+            'thanks' => 'Kiitos',
         ],
         'fields' => [
             '_section_background' => 'Tausta',
@@ -261,7 +261,7 @@
             'panel_bg' => 'Paneelin tausta',
             'promotion_bg' => 'Promootion tausta',
             'promotion_border_color' => 'Promootion reunan väri',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Kiinnitä projektiin',
@@ -270,7 +270,7 @@
         'missing_plugin_name' => 'Määritä asennettavan lisäosan nimi.',
         'missing_theme_name' => 'Määritä asennettavan teeman nimi.',
         'install_completing' => 'Viimeistellään asennusta',
-        'install_success' => 'Lisäosa asennettu onnistuneesti'
+        'install_success' => 'Lisäosa asennettu onnistuneesti',
     ],
     'updates' => [
         'title' => 'Hallinnoi päivityksiä',
@@ -309,17 +309,17 @@
         'force_label' => 'Pakota päivitys',
         'found' => [
             'label' => 'Löydettiin uusia päivityksiä!',
-            'help' => 'Klikkaa Päivitä ohjelmisto aloittaaksesi päivitysprosessi.'
+            'help' => 'Klikkaa Päivitä ohjelmisto aloittaaksesi päivitysprosessi.',
         ],
         'none' => [
             'label' => 'Ei päivityksiä',
-            'help' => 'Uusia päivityksiä ei löytynyt.'
+            'help' => 'Uusia päivityksiä ei löytynyt.',
         ],
         'important_action' => [
             'empty' => 'Valitse toimenpide',
             'confirm' => 'Vahvista päivitys',
             'skip' => 'Jätä tämä pävitys väliin (vain kerran)',
-            'ignore' => 'Hyppää tämän päivityksen yli (aina)'
+            'ignore' => 'Hyppää tämän päivityksen yli (aina)',
         ],
         'important_action_required' => 'Toimenpiteitä vaaditaan',
         'important_view_guide' => 'Katso päivitysopas',
@@ -336,7 +336,7 @@
         'details_licence' => 'Lisenssi',
         'details_licence_missing' => 'Lisenssiä ei löydy.',
         'details_current_version' => 'Tämän hetkinen versio',
-        'details_author' => 'Tekijä'
+        'details_author' => 'Tekijä',
     ],
     'server' => [
         'connect_error' => 'Palvelimeen ei saada yhteyttä.',
@@ -344,17 +344,17 @@
         'response_invalid' => 'Virheellinen vastaus palvelimelta.',
         'response_empty' => 'Tyhjä vastaus palvelimelta.',
         'file_error' => 'Paketin toimitus palvelimelta epäonnistui.',
-        'file_corrupt' => 'Palvelimella oleva tiedosto on vahingoittunut.'
+        'file_corrupt' => 'Palvelimella oleva tiedosto on vahingoittunut.',
     ],
     'behavior' => [
-        'missing_property' => 'Luokan :class täytyy määritellä ominaisuus $:property, jota käyttää :behavior käyttäytyminen.'
+        'missing_property' => 'Luokan :class täytyy määritellä ominaisuus $:property, jota käyttää :behavior käyttäytyminen.',
     ],
     'config' => [
         'not_found' => 'Asetustiedostoa :file ei löydy määriteltynä kohteelle :location.',
-        'required' => "Kohteen :location asetustiedostossa on oltava arvo ':property'."
+        'required' => "Kohteen :location asetustiedostossa on oltava arvo ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Ydintiedoston ':file' purku epäonnistui."
+        'extract_failed' => "Ydintiedoston ':file' purku epäonnistui.",
     ],
     'event_log' => [
         'hint' => 'Tämä loki näyttää listan mahdollisista virheistä, jotka tapahtuvat sovelluksessa, kuten poikkeukset ja virheen korjaustiedot.',
@@ -369,7 +369,7 @@
         'created_at' => 'Päivä & Aika',
         'message' => 'Viesti',
         'level' => 'Taso',
-        'preview_title' => 'Tapahtuma'
+        'preview_title' => 'Tapahtuma',
     ],
     'request_log' => [
         'hint' => 'Tämä loki näyttää listan selainten pyynnöistä, jotka saattavat vaatia huomiotasi. Esim. jos vierailijat avaavat CMS-sivun, jota ei löydy, kohde lisätään tilakoodilla 404.',
@@ -385,7 +385,7 @@
         'referer' => 'Viitteet',
         'url' => 'URL',
         'status_code' => 'Tilakoodi',
-        'preview_title' => 'Pyyntö'
+        'preview_title' => 'Pyyntö',
     ],
     'permissions' => [
         'name' => 'Järjestelmä',
@@ -398,7 +398,7 @@
         'manage_preferences' => 'Hallitse ylläpitopuolen asetuksia',
         'manage_editor' => 'Hallitse koodieditorin asetuksia',
         'view_the_dashboard' => 'Katso Dashboardia',
-        'manage_branding' => 'Muokkaa ylläpitoa'
+        'manage_branding' => 'Muokkaa ylläpitoa',
     ],
     'log' => [
         'menu_label' => 'Lokiasetukset',
@@ -414,5 +414,5 @@
     'media' => [
         'invalid_path' => "Virheellinen tiedostopolku: ':path'.",
         'folder_size_items' => 'tiedosto(a)',
-    ]
+    ],
 ];
diff --git a/modules/system/lang/fr/client.php b/modules/system/lang/fr/client.php
index fe746cdeb9..70fbbbd235 100644
--- a/modules/system/lang/fr/client.php
+++ b/modules/system/lang/fr/client.php
@@ -47,14 +47,14 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Annuler',
-        'widget_remove_confirm' => 'Retirer ce widget ?'
+        'widget_remove_confirm' => 'Retirer ce widget ?',
     ],
     'datepicker' => [
         'previousMonth' => 'Mois précédent',
         'nextMonth'  => 'Mois suivant',
         'months' => ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
         'weekdays' => ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
-        'weekdaysShort' => ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam']
+        'weekdaysShort' => ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
     ],
     'colorpicker' => [
         'last_color' => 'Utiliser la couleur sélectionnée précédemment',
@@ -64,11 +64,11 @@
     ],
     'filter' => [
         'group' => [
-            'all' => 'tous'
+            'all' => 'tous',
         ],
         'scopes' => [
             'apply_button_text' => 'Appliquer',
-            'clear_button_text'  => 'Annuler'
+            'clear_button_text'  => 'Annuler',
         ],
         'dates' => [
             'all' => 'toute la période',
@@ -83,8 +83,8 @@
             'filter_button_text' => 'Filtres',
             'reset_button_text'  => 'Réinitialiser',
             'min_placeholder' => 'Min',
-            'max_placeholder' => 'Max'
-        ]
+            'max_placeholder' => 'Max',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Afficher la pile d\'exécution',
@@ -99,7 +99,7 @@
             'openWith' => 'Ouvrir avec',
             'remember_choice' => 'Se souvenir de la sélection pour la durée de la session dans ce navigateur',
             'open' => 'Ouvrir',
-            'cancel' => 'Annuler'
-        ]
-    ]
+            'cancel' => 'Annuler',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php
index 57a25e478b..5cfb27578f 100644
--- a/modules/system/lang/fr/lang.php
+++ b/modules/system/lang/fr/lang.php
@@ -31,14 +31,14 @@
             'events' => 'Évènements',
             'customers' => 'Clients',
             'my_settings' => 'Mes réglages',
-        ]
+        ],
     ],
     'theme' => [
         'label' => 'Thème',
         'unnamed' => 'Thème sans nom',
         'name' => [
             'label' => 'Nom du thème',
-            'help' => 'Nommer le thème avec un nom de code unique. Par exemple, Winter.Vanilla'
+            'help' => 'Nommer le thème avec un nom de code unique. Par exemple, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -47,7 +47,7 @@
         'installed' => 'Thèmes installés',
         'no_themes' => 'Il n\'y a aucun thème installé depuis le Marketplace.',
         'recommended' => 'Recommandé',
-        'remove_confirm' => 'Êtes-vous sûr(e) de vouloir supprimer ce thème ?'
+        'remove_confirm' => 'Êtes-vous sûr(e) de vouloir supprimer ce thème ?',
     ],
     'plugin' => [
         'label' => 'Plugin',
@@ -121,7 +121,7 @@
         'test_content' => "Il s'agit d'un e-mail de test pour confirmer que les paramètres de messagerie fournis fonctionnent.",
         'test_confirm' => "Cela permettra de sauvegarder votre configuration actuelle et d'envoyer un e-mail de test à :email.",
         'return' => 'Retourner à la page des réglages du système',
-        'search' => 'Rechercher'
+        'search' => 'Rechercher',
     ],
     'mail' => [
         'log_file' => 'Fichier journal',
@@ -183,7 +183,7 @@
         'sending' => 'Envoi du message de test en cours…',
         'return' => 'Retour à la liste des modèles.',
         'options' => 'Options',
-        'disable_auto_inline_css' => 'Désactiver le CSS automatique en ligne'
+        'disable_auto_inline_css' => 'Désactiver le CSS automatique en ligne',
     ],
     'mail_brand' => [
         'menu_label' => 'Personnalisation des courriels',
@@ -197,7 +197,7 @@
                 'description' => 'Description',
                 'price' => 'Prix',
                 'centered' => 'Centré',
-                'right_aligned' => 'Aligné à droite'
+                'right_aligned' => 'Aligné à droite',
             ],
             'buttons' => [
                 'primary' => 'Bouton principal',
@@ -208,7 +208,7 @@
             'more' => 'Un peu plus de texte',
             'promotion' => 'Code de réduction: WINTER',
             'subcopy' => 'Ceci est le pré copyright de votre courriel',
-            'thanks' => 'Merci'
+            'thanks' => 'Merci',
         ],
         'fields' => [
             '_section_background' => 'Arrière-plan',
@@ -234,7 +234,7 @@
             'panel_bg' => 'Arrière-plan du panneau',
             'promotion_bg' => 'Arrière-plan de la promotion',
             'promotion_border_color' => 'Couleur de la bordure de la promotion',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Attacher un projet',
@@ -367,7 +367,7 @@
         'referer' => 'Référents',
         'url' => 'Adresse URL',
         'status_code' => 'Statut',
-        'preview_title' => 'Requête'
+        'preview_title' => 'Requête',
     ],
     'permissions' => [
         'name' => 'Système',
@@ -383,7 +383,7 @@
         'manage_own_editor' => 'Gérer les préférences personnelles de l\'éditeur de code',
         'view_the_dashboard' => 'Voir le tableau de bord',
         'manage_default_dashboard' => 'Gérer le tableau de bord par défaut',
-        'manage_branding' => 'Personnaliser l\'interface d\'administration'
+        'manage_branding' => 'Personnaliser l\'interface d\'administration',
     ],
     'log' => [
         'menu_label' => 'Paramètres du journal',
diff --git a/modules/system/lang/hu/client.php b/modules/system/lang/hu/client.php
index ab9f90dec8..65975a225d 100644
--- a/modules/system/lang/hu/client.php
+++ b/modules/system/lang/hu/client.php
@@ -31,7 +31,7 @@
         'link' => 'Hivatkozás',
         'horizontalrule' => 'Vonal beszúrása',
         'fullscreen' => 'Teljes képernyő',
-        'preview' => 'Előnézet'
+        'preview' => 'Előnézet',
     ],
     'mediamanager' => [
         'insert_link' => 'Hivatkozás beszúrása',
@@ -42,26 +42,26 @@
         'invalid_file_single_insert' => 'Kérjük jelöljön ki egy fájlt.',
         'invalid_image_empty_insert' => 'Válasszon ki legalább egy képet a beszúráshoz.',
         'invalid_video_empty_insert' => 'Válasszon ki legalább egy videót a beszúráshoz.',
-        'invalid_audio_empty_insert' => 'Válasszon ki legalább egy audiót a beszúráshoz.'
+        'invalid_audio_empty_insert' => 'Válasszon ki legalább egy audiót a beszúráshoz.',
     ],
     'alert' => [
         'confirm_button_text' => 'Igen',
         'cancel_button_text' => 'Mégsem',
-        'widget_remove_confirm' => 'Valóban törölni akarja?'
+        'widget_remove_confirm' => 'Valóban törölni akarja?',
     ],
     'datepicker' => [
         'previousMonth' => 'Előző hónap',
         'nextMonth' => 'Következő hónap',
         'months' => ['január', 'február', 'március', 'április', 'május', 'június', 'július', 'augusztus', 'szeptember', 'október', 'november', 'december'],
         'weekdays' => ['vasárnap', 'hétfő', 'kedd', 'szerda', 'csütörtök', 'péntek', 'szombat'],
-        'weekdaysShort' => ['va', 'hé', 'ke', 'sze', 'cs', 'pé', 'szo']
+        'weekdaysShort' => ['va', 'hé', 'ke', 'sze', 'cs', 'pé', 'szo'],
     ],
     'colorpicker' => [
         'choose' => 'Mentés',
     ],
     'filter' => [
         'group' => [
-            'all' => 'összes'
+            'all' => 'összes',
         ],
         'scopes' => [
             'apply_button_text' => 'Szűrés',
@@ -73,15 +73,15 @@
             'reset_button_text' => 'Alaphelyzet',
             'date_placeholder' => 'Dátum',
             'after_placeholder' => 'Kezdete',
-            'before_placeholder' => 'Vége'
+            'before_placeholder' => 'Vége',
         ],
         'numbers' => [
             'all' => 'összes',
             'filter_button_text' => 'Szűrés',
             'reset_button_text' => 'Alaphelyzet',
             'min_placeholder' => 'Minimum',
-            'max_placeholder' => 'Maximum'
-        ]
+            'max_placeholder' => 'Maximum',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Részletek',
@@ -96,7 +96,7 @@
             'openWith' => 'Megnyitás mint',
             'remember_choice' => 'Kiválasztott beállítások megjegyzése ebben a munkamenetben',
             'open' => 'Megnyitás',
-            'cancel' => 'Mégsem'
-        ]
-    ]
+            'cancel' => 'Mégsem',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php
index 9773adce30..7d3c6966d5 100644
--- a/modules/system/lang/hu/lang.php
+++ b/modules/system/lang/hu/lang.php
@@ -233,7 +233,7 @@
             'panel_bg' => 'Panel háttere',
             'promotion_bg' => 'Promóció háttere',
             'promotion_border_color' => 'Promóció szegély színe',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Csatolás',
@@ -335,7 +335,7 @@
         'required' => "A(z) :location helyen használt konfigurációnak meg kell adnia egy ':property' értéket.",
     ],
     'zip' => [
-        'extract_failed' => "Nem tömöríthető ki a(z) ':file' fájl."
+        'extract_failed' => "Nem tömöríthető ki a(z) ':file' fájl.",
     ],
     'event_log' => [
         'hint' => 'Ez a napló a rendszerben történt lehetséges hibákat listázza ki. Például a kivételeket és a hibakeresési információkat.',
diff --git a/modules/system/lang/id/lang.php b/modules/system/lang/id/lang.php
index 68e886f86b..c569e1e907 100644
--- a/modules/system/lang/id/lang.php
+++ b/modules/system/lang/id/lang.php
@@ -3,16 +3,16 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Dapati kembali yang mendasar'
+        'tagline' => 'Dapati kembali yang mendasar',
     ],
     'directory' => [
-        'create_fail' => 'Tidak dapat membuat direktori: :name'
+        'create_fail' => 'Tidak dapat membuat direktori: :name',
     ],
     'file' => [
-        'create_fail' => 'Tidak dapat membuat berkas: :name'
+        'create_fail' => 'Tidak dapat membuat berkas: :name',
     ],
     'combiner' => [
-        'not_found' => "Berkas penggabung ':name' tidak ditemukan."
+        'not_found' => "Berkas penggabung ':name' tidak ditemukan.",
     ],
     'system' => [
         'name' => 'Sistem',
@@ -29,15 +29,15 @@
             'social' => 'Sosial',
             'events' => 'Peristiwa',
             'customers' => 'Pelanggan',
-            'my_settings' => 'Pengaturanku'
-        ]
+            'my_settings' => 'Pengaturanku',
+        ],
     ],
     'plugin' => [
         'unnamed' => 'Pengaya Tak Bernama',
         'name' => [
             'label' => 'Nama Pengaya',
-            'help' => 'Namai pengaya dengan kode uniknya. Contoh, Winter.Blog'
-        ]
+            'help' => 'Namai pengaya dengan kode uniknya. Contoh, Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => 'Kelola pengaya',
@@ -55,7 +55,7 @@
         'disable_confirm' => 'Anda yakin akan melumpuhkannya?',
         'disable_success' => 'Berhasil melumpuhkan pengaya tersebut.',
         'enable_success' => 'Berhasil memberdayakan pengaya tersebut.',
-        'unknown_plugin' => 'Pengaya telah dilepas dari sistem berkas.'
+        'unknown_plugin' => 'Pengaya telah dilepas dari sistem berkas.',
     ],
     'project' => [
         'name' => 'Proyek',
@@ -66,10 +66,10 @@
         'id' => [
             'label' => 'ID Proyek',
             'help' => 'Bagaimana menemukan ID Proyek Anda',
-            'missing' => 'Silakan tentukan ID Proyek yang akan digunakan.'
+            'missing' => 'Silakan tentukan ID Proyek yang akan digunakan.',
         ],
         'detach_confirm' => 'Anda yakin akan melepaskan proyek ini?',
-        'unbind_success' => 'Proyek telah berhasil dilepaskan.'
+        'unbind_success' => 'Proyek telah berhasil dilepaskan.',
     ],
     'settings' => [
         'menu_label' => 'Pengaturan',
@@ -77,7 +77,7 @@
         'missing_model' => 'Laman pengaturan kehilangan definisi Model.',
         'update_success' => 'Pengaturan untuk :name berhasil diperbarui.',
         'return' => 'Kembali ke pengaturan sistem',
-        'search' => 'Pencarian'
+        'search' => 'Pencarian',
     ],
     'mail' => [
         'log_file' => 'Berkas catatan',
@@ -121,14 +121,14 @@
         'content_text' => 'Teks polos',
         'test_send' => 'Kirim pesan ujicoba',
         'test_success' => 'Pesan ujicoba berhasil dikirim.',
-        'return' => 'Kembali ke senarai acuan'
+        'return' => 'Kembali ke senarai acuan',
     ],
     'install' => [
         'project_label' => 'Kaitkan Ke Proyek',
         'plugin_label' => 'Pasang Pengaya',
         'missing_plugin_name' => 'Silakan tentukan nama Pengaya yang akan dipasang.',
         'install_completing' => 'Menyelesaikan proses pemasangan',
-        'install_success' => 'Pengaya berhasil dipasang.'
+        'install_success' => 'Pengaya berhasil dipasang.',
     ],
     'updates' => [
         'title' => 'Kelola Pembaruan',
@@ -163,12 +163,12 @@
         'force_label' => 'Paksa pembaruan',
         'found' => [
             'label' => 'Terdapat pembaruan baru!',
-            'help' => 'Klik Pembaruan perangkat lunak untuk memulai proses pembaruan.'
+            'help' => 'Klik Pembaruan perangkat lunak untuk memulai proses pembaruan.',
         ],
         'none' => [
             'label' => 'Tidak ada pembaruan',
-            'help' => 'Tidak ditemukan pembaruan baru.'
-        ]
+            'help' => 'Tidak ditemukan pembaruan baru.',
+        ],
     ],
     'server' => [
         'connect_error' => 'Galat mengkoneksikan dengan peladen.',
@@ -176,17 +176,17 @@
         'response_invalid' => 'Tanggapan tidak valid dari peladen.',
         'response_empty' => 'Tanggapan kosong dari peladen.',
         'file_error' => 'Peladen gagal mengirimkan paket.',
-        'file_corrupt' => 'Berkas dari peladen tidak lengkap.'
+        'file_corrupt' => 'Berkas dari peladen tidak lengkap.',
     ],
     'behavior' => [
-        'missing_property' => 'Kelas :class harus menetapkan properti $:property digunakan oleh behavior :behavior.'
+        'missing_property' => 'Kelas :class harus menetapkan properti $:property digunakan oleh behavior :behavior.',
     ],
     'config' => [
         'not_found' => 'Tidak dapat menemukan berkas pengaturan :file ditetapkan untuk :location.',
-        'required' => "Pengaturan yang digunakan pada :location harus memberikan nilai ':property'."
+        'required' => "Pengaturan yang digunakan pada :location harus memberikan nilai ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Tidak dapat membuka berkas inti ':file'."
+        'extract_failed' => "Tidak dapat membuka berkas inti ':file'.",
     ],
     'event_log' => [
         'hint' => 'Catatan ini menampilkan senarai kemungkinan galat yang terjadi pada aplikasi, seperti `exception` dan informasi awakutu.',
@@ -200,7 +200,7 @@
         'id_label' => 'ID Peristiwa',
         'created_at' => 'Tanggal & Waktu',
         'message' => 'Pesan',
-        'level' => 'Tingkat'
+        'level' => 'Tingkat',
     ],
     'request_log' => [
         'hint' => 'Catatan ini menampilkan senarai permintaan dari peramban yang mungkin memerlukan perhatian. Contohnya, jika pengunjung membuka laman CMS yang tidak dapat ditemukan, rekam dibuat dengan kode status 404.',
@@ -215,7 +215,7 @@
         'count' => 'Hitungan',
         'referer' => 'Perujuk',
         'url' => 'URL',
-        'status_code' => 'Status'
+        'status_code' => 'Status',
     ],
     'permissions' => [
         'name' => 'Sistem',
@@ -224,6 +224,6 @@
         'manage_mail_templates' => 'Kelola acuan surat',
         'manage_mail_settings' => 'Kelola pengaturan surat',
         'manage_other_administrators' => 'Kelola administrator lainnya',
-        'view_the_dashboard' => 'Tampilan dasbor'
-    ]
+        'view_the_dashboard' => 'Tampilan dasbor',
+    ],
 ];
diff --git a/modules/system/lang/it/client.php b/modules/system/lang/it/client.php
index d4383a6584..38bfc2fef7 100644
--- a/modules/system/lang/it/client.php
+++ b/modules/system/lang/it/client.php
@@ -97,6 +97,6 @@
             'remember_choice' => 'Ricorda l\'opzione selezionata per questa sessione',
             'open' => 'Apri',
             'cancel' => 'Annulla',
-        ]
-    ]
+        ],
+    ],
 ];
diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php
index dbb48e489d..f6ad2e0c7f 100644
--- a/modules/system/lang/it/lang.php
+++ b/modules/system/lang/it/lang.php
@@ -35,14 +35,14 @@
             'events' => 'Eventi',
             'customers' => 'Clienti',
             'my_settings' => 'Impostazioni personali',
-        ]
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Tema senza nome',
         'name' => [
             'label' => 'Nome tema',
-            'help' => 'Cerca il tema tramite il suo codice univoco. Ad esempio, Winter.Vanilla'
+            'help' => 'Cerca il tema tramite il suo codice univoco. Ad esempio, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -51,15 +51,15 @@
         'installed' => 'Temi installati',
         'no_themes' => 'Non ci sono temi installati dal marketplace.',
         'recommended' => 'Raccomandati',
-        'remove_confirm' => 'Sei sicuro di voler rimuovere questo tema?'
+        'remove_confirm' => 'Sei sicuro di voler rimuovere questo tema?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Plugin senza nome',
         'name' => [
             'label' => 'Nome del plugin',
-            'help' => 'Cerca il plugin tramite il suo codice univoco. Ad esempio, Winter.Blog'
-        ]
+            'help' => 'Cerca il plugin tramite il suo codice univoco. Ad esempio, Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => 'Gestisci plugin',
@@ -107,7 +107,7 @@
         'missing_model' => 'La pagine delle impostazioni non ha nessun modello associato.',
         'update_success' => 'Le impostazioni per :name sono state aggiornate con successo.',
         'return' => 'Ritorna alle impostazioni di sistema',
-        'search' => 'Cerca'
+        'search' => 'Cerca',
     ],
     'mail' => [
         'log_file' => 'File di log',
@@ -316,7 +316,7 @@
         'created_at' => 'Data e ora',
         'message' => 'Messaggio',
         'level' => 'Livello',
-        'preview_title' => 'Evento'
+        'preview_title' => 'Evento',
     ],
     'request_log' => [
         'hint' => 'Questo registro visualizza un elenco delle richieste del browser che possono richiedere attenzione. Ad esempio, se un visitatore apre una pagina del CMS che non può essere trovata, viene creato un record con il codice di errore 404.',
@@ -332,7 +332,7 @@
         'referer' => 'Provenienza',
         'url' => 'URL',
         'status_code' => 'Codice di stato',
-        'preview_title' => 'Richiesta'
+        'preview_title' => 'Richiesta',
     ],
     'permissions' => [
         'name' => 'Sistema',
diff --git a/modules/system/lang/ja/lang.php b/modules/system/lang/ja/lang.php
index d922ea6a88..183de206ff 100644
--- a/modules/system/lang/ja/lang.php
+++ b/modules/system/lang/ja/lang.php
@@ -29,8 +29,8 @@
             'social' => 'ソーシャル',
             'events' => 'イベント',
             'customers' => 'カスタマー',
-            'my_settings' => 'マイ設定'
-        ]
+            'my_settings' => 'マイ設定',
+        ],
     ],
     'plugin' => [
         'unnamed' => '名前なしプラグイン',
@@ -130,7 +130,7 @@
         'missing_model' => 'モデルの定義が見つかりません。',
         'update_success' => ':name を設定しました。',
         'return' => 'システム設定へ戻る',
-        'search' => '検索'
+        'search' => '検索',
     ],
     'mail' => [
         'log_file' => 'ログファイル',
diff --git a/modules/system/lang/kr/client.php b/modules/system/lang/kr/client.php
index f05baaadee..46eeefc7e0 100644
--- a/modules/system/lang/kr/client.php
+++ b/modules/system/lang/kr/client.php
@@ -47,18 +47,18 @@
     'alert' => [
         'confirm_button_text' => '확인',
         'cancel_button_text' => '취소',
-        'widget_remove_confirm' => '이 위젯을 삭제하시겠습니까?'
+        'widget_remove_confirm' => '이 위젯을 삭제하시겠습니까?',
     ],
     'datepicker' => [
         'previousMonth' => '지난 달',
         'nextMonth' => '다음 달',
         'months' => ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
         'weekdays' => ['일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'],
-        'weekdaysShort' => ['일', '월', '화', '수', '목', '금', '토']
+        'weekdaysShort' => ['일', '월', '화', '수', '목', '금', '토'],
     ],
     'filter' => [
         'group' => [
-            'all' => '전체'
+            'all' => '전체',
         ],
         'dates' => [
             'all' => '전체',
@@ -66,8 +66,8 @@
             'reset_button_text'  => '재설정',
             'date_placeholder' => '날짜',
             'after_placeholder' => '이후',
-            'before_placeholder' => '이전'
-        ]
+            'before_placeholder' => '이전',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => '스택 추적 보기',
@@ -82,7 +82,7 @@
             'openWith' => '같이 열기',
             'remember_choice' => '이 세션의 옵션을 기억',
             'open' => '열기',
-            'cancel' => '취소'
-        ]
-    ]
+            'cancel' => '취소',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/kr/lang.php b/modules/system/lang/kr/lang.php
index 9e602d3be8..317e6bbb2d 100644
--- a/modules/system/lang/kr/lang.php
+++ b/modules/system/lang/kr/lang.php
@@ -34,15 +34,15 @@
             'social' => '소셜',
             'events' => '이벤트',
             'customers' => '고객',
-            'my_settings' => '내 설정'
-        ]
+            'my_settings' => '내 설정',
+        ],
     ],
     'theme' => [
         'label' => '테마',
         'unnamed' => '이름없는 테마',
         'name' => [
             'label' => '테마명',
-            'help' => '중복없는 테마명을 사용해주세요. (예:Winter.Vanilla)'
+            'help' => '중복없는 테마명을 사용해주세요. (예:Winter.Vanilla)',
         ],
     ],
     'themes' => [
@@ -51,7 +51,7 @@
         'installed' => '설치된 테마',
         'no_themes' => '마켓에서 설치된 테마가 없습니다.',
         'recommended' => '추천',
-        'remove_confirm' => '이 테마를 삭제하시겠습니까?'
+        'remove_confirm' => '이 테마를 삭제하시겠습니까?',
     ],
     'plugin' => [
         'label' => '플러그인',
@@ -60,7 +60,7 @@
             'label' => '플러그인명',
             'help' => '중복없는 플러그인명을 사용해주세요. (예:Winter.Blog)',
         ],
-        'by_author' => 'By :name'
+        'by_author' => 'By :name',
     ],
     'plugins' => [
         'manage' => '플러그인 관리',
@@ -86,7 +86,7 @@
         'disable_confirm' => '비활성화하시겠습니까?',
         'disable_success' => '플러그인을 비활성화 했습니다.',
         'enable_success' => '플러그인을 활성화했습니다.',
-        'unknown_plugin' => '시스템에서 불명확한 플러그인을 삭제했습니다.'
+        'unknown_plugin' => '시스템에서 불명확한 플러그인을 삭제했습니다.',
     ],
     'project' => [
         'name' => '프로젝트',
@@ -108,7 +108,7 @@
         'missing_model' => '모델의 정의를 발견할 수 없습니다.',
         'update_success' => ':name 을 설정했습니다.',
         'return' => '시스템 설정으로 돌아가기',
-        'search' => '검색'
+        'search' => '검색',
     ],
     'mail' => [
         'log_file' => '로그파일',
@@ -162,7 +162,7 @@
         'deleting' => '템플릿을 삭제중...',
         'deleting_layout' => '레이아웃을 삭제중...',
         'sending' => '테스트 메시지 전송중...',
-        'return' => '템플릿 목록으로 돌아가기'
+        'return' => '템플릿 목록으로 돌아가기',
     ],
     'install' => [
         'project_label' => '프로젝트 추가',
@@ -220,7 +220,7 @@
             'empty' => '선택',
             'confirm' => '업데이트',
             'skip' => '이번만 업데이트 안함',
-            'ignore' => '계속 업데이트 안'
+            'ignore' => '계속 업데이트 안',
         ],
         'important_action_required' => '선택 필요',
         'important_view_guide' => '업그레이드 가이드 보기',
@@ -237,7 +237,7 @@
         'details_licence' => '라이센스',
         'details_licence_missing' => '라이센스 정보가 제공되지 않습니다.',
         'details_current_version' => '현재 버전',
-        'details_author' => '작성자'
+        'details_author' => '작성자',
     ],
     'server' => [
         'connect_error' => '서버 접속 오류.',
@@ -270,7 +270,7 @@
         'created_at' => '생성시간',
         'message' => '메시지',
         'level' => '레벨',
-        'preview_title' => '이벤트'
+        'preview_title' => '이벤트',
     ],
     'request_log' => [
         'hint' => '존재하지 않는 페이지요청등 주의가 필요한 브라우저 요청을 표시합니다.',
@@ -286,7 +286,7 @@
         'referer' => 'Referer',
         'url' => 'URL',
         'status_code' => '상태코드',
-        'preview_title' => '요청'
+        'preview_title' => '요청',
     ],
     'permissions' => [
         'name' => '시스템',
@@ -299,7 +299,7 @@
         'manage_preferences' => '백엔드 설정 관리',
         'manage_editor' => '코드 에디터 설정 관리',
         'view_the_dashboard' => '대시보드 표시',
-        'manage_branding' => '백엔드 브랜드 변경'
+        'manage_branding' => '백엔드 브랜드 변경',
     ],
     'log' => [
         'menu_label' => '로그 설정',
diff --git a/modules/system/lang/lt/client.php b/modules/system/lang/lt/client.php
index f3f68b858e..5cfa2dcfea 100644
--- a/modules/system/lang/lt/client.php
+++ b/modules/system/lang/lt/client.php
@@ -47,18 +47,18 @@
     'alert' => [
         'confirm_button_text' => 'GERAI',
         'cancel_button_text' => 'Atšaukti',
-        'widget_remove_confirm' => 'Pašalinti šį valdiklį?'
+        'widget_remove_confirm' => 'Pašalinti šį valdiklį?',
     ],
     'datepicker' => [
         'previousMonth' => 'Ankstenis mėnuo',
         'nextMonth' => 'Sekantis Mėnuo',
         'months' => ['Sausis', 'Vasaris', 'Kovas', 'Balandis', 'Gegužė', 'Birželis', 'Liepa', 'Rugpjūtis', 'Rugsėjis', 'Spalis', 'Lapkritis', 'Gruodis'],
         'weekdays' => ['Sekmadienis', 'Pirmadienis', 'Antradienis', 'Trečiadienis', 'Ketvirtadienis', 'Penktadienis', 'Šeštadienis'],
-        'weekdaysShort' => ['Sek', 'Pir', 'Ant', 'Tre', 'Ket', 'Pen', 'šeš']
+        'weekdaysShort' => ['Sek', 'Pir', 'Ant', 'Tre', 'Ket', 'Pen', 'šeš'],
     ],
     'filter' => [
         'group' => [
-            'all' => 'visos'
+            'all' => 'visos',
         ],
         'dates' => [
             'all' => 'visos',
@@ -66,8 +66,8 @@
             'reset_button_text'  => 'Atstatyti',
             'date_placeholder' => 'Data',
             'after_placeholder' => 'Po',
-            'before_placeholder' => 'Prieš'
-        ]
+            'before_placeholder' => 'Prieš',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Rodyti išklotinę',
@@ -82,7 +82,7 @@
             'openWith' => 'Atidaryti su',
             'remember_choice' => 'Atsiminti pasirinktą parinktį šiai sesijai',
             'open' => 'Atidaryti',
-            'cancel' => 'Atšaukti'
-        ]
-    ]
+            'cancel' => 'Atšaukti',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/lt/lang.php b/modules/system/lang/lt/lang.php
index 2b237a1ef3..7073238fde 100644
--- a/modules/system/lang/lt/lang.php
+++ b/modules/system/lang/lt/lang.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Puiki pradžia!'
+        'tagline' => 'Puiki pradžia!',
     ],
     'locale' => [
         'be' => 'Беларуская',
@@ -40,13 +40,13 @@
         'tr' => 'Türk',
         'zh-cn' => '简体中文',
         'zh-tw' => '繁體中文',
-        'vn' => 'Tiếng việt'
+        'vn' => 'Tiếng việt',
     ],
     'directory' => [
-        'create_fail' => 'Negalime sukurti direktorijos: :name'
+        'create_fail' => 'Negalime sukurti direktorijos: :name',
     ],
     'file' => [
-        'create_fail' => 'Negalime sukurti failo: :name'
+        'create_fail' => 'Negalime sukurti failo: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -54,7 +54,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Bendrintojo failas ':name' nerastas."
+        'not_found' => "Bendrintojo failas ':name' nerastas.",
     ],
     'system' => [
         'name' => 'Sistema',
@@ -71,15 +71,15 @@
             'social' => 'Social',
             'events' => 'Įvykiai',
             'customers' => 'Klientai',
-            'my_settings' => 'Mano nustatymai'
-        ]
+            'my_settings' => 'Mano nustatymai',
+        ],
     ],
     'theme' => [
         'label' => 'Dizainas',
         'unnamed' => 'Neužvardintas dizainas',
         'name' => [
             'label' => 'Dizaino pavadinimas',
-            'help' => 'Užvardinkite dizainą unikaliu kodu. Pavyzdžiui, Winter.Vanilla'
+            'help' => 'Užvardinkite dizainą unikaliu kodu. Pavyzdžiui, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -88,15 +88,15 @@
         'installed' => 'Įdiegti dizainai',
         'no_themes' => 'Kolkas įdiegtų dizainų iš viešosios saugyklos nėra.',
         'recommended' => 'Rekomenduojama',
-        'remove_confirm' => 'Ar tikrai norite pašalinti šį dizainą?'
+        'remove_confirm' => 'Ar tikrai norite pašalinti šį dizainą?',
     ],
     'plugin' => [
         'label' => 'Įskiepiai',
         'unnamed' => 'Neužvardintas įskiepis',
         'name' => [
             'label' => 'Įskiepio pavadinimas',
-            'help' => 'Užvardinkite įskiepį unikaliu kodu. Pavyzdžiui, Winter.Blog'
-        ]
+            'help' => 'Užvardinkite įskiepį unikaliu kodu. Pavyzdžiui, Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => 'Tvarkyti įskiepius',
@@ -122,7 +122,7 @@
         'disable_confirm' => 'Ar tikrai?',
         'disable_success' => 'Sėkmingai išjungėme šiuos įskiepius.',
         'enable_success' => 'Sėkmingai ijungėme šiuos įskiepius.',
-        'unknown_plugin' => 'Įskiepis buvo pašalintas iš failų sistemos.'
+        'unknown_plugin' => 'Įskiepis buvo pašalintas iš failų sistemos.',
     ],
     'project' => [
         'name' => 'Projektas',
@@ -133,10 +133,10 @@
         'id' => [
             'label' => 'Projekto ID',
             'help' => 'Kaip rasti Projekto ID',
-            'missing' => 'Prašome nurodyti Projekto ID, kurį norite naudoti.'
+            'missing' => 'Prašome nurodyti Projekto ID, kurį norite naudoti.',
         ],
         'detach_confirm' => 'Ar tikrai norite atjungti Projektą?',
-        'unbind_success' => 'Projektas buvo sėkmingai atjungtas.'
+        'unbind_success' => 'Projektas buvo sėkmingai atjungtas.',
     ],
     'settings' => [
         'menu_label' => 'Nustatymai',
@@ -144,7 +144,7 @@
         'missing_model' => 'Nustatymų puslapiui trūksta Modelio aprašo.',
         'update_success' => ':name nustatymai atnaujinti',
         'return' => 'Grįžti į sistemos nustatymus',
-        'search' => 'Ieškoti'
+        'search' => 'Ieškoti',
     ],
     'mail' => [
         'log_file' => 'Registro failas',
@@ -199,7 +199,7 @@
         'deleting' => 'Šablonas trinamas...',
         'deleting_layout' => 'Išvaizda trinama...',
         'sending' => 'Siunčiamas bandomasis laiškas...',
-        'return' => 'Grįžti į šablonų sąrašą'
+        'return' => 'Grįžti į šablonų sąrašą',
     ],
     'install' => [
         'project_label' => 'Prisegti prie Projekto',
@@ -208,7 +208,7 @@
         'missing_plugin_name' => 'Nurodykite instaliuojamo Įskiepio pavadinimą.',
         'missing_theme_name' => 'Nurodykite instaliuojamo Dizaino pavadinimą.',
         'install_completing' => 'Užbaigiamas diegimo procesas',
-        'install_success' => 'Įskiepis įdiegtas sėkmingai'
+        'install_success' => 'Įskiepis įdiegtas sėkmingai',
     ],
     'updates' => [
         'title' => 'Tvarkyti Naujinimus',
@@ -247,17 +247,17 @@
         'force_label' => 'Naujinti priverstinai',
         'found' => [
             'label' => 'Yra atnaujinimų!',
-            'help' => 'Spauskite Atnaujinti programą, kad pradėtumėte atnaujinimo procesą.'
+            'help' => 'Spauskite Atnaujinti programą, kad pradėtumėte atnaujinimo procesą.',
         ],
         'none' => [
             'label' => 'Naujinimų nėra',
-            'help' => 'Naujų papildymų neradome.'
+            'help' => 'Naujų papildymų neradome.',
         ],
         'important_action' => [
             'empty' => 'Pasirinkite veiksmą',
             'confirm' => 'Patvirtinti atnaujinimą',
             'skip' => 'Praleisti šį įskiepį (tik šįkart)',
-            'ignore' => 'Praleisti šį įskiepį (visada)'
+            'ignore' => 'Praleisti šį įskiepį (visada)',
         ],
         'important_action_required' => 'Reikalingas veiksmas',
         'important_view_guide' => 'Žiūrėkite papildymo gidą',
@@ -273,7 +273,7 @@
         'details_licence' => 'Licencija',
         'details_licence_missing' => 'Licencija nepateikta.',
         'details_current_version' => 'Dabartinė versija',
-        'details_author' => 'Autorius'
+        'details_author' => 'Autorius',
     ],
     'server' => [
         'connect_error' => 'Nepavyko prisijungti prie serverio.',
@@ -281,17 +281,17 @@
         'response_invalid' => 'Netinkamas serverio atsakymas.',
         'response_empty' => 'Tuščias serverio atsakymas.',
         'file_error' => 'Serveriui nepavyko pateikti paketo.',
-        'file_corrupt' => 'Failas iš serverio yra sugadintas.'
+        'file_corrupt' => 'Failas iš serverio yra sugadintas.',
     ],
     'behavior' => [
-        'missing_property' => 'Klasė :class turi nurodyti ypatybę $:property naudojamą :behavior funkcionalumo.'
+        'missing_property' => 'Klasė :class turi nurodyti ypatybę $:property naudojamą :behavior funkcionalumo.',
     ],
     'config' => [
         'not_found' => 'Nepavyko rasti konfigūracijos failo :file nurodyto vietai :location.',
-        'required' => "Konfigūracija naudojama :location turi pateikti reikšmę ':property'."
+        'required' => "Konfigūracija naudojama :location turi pateikti reikšmę ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Nepavyko išskleisti šakninio failo ':file'."
+        'extract_failed' => "Nepavyko išskleisti šakninio failo ':file'.",
     ],
     'event_log' => [
         'hint' => 'Šis registras rodo potencialių klaidų, kurios atsirado programoje, sąrašą. Išimtinos klaidos ir taisymo informacija.',
@@ -306,7 +306,7 @@
         'created_at' => 'Data ir Laikas',
         'message' => 'Žinutė',
         'level' => 'Lygis',
-        'preview_title' => 'Įvykis'
+        'preview_title' => 'Įvykis',
     ],
     'request_log' => [
         'hint' => 'Šis registras rodo naršyklės užklausų, kurios galimai reikalauja peržiūros, sąrašą. Pavyzdžiui jeigu lankytojas atidaro turinio puslapį, kuris neegzistuoja - tokiu atveju yra sukuriamas įrašas su statuso kodu 404.',
@@ -322,7 +322,7 @@
         'referer' => 'Siuntėjai',
         'url' => 'URL',
         'status_code' => 'Statusas',
-        'preview_title' => 'Užklausa'
+        'preview_title' => 'Užklausa',
     ],
     'permissions' => [
         'name' => 'Sistema',
@@ -335,7 +335,7 @@
         'manage_preferences' => 'Tvarkyti posistemės nustatymus',
         'manage_editor' => 'Tvarkyti kodo redaktoriaus nustatymus',
         'view_the_dashboard' => 'Skydelis',
-        'manage_branding' => 'Redaguoti posistemę'
+        'manage_branding' => 'Redaguoti posistemę',
     ],
     'media' => [
         'invalid_path' => "Nurodytas netinkamas kelias: ':path'.",
diff --git a/modules/system/lang/lv/client.php b/modules/system/lang/lv/client.php
index f2faab410e..25dab1f298 100644
--- a/modules/system/lang/lv/client.php
+++ b/modules/system/lang/lv/client.php
@@ -54,7 +54,7 @@
         'nextMonth' => 'Nākamais mēnesis',
         'months' => ['Janvāris', 'Februāris', 'Marts', 'Aprīlis', 'Maijs', 'Jūnijs', 'Jūlijs', 'Augusts', 'Septembris', 'Oktobris', 'Novembris', 'Decembris'],
         'weekdays' => ['Svētdiena', 'Pirmdiena', 'Otrdiena', 'Trešdiena', 'Ceturtdiena', 'Piektdiena', 'Sestdiena'],
-        'weekdaysShort' => ['Sv', 'P', 'O', 'T', 'C', 'Pk', 'S']
+        'weekdaysShort' => ['Sv', 'P', 'O', 'T', 'C', 'Pk', 'S'],
     ],
     'colorpicker' => [
         'last_color' => 'Lietot iepriekš izvēlēto krāsu',
diff --git a/modules/system/lang/nb-no/client.php b/modules/system/lang/nb-no/client.php
index b3ff388198..95d0ebd747 100644
--- a/modules/system/lang/nb-no/client.php
+++ b/modules/system/lang/nb-no/client.php
@@ -49,7 +49,7 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Avbryt',
-        'widget_remove_confirm' => 'Fjerne widget?'
+        'widget_remove_confirm' => 'Fjerne widget?',
     ],
 
     'datepicker' => [
@@ -57,12 +57,12 @@
         'nextMonth' => 'Neste måned',
         'months' => ['januar', 'februar', 'mars', 'april', 'mai', 'juni', 'july', 'august', 'september', 'oktober', 'november', 'desember'],
         'weekdays' => ['søndag', 'mandag', 'tirsdag', 'onsdag', 'torsdag', 'fredag', 'lørdag'],
-        'weekdaysShort' => ['søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør']
+        'weekdaysShort' => ['søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør'],
     ],
 
     'filter' => [
         'group' => [
-            'all' => 'alle'
+            'all' => 'alle',
         ],
         'dates' => [
             'all' => 'alle',
@@ -70,8 +70,8 @@
             'reset_button_text'  => 'Tilbakestill',
             'date_placeholder' => 'Dato',
             'after_placeholder' => 'Etter',
-            'before_placeholder' => 'Før'
-        ]
+            'before_placeholder' => 'Før',
+        ],
     ],
 
     'eventlog' => [
@@ -87,7 +87,7 @@
             'openWith' => 'Åpne med',
             'remember_choice' => 'Husk valget for denne sesjonen',
             'open' => 'Åpne',
-            'cancel' => 'Avbryt'
-        ]
-    ]
+            'cancel' => 'Avbryt',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php
index 326a0591d8..25c66dfb3d 100644
--- a/modules/system/lang/nb-no/lang.php
+++ b/modules/system/lang/nb-no/lang.php
@@ -3,13 +3,13 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Getting back to basics'
+        'tagline' => 'Getting back to basics',
     ],
     'directory' => [
-        'create_fail' => 'Kan ikke opprette mappen: :name'
+        'create_fail' => 'Kan ikke opprette mappen: :name',
     ],
     'file' => [
-        'create_fail' => 'Kan ikke opprette filen: :name'
+        'create_fail' => 'Kan ikke opprette filen: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -17,7 +17,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Kombinasjonsfilen ':name' ble ikke funnet."
+        'not_found' => "Kombinasjonsfilen ':name' ble ikke funnet.",
     ],
     'system' => [
         'name' => 'System',
@@ -34,15 +34,15 @@
             'social' => 'Sosialt',
             'events' => 'Hendelser',
             'customers' => 'Kunder',
-            'my_settings' => 'Mine innstillinger'
-        ]
+            'my_settings' => 'Mine innstillinger',
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Tema uten navn',
         'name' => [
             'label' => 'Navn på tema',
-            'help' => 'Navngi temaet ved et unikt navn. For eksempel, Winter.Vanilla'
+            'help' => 'Navngi temaet ved et unikt navn. For eksempel, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -51,15 +51,15 @@
         'installed' => 'Installerte temaer',
         'no_themes' => 'Det er ingen installerte temaer fra markedsplassen.',
         'recommended' => 'Anbefalt',
-        'remove_confirm' => 'Vil du virkelig slette dette temaet?'
+        'remove_confirm' => 'Vil du virkelig slette dette temaet?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Plugin uten navn',
         'name' => [
             'label' => 'Navn på plugin',
-            'help' => 'Navngi pluginen ved et unikt navn. For eksempel, Winter.Blog'
-        ]
+            'help' => 'Navngi pluginen ved et unikt navn. For eksempel, Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => 'Administrere plugins',
@@ -85,7 +85,7 @@
         'disable_confirm' => 'Er du sikker?',
         'disable_success' => 'Plugins har blitt deaktivert.',
         'enable_success' => 'Plugins har blitt aktivert.',
-        'unknown_plugin' => 'Plugins har blitt fjernet fra systemet.'
+        'unknown_plugin' => 'Plugins har blitt fjernet fra systemet.',
     ],
     'project' => [
         'name' => 'Prosjekt',
@@ -96,10 +96,10 @@
         'id' => [
             'label' => 'Prosjekt-ID',
             'help' => 'Hvordan finne din prosjekt-ID',
-            'missing' => 'Vennligst spesifiser en prosjekt-ID.'
+            'missing' => 'Vennligst spesifiser en prosjekt-ID.',
         ],
         'detach_confirm' => 'Vil du virkelig avkoble dette prosjektet?',
-        'unbind_success' => 'Prosjektet har blitt avkoblet.'
+        'unbind_success' => 'Prosjektet har blitt avkoblet.',
     ],
     'settings' => [
         'menu_label' => 'Innstillinger',
@@ -107,7 +107,7 @@
         'missing_model' => 'Innstillingssiden mangler en modell-definisjon.',
         'update_success' => 'Innstillingene for :name har blitt lagret.',
         'return' => 'Tilbake til systeminnstillinger',
-        'search' => 'Søk'
+        'search' => 'Søk',
     ],
     'mail' => [
         'log_file' => 'Loggfil',
@@ -162,7 +162,7 @@
         'deleting' => 'Sletter mal...',
         'deleting_layout' => 'Sletter layout...',
         'sending' => 'Sender testmelding...',
-        'return' => 'Tilbake til mallisten'
+        'return' => 'Tilbake til mallisten',
     ],
     'install' => [
         'project_label' => 'Tilkoble prosjekt',
@@ -171,7 +171,7 @@
         'missing_plugin_name' => 'Vennligst oppgi pluginens navn.',
         'missing_theme_name' => 'Oppgi tema-navn for å installere.',
         'install_completing' => 'Fullfører installasjonen',
-        'install_success' => 'Plugin har blitt installert.'
+        'install_success' => 'Plugin har blitt installert.',
     ],
     'updates' => [
         'title' => 'Administrer oppdateringer',
@@ -210,11 +210,11 @@
         'force_label' => 'Tving update',
         'found' => [
             'label' => 'Fant nye oppdateringer!',
-            'help' => 'Klikk på Oppdatér programvare for å oppdatere.'
+            'help' => 'Klikk på Oppdatér programvare for å oppdatere.',
         ],
         'none' => [
             'label' => 'Ingen oppdateringer',
-            'help' => 'Ingen nye oppdateringer ble funnet.'
+            'help' => 'Ingen nye oppdateringer ble funnet.',
         ],
         'important_action' => [
             'empty' => 'Velg handling',
@@ -240,17 +240,17 @@
         'response_invalid' => 'Feilaktig respons fra serveren.',
         'response_empty' => 'Tom respons fra serveren.',
         'file_error' => 'Serveren kunne ikke levere pakken.',
-        'file_corrupt' => 'Pakken fra serveren er korrupt.'
+        'file_corrupt' => 'Pakken fra serveren er korrupt.',
     ],
     'behavior' => [
-        'missing_property' => 'Klassen :class må definere egenskapen $:property som brukes av :behavior -egenskapen.'
+        'missing_property' => 'Klassen :class må definere egenskapen $:property som brukes av :behavior -egenskapen.',
     ],
     'config' => [
         'not_found' => 'Fant ikke konfigurasjonsfilen :file definert for for :location.',
-        'required' => "Konfigurasjon brukt i :location må angi verdien ':property'."
+        'required' => "Konfigurasjon brukt i :location må angi verdien ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Kunne ikke pakke opp core-fil ':file'."
+        'extract_failed' => "Kunne ikke pakke opp core-fil ':file'.",
     ],
     'event_log' => [
         'hint' => 'Denne loggen viser en liste over potensielle feilmeldinger som oppstår i applikasjonen, for eksempel unntak og debugginginformasjon.',
@@ -265,7 +265,7 @@
         'created_at' => 'Tid',
         'message' => 'Melding',
         'level' => 'Nivå',
-        'preview_title' => 'Hendelse'
+        'preview_title' => 'Hendelse',
     ],
     'request_log' => [
         'hint' => 'Denne loggen viser en liste over nettleserforespørsler som kan kreve oppmerksomhet. For eksempel, hvis en bruker besøker en side som ikke eksisterer, vil det bli oppført her med statuskode 404.',
@@ -281,7 +281,7 @@
         'referer' => 'Referers',
         'url' => 'URL',
         'status_code' => 'Status',
-        'preview_title' => 'Forespørsel'
+        'preview_title' => 'Forespørsel',
     ],
     'permissions' => [
         'name' => 'System',
@@ -294,7 +294,7 @@
         'manage_preferences' => 'Administrer backend-innstillinger',
         'manage_editor' => 'Administrer kodeeditor-innstillinger',
         'view_the_dashboard' => 'Se dashboard',
-        'manage_branding' => 'Tilpasse backend'
+        'manage_branding' => 'Tilpasse backend',
     ],
     'media' => [
         'invalid_path' => "Ugyldig filsti: ':path'.",
diff --git a/modules/system/lang/nl/client.php b/modules/system/lang/nl/client.php
index 7ed6a03884..fe290fea55 100644
--- a/modules/system/lang/nl/client.php
+++ b/modules/system/lang/nl/client.php
@@ -47,25 +47,25 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Annuleren',
-        'widget_remove_confirm' => 'Deze widget verwijderen?'
+        'widget_remove_confirm' => 'Deze widget verwijderen?',
     ],
     'datepicker' => [
         'previousMonth' => 'Vorige maand',
         'nextMonth' => 'Volgende maan',
         'months' => ['Januari', 'Februari', 'Maart', 'April', 'Mei', 'Juni', 'Juli', 'Augustus', 'September', 'Oktober', 'November', 'December'],
         'weekdays' => ['Zondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrijdag', 'Zaterdag'],
-        'weekdaysShort' => ['Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za']
+        'weekdaysShort' => ['Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za'],
     ],
     'colorpicker' => [
         'choose' => 'OK',
     ],
     'filter' => [
         'group' => [
-            'all' => 'alle'
+            'all' => 'alle',
         ],
         'scopes' => [
             'apply_button_text' => 'Toepassen',
-            'clear_button_text'  => 'Resetten'
+            'clear_button_text'  => 'Resetten',
         ],
         'dates' => [
             'all' => 'alle',
@@ -73,7 +73,7 @@
             'reset_button_text'  => 'Resetten',
             'date_placeholder' => 'Datum',
             'after_placeholder' => 'Na',
-            'before_placeholder' => 'Voor'
+            'before_placeholder' => 'Voor',
         ],
         'numbers' => [
             'all' => 'alle',
diff --git a/modules/system/lang/pl/client.php b/modules/system/lang/pl/client.php
index df124c2c08..080f37daf0 100644
--- a/modules/system/lang/pl/client.php
+++ b/modules/system/lang/pl/client.php
@@ -56,12 +56,12 @@
         'nextMonth' => 'Następny miesiąc',
         'months' => ['Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'],
         'weekdays' => ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'],
-        'weekdaysShort' => ['Nie', 'Pn', 'Wt', 'Śr', 'Czw', 'Pt', 'So']
+        'weekdaysShort' => ['Nie', 'Pn', 'Wt', 'Śr', 'Czw', 'Pt', 'So'],
     ],
 
     'filter' => [
         'group' => [
-            'all' => 'wszystkie'
+            'all' => 'wszystkie',
         ],
         'dates' => [
             'all' => 'wszystkie',
@@ -69,8 +69,8 @@
             'reset_button_text'  => 'Resetuj',
             'date_placeholder' => 'Data',
             'after_placeholder' => 'Po',
-            'before_placeholder' => 'Przed'
-        ]
+            'before_placeholder' => 'Przed',
+        ],
     ],
 
     'eventlog' => [
@@ -86,7 +86,7 @@
             'openWith' => 'Otwórz za pomocą',
             'remember_choice' => 'Zapamiętaj wybraną opcję dla tej sesji',
             'open' => 'Otwórz',
-            'cancel' => 'Anuluj'
-        ]
-    ]
+            'cancel' => 'Anuluj',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/pt-br/client.php b/modules/system/lang/pt-br/client.php
index 12eb5c3801..6847db7d55 100644
--- a/modules/system/lang/pt-br/client.php
+++ b/modules/system/lang/pt-br/client.php
@@ -47,25 +47,25 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Cancelar',
-        'widget_remove_confirm' => 'Remover este widget?'
+        'widget_remove_confirm' => 'Remover este widget?',
     ],
     'datepicker' => [
         'previousMonth' => 'Mês anterior',
         'nextMonth' => 'Próximo mês',
         'months' => ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
         'weekdays' => ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'],
-        'weekdaysShort' => ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab']
+        'weekdaysShort' => ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab'],
     ],
     'colorpicker' => [
         'choose' => 'Ok',
     ],
     'filter' => [
         'group' => [
-            'all' => 'todos'
+            'all' => 'todos',
         ],
         'scopes' => [
             'apply_button_text' => 'Aplicar',
-            'clear_button_text'  => 'Limpar'
+            'clear_button_text'  => 'Limpar',
         ],
         'dates' => [
             'all' => 'todas',
@@ -73,15 +73,15 @@
             'reset_button_text'  => 'Reiniciar',
             'date_placeholder' => 'Data',
             'after_placeholder' => 'Após',
-            'before_placeholder' => 'Antes'
+            'before_placeholder' => 'Antes',
         ],
         'numbers' => [
             'all' => 'todas',
             'filter_button_text' => 'Filtar',
             'reset_button_text'  => 'Reiniciar',
             'min_placeholder' => 'Min',
-            'max_placeholder' => 'Max'
-        ]
+            'max_placeholder' => 'Max',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Exibir o rastreamento',
@@ -96,7 +96,7 @@
             'openWith' => 'Abrir com',
             'remember_choice' => 'Lembrar a opção selecionada nesta sessão',
             'open' => 'Abrir',
-            'cancel' => 'Cancelar'
-        ]
-    ]
+            'cancel' => 'Cancelar',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php
index fe8bc624ab..c960cfeb54 100644
--- a/modules/system/lang/pt-br/lang.php
+++ b/modules/system/lang/pt-br/lang.php
@@ -76,15 +76,15 @@
             'events' => 'Eventos',
             'customers' => 'Clientes',
             'my_settings' => 'Configurações',
-            'notifications' => 'Notificações'
-        ]
+            'notifications' => 'Notificações',
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Tema sem nome',
         'name' => [
             'label' => 'Nome do Tema',
-            'help' => 'Nome do tema deve ser único. Por exemplo, Winter.Vanilla'
+            'help' => 'Nome do tema deve ser único. Por exemplo, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -93,7 +93,7 @@
         'installed' => 'Temas instalados',
         'no_themes' => 'Não há temas instalados.',
         'recommended' => 'Recomendado',
-        'remove_confirm' => 'Você tem certeza que deseja remover este tema?'
+        'remove_confirm' => 'Você tem certeza que deseja remover este tema?',
     ],
     'plugin' => [
         'label' => 'Plugin',
@@ -102,7 +102,7 @@
             'label' => 'Nome do Plugin',
             'help' => 'Nomeie o plugin pelo seu código exclusivo. Por exemplo, Winter.Blog',
         ],
-        'by_author' => 'Por :name'
+        'by_author' => 'Por :name',
     ],
     'plugins' => [
         'manage' => 'Gerenciar plugins',
@@ -222,7 +222,7 @@
         'sending' => 'Enviando mensagem de teste...',
         'return' => 'Retornar à lista de modelos',
         'options' => 'Opções',
-        'disable_auto_inline_css' => 'Desativar CSS inline automático'
+        'disable_auto_inline_css' => 'Desativar CSS inline automático',
     ],
     'mail_brand' => [
         'menu_label' => 'Personalizar Email',
@@ -236,7 +236,7 @@
                 'description' => 'Descrição',
                 'price' => 'Priço',
                 'centered' => 'Centralizado',
-                'right_aligned' => 'Alinhado à direita'
+                'right_aligned' => 'Alinhado à direita',
             ],
             'buttons' => [
                 'primary' => 'Botão principal',
@@ -247,7 +247,7 @@
             'more' => 'Mais alguns textos',
             'promotion' => 'Código do cupom: WINTER',
             'subcopy' => 'Esta é a subcópia do email',
-            'thanks' => 'Obrigado'
+            'thanks' => 'Obrigado',
         ],
         'fields' => [
             '_section_background' => 'Fundo',
@@ -273,7 +273,7 @@
             'panel_bg' => 'Fundo do painel',
             'promotion_bg' => 'Fundo do cupom promocional',
             'promotion_border_color' => 'Cor da borda cupom promocional',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Anexar ao projeto',
@@ -388,7 +388,7 @@
         'created_at' => 'Data & Hora',
         'message' => 'Mensagem',
         'level' => 'Nível',
-        'preview_title' => 'Evento'
+        'preview_title' => 'Evento',
     ],
     'request_log' => [
         'hint' => 'Este registro mostra uma lista de requisições que requerem atenção. Por exemplo, se um usuário solicitar uma página não encontrada, será registrado com o status 404.',
@@ -404,7 +404,7 @@
         'referer' => 'Referências',
         'url' => 'URL',
         'status_code' => 'Status',
-        'preview_title' => 'Requisição'
+        'preview_title' => 'Requisição',
     ],
     'permissions' => [
         'name' => 'Sistema',
@@ -420,7 +420,7 @@
         'manage_own_editor' => 'Gerenciar preferências pessoais do editor de código',
         'view_the_dashboard' => 'Visualizar o painel',
         'manage_default_dashboard' => 'Gerenciar o painel padrão',
-        'manage_branding' => 'Personalizar o painel'
+        'manage_branding' => 'Personalizar o painel',
     ],
     'log' => [
         'menu_label' => 'Configurações de registros',
@@ -440,7 +440,7 @@
     'page' => [
         'custom_error' => [
             'label' => 'Erro de página',
-            'help' => "Desculpe, mas algo deu errado e a página não pode ser exibida."
+            'help' => "Desculpe, mas algo deu errado e a página não pode ser exibida.",
         ],
         'invalid_token' => [
             'label' => 'Token de segurança inválido',
diff --git a/modules/system/lang/pt-pt/client.php b/modules/system/lang/pt-pt/client.php
index f62fac2e93..223d8a7cfe 100644
--- a/modules/system/lang/pt-pt/client.php
+++ b/modules/system/lang/pt-pt/client.php
@@ -47,18 +47,18 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Cancelar',
-        'widget_remove_confirm' => 'Remover este widget?'
+        'widget_remove_confirm' => 'Remover este widget?',
     ],
     'datepicker' => [
         'previousMonth' => 'Mês anterior',
         'nextMonth' => 'Mês seguinte',
         'months' => ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
         'weekdays' => ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'],
-        'weekdaysShort' => ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab']
+        'weekdaysShort' => ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sab'],
     ],
     'filter' => [
         'group' => [
-            'all' => 'todos'
+            'all' => 'todos',
         ],
         'dates' => [
             'all' => 'todas',
@@ -66,8 +66,8 @@
             'reset_button_text'  => 'Reiniciar',
             'date_placeholder' => 'Data',
             'after_placeholder' => 'Após',
-            'before_placeholder' => 'Antes'
-        ]
+            'before_placeholder' => 'Antes',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Mostrar o rastreamento',
@@ -82,7 +82,7 @@
             'openWith' => 'Abrir com',
             'remember_choice' => 'Lembrar a opção selecionada nesta sessão',
             'open' => 'Abrir',
-            'cancel' => 'Cancelar'
-        ]
-    ]
+            'cancel' => 'Cancelar',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/pt-pt/lang.php b/modules/system/lang/pt-pt/lang.php
index 98500bc48e..d186c6ced8 100644
--- a/modules/system/lang/pt-pt/lang.php
+++ b/modules/system/lang/pt-pt/lang.php
@@ -40,7 +40,7 @@
         'tr' => 'Turco',
         'zh-cn' => 'Chinês',
         'zh-tw' => 'Tailandês',
-        'vn' => 'Tiếng việt'
+        'vn' => 'Tiếng việt',
     ],
     'directory' => [
         'create_fail' => 'Não é possível criar a diretoria: :name',
@@ -72,14 +72,14 @@
             'events' => 'Eventos',
             'customers' => 'Clientes',
             'my_settings' => 'Configurações',
-        ]
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Tema sem nome',
         'name' => [
             'label' => 'Nome do Tema',
-            'help' => 'O nome do tema deve ser único. Por exemplo, Winter.Vanilla'
+            'help' => 'O nome do tema deve ser único. Por exemplo, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -88,7 +88,7 @@
         'installed' => 'Temas instalados',
         'no_themes' => 'Não há temas instalados.',
         'recommended' => 'Recomendado',
-        'remove_confirm' => 'Tem a certeza que deseja remover este tema?'
+        'remove_confirm' => 'Tem a certeza que deseja remover este tema?',
     ],
     'plugin' => [
         'label' => 'Extensão',
@@ -199,7 +199,7 @@
         'deleting' => 'Apagando modelo...',
         'deleting_layout' => 'Apagando esboço...',
         'sending' => 'Enviando mensagem de teste...',
-        'return' => 'Regressar à lista de modelos'
+        'return' => 'Regressar à lista de modelos',
     ],
     'install' => [
         'project_label' => 'Anexar ao projecto',
@@ -307,7 +307,7 @@
         'created_at' => 'Data & Hora',
         'message' => 'Mensagem',
         'level' => 'Nível',
-        'preview_title' => 'Evento'
+        'preview_title' => 'Evento',
     ],
     'request_log' => [
         'hint' => 'Este registro mostra uma lista de requisições que requerem atenção. Por exemplo, se um utilizador solicitar uma página não encontrada, será registado com o status 404.',
@@ -323,7 +323,7 @@
         'referer' => 'Referências',
         'url' => 'URL',
         'status_code' => 'Estado',
-        'preview_title' => 'Requisição'
+        'preview_title' => 'Requisição',
     ],
     'permissions' => [
         'name' => 'Sistema',
@@ -336,7 +336,7 @@
         'manage_preferences' => 'Gerir preferências da área administrativa',
         'manage_editor' => 'Gerir preferências do editor de código',
         'view_the_dashboard' => 'Visualizar o painel',
-        'manage_branding' => 'Personalizar o backend'
+        'manage_branding' => 'Personalizar o backend',
     ],
     'log' => [
         'menu_label' => 'Configurações de registo',
diff --git a/modules/system/lang/ro/lang.php b/modules/system/lang/ro/lang.php
index e455031841..df37a49ac7 100644
--- a/modules/system/lang/ro/lang.php
+++ b/modules/system/lang/ro/lang.php
@@ -142,7 +142,7 @@
         'remove_success' => 'Ștergere cu succes a plugin-urilor selectate.',
         'replace' => [
             'multi_install_error' => 'Înlocuirea mai multor plugin-uri este în prezent neacceptată',
-        ]
+        ],
     ],
     'project' => [
         'name' => 'Proiect',
@@ -164,7 +164,7 @@
         'missing_model' => 'Pe pagina de setări lipsește o definiție a modelului.',
         'update_success' => 'Setările pentru :name au fost actualizate.',
         'return' => 'Întoarcere la setările sistemului.',
-        'search' => 'Căutare'
+        'search' => 'Căutare',
     ],
     'mail' => [
         'log_file' => 'Fișier jurnal',
diff --git a/modules/system/lang/rs/client.php b/modules/system/lang/rs/client.php
index 6a3bf49d5d..3bc236a061 100644
--- a/modules/system/lang/rs/client.php
+++ b/modules/system/lang/rs/client.php
@@ -54,7 +54,7 @@
         'nextMonth' => 'Sledeći mesec',
         'months' => ['Januar', 'Februar', 'Mart', 'April', 'Maj', 'Juni', 'Juli', 'Avgust', 'Septembar', 'Oktobar', 'Novembar', 'Decembar'],
         'weekdays' => ['Nedelja', 'Ponedeljak', 'Utorak', 'Sreda', 'Četvrtak', 'Petak', 'Subota'],
-        'weekdaysShort' => ['Ned', 'Pon', 'Uto', 'Sre', 'Čet', 'Pet', 'Sub']
+        'weekdaysShort' => ['Ned', 'Pon', 'Uto', 'Sre', 'Čet', 'Pet', 'Sub'],
     ],
     'colorpicker' => [
         'choose' => 'Ok',
diff --git a/modules/system/lang/sk/client.php b/modules/system/lang/sk/client.php
index 69121eb9cd..c54fb3121b 100644
--- a/modules/system/lang/sk/client.php
+++ b/modules/system/lang/sk/client.php
@@ -45,21 +45,21 @@
     'alert' => [
         'confirm_button_text' => 'OK',
         'cancel_button_text' => 'Zrušiť',
-        'widget_remove_confirm' => 'Skutočne zmazať tento widget?'
+        'widget_remove_confirm' => 'Skutočne zmazať tento widget?',
     ],
     'datepicker' => [
         'previousMonth' => 'Predchádzajúci mesiac',
         'nextMonth' => 'Nasledujúci mesiac',
         'months' => ['Január', 'Február', 'Marec', 'Apríl', 'Máj', 'Jún', 'Júl', 'August', 'September', 'Október', 'November', 'December'],
         'weekdays' => ['Nedeľa', 'Pondelok', 'Utorok', 'Streda', 'Štvrtok', 'Piatok', 'Sobota'],
-        'weekdaysShort' => ['Ne', 'Po', 'Ut', 'St', 'Št', 'Pi', 'So']
+        'weekdaysShort' => ['Ne', 'Po', 'Ut', 'St', 'Št', 'Pi', 'So'],
     ],
     'colorpicker' => [
         'choose' => 'Ok',
     ],
     'filter' => [
         'group' => [
-            'all' => 'všetko'
+            'all' => 'všetko',
         ],
         'dates' => [
             'all' => 'všetko',
@@ -67,15 +67,15 @@
             'reset_button_text'  => 'Zrušiť',
             'date_placeholder' => 'Dátum',
             'after_placeholder' => 'Po',
-            'before_placeholder' => 'Pred'
+            'before_placeholder' => 'Pred',
         ],
         'numbers' => [
             'all' => 'all',
             'filter_button_text' => 'Filter',
             'reset_button_text'  => 'Zrušiť',
             'min_placeholder' => 'Min',
-            'max_placeholder' => 'Max'
-        ]
+            'max_placeholder' => 'Max',
+        ],
     ],
     'eventlog' => [
         'show_stacktrace' => 'Zobraziť stacktrace',
@@ -90,7 +90,7 @@
             'openWith' => 'Otvoriť v',
             'remember_choice' => 'Zapamätať si vybranú voľbu pre túto reláciu',
             'open' => 'Otvoriť',
-            'cancel' => 'Zrušiť'
-        ]
-    ]
+            'cancel' => 'Zrušiť',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/sk/lang.php b/modules/system/lang/sk/lang.php
index b3bd03ca45..e497a6d90c 100644
--- a/modules/system/lang/sk/lang.php
+++ b/modules/system/lang/sk/lang.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Návrat k základom'
+        'tagline' => 'Návrat k základom',
     ],
     'locale' => [
         'ar' => 'العربية',
@@ -46,13 +46,13 @@
         'uk' => 'Українська мова',
         'zh-cn' => '简体中文',
         'zh-tw' => '繁體中文',
-        'vn' => 'Tiếng việt'
+        'vn' => 'Tiếng việt',
     ],
     'directory' => [
-        'create_fail' => 'Nie je možné vytvoriť priečinok: :name'
+        'create_fail' => 'Nie je možné vytvoriť priečinok: :name',
     ],
     'file' => [
-        'create_fail' => 'Nie je možné vytvoriť súbor: :name'
+        'create_fail' => 'Nie je možné vytvoriť súbor: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -60,7 +60,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Zlučujúci súbor ':name' nebol nájdený."
+        'not_found' => "Zlučujúci súbor ':name' nebol nájdený.",
     ],
     'system' => [
         'name' => 'Systém',
@@ -79,15 +79,15 @@
             'events' => 'Udalosti',
             'customers' => 'Zákazníci',
             'my_settings' => 'Moje nastavenia',
-            'notifications' => 'Oznámenia'
-        ]
+            'notifications' => 'Oznámenia',
+        ],
     ],
     'theme' => [
         'label' => 'Téma',
         'unnamed' => 'Téma bez názvu',
         'name' => [
             'label' => 'Názov témy',
-            'help' => 'Názov témy podľa jej unikátneho kódu. Napríklad, Winter.Vanilla'
+            'help' => 'Názov témy podľa jej unikátneho kódu. Napríklad, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -96,16 +96,16 @@
         'installed' => 'Nainštalované témy',
         'no_themes' => 'Žiadne témy inštalované z trhu.',
         'recommended' => 'Odporúčané',
-        'remove_confirm' => 'Skutočne chcete odstrániť túto tému?'
+        'remove_confirm' => 'Skutočne chcete odstrániť túto tému?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Plugin bez názvu',
         'name' => [
             'label' => 'Názov pluginu',
-            'help' => 'Názov pluginu podľa jeho unikátneho kódu. Napríklad, Winter.Blog'
+            'help' => 'Názov pluginu podľa jeho unikátneho kódu. Napríklad, Winter.Blog',
         ],
-        'by_author' => 'Vytvoril :name'
+        'by_author' => 'Vytvoril :name',
     ],
     'plugins' => [
         'manage' => 'Správa pluginov',
@@ -152,10 +152,10 @@
         'id' => [
             'label' => 'Project ID',
             'help' => 'Ako nájsť vaše Project ID',
-            'missing' => 'Prosím zadajta vaše Project ID.'
+            'missing' => 'Prosím zadajta vaše Project ID.',
         ],
         'detach_confirm' => 'Skutočne chcete odpojiť tento projekt?',
-        'unbind_success' => 'Projekt bol odpojený.'
+        'unbind_success' => 'Projekt bol odpojený.',
     ],
     'settings' => [
         'menu_label' => 'Nastavenia',
@@ -163,7 +163,7 @@
         'missing_model' => 'Stránka s nastaveniami vyžaduje definíciu Modelu.',
         'update_success' => 'nastavenia pre :name úspešne uložené',
         'return' => 'Návrat do systémových nastavení',
-        'search' => 'Hľadať'
+        'search' => 'Hľadať',
     ],
     'mail' => [
         'log_file' => 'Súbor záznamov',
@@ -222,7 +222,7 @@
         'deleting' => 'Mazanie šablóny...',
         'deleting_layout' => 'Mazanie layoutu...',
         'sending' => 'Posielanie testovacej správy...',
-        'return' => 'Späť na zoznam šablón'
+        'return' => 'Späť na zoznam šablón',
     ],
     'mail_brand' => [
         'menu_label' => 'Personalizácia e-mailov',
@@ -236,7 +236,7 @@
                 'description' => 'Popis',
                 'price' => 'Cena',
                 'centered' => 'Na stred',
-                'right_aligned' => 'Zarovnané vpravo'
+                'right_aligned' => 'Zarovnané vpravo',
             ],
             'buttons' => [
                 'primary' => 'Primárne tlačítko',
@@ -247,7 +247,7 @@
             'more' => 'Nejaký ďalší text',
             'promotion' => 'Kód kupónu: WINTER',
             'subcopy' => 'Toto je subkópia e-mailu',
-            'thanks' => 'Ďakujeme'
+            'thanks' => 'Ďakujeme',
         ],
         'fields' => [
             '_section_background' => 'Pozadie',
@@ -273,7 +273,7 @@
             'panel_bg' => 'Pozadie panelu',
             'promotion_bg' => 'Pozadie reklamy',
             'promotion_border_color' => 'Farba okrajov reklamy',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Pridať k projetku',
@@ -282,7 +282,7 @@
         'missing_plugin_name' => 'Prosím zadajte názov pluginu na nainštalovanie.',
         'missing_theme_name' => 'Prosím zadajte názov témy na nainštalovanie.',
         'install_completing' => 'Dokončovanie inštalačného procesu',
-        'install_success' => 'Plugin bol úspešne nainštalovaný'
+        'install_success' => 'Plugin bol úspešne nainštalovaný',
     ],
     'updates' => [
         'title' => 'Správa aktualizácií',
@@ -322,17 +322,17 @@
         'force_label' => 'Vynútiť aktualizácie',
         'found' => [
             'label' => 'Nájdené nové aktualizácie!',
-            'help' => 'Kliknite na Aktualizovať pre začatie aktualizácie.'
+            'help' => 'Kliknite na Aktualizovať pre začatie aktualizácie.',
         ],
         'none' => [
             'label' => 'Žiadne aktualizácie',
-            'help' => 'Žiadne nové aktualizácie neboli nájdené.'
+            'help' => 'Žiadne nové aktualizácie neboli nájdené.',
         ],
         'important_action' => [
             'empty' => 'Vybrať akciu',
             'confirm' => 'Potvrdiť aktualizácie',
             'skip' => 'Preskočiť túto aktualizáciu (iba raz)',
-            'ignore' => 'Preskočiť tento update (vždy)'
+            'ignore' => 'Preskočiť tento update (vždy)',
         ],
         'important_action_required' => 'Je vyťadovaná akcia',
         'important_view_guide' => 'Zobraziť návod pre aktualizáciu',
@@ -349,7 +349,7 @@
         'details_licence' => 'Licencia',
         'details_licence_missing' => 'Nie je poskytnutá žiadna licencia.',
         'details_current_version' => 'Aktuálna verzia',
-        'details_author' => 'Autor'
+        'details_author' => 'Autor',
     ],
     'server' => [
         'connect_error' => 'Chyba pripojenia na server.',
@@ -357,17 +357,17 @@
         'response_invalid' => 'Neplatná odpoveď servra.',
         'response_empty' => 'Prázdna odpoveď servra.',
         'file_error' => 'Chyba sťahovania balíčku zo servra.',
-        'file_corrupt' => 'Súbor zo servra je poškodený.'
+        'file_corrupt' => 'Súbor zo servra je poškodený.',
     ],
     'behavior' => [
-        'missing_property' => 'Trieda :class musí definovať vlastnosť $:property použitú správaním :behavior.'
+        'missing_property' => 'Trieda :class musí definovať vlastnosť $:property použitú správaním :behavior.',
     ],
     'config' => [
         'not_found' => 'Nebolo možné nájsť konfiguračný súbor :file definovaný pre :location.',
-        'required' => "Konfigurácia použitá v :location musí podporovať hodnotu ':property'."
+        'required' => "Konfigurácia použitá v :location musí podporovať hodnotu ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Nepodarilo sa rozbaliť súbor ':file'."
+        'extract_failed' => "Nepodarilo sa rozbaliť súbor ':file'.",
     ],
     'event_log' => [
         'hint' => 'Tento záznam zobrazuje zoznam potencionálnch chýb v aplikácií, ako napríklad výnimky a ladiace informácie.',
@@ -382,7 +382,7 @@
         'created_at' => 'Dátum a čas',
         'message' => 'Správa',
         'level' => 'Úroveň',
-        'preview_title' => 'Udalosť'
+        'preview_title' => 'Udalosť',
     ],
     'request_log' => [
         'hint' => 'Tento záznam zobrazuje zoznam požiadaviek prehliadača, ktoré môžu vyžadovať vašu pozornosť. Napríklad, ak návštevník otvorí CMS stránku, ktorú sa nepodarilo nájsť, vytvorí sa záznam so status kódom 404.',
@@ -398,7 +398,7 @@
         'referer' => 'Odkazy',
         'url' => 'URL',
         'status_code' => 'Status',
-        'preview_title' => 'Požiadavka'
+        'preview_title' => 'Požiadavka',
     ],
     'permissions' => [
         'name' => 'Systém',
@@ -411,7 +411,7 @@
         'manage_preferences' => 'Správa nastavení administrácie',
         'manage_editor' => 'Správa nastavení editora kódu',
         'view_the_dashboard' => 'Zobrazenie hlavného panelu',
-        'manage_branding' => 'Prispôsobenie administrácie'
+        'manage_branding' => 'Prispôsobenie administrácie',
     ],
     'log' => [
         'menu_label' => 'Nastavenia záznamov',
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index fa359296be..286f0ae588 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -34,15 +34,15 @@
             'social' => 'Social',
             'events' => 'Händelser',
             'customers' => 'Kunder',
-            'my_settings' => 'Mina inställningar'
-        ]
+            'my_settings' => 'Mina inställningar',
+        ],
     ],
     'theme' => [
         'label' => 'Tema',
         'unnamed' => 'Namnlöst tema',
         'name' => [
             'label' => 'Temanamn',
-            'help' => 'Namnge temat med en unik kod. Till exempel, Winter.Vanilla'
+            'help' => 'Namnge temat med en unik kod. Till exempel, Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -51,7 +51,7 @@
         'installed' => 'Installerade teman',
         'no_themes' => 'Det finns inga teman installerade från marknadsplatsen.',
         'recommended' => 'Rekommenderat',
-        'remove_confirm' => 'Är du säker på att du vill radera det här temat?'
+        'remove_confirm' => 'Är du säker på att du vill radera det här temat?',
     ],
     'plugin' => [
         'label' => 'Tillägg',
@@ -59,7 +59,7 @@
         'name' => [
             'label' => 'Tilläggsnamn',
             'help' => 'Namnge tillägget efter dess unika kod. Exempelvis Winter.Blog',
-        ]
+        ],
         ],
     'plugins' => [
         'manage' => 'Hantera tillägg',
@@ -85,7 +85,7 @@
         'disable_confirm' => 'Är du säker?',
         'disable_success' => 'Tilläggen avaktiverades.',
         'enable_success' => 'Aktiverade tilläggen.',
-        'unknown_plugin' => 'Tillägget har raderats.'
+        'unknown_plugin' => 'Tillägget har raderats.',
     ],
     'project' => [
         'name' => 'Projekt',
@@ -107,7 +107,7 @@
         'missing_model' => 'Inställningssidan saknar en modell-definition',
         'update_success' => 'Inställningar för :name har uppdaterats',
         'return' => 'Återgå till systeminställningar',
-        'search' => 'Sök'
+        'search' => 'Sök',
     ],
     'mail' => [
         'log_file' => 'Loggfiler',
@@ -203,11 +203,11 @@
         'force_label' => 'Tvinga uppdatering',
         'found' => [
             'label' => 'Hittade nya uppdateringar!',
-            'help' => 'Klicka på Uppdatera systemet för att påbörja processen.'
+            'help' => 'Klicka på Uppdatera systemet för att påbörja processen.',
         ],
         'none' => [
             'label' => 'Inga uppdateringar',
-            'help' => 'Inga nya uppdateringar hittades.'
+            'help' => 'Inga nya uppdateringar hittades.',
         ],
         'important_action' => [
             'empty' => 'Välj åtgärd',
@@ -257,7 +257,7 @@
         'id_label' => 'Händelse-ID',
         'created_at' => 'Datum och tid',
         'message' => 'Meddelande',
-        'level' => 'Nivå'
+        'level' => 'Nivå',
     ],
     'request_log' => [
         'hint' => 'Denna loggen visar en lista med förfrågningar från webbläsare som kan kräva uppmärksamhet. Till exempel, om en besökare öppnar en CMS sida som inte kan hittas, så skapas en post med statuskoden 404.',
@@ -272,7 +272,7 @@
         'count' => 'Räknare',
         'referer' => 'Hänvisning',
         'url' => 'URL',
-        'status_code' => 'Status'
+        'status_code' => 'Status',
     ],
     'permissions' => [
         'name' => 'System',
diff --git a/modules/system/lang/th/lang.php b/modules/system/lang/th/lang.php
index 0ec75f8e1b..009a36be1e 100644
--- a/modules/system/lang/th/lang.php
+++ b/modules/system/lang/th/lang.php
@@ -57,7 +57,7 @@
             'label' => 'ชื่อปลั๊กอิน',
             'help' => 'ตั้งชื่อปลั๊กอินตามรหัสที่ไม่ซ้ำใคร เช่น Winter.Blog',
         ],
-        'by_author' => 'โดย :name'
+        'by_author' => 'โดย :name',
     ],
     'plugins' => [
         'manage' => 'จัดการปลั๊กอิน',
diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
index 7cf40cdfe4..5fa53bc57f 100644
--- a/modules/system/lang/tr/lang.php
+++ b/modules/system/lang/tr/lang.php
@@ -102,7 +102,7 @@
             'label' => 'Eklenti Adı',
             'help' => 'Eklenti adı eşsiz olmalıdır. Örneğin, Winter.Blog',
         ],
-        'by_author' => ':name ile filtrele'
+        'by_author' => ':name ile filtrele',
     ],
     'plugins' => [
         'manage' => 'Eklentileri yönet',
diff --git a/modules/system/lang/tr/validation.php b/modules/system/lang/tr/validation.php
index 0d3584e8bc..37432a2b43 100644
--- a/modules/system/lang/tr/validation.php
+++ b/modules/system/lang/tr/validation.php
@@ -54,7 +54,7 @@
         'numeric'   => ':attribute, :value değerinden büyük veya ona eşit olmalıdır.',
         'file'      => ':attribute, :value kilobayttan büyük veya ona eşit olmalıdır.',
         'string'    => ':attribute, :value karakterden büyük veya ona eşit olmalıdır.',
-        'array'     => ':attribute, :value öğeden veya daha fazlasına sahip olmalıdır.'
+        'array'     => ':attribute, :value öğeden veya daha fazlasına sahip olmalıdır.',
     ],
     'image'             => ':attribute alanı resim dosyası olmalıdır.',
     'in'                => ':attribute değeri geçersiz.',
diff --git a/modules/system/lang/uk/validation.php b/modules/system/lang/uk/validation.php
index 1a16b5613f..1eb82c72b1 100644
--- a/modules/system/lang/uk/validation.php
+++ b/modules/system/lang/uk/validation.php
@@ -145,6 +145,6 @@
     |
     */
 
-    'attributes' => []
+    'attributes' => [],
 
 ];
diff --git a/modules/system/lang/vn/client.php b/modules/system/lang/vn/client.php
index 70a272ec81..73072ba00e 100644
--- a/modules/system/lang/vn/client.php
+++ b/modules/system/lang/vn/client.php
@@ -47,21 +47,21 @@
     'alert' => [
         'confirm_button_text' => 'Đồng ý',
         'cancel_button_text' => 'Bỏ qua',
-        'widget_remove_confirm' => 'Đồng ý xóa widget này?'
+        'widget_remove_confirm' => 'Đồng ý xóa widget này?',
     ],
     'datepicker' => [
         'previousMonth' => 'Tháng trước',
         'nextMonth' => 'Tháng tiếp theo',
         'months' => ['Tháng giêng', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6', 'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
         'weekdays' => ['Chủ nhật', 'Thứ 2', 'Thứ 3', 'Thứ 4', 'Thứ 5', 'Thứ 6', 'Thứ 7'],
-        'weekdaysShort' => ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7']
+        'weekdaysShort' => ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
     ],
     'colorpicker' => [
         'choose' => 'Chọn',
     ],
     'filter' => [
         'group' => [
-            'all' => 'tất cả'
+            'all' => 'tất cả',
         ],
         'dates' => [
             'all' => 'tất cả',
@@ -69,15 +69,15 @@
             'reset_button_text'  => 'Reset',
             'date_placeholder' => 'Ngày',
             'after_placeholder' => 'Sau ngày',
-            'before_placeholder' => 'Trước ngày'
+            'before_placeholder' => 'Trước ngày',
         ],
         'numbers' => [
             'all' => 'all',
             'filter_button_text' => 'Lọc',
             'reset_button_text'  => 'Reset',
             'min_placeholder' => 'Nhỏ nhất',
-            'max_placeholder' => 'Lớn nhất'
-        ]
+            'max_placeholder' => 'Lớn nhất',
+        ],
 
     ],
     'eventlog' => [
@@ -93,7 +93,7 @@
             'openWith' => 'Mở bằng',
             'remember_choice' => 'Nhớ lựa chọn này cho các lần tiếp theo',
             'open' => 'Mở ra',
-            'cancel' => 'Bỏ qua'
-        ]
-    ]
+            'cancel' => 'Bỏ qua',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/vn/lang.php b/modules/system/lang/vn/lang.php
index dd59be3384..6c22ebd669 100644
--- a/modules/system/lang/vn/lang.php
+++ b/modules/system/lang/vn/lang.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => 'Getting back to basics'
+        'tagline' => 'Getting back to basics',
     ],
     'locale' => [
         'be' => 'Беларуская',
@@ -45,13 +45,13 @@
         'uk' => 'Українська мова',
         'zh-cn' => '简体中文',
         'zh-tw' => '繁體中文',
-        'vn' => 'Tiếng việt'
+        'vn' => 'Tiếng việt',
     ],
     'directory' => [
-        'create_fail' => 'Không thể tạo danh mục: :name'
+        'create_fail' => 'Không thể tạo danh mục: :name',
     ],
     'file' => [
-        'create_fail' => 'Không thể tạo file: :name'
+        'create_fail' => 'Không thể tạo file: :name',
     ],
     'page' => [
         'invalid_token' => [
@@ -59,7 +59,7 @@
         ],
     ],
     'combiner' => [
-        'not_found' => "Không tìm thấy combiner file ':name'."
+        'not_found' => "Không tìm thấy combiner file ':name'.",
     ],
     'system' => [
         'name' => 'Hệ thống',
@@ -78,15 +78,15 @@
             'events' => 'Sự kiện',
             'customers' => 'Khách hàng',
             'my_settings' => 'Cài đặt của tôi',
-            'notifications' => 'Thông báo'
-        ]
+            'notifications' => 'Thông báo',
+        ],
     ],
     'theme' => [
         'label' => 'Theme',
         'unnamed' => 'Theme chưa được đặt tên',
         'name' => [
             'label' => 'Tên theme',
-            'help' => 'Tên của theme không được trùng lặp. Ví dụ Winter.Vanilla'
+            'help' => 'Tên của theme không được trùng lặp. Ví dụ Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -95,16 +95,16 @@
         'installed' => 'Các theme đã cài đặt',
         'no_themes' => 'Không có theme nào được cài đặt từ chợ theme.',
         'recommended' => 'Được khuyến khích cài đặt',
-        'remove_confirm' => 'Bạn có chắc chắn muốn xóa theme này?'
+        'remove_confirm' => 'Bạn có chắc chắn muốn xóa theme này?',
     ],
     'plugin' => [
         'label' => 'Plugin',
         'unnamed' => 'Plugin chưa được đặt tên',
         'name' => [
             'label' => 'Tên plugin',
-            'help' => 'Tên của plugin không được trùng lặp. For example, Winter.Blog'
+            'help' => 'Tên của plugin không được trùng lặp. For example, Winter.Blog',
         ],
-        'by_author' => 'Tạo bởi :name'
+        'by_author' => 'Tạo bởi :name',
     ],
     'plugins' => [
         'manage' => 'Quản lý các plugin',
@@ -130,7 +130,7 @@
         'disable_confirm' => 'Xác nhận tắt?',
         'disable_success' => 'Đã tắt các plugin.',
         'enable_success' => 'Đã bật các plugin.',
-        'unknown_plugin' => 'Đã xóa các file của plugin ra khỏi hệ thống.'
+        'unknown_plugin' => 'Đã xóa các file của plugin ra khỏi hệ thống.',
     ],
     'project' => [
         'name' => 'Dự án',
@@ -141,10 +141,10 @@
         'id' => [
             'label' => 'ID Dự án',
             'help' => 'Cách để xem ID Dự án',
-            'missing' => 'Điền vào ID Dự án để sử dụng.'
+            'missing' => 'Điền vào ID Dự án để sử dụng.',
         ],
         'detach_confirm' => 'Xác nhận gỡ Dự án?',
-        'unbind_success' => 'Dự án đã được gỡ ra.'
+        'unbind_success' => 'Dự án đã được gỡ ra.',
     ],
     'settings' => [
         'menu_label' => 'Cài đặt',
@@ -152,7 +152,7 @@
         'missing_model' => 'Không có  Model cho trang cài đặt.',
         'update_success' => 'Cấu hình cho :name thành công',
         'return' => 'Trở lại trang cài đặt',
-        'search' => 'Tìm kiếm'
+        'search' => 'Tìm kiếm',
     ],
     'mail' => [
         'log_file' => 'Log file',
@@ -211,7 +211,7 @@
         'deleting' => 'Đang xóa mẫu...',
         'deleting_layout' => 'Đang xóa Layout...',
         'sending' => 'Đang gửi mail test...',
-        'return' => 'Quay lại trang danh sách mail mẫu'
+        'return' => 'Quay lại trang danh sách mail mẫu',
     ],
     'mail_brand' => [
         'menu_label' => 'Giao diện Mail',
@@ -225,7 +225,7 @@
                 'description' => 'Mô tả',
                 'price' => 'Giá',
                 'centered' => 'Căn giữa',
-                'right_aligned' => 'Căn phải'
+                'right_aligned' => 'Căn phải',
             ],
             'buttons' => [
                 'primary' => 'Nút bấm chính',
@@ -236,7 +236,7 @@
             'more' => 'Mô tả thêm',
             'promotion' => 'Mã ưu đãi: WINTER',
             'subcopy' => 'Thông tin thêm',
-            'thanks' => 'Lời cám ơn'
+            'thanks' => 'Lời cám ơn',
         ],
         'fields' => [
             '_section_background' => 'Màu nền',
@@ -262,7 +262,7 @@
             'panel_bg' => 'Nền của bảng điều khiển',
             'promotion_bg' => 'Nền mục khuyến mãi',
             'promotion_border_color' => 'Viền của mục khuyến mãi',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => 'Chèn Project',
@@ -271,7 +271,7 @@
         'missing_plugin_name' => 'Điền vào tên Plugin để cài đặt.',
         'missing_theme_name' => 'Điền vào tên Theme để cài đặt.',
         'install_completing' => 'Hoàn tất cài đặt',
-        'install_success' => 'Plugin đã được cài thành công'
+        'install_success' => 'Plugin đã được cài thành công',
     ],
     'updates' => [
         'title' => 'Quản lý các cập nhật',
@@ -311,17 +311,17 @@
         'force_label' => 'Bắt buộc cập nhật',
         'found' => [
             'label' => 'Có cập nhật mới!',
-            'help' => 'Bấm cập nhật hệ thống để bắt đầu cập nhật.'
+            'help' => 'Bấm cập nhật hệ thống để bắt đầu cập nhật.',
         ],
         'none' => [
             'label' => 'Không có cập nhật',
-            'help' => 'Không tìm thấy bản cập nhật nào.'
+            'help' => 'Không tìm thấy bản cập nhật nào.',
         ],
         'important_action' => [
             'empty' => 'Chọn hành động',
             'confirm' => 'Xác nhận cập nhật',
             'skip' => 'Bỏ qua bản cập nhật này (Chỉ lần này)',
-            'ignore' => 'Bỏ qua bản cập nhật này (luôn luôn bỏ qua)'
+            'ignore' => 'Bỏ qua bản cập nhật này (luôn luôn bỏ qua)',
         ],
         'important_action_required' => 'Hành động này là bắt buộc',
         'important_view_guide' => 'Xem hướng dẫn nâng cấp',
@@ -338,7 +338,7 @@
         'details_licence' => 'Giấy phép',
         'details_licence_missing' => 'Không có giấy phép nào được cung cấp.',
         'details_current_version' => 'Phiên bản hiện tại',
-        'details_author' => 'Tác giả'
+        'details_author' => 'Tác giả',
     ],
     'server' => [
         'connect_error' => 'Lỗi kết nối đến máy chủ.',
@@ -346,17 +346,17 @@
         'response_invalid' => 'Phản hồi không hợp lệ từ máy chủ.',
         'response_empty' => 'Phản hồi trống từ máy chủ.',
         'file_error' => 'Lỗi máy chủ không thể gửi về các package.',
-        'file_corrupt' => 'File trên máy chủ bị hỏng.'
+        'file_corrupt' => 'File trên máy chủ bị hỏng.',
     ],
     'behavior' => [
-        'missing_property' => 'Class :class cần phải khai báo thuộc tính $:property được sử dụng bởi :behavior behavior.'
+        'missing_property' => 'Class :class cần phải khai báo thuộc tính $:property được sử dụng bởi :behavior behavior.',
     ],
     'config' => [
         'not_found' => 'Không tìm thấy tệp tin cấu hình :file được khai báo cho :location.',
-        'required' => "Cấu hình được sử dụng cho :location cần phải có giá trị ':property'."
+        'required' => "Cấu hình được sử dụng cho :location cần phải có giá trị ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "Không thể giải nén tệp tin ':file'."
+        'extract_failed' => "Không thể giải nén tệp tin ':file'.",
     ],
     'event_log' => [
         'hint' => 'Bản ghi các lỗi có thể sảy ra trong ứng dụng, ví dụ exceptions và thông tin debug.',
@@ -371,7 +371,7 @@
         'created_at' => 'Ngày giờ',
         'message' => 'Nội dung',
         'level' => 'Cấp độ',
-        'preview_title' => 'Event'
+        'preview_title' => 'Event',
     ],
     'request_log' => [
         'hint' => 'Bản ghi các request lỗi của trình duyệt. Ví dụ, nếu có khách truy cập vào một trang nội dung mà hệ thống không tìm thấy trang đó, một bản ghi sẽ được tạo ra với mã trạng thái 404.',
@@ -387,7 +387,7 @@
         'referer' => 'Người giới thiệu',
         'url' => 'URL',
         'status_code' => 'Trạng thái',
-        'preview_title' => 'Request'
+        'preview_title' => 'Request',
     ],
     'permissions' => [
         'name' => 'Hệ thống',
@@ -400,7 +400,7 @@
         'manage_preferences' => 'Cá nhân hóa trang quản trị',
         'manage_editor' => 'Cá nhân hóa trình biên tập(code editor)',
         'view_the_dashboard' => 'Xem bảng điều khiển',
-        'manage_branding' => 'Tùy chỉnh trang quản trị'
+        'manage_branding' => 'Tùy chỉnh trang quản trị',
     ],
     'log' => [
         'menu_label' => 'Cài đặt log',
diff --git a/modules/system/lang/zh-cn/client.php b/modules/system/lang/zh-cn/client.php
index f71cb92d59..e4d9aa9fe0 100644
--- a/modules/system/lang/zh-cn/client.php
+++ b/modules/system/lang/zh-cn/client.php
@@ -56,12 +56,12 @@
         'nextMonth' => '下一个月',
         'months' => ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
         'weekdays' => ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-        'weekdaysShort' => ['日', '一', '二', '三', '四', '五', '六']
+        'weekdaysShort' => ['日', '一', '二', '三', '四', '五', '六'],
     ],
 
     'filter' => [
         'group' => [
-            'all' => '全部'
+            'all' => '全部',
         ],
         'dates' => [
             'all' => '全部',
@@ -69,8 +69,8 @@
             'reset_button_text'  => '重置',
             'date_placeholder' => '日期',
             'after_placeholder' => 'After',
-            'before_placeholder' => 'Before'
-        ]
+            'before_placeholder' => 'Before',
+        ],
     ],
 
     'eventlog' => [
@@ -86,7 +86,7 @@
             'openWith' => 'Open with',
             'remember_choice' => '记住选择',
             'open' => '打开',
-            'cancel' => '取消'
-        ]
-    ]
+            'cancel' => '取消',
+        ],
+    ],
 ];
diff --git a/modules/system/lang/zh-cn/lang.php b/modules/system/lang/zh-cn/lang.php
index 80869b3492..344b6337d4 100644
--- a/modules/system/lang/zh-cn/lang.php
+++ b/modules/system/lang/zh-cn/lang.php
@@ -3,16 +3,16 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => '欢迎使用Winter CMS！'
+        'tagline' => '欢迎使用Winter CMS！',
     ],
     'directory' => [
-        'create_fail' => '不能创建目录: :name'
+        'create_fail' => '不能创建目录: :name',
     ],
     'file' => [
-        'create_fail' => '不能创建文件: :name'
+        'create_fail' => '不能创建文件: :name',
     ],
     'combiner' => [
-        'not_found' => "组合文件 ':name' 没找到."
+        'not_found' => "组合文件 ':name' 没找到.",
     ],
     'system' => [
         'name' => '系统',
@@ -31,15 +31,15 @@
             'events' => '事件',
             'customers' => '自定义',
             'my_settings' => '我的设置',
-            'notifications' => '通知'
-        ]
+            'notifications' => '通知',
+        ],
     ],
     'theme' => [
         'label' => '主题',
         'unnamed' => '未命名主题',
         'name' => [
             'label' => '主题名称',
-            'help' => '主题的唯一名称，例如：Winter.Vanilla'
+            'help' => '主题的唯一名称，例如：Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -48,16 +48,16 @@
         'installed' => '已安装主题',
         'no_themes' => '市场上没有已安装的主题。',
         'recommended' => '推荐',
-        'remove_confirm' => '你确定要删除这些主题吗？'
+        'remove_confirm' => '你确定要删除这些主题吗？',
     ],
     'plugin' => [
         'label' => '插件',
         'unnamed' => '未命名的插件',
         'name' => [
             'label' => '插件名称',
-            'help' => '插件的唯一名称，例如：Winter.Blog'
+            'help' => '插件的唯一名称，例如：Winter.Blog',
         ],
-        'by_author' => '作者 :name'
+        'by_author' => '作者 :name',
     ],
     'plugins' => [
         'manage' => '管理插件',
@@ -83,7 +83,7 @@
         'disable_confirm' => '你确定吗?',
         'disable_success' => '成功禁用了这些插件.',
         'enable_success' => '成功启用了这些插件',
-        'unknown_plugin' => '插件从文件系统中移除了.'
+        'unknown_plugin' => '插件从文件系统中移除了.',
     ],
     'project' => [
         'name' => '项目',
@@ -94,10 +94,10 @@
         'id' => [
             'label' => '项目ID',
             'help' => '如何找到您的项目ID',
-            'missing' => '请确认你想使用的项目ID。'
+            'missing' => '请确认你想使用的项目ID。',
         ],
         'detach_confirm' => '你确定要删除这个项目吗?',
-        'unbind_success' => '项目删除成功。'
+        'unbind_success' => '项目删除成功。',
     ],
     'settings' => [
         'menu_label' => '设置',
@@ -105,7 +105,7 @@
         'missing_model' => '设置页缺少模型定义.',
         'update_success' => ':name 的设置更新成功了.',
         'return' => '返回系统设置',
-        'search' => '搜索'
+        'search' => '搜索',
     ],
     'mail' => [
         'log_file' => '日志文件',
@@ -149,7 +149,7 @@
         'content_text' => '纯文本',
         'test_send' => '发送测试消息',
         'test_success' => '测试消息已经成功发送.',
-        'return' => '返回模板列表'
+        'return' => '返回模板列表',
     ],
     'mail_brand' => [
         'menu_label' => '自定义邮件模板',
@@ -163,7 +163,7 @@
                 'description' => 'Description',
                 'price' => 'Price',
                 'centered' => 'Centered',
-                'right_aligned' => 'Right-Aligned'
+                'right_aligned' => 'Right-Aligned',
             ],
             'buttons' => [
                 'primary' => 'Primary button',
@@ -174,7 +174,7 @@
             'more' => 'Some more text',
             'promotion' => 'Coupon code: WINTER',
             'subcopy' => 'This is the subcopy of the email',
-            'thanks' => 'Thanks'
+            'thanks' => 'Thanks',
         ],
         'fields' => [
             '_section_background' => '背景',
@@ -200,7 +200,7 @@
             'panel_bg' => 'Panel 背景色',
             'promotion_bg' => 'Promotion 背景色',
             'promotion_border_color' => 'Promotion 边框颜色',
-        ]
+        ],
     ],
     'install' => [
         'project_label' => '加入项目',
@@ -209,7 +209,7 @@
         'missing_plugin_name' => '请输入要安装的插件名称。',
         'missing_theme_name' => '请输入要安装的主题名称。',
         'install_completing' => '完成安装过程',
-        'install_success' => '插件安装成功。'
+        'install_success' => '插件安装成功。',
     ],
     'updates' => [
         'title' => '管理更新',
@@ -248,11 +248,11 @@
         'force_label' => '强制更新',
         'found' => [
             'label' => '发现新的更新!',
-            'help' => '点击更新.'
+            'help' => '点击更新.',
         ],
         'none' => [
             'label' => '没有更新',
-            'help' => '没有发现新的更新.'
+            'help' => '没有发现新的更新.',
         ],
         'important_action' => [
             'empty' => '选择操作',
@@ -282,17 +282,17 @@
         'response_invalid' => '服务器返回异常.',
         'response_empty' => '服务器返回为空.',
         'file_error' => '服务器下载文件失败.',
-        'file_corrupt' => '服务器下载文件校验失败.'
+        'file_corrupt' => '服务器下载文件校验失败.',
     ],
     'behavior' => [
-        'missing_property' => '行为 :behavior 使用的类 :class 必须定义属性 $:property。'
+        'missing_property' => '行为 :behavior 使用的类 :class 必须定义属性 $:property。',
     ],
     'config' => [
         'not_found' => '无法找到定义 :location 的配置文件 :file。',
-        'required' => "配置 :location 必须有 ':property'。"
+        'required' => "配置 :location 必须有 ':property'。",
     ],
     'zip' => [
-        'extract_failed' => "不能解压文件 ':file'。"
+        'extract_failed' => "不能解压文件 ':file'。",
     ],
     'event_log' => [
         'hint' => '日志显示了程序中的潜在错误, 比如异常和调试信息。',
@@ -307,7 +307,7 @@
         'created_at' => '时间和日期',
         'message' => '消息',
         'level' => '级别',
-        'preview_title' => '事件详情'
+        'preview_title' => '事件详情',
     ],
     'request_log' => [
         'hint' => '这个日志显示了需要注意的浏览器请求. 比如如果一个访问者打开一个没有的CMS页面, 一条返回状态404的记录被创建。',
@@ -323,7 +323,7 @@
         'referer' => '来源',
         'url' => 'URL',
         'status_code' => '状态',
-        'preview_title' => '预览事件日志'
+        'preview_title' => '预览事件日志',
     ],
     'permissions' => [
         'name' => '系统',
@@ -337,7 +337,7 @@
         'manage_editor' => '管理代码编辑器偏好设置',
         'view_the_dashboard' => '查看仪表盘',
         'manage_default_dashboard' => '管理默认的仪表盘面板',
-        'manage_branding' => '自定义后台'
+        'manage_branding' => '自定义后台',
     ],
     'log' => [
         'menu_label' => '日志设置',
@@ -357,7 +357,7 @@
     'page' => [
         'custom_error' => [
             'label' => '页面错误',
-            'help' => "抱歉，页面因为一些错误导致无法显示"
+            'help' => "抱歉，页面因为一些错误导致无法显示",
         ],
         'invalid_token' => [
             'label' => '非法安全令牌',
@@ -365,6 +365,6 @@
     ],
     'pagination' => [
         'previous' => '上一页',
-        'next' => '下一页'
+        'next' => '下一页',
     ],
 ];
diff --git a/modules/system/lang/zh-tw/client.php b/modules/system/lang/zh-tw/client.php
index e98cfda006..2dc96c5916 100644
--- a/modules/system/lang/zh-tw/client.php
+++ b/modules/system/lang/zh-tw/client.php
@@ -54,7 +54,7 @@
         'nextMonth' => '下個月',
         'months' => ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
         'weekdays' => ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
-        'weekdaysShort' => ['週日', '週一', '週二', '週三', '週四', '週五', '週六']
+        'weekdaysShort' => ['週日', '週一', '週二', '週三', '週四', '週五', '週六'],
     ],
     'colorpicker' => [
         'choose' => '確定',
@@ -82,5 +82,5 @@
             'min_placeholder' => '最小值',
             'max_placeholder' => '最大值',
         ],
-    ]
+    ],
 ];
diff --git a/modules/system/lang/zh-tw/lang.php b/modules/system/lang/zh-tw/lang.php
index e57666a321..daf8e43ebb 100644
--- a/modules/system/lang/zh-tw/lang.php
+++ b/modules/system/lang/zh-tw/lang.php
@@ -3,16 +3,16 @@
 return [
     'app' => [
         'name' => 'Winter CMS',
-        'tagline' => '登入'
+        'tagline' => '登入',
     ],
     'directory' => [
-        'create_fail' => '不能建立目錄: :name'
+        'create_fail' => '不能建立目錄: :name',
     ],
     'file' => [
-        'create_fail' => '不能建立檔案: :name'
+        'create_fail' => '不能建立檔案: :name',
     ],
     'combiner' => [
-        'not_found' => "混合檔案 ':name' 沒找到."
+        'not_found' => "混合檔案 ':name' 沒找到.",
     ],
     'system' => [
         'name' => '系統',
@@ -29,14 +29,14 @@
             'social' => '社交',
             'events' => '事件',
             'customers' => '自訂',
-            'my_settings' => '我的設定'
-        ]
+            'my_settings' => '我的設定',
+        ],
     ],
     'theme' => [
         'unnamed' => '未命名主題',
         'name' => [
             'label' => '主題名稱',
-            'help' => '主題的唯一名稱，例如：Winter.Vanilla'
+            'help' => '主題的唯一名稱，例如：Winter.Vanilla',
         ],
     ],
     'themes' => [
@@ -45,14 +45,14 @@
         'installed' => '已安裝主題',
         'no_themes' => '市集上沒有已安裝的主題。',
         'recommended' => '推薦',
-        'remove_confirm' => '您確定要刪除這些主題嗎？'
+        'remove_confirm' => '您確定要刪除這些主題嗎？',
     ],
     'plugin' => [
         'unnamed' => '未命名的外掛',
         'name' => [
             'label' => '外掛名稱',
-            'help' => '外掛的唯一名稱，例如：Winter.Blog'
-        ]
+            'help' => '外掛的唯一名稱，例如：Winter.Blog',
+        ],
     ],
     'plugins' => [
         'manage' => '管理外掛',
@@ -76,7 +76,7 @@
         'disable_confirm' => '您確定嗎?',
         'disable_success' => '成功停用了這些外掛.',
         'enable_success' => '成功啟用了這些外掛',
-        'unknown_plugin' => '外掛從檔案系統中移除了.'
+        'unknown_plugin' => '外掛從檔案系統中移除了.',
     ],
     'project' => [
         'name' => '產品',
@@ -87,10 +87,10 @@
         'id' => [
             'label' => '產品ID',
             'help' => '如何找到您的產品ID',
-            'missing' => '請確認您想使用的產品ID.'
+            'missing' => '請確認您想使用的產品ID.',
         ],
         'detach_confirm' => '您確定要刪除這個產品嗎?',
-        'unbind_success' => '產品刪除成功.'
+        'unbind_success' => '產品刪除成功.',
     ],
     'settings' => [
         'menu_label' => '設定',
@@ -98,7 +98,7 @@
         'missing_model' => '設定頁缺少Model定義.',
         'update_success' => ':name 的設定更新成功了.',
         'return' => '返回系統設定',
-        'search' => '搜尋'
+        'search' => '搜尋',
     ],
     'mail' => [
         'log_file' => '日誌檔案',
@@ -142,7 +142,7 @@
         'content_text' => '純文字',
         'test_send' => '發送測試訊息',
         'test_success' => '測試訊息已經成功發送.',
-        'return' => '返回模板列表'
+        'return' => '返回模板列表',
     ],
     'install' => [
         'project_label' => '加入產品',
@@ -151,7 +151,7 @@
         'missing_plugin_name' => '請輸入要安裝的外掛名稱。',
         'missing_theme_name' => '請輸入要安裝的主題名稱。',
         'install_completing' => '完成安裝過程',
-        'install_success' => '外掛安裝成功。'
+        'install_success' => '外掛安裝成功。',
     ],
     'updates' => [
         'title' => '管理更新',
@@ -187,12 +187,12 @@
         'force_label' => '強制更新',
         'found' => [
             'label' => '發現新的更新!',
-            'help' => '點選更新.'
+            'help' => '點選更新.',
         ],
         'none' => [
             'label' => '沒有更新',
-            'help' => '沒有發現新的更新.'
-        ]
+            'help' => '沒有發現新的更新.',
+        ],
     ],
     'server' => [
         'connect_error' => '連接伺服器失敗.',
@@ -200,17 +200,17 @@
         'response_invalid' => '伺服器返回異常.',
         'response_empty' => '伺服器返回為空.',
         'file_error' => '伺服器下載檔案失敗.',
-        'file_corrupt' => '伺服器下載檔案校驗失敗.'
+        'file_corrupt' => '伺服器下載檔案校驗失敗.',
     ],
     'behavior' => [
-        'missing_property' => 'Class :class 必須定義屬性 $:property 被 :behavior behavior 使用.'
+        'missing_property' => 'Class :class 必須定義屬性 $:property 被 :behavior behavior 使用.',
     ],
     'config' => [
         'not_found' => '不能搜尋設定檔案 :file 為 :location 定義.',
-        'required' => "設定 :location 必須有 ':property'."
+        'required' => "設定 :location 必須有 ':property'.",
     ],
     'zip' => [
-        'extract_failed' => "不能解壓縮檔案 ':file'."
+        'extract_failed' => "不能解壓縮檔案 ':file'.",
     ],
     'event_log' => [
         'hint' => '日誌顯示了程序中的潛在錯誤, 比如異常和測試訊息.',
@@ -224,7 +224,7 @@
         'id_label' => '事件 ID',
         'created_at' => '時間和日期',
         'message' => '訊息',
-        'level' => '等級'
+        'level' => '等級',
     ],
     'request_log' => [
         'hint' => '這個日誌顯示了需要注意的瀏覽器請求. 比如如果一個訪問者打開一個沒有的CMS頁面, 一條返回狀態404的記錄被建立.',
@@ -239,7 +239,7 @@
         'count' => '次數',
         'referer' => '來源',
         'url' => 'URL',
-        'status_code' => '狀態'
+        'status_code' => '狀態',
     ],
     'permissions' => [
         'name' => '系統',
@@ -250,7 +250,7 @@
         'manage_mail_settings' => '管理郵件設定',
         'manage_other_administrators' => '管理其他管理員',
         'view_the_dashboard' => '查看儀表板',
-        'manage_branding' => '自訂後台'
+        'manage_branding' => '自訂後台',
     ],
     'media' => [
         'invalid_path' => "不合法的路徑: ':path'.",
diff --git a/modules/system/models/EventLog.php b/modules/system/models/EventLog.php
index d54a9a4e25..b92c2110be 100644
--- a/modules/system/models/EventLog.php
+++ b/modules/system/models/EventLog.php
@@ -2,10 +2,10 @@
 
 namespace System\Models;
 
-use App;
 use Exception;
-use Model;
-use Str;
+use Illuminate\Support\Facades\App;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Str;
 
 /**
  * Model for logging system errors and debug trace messages
diff --git a/modules/system/models/File.php b/modules/system/models/File.php
index 738aeb47b2..3e9db18426 100644
--- a/modules/system/models/File.php
+++ b/modules/system/models/File.php
@@ -2,11 +2,11 @@
 
 namespace System\Models;
 
-use Url;
-use Config;
+use Backend\Controllers\Files;
+use Illuminate\Support\Facades\URL;
 use Storage;
 use Winter\Storm\Database\Attach\File as FileBase;
-use Backend\Controllers\Files;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * File attachment model
diff --git a/modules/system/models/LogSetting.php b/modules/system/models/LogSetting.php
index 8fddfdfa55..a60772b8af 100644
--- a/modules/system/models/LogSetting.php
+++ b/modules/system/models/LogSetting.php
@@ -2,7 +2,7 @@
 
 namespace System\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 /**
  * System log settings
@@ -18,7 +18,7 @@ class LogSetting extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \System\Behaviors\SettingsModel::class
+        \System\Behaviors\SettingsModel::class,
     ];
 
     /**
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index af3f36a33d..89506af4cc 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -2,13 +2,13 @@
 
 namespace System\Models;
 
-use App;
-use Str;
-use Model;
-use Cache;
-use Less_Parser;
 use Exception;
 use File as FileHelper;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Less_Parser;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Str;
 
 /**
  * Mail brand settings
@@ -25,7 +25,7 @@ class MailBrandSetting extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \System\Behaviors\SettingsModel::class
+        \System\Behaviors\SettingsModel::class,
     ];
 
     /**
diff --git a/modules/system/models/MailLayout.php b/modules/system/models/MailLayout.php
index 987d2a96c5..9d870791f5 100644
--- a/modules/system/models/MailLayout.php
+++ b/modules/system/models/MailLayout.php
@@ -2,12 +2,12 @@
 
 namespace System\Models;
 
-use View;
-use Model;
+use File as FileHelper;
+use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Mail\MailParser;
-use ApplicationException;
-use File as FileHelper;
 
 /**
  * Mail layout
@@ -47,7 +47,7 @@ class MailLayout extends Model
      * @var array Options array
      */
     protected $jsonable = [
-        'options'
+        'options',
     ];
 
     public static $codeCache;
diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
index d31beeaf13..a993dbfa3d 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -2,13 +2,13 @@
 
 namespace System\Models;
 
-use View;
-use Model;
-use System\Classes\MailManager;
-use Winter\Storm\Mail\MailParser;
-use ApplicationException;
 use Exception;
 use File as FileHelper;
+use Illuminate\Support\Facades\View;
+use System\Classes\MailManager;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Mail\MailParser;
 
 /**
  * Mail partial
diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php
index e66e73f502..e0f45bcc5c 100644
--- a/modules/system/models/MailSetting.php
+++ b/modules/system/models/MailSetting.php
@@ -2,8 +2,8 @@
 
 namespace System\Models;
 
-use App;
-use Model;
+use Illuminate\Support\Facades\App;
+use Winter\Storm\Database\Model;
 
 /**
  * Mail settings
@@ -24,7 +24,7 @@ class MailSetting extends Model
      * @var array Behaviors implemented by this model.
      */
     public $implement = [
-        \System\Behaviors\SettingsModel::class
+        \System\Behaviors\SettingsModel::class,
     ];
 
     /**
@@ -42,7 +42,7 @@ class MailSetting extends Model
      */
     public $rules = [
         'sender_name'  => 'required',
-        'sender_email' => 'required|email'
+        'sender_email' => 'required|email',
     ];
 
     /**
diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
index 5344cb1bf1..8ea8f55b15 100644
--- a/modules/system/models/MailTemplate.php
+++ b/modules/system/models/MailTemplate.php
@@ -2,11 +2,11 @@
 
 namespace System\Models;
 
-use View;
-use Model;
+use File as FileHelper;
+use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
+use Winter\Storm\Database\Model;
 use Winter\Storm\Mail\MailParser;
-use File as FileHelper;
 
 /**
  * Mail template
@@ -44,7 +44,7 @@ class MailTemplate extends Model
     ];
 
     public $belongsTo = [
-        'layout' => MailLayout::class
+        'layout' => MailLayout::class,
     ];
 
     /**
diff --git a/modules/system/models/Parameter.php b/modules/system/models/Parameter.php
index 38955167de..23ce3d2457 100644
--- a/modules/system/models/Parameter.php
+++ b/modules/system/models/Parameter.php
@@ -2,8 +2,8 @@
 
 namespace System\Models;
 
-use App;
-use Cache;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
 use Winter\Storm\Database\Model;
 
 /**
diff --git a/modules/system/models/PluginVersion.php b/modules/system/models/PluginVersion.php
index 2a6a8758ee..4d984e40e2 100644
--- a/modules/system/models/PluginVersion.php
+++ b/modules/system/models/PluginVersion.php
@@ -2,9 +2,9 @@
 
 namespace System\Models;
 
-use Lang;
-use Model;
+use Illuminate\Support\Facades\Lang;
 use System\Classes\PluginManager;
+use Winter\Storm\Database\Model;
 
 /**
  * Stores information about current plugin versions.
diff --git a/modules/system/models/RequestLog.php b/modules/system/models/RequestLog.php
index c98b665df1..74ca57089b 100644
--- a/modules/system/models/RequestLog.php
+++ b/modules/system/models/RequestLog.php
@@ -2,9 +2,9 @@
 
 namespace System\Models;
 
-use App;
-use Model;
-use Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Request;
+use Winter\Storm\Database\Model;
 
 /**
  * Model for logging 404 errors
diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php
index 3f8e529d31..b7655cd9f8 100644
--- a/modules/system/reportwidgets/Status.php
+++ b/modules/system/reportwidgets/Status.php
@@ -2,18 +2,18 @@
 
 namespace System\ReportWidgets;
 
-use Lang;
-use Config;
-use BackendAuth;
-use System\Models\Parameter;
-use System\Models\LogSetting;
-use System\Classes\UpdateManager;
-use System\Classes\PluginManager;
 use Backend\Classes\ReportWidgetBase;
+use Backend\Facades\BackendAuth;
 use Backend\Models\User;
+use Exception;
+use Illuminate\Support\Facades\Lang;
+use System\Classes\PluginManager;
+use System\Classes\UpdateManager;
 use System\Models\EventLog;
+use System\Models\LogSetting;
+use System\Models\Parameter;
 use System\Models\RequestLog;
-use Exception;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * System status report widget.
@@ -51,7 +51,7 @@ public function defineProperties()
                 'type'              => 'string',
                 'validationPattern' => '^.+$',
                 'validationMessage' => 'backend::lang.dashboard.widget_title_error',
-            ]
+            ],
         ];
     }
 
@@ -153,7 +153,7 @@ protected function getSystemWarnings()
         foreach ($writablePaths as $path) {
             if (!is_writable($path)) {
                 $warnings[] = [
-                    'message' => Lang::get('backend::lang.warnings.permissions', ['name' => '<strong>' . $path . '</strong>'])
+                    'message' => Lang::get('backend::lang.warnings.permissions', ['name' => '<strong>' . $path . '</strong>']),
                 ];
             }
         }
@@ -172,7 +172,7 @@ protected function getSystemWarnings()
                 $warnings[] = [
                     'message' => Lang::get('system::lang.updates.update_warnings_plugin_missing', [
                         'code' => '<strong>' . $missingPluginCode . '</strong>',
-                        'parent_code' => '<strong>' . $pluginCode . '</strong>'
+                        'parent_code' => '<strong>' . $pluginCode . '</strong>',
                     ]),
                 ];
             }
diff --git a/modules/system/tests/ServiceProviderTest.php b/modules/system/tests/ServiceProviderTest.php
index f583e962c9..7e7c2dfd81 100644
--- a/modules/system/tests/ServiceProviderTest.php
+++ b/modules/system/tests/ServiceProviderTest.php
@@ -2,9 +2,9 @@
 
 namespace System\Tests;
 
-use Db;
-use Log;
+use Illuminate\Support\Facades\Log;
 use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Support\Facades\DB;
 
 class ServiceProviderTest extends PluginTestCase
 {
diff --git a/modules/system/tests/bootstrap/PluginManagerTestCase.php b/modules/system/tests/bootstrap/PluginManagerTestCase.php
index 0fe882bb26..9cabe5f9d0 100644
--- a/modules/system/tests/bootstrap/PluginManagerTestCase.php
+++ b/modules/system/tests/bootstrap/PluginManagerTestCase.php
@@ -2,10 +2,10 @@
 
 namespace System\Tests\Bootstrap;
 
+use ReflectionClass;
+use System\Classes\PluginManager;
 use System\Classes\UpdateManager;
 use System\Classes\VersionManager;
-use System\Classes\PluginManager;
-use ReflectionClass;
 use Winter\Storm\Database\Model as ActiveRecord;
 
 class PluginManagerTestCase extends TestCase
diff --git a/modules/system/tests/bootstrap/PluginTestCase.php b/modules/system/tests/bootstrap/PluginTestCase.php
index 38f60edce2..83234a272d 100644
--- a/modules/system/tests/bootstrap/PluginTestCase.php
+++ b/modules/system/tests/bootstrap/PluginTestCase.php
@@ -2,18 +2,18 @@
 
 namespace System\Tests\Bootstrap;
 
-use Mail;
-use Config;
-use Artisan;
-use Exception;
-use ReflectionClass;
 use Backend\Classes\AuthManager;
 use Backend\Tests\Concerns\InteractsWithAuthentication;
+use Exception;
+use Illuminate\Support\Facades\Artisan;
 use Mockery\MockInterface;
+use ReflectionClass;
 use System\Classes\PluginBase;
 use System\Classes\PluginManager;
 use System\Classes\UpdateManager;
 use Winter\Storm\Database\Model as BaseModel;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Plugin test case.
diff --git a/modules/system/tests/bootstrap/TestCase.php b/modules/system/tests/bootstrap/TestCase.php
index 3bdb052718..f388a06401 100644
--- a/modules/system/tests/bootstrap/TestCase.php
+++ b/modules/system/tests/bootstrap/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Bootstrap;
 
-use ReflectionClass;
 use PHPUnit\Framework\Assert;
+use ReflectionClass;
 
 class TestCase extends \Illuminate\Foundation\Testing\TestCase
 {
diff --git a/modules/system/tests/classes/CombineAssetsTest.php b/modules/system/tests/classes/CombineAssetsTest.php
index 159fefc1e7..02aae20295 100644
--- a/modules/system/tests/classes/CombineAssetsTest.php
+++ b/modules/system/tests/classes/CombineAssetsTest.php
@@ -2,9 +2,8 @@
 
 namespace System\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
-use Cms\Classes\Theme;
 use System\Classes\CombineAssets;
+use System\Tests\Bootstrap\TestCase;
 
 class CombineAssetsTest extends TestCase
 {
@@ -46,7 +45,7 @@ public function testCombine()
         $url = $combiner->combine(
             [
                 'assets/css/style1.css',
-                'assets/css/style2.css'
+                'assets/css/style2.css',
             ],
             base_path() . '/modules/system/tests/fixtures/themes/test'
         );
@@ -56,7 +55,7 @@ public function testCombine()
         $url = $combiner->combine(
             [
                 'assets/js/script1.js',
-                'assets/js/script2.js'
+                'assets/js/script2.js',
             ],
             base_path() . '/modules/system/tests/fixtures/themes/test'
         );
diff --git a/modules/system/tests/classes/CoreLangTest.php b/modules/system/tests/classes/CoreLangTest.php
index 38ad416065..692bde3ea5 100644
--- a/modules/system/tests/classes/CoreLangTest.php
+++ b/modules/system/tests/classes/CoreLangTest.php
@@ -3,8 +3,7 @@
 namespace System\Tests\Classes;
 
 use System\Tests\Bootstrap\TestCase;
-use System\Classes\PluginManager;
-use Validator;
+use Winter\Storm\Support\Facades\Validator;
 
 class CoreLangTest extends TestCase
 {
diff --git a/modules/system/tests/classes/FileManifestTest.php b/modules/system/tests/classes/FileManifestTest.php
index 1d8c9987ff..4a37a1bcfd 100644
--- a/modules/system/tests/classes/FileManifestTest.php
+++ b/modules/system/tests/classes/FileManifestTest.php
@@ -3,9 +3,9 @@
 namespace System\Tests\Classes;
 
 use ReflectionClass;
+use System\Classes\FileManifest;
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Exception\ApplicationException;
-use System\Classes\FileManifest;
 
 class FileManifestTest extends TestCase
 {
diff --git a/modules/system/tests/classes/ImageResizerTest.php b/modules/system/tests/classes/ImageResizerTest.php
index 76a533172e..c0b5d13237 100644
--- a/modules/system/tests/classes/ImageResizerTest.php
+++ b/modules/system/tests/classes/ImageResizerTest.php
@@ -5,15 +5,15 @@
 use Backend\Facades\Backend;
 use Cms\Classes\Controller as CmsController;
 use Cms\Classes\Theme;
-use Config;
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
-use Event;
+use Illuminate\Support\Facades\URL;
 use System\Classes\ImageResizer;
 use System\Classes\MediaLibrary;
 use System\Models\File as FileModel;
 use System\Tests\Bootstrap\PluginTestCase;
-use URL;
 use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
 
 class ImageResizerTest extends PluginTestCase
 {
@@ -84,7 +84,7 @@ public function testConfiguration()
                 'sharpen' => 23,
                 'interlace' => true,
                 'quality' => 73,
-                'extension' => 'jpg'
+                'extension' => 'jpg',
             ]
         );
         self::assertArraySubset([
@@ -96,7 +96,7 @@ public function testConfiguration()
                 'sharpen' => 23,
                 'interlace' => true,
                 'quality' => 73,
-                'extension' => 'jpg'
+                'extension' => 'jpg',
             ],
         ], $imageResizer->getConfig());
 
diff --git a/modules/system/tests/classes/MarkupManagerTest.php b/modules/system/tests/classes/MarkupManagerTest.php
index ae8083acc6..795bb1b887 100644
--- a/modules/system/tests/classes/MarkupManagerTest.php
+++ b/modules/system/tests/classes/MarkupManagerTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use System\Classes\MarkupManager;
+use System\Tests\Bootstrap\TestCase;
 
 class MarkupManagerTest extends TestCase
 {
diff --git a/modules/system/tests/classes/MediaLibraryTest.php b/modules/system/tests/classes/MediaLibraryTest.php
index ac9e67f6ae..a7cfe2e3c5 100644
--- a/modules/system/tests/classes/MediaLibraryTest.php
+++ b/modules/system/tests/classes/MediaLibraryTest.php
@@ -2,9 +2,9 @@
 
 namespace System\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use Illuminate\Filesystem\FilesystemAdapter;
 use System\Classes\MediaLibrary;
+use System\Tests\Bootstrap\TestCase;
 
 class MediaLibraryTest extends TestCase
 {
@@ -113,8 +113,8 @@ public function testListAllDirectories()
                 '/media/hidden/sub1/deep1',
                 '/media/hidden/sub2',
                 '/media/hidden but not really',
-                '/media/name'
-            ]
+                '/media/name',
+            ],
         ]);
 
         $this->app['config']->set('cms.storage.media.folder', 'media');
diff --git a/modules/system/tests/classes/PluginBaseTest.php b/modules/system/tests/classes/PluginBaseTest.php
index fce91ba082..f36c7bb9bd 100644
--- a/modules/system/tests/classes/PluginBaseTest.php
+++ b/modules/system/tests/classes/PluginBaseTest.php
@@ -15,16 +15,16 @@ public function testGetPluginVersions()
         $expectedVersions = [
             '1.0.1' => [
                 'Added some upgrade file and some "seeding"',
-                'some_seeding_file.php' //does not exist
+                'some_seeding_file.php', //does not exist
             ],
             '1.0.2' => [
                 'Added some stuff',
             ],
             '1.0.3' => [
-                'Bug fix update that uses no scripts'
+                'Bug fix update that uses no scripts',
             ],
             '1.0.4' => [
-                'Another fix'
+                'Another fix',
             ],
             '1.0.5' => [
                 'Create blog settings table',
diff --git a/modules/system/tests/classes/PluginManagerTest.php b/modules/system/tests/classes/PluginManagerTest.php
index 4c88983219..8aacfedfa1 100644
--- a/modules/system/tests/classes/PluginManagerTest.php
+++ b/modules/system/tests/classes/PluginManagerTest.php
@@ -2,9 +2,9 @@
 
 namespace System\Tests\Classes;
 
-use System\Tests\Bootstrap\PluginManagerTestCase;
-use System\Classes\PluginManager;
 use System\Classes\PluginBase;
+use System\Classes\PluginManager;
+use System\Tests\Bootstrap\PluginManagerTestCase;
 
 class PluginManagerTest extends PluginManagerTestCase
 {
diff --git a/modules/system/tests/classes/SourceManifestTest.php b/modules/system/tests/classes/SourceManifestTest.php
index 3b3ed20ea3..5de97c33c8 100644
--- a/modules/system/tests/classes/SourceManifestTest.php
+++ b/modules/system/tests/classes/SourceManifestTest.php
@@ -2,10 +2,10 @@
 
 namespace System\Tests\Classes;
 
+use System\Classes\FileManifest;
+use System\Classes\SourceManifest;
 use System\Tests\Bootstrap\TestCase;
 use Winter\Storm\Argon\Argon;
-use System\Classes\SourceManifest;
-use System\Classes\FileManifest;
 
 class SourceManifestTest extends TestCase
 {
@@ -234,37 +234,37 @@ public function testCompare()
         $this->assertEquals([
             'build' => '1.0.0',
             'modified' => false,
-            'confident' => true
+            'confident' => true,
         ], $this->sourceManifest->compare($this->builds['1.0.0']));
 
         $this->assertEquals([
             'build' => '1.0.1',
             'modified' => false,
-            'confident' => true
+            'confident' => true,
         ], $this->sourceManifest->compare($this->builds['1.0.1']));
 
         $this->assertEquals([
             'build' => '1.0.2',
             'modified' => false,
-            'confident' => true
+            'confident' => true,
         ], $this->sourceManifest->compare($this->builds['1.0.2']));
 
         $this->assertEquals([
             'build' => '1.0.3',
             'modified' => false,
-            'confident' => true
+            'confident' => true,
         ], $this->sourceManifest->compare($this->builds['1.0.3']));
 
         $this->assertEquals([
             'build' => '1.1.0',
             'modified' => false,
-            'confident' => true
+            'confident' => true,
         ], $this->sourceManifest->compare($this->builds['1.1.0']));
 
         $this->assertEquals([
             'build' => '1.1.1',
             'modified' => false,
-            'confident' => true
+            'confident' => true,
         ], $this->sourceManifest->compare($this->builds['1.1.1']));
     }
 
diff --git a/modules/system/tests/classes/VersionManagerTest.php b/modules/system/tests/classes/VersionManagerTest.php
index 779b740caa..2fad981854 100644
--- a/modules/system/tests/classes/VersionManagerTest.php
+++ b/modules/system/tests/classes/VersionManagerTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Classes;
 
-use System\Tests\Bootstrap\TestCase;
 use System\Classes\VersionManager;
+use System\Tests\Bootstrap\TestCase;
 
 class VersionManagerTest extends TestCase
 {
@@ -162,21 +162,21 @@ public function versionInfoProvider()
             [
                 'A single update comment string',
                 [
-                    'A single update comment string'
+                    'A single update comment string',
                 ],
-                []
+                [],
             ],
             [
                 [
                     'A classic update comment string followed by script',
-                    'update_script.php'
+                    'update_script.php',
                 ],
                 [
-                    'A classic update comment string followed by script'
+                    'A classic update comment string followed by script',
                 ],
                 [
-                    'update_script.php'
-                ]
+                    'update_script.php',
+                ],
             ],
             [
                 [
@@ -184,11 +184,11 @@ public function versionInfoProvider()
                     'An update comment string after the script',
                 ],
                 [
-                    'An update comment string after the script'
+                    'An update comment string after the script',
                 ],
                 [
-                    'scripts_can_go_first.php'
-                ]
+                    'scripts_can_go_first.php',
+                ],
             ],
             [
                 [
@@ -197,12 +197,12 @@ public function versionInfoProvider()
                     'scripts_can_go_anywhere.php',
                 ],
                 [
-                    'An update comment string after the script'
+                    'An update comment string after the script',
                 ],
                 [
                     'scripts_can_go_first.php',
-                    'scripts_can_go_anywhere.php'
-                ]
+                    'scripts_can_go_anywhere.php',
+                ],
             ],
             [
                 [
@@ -213,12 +213,12 @@ public function versionInfoProvider()
                 ],
                 [
                     'The first update comment',
-                    'The second update comment'
+                    'The second update comment',
                 ],
                 [
                     'scripts_can_go_first.php',
-                    'scripts_can_go_anywhere.php'
-                ]
+                    'scripts_can_go_anywhere.php',
+                ],
             ],
             [
                 [
@@ -229,12 +229,12 @@ public function versionInfoProvider()
                 ],
                 [
                     'The first update comment',
-                    'The second update comment'
+                    'The second update comment',
                 ],
                 [
                     'file.name.with.dots.php',
-                    '1.0.2.scripts_can_go_anywhere.php'
-                ]
+                    '1.0.2.scripts_can_go_anywhere.php',
+                ],
             ],
             [
                 [
@@ -245,13 +245,13 @@ public function versionInfoProvider()
                 ],
                 [
                     'The first update comment',
-                    'The second update comment'
+                    'The second update comment',
                 ],
                 [
                     'subdirectory/file.name.with.dots.php',
-                    'subdirectory\1.0.2.scripts_can_go_anywhere.php'
-                ]
-            ]
+                    'subdirectory\1.0.2.scripts_can_go_anywhere.php',
+                ],
+            ],
         ];
     }
 }
diff --git a/modules/system/tests/classes/asset/BundleManagerTest.php b/modules/system/tests/classes/asset/BundleManagerTest.php
index bc6eaaacc8..db288fd9de 100644
--- a/modules/system/tests/classes/asset/BundleManagerTest.php
+++ b/modules/system/tests/classes/asset/BundleManagerTest.php
@@ -26,12 +26,12 @@ public function testRegisterBundles(): void
         $defaultBundles = $this->bundleManager->getBundles();
         $this->bundleManager->registerBundles([
             'winter1js' => [
-                'winter1js' => 'v1.0.0'
-            ]
+                'winter1js' => 'v1.0.0',
+            ],
         ]);
 
         $this->bundleManager->registerBundle('winter2js', [
-            'winter2js' => 'v1.0.0'
+            'winter2js' => 'v1.0.0',
         ]);
 
         $bundles = $this->bundleManager->getBundles();
@@ -53,8 +53,8 @@ public function testRegisterBundlesDoesNotBreakDefaults(): void
         // Register a new bundle
         $this->bundleManager->registerBundles([
             'winterjs' => [
-                'winterjs' => 'v1.0.0'
-            ]
+                'winterjs' => 'v1.0.0',
+            ],
         ]);
         // Grab the current bundles
         $bundles = $this->bundleManager->getBundles();
@@ -131,7 +131,7 @@ public function testGetBundlePackages(): void
             'a' => 'v0.1.2',
             'mix' => [
                 'b' => 'v0.1.3',
-            ]
+            ],
         ]);
 
         // Validate the testing bundle works with compiler dependent packages
@@ -214,8 +214,8 @@ public function testLoadRegisteredBundles(): void
                     'test-package' => 'v0.1.2',
                     'vite' => [
                         'vite-package' => 'v0.1.3',
-                    ]
-                ]
+                    ],
+                ],
             ]);
         });
 
diff --git a/modules/system/tests/console/CreateMigrationTest.php b/modules/system/tests/console/CreateMigrationTest.php
index e84419756a..d9778bbce2 100644
--- a/modules/system/tests/console/CreateMigrationTest.php
+++ b/modules/system/tests/console/CreateMigrationTest.php
@@ -2,10 +2,9 @@
 
 namespace System\Tests\Console;
 
-use File;
-use Illuminate\Database\Schema\Blueprint;
-use Schema;
 use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateMigrationTest extends PluginTestCase
 {
diff --git a/modules/system/tests/console/asset/MixCompileTest.php b/modules/system/tests/console/asset/MixCompileTest.php
index 4f81885f0c..93b63532fc 100644
--- a/modules/system/tests/console/asset/MixCompileTest.php
+++ b/modules/system/tests/console/asset/MixCompileTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Console\Asset;
 
-use Winter\Storm\Support\Facades\File;
 use System\Tests\Bootstrap\TestCase;
+use Winter\Storm\Support\Facades\File;
 
 class MixCompileTest extends TestCase
 {
@@ -26,7 +26,7 @@ public function testCompileMultiple()
     {
         $this->artisan($this->command, [
             '--manifest' => 'modules/system/tests/fixtures/npm/package-ac.json',
-            '--silent' => true
+            '--silent' => true,
         ])->assertExitCode(0);
 
         $this->assertFileExists(base_path('modules/system/tests/fixtures/plugins/mix/testa/assets/dist/app.js'));
@@ -37,7 +37,7 @@ public function testCompileMultipleWithErrors()
     {
         $this->artisan($this->command, [
             '--manifest' => 'modules/system/tests/fixtures/npm/package-abc.json',
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('Error: Can\'t resolve \'some-missing-package\'')
             ->assertExitCode(1);
@@ -52,7 +52,7 @@ public function testCompileTarget()
         $this->artisan($this->command, [
             '--manifest' => 'modules/system/tests/fixtures/npm/package-abc.json',
             '--package' => 'mix.testa',
-            '--silent' => true
+            '--silent' => true,
         ])->assertExitCode(0);
 
         $this->assertFileExists(base_path('modules/system/tests/fixtures/plugins/mix/testa/assets/dist/app.js'));
@@ -65,7 +65,7 @@ public function testCompileTargetWithError()
         $this->artisan($this->command, [
             '--manifest' => 'modules/system/tests/fixtures/npm/package-abc.json',
             '--package' => 'mix.testb',
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('Error: Can\'t resolve \'some-missing-package\'')
             ->assertExitCode(1);
@@ -80,7 +80,7 @@ public function testCompileTargetStopOnError()
         $this->artisan($this->command, [
             '--manifest' => 'modules/system/tests/fixtures/npm/package-abc.json',
             '--stop-on-error' => true,
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('Error: Can\'t resolve \'some-missing-package\'')
             ->assertExitCode(1);
diff --git a/modules/system/tests/console/asset/ViteCompileTest.php b/modules/system/tests/console/asset/ViteCompileTest.php
index d51a1c6e56..96eb0e4d1b 100644
--- a/modules/system/tests/console/asset/ViteCompileTest.php
+++ b/modules/system/tests/console/asset/ViteCompileTest.php
@@ -38,7 +38,7 @@ public function testThemeCompile(): void
         $this->artisan('vite:compile', [
             'theme-vitetest',
             '--manifest' => 'modules/system/tests/fixtures/npm/package-vitetheme.json',
-            '--silent' => true
+            '--silent' => true,
         ])->assertExitCode(0);
 
         $manifestPath = $this->themePath . '/public/build/manifest.json';
@@ -75,7 +75,7 @@ public function testThemeCompileFailed(): void
         $this->artisan('vite:compile', [
             'theme-vitetest',
             '--manifest' => 'modules/system/tests/fixtures/npm/package-vitetheme.json',
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('Could not resolve entry module "assets/css/theme.css".')
             ->assertExitCode(1);
@@ -98,7 +98,7 @@ public function testThemeCompileWarning(): void
         $this->artisan('vite:compile', [
             'theme-vitetest',
             '--manifest' => 'modules/system/tests/fixtures/npm/package-vitetheme.json',
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('[WARNING] Expected "}" to go with "{" [css-syntax-error]')
             ->assertExitCode(0);
diff --git a/modules/system/tests/fixtures/plugins/database/tester/Plugin.php b/modules/system/tests/fixtures/plugins/database/tester/Plugin.php
index e1537023e2..34612b83d0 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Database Tester Plugin',
             'description' => 'Plugin for loading tests that involve the database.',
-            'author' => 'Alexey Bobkov, Samuel Georges'
+            'author' => 'Alexey Bobkov, Samuel Georges',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Author.php b/modules/system/tests/fixtures/plugins/database/tester/models/Author.php
index 3c19ebd264..0c5794a246 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Author.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Author.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Author extends Model
 {
@@ -36,12 +36,12 @@ class Author extends Model
     public $belongsToMany = [
         'roles' => [
             'Database\Tester\Models\Role',
-            'table' => 'database_tester_authors_roles'
+            'table' => 'database_tester_authors_roles',
         ],
         'executive_authors' => [
             'Database\Tester\Models\Role',
             'table' => 'database_tester_authors_roles',
-            'conditions' => 'is_executive = 1'
+            'conditions' => 'is_executive = 1',
         ],
     ];
 
@@ -58,7 +58,7 @@ class Author extends Model
             'Database\Tester\Models\Tag',
             'name'  => 'taggable',
             'table' => 'database_tester_taggables',
-            'pivot' => ['added_by']
+            'pivot' => ['added_by'],
         ],
     ];
 }
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Category.php b/modules/system/tests/fixtures/plugins/database/tester/models/Category.php
index ed957bd90a..f4cddf13de 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Category.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Category.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Category extends Model
 {
@@ -15,8 +15,8 @@ class Category extends Model
         'posts' => [
             'Database\Tester\Models\Post',
             'table' => 'database_tester_categories_posts',
-            'pivot' => ['category_name', 'post_name']
-        ]
+            'pivot' => ['category_name', 'post_name'],
+        ],
     ];
 
     public function getCustomNameAttribute()
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Country.php b/modules/system/tests/fixtures/plugins/database/tester/models/Country.php
index 36237a072c..1c1d3f82e1 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Country.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Country.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Country extends Model
 {
@@ -26,7 +26,7 @@ class Country extends Model
         'posts' => [
             'Database\Tester\Models\Post',
             'through' => 'Database\Tester\Models\Author',
-        ]
+        ],
     ];
 }
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php b/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php
index 8afac86ae6..7927f1b716 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/EventLog.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class EventLog extends Model
 {
@@ -27,6 +27,6 @@ class EventLog extends Model
      * @var array Relations
      */
     public $morphTo = [
-        'related' => []
+        'related' => [],
     ];
 }
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php b/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php
index c2c61bdba8..242c1fb753 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Meta.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Meta extends Model
 {
@@ -11,7 +11,7 @@ class Meta extends Model
     public $timestamps = false;
 
     public $morphTo = [
-        'taggable' => []
+        'taggable' => [],
     ];
 
     public $fillable = [
@@ -21,6 +21,6 @@ class Meta extends Model
         'canonical_url',
         'redirect_url',
         'robot_index',
-        'robot_follow'
+        'robot_follow',
     ];
 }
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php b/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php
index 69fc029f42..123ec862b9 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Phone.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Phone extends Model
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Post.php b/modules/system/tests/fixtures/plugins/database/tester/models/Post.php
index 4f66b240fe..666ff238c2 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Post.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Post.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Post extends Model
 {
@@ -32,8 +32,8 @@ class Post extends Model
         'categories' => [
             'Database\Tester\Models\Category',
             'table' => 'database_tester_categories_posts',
-            'pivot' => ['category_name', 'post_name']
-        ]
+            'pivot' => ['category_name', 'post_name'],
+        ],
     ];
 
     public $morphMany = [
@@ -49,7 +49,7 @@ class Post extends Model
             'Database\Tester\Models\Tag',
             'name'  => 'taggable',
             'table' => 'database_tester_taggables',
-            'pivot' => ['added_by']
+            'pivot' => ['added_by'],
         ],
     ];
 }
@@ -85,7 +85,7 @@ class SluggablePost extends Post
      */
     protected $slugs = [
         'slug' => 'title',
-        'long_slug' => ['title', 'description']
+        'long_slug' => ['title', 'description'],
     ];
 }
 
@@ -113,7 +113,7 @@ class RevisionablePost extends Post
         'description',
         'is_published',
         'published_at',
-        'deleted_at'
+        'deleted_at',
     ];
 
     /**
@@ -125,7 +125,7 @@ class RevisionablePost extends Post
      * @var array Relations
      */
     public $morphMany = [
-        'revision_history' => ['System\Models\Revision', 'name' => 'revisionable']
+        'revision_history' => ['System\Models\Revision', 'name' => 'revisionable'],
     ];
 
     /**
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Role.php b/modules/system/tests/fixtures/plugins/database/tester/models/Role.php
index ab8b550ed1..5931a79784 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Role.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Role.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 /**
  * Role Model
@@ -30,7 +30,7 @@ class Role extends Model
     public $belongsToMany = [
         'authors' => [
             'Database\Tester\Models\User',
-            'table' => 'database_tester_authors_roles'
+            'table' => 'database_tester_authors_roles',
         ],
     ];
 }
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php b/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php
index b5a382470b..0711399725 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/Tag.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class Tag extends Model
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/models/User.php b/modules/system/tests/fixtures/plugins/database/tester/models/User.php
index 9aa91bf726..d9e13d5d43 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/models/User.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/models/User.php
@@ -2,7 +2,7 @@
 
 namespace Database\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class User extends Model
 {
@@ -22,7 +22,7 @@ class User extends Model
     public $hasOne = [
         'author' => [
             'Database\Tester\Models\Author',
-        ]
+        ],
     ];
 
     public $hasOneThrough = [
@@ -33,11 +33,11 @@ class User extends Model
     ];
 
     public $attachOne = [
-        'avatar' => 'System\Models\File'
+        'avatar' => 'System\Models\File',
     ];
 
     public $attachMany = [
-        'photos' => 'System\Models\File'
+        'photos' => 'System\Models\File',
     ];
 }
 
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
index 85c46ae8b9..8c32fed8f6 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateAuthorsTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
index 3c85f53648..f129870cdf 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateCategoriesTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php
index 492f421791..fdbc8885d4 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_countries_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateCountriesTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php
index 2a3c766f1d..6a29a0d742 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_event_log_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateEventLogTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php
index 2ce62a6628..0b127bddb9 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_meta_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateMetaTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php
index af075bf629..401a9df0f8 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_phones_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreatePhonesTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
index 4fc2db8af2..2c6c1de671 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreatePostsTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php
index 820a4a340f..a6279dae36 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_roles_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateRolesTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php
index 50d08f53bb..691f01b6ca 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_tags_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateTagsTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php b/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php
index 3a61dd134e..525f6faf0a 100644
--- a/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php
+++ b/modules/system/tests/fixtures/plugins/database/tester/updates/create_users_table.php
@@ -2,8 +2,8 @@
 
 namespace Database\Tester\Updates;
 
-use Schema;
 use Winter\Storm\Database\Updates\Migration;
+use Winter\Storm\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php
index 030d812d82..4fd8d82b39 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/acme/Plugin.php
@@ -2,8 +2,6 @@
 
 namespace DependencyTest\Acme;
 
-use Backend;
-use Backend\Models\UserRole;
 use System\Classes\PluginBase;
 
 /**
@@ -24,7 +22,7 @@ public function pluginDetails(): array
             'name' => 'ACME',
             'description' => 'This is a test plugin that will be used to check dependencies are loaded first.',
             'author' => 'Eric Pfeiffer',
-            'icon' => 'icon-leaf'
+            'icon' => 'icon-leaf',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php
index 8ec587ee19..a40157b847 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/dependency/Plugin.php
@@ -12,7 +12,7 @@ public function pluginDetails()
             'name' => 'Dependency Test - Dependency',
             'description' => 'This is a test plugin that will act as a dependency for the other test plugins in this
                 namespace.',
-            'author' => 'Ben Thomson'
+            'author' => 'Ben Thomson',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php
index 35b2af81f8..09d1999564 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/found/Plugin.php
@@ -7,7 +7,7 @@
 class Plugin extends PluginBase
 {
     public $require = [
-        'DependencyTest.Dependency'
+        'DependencyTest.Dependency',
     ];
 
     public function pluginDetails()
@@ -15,7 +15,7 @@ public function pluginDetails()
         return [
             'name' => 'Dependency Test - Found',
             'description' => 'This is a test plugin with a dependency that exists.',
-            'author' => 'Ben Thomson'
+            'author' => 'Ben Thomson',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php
index 6191e799e6..6a7b78eb81 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/notfound/Plugin.php
@@ -7,7 +7,7 @@
 class Plugin extends PluginBase
 {
     public $require = [
-        'DependencyTest.Missing'
+        'DependencyTest.Missing',
     ];
 
     public function pluginDetails()
@@ -15,7 +15,7 @@ public function pluginDetails()
         return [
             'name' => 'Dependency Test - Not Found',
             'description' => 'This is a test plugin with a dependency that does not exist.',
-            'author' => 'Ben Thomson'
+            'author' => 'Ben Thomson',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php b/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php
index 5f76297494..e1f3a3a32f 100644
--- a/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/dependencytest/wrongcase/Plugin.php
@@ -7,7 +7,7 @@
 class Plugin extends PluginBase
 {
     public $require = [
-        'Dependencytest.dependency'
+        'Dependencytest.dependency',
     ];
 
     public function pluginDetails()
@@ -15,7 +15,7 @@ public function pluginDetails()
         return [
             'name' => 'Dependency Test - Wrong Case',
             'description' => 'This is a test plugin with a dependency that exists, but is using the wrong letter case.',
-            'author' => 'Ben Thomson'
+            'author' => 'Ben Thomson',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php b/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php
index 463573484b..7ea3f01cc0 100644
--- a/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/mix/testa/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Mix Test A',
             'description' => 'Sample plugin used by unit tests.',
-            'author' => 'Mix Test'
+            'author' => 'Mix Test',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php b/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php
index ac9fdffad8..48cc1b2ad7 100644
--- a/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/mix/testb/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Mix Test B',
             'description' => 'Sample plugin used by unit tests.',
-            'author' => 'Mix Test'
+            'author' => 'Mix Test',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php b/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php
index cc1f693e24..b61f58aa04 100644
--- a/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/mix/testc/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Mix Test C',
             'description' => 'Sample plugin used by unit tests.',
-            'author' => 'Mix Test'
+            'author' => 'Mix Test',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php b/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php
index a647a8c951..e2e9d56f6f 100644
--- a/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/testvendor/test/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Another Test Plugin',
             'description' => 'Test plugin used by unit tests with the same name.',
-            'author' => 'Test Vendor'
+            'author' => 'Test Vendor',
         ];
     }
 
@@ -20,8 +20,8 @@ public function registerFormWidgets()
         return [
             'TestVendor\Test\FormWidgets\Sample' => [
                 'label' => 'Sample',
-                'code'  => 'sample'
-            ]
+                'code'  => 'sample',
+            ],
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php b/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php
index 52d38131e2..dc1c290299 100644
--- a/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/invalidreplacement/Plugin.php
@@ -13,8 +13,8 @@ public function pluginDetails()
             'description' => 'Sample plugin used by unit tests.',
             'author' => 'Alexey Bobkov, Samuel Georges',
             'replaces' => [
-                'Winter.Tester' => '>=9.0'
-            ]
+                'Winter.Tester' => '>=9.0',
+            ],
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php b/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php
index e0c3d84fb2..1e779a2107 100644
--- a/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/noupdates/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Winter Empty Plugin',
             'description' => 'Empty plugin used by unit tests.',
-            'author' => 'Alexey Bobkov, Samuel Georges'
+            'author' => 'Alexey Bobkov, Samuel Georges',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/original/Plugin.php b/modules/system/tests/fixtures/plugins/winter/original/Plugin.php
index 554556c280..938723a568 100644
--- a/modules/system/tests/fixtures/plugins/winter/original/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/original/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Winter Sample Plugin',
             'description' => 'Sample plugin used by unit tests.',
-            'author' => 'Alexey Bobkov, Samuel Georges'
+            'author' => 'Alexey Bobkov, Samuel Georges',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php b/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php
index cd9eb991fd..0f25d18fb0 100644
--- a/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/replacement/Plugin.php
@@ -13,8 +13,8 @@ public function pluginDetails()
             'description' => 'Sample plugin used by unit tests.',
             'author' => 'Alexey Bobkov, Samuel Georges',
             'replaces' => [
-                'Winter.Original' => '<=1.0.3'
-            ]
+                'Winter.Original' => '<=1.0.3',
+            ],
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/replacenotinstalled/Plugin.php b/modules/system/tests/fixtures/plugins/winter/replacenotinstalled/Plugin.php
index 963b667704..fb287b68ed 100644
--- a/modules/system/tests/fixtures/plugins/winter/replacenotinstalled/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/replacenotinstalled/Plugin.php
@@ -13,8 +13,8 @@ public function pluginDetails()
             'description' => 'Sample plugin used by unit tests.',
             'author' => 'Alexey Bobkov, Samuel Georges',
             'replaces' => [
-                'Winter.NotInstalled' => '>=1.0.3'
-            ]
+                'Winter.NotInstalled' => '>=1.0.3',
+            ],
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php b/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php
index 2823aed20e..233e36ac00 100644
--- a/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/sample/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Winter Sample Plugin',
             'description' => 'Sample plugin used by unit tests.',
-            'author' => 'Alexey Bobkov, Samuel Georges'
+            'author' => 'Alexey Bobkov, Samuel Georges',
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php b/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php
index 2a19c0929e..0ef8223fa0 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/Plugin.php
@@ -11,7 +11,7 @@ public function pluginDetails()
         return [
             'name' => 'Winter Test Plugin',
             'description' => 'Test plugin used by unit tests.',
-            'author' => 'Alexey Bobkov, Samuel Georges'
+            'author' => 'Alexey Bobkov, Samuel Georges',
         ];
     }
 
@@ -31,8 +31,8 @@ public function registerFormWidgets()
         return [
             'Winter\Tester\FormWidgets\Preview' => [
                 'label' => 'Preview',
-                'code'  => 'preview'
-            ]
+                'code'  => 'preview',
+            ],
         ];
     }
 
@@ -51,16 +51,16 @@ public function registerNavigation()
                         'label'       => 'Posts',
                         'icon'        => 'icon-copy',
                         'url'         => 'http://example.com/blog/posts',
-                        'permissions' => ['winter.blog.access_posts']
+                        'permissions' => ['winter.blog.access_posts'],
                     ],
                     'categories' => [
                         'label'       => 'Categories',
                         'icon'        => 'icon-list-ul',
                         'url'         => 'http://example.com/blog/categories',
-                        'permissions' => ['winter.blog.access_categories']
+                        'permissions' => ['winter.blog.access_categories'],
                     ],
-                ]
-            ]
+                ],
+            ],
         ];
     }
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
index 846e2314ad..d94a999a59 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
@@ -10,7 +10,7 @@ public function componentDetails()
     {
         return [
             'name' => 'Blog Archive Dummy Component',
-            'description' => 'Displays an archive of blog posts.'
+            'description' => 'Displays an archive of blog posts.',
         ];
     }
 
@@ -19,12 +19,12 @@ public function defineProperties()
         return [
             'posts-per-page' => [
                  'description' => 'This will set the posts to display per page',
-                 'default' => 10
+                 'default' => 10,
             ],
             'page-number-param' => [
                 'description' => 'The router parameter for getting the pagination page number',
-                'default' => 'pageNum'
-            ]
+                'default' => 'pageNum',
+            ],
         ];
     }
 
@@ -32,7 +32,7 @@ public function posts()
     {
         return [
             ['title' => 'Lorum ipsum', 'content' => 'Post Content #1'],
-            ['title' => 'La Playa Nudista', 'content' => 'Second Post Content']
+            ['title' => 'La Playa Nudista', 'content' => 'Second Post Content'],
         ];
     }
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php
index 99d33fd6bf..b6f8576d6b 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Categories.php
@@ -2,8 +2,8 @@
 
 namespace Winter\Tester\Components;
 
-use Cms\Classes\ComponentBase;
 use Cms\Classes\CodeBase;
+use Cms\Classes\ComponentBase;
 
 class Categories extends ComponentBase
 {
@@ -16,7 +16,7 @@ public function componentDetails()
     {
         return [
             'name' => 'Blog Categories Dummy Component',
-            'description' => 'Displays the list of categories in the blog.'
+            'description' => 'Displays the list of categories in the blog.',
         ];
     }
 
@@ -24,7 +24,7 @@ public function posts()
     {
         return [
             ['title' => 'Lorum ipsum', 'content' => 'Post Content #1'],
-            ['title' => 'La Playa Nudista', 'content' => 'Second Post Content']
+            ['title' => 'La Playa Nudista', 'content' => 'Second Post Content'],
         ];
     }
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php
index 12065e2f18..48f9184db9 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Comments.php
@@ -2,8 +2,8 @@
 
 namespace Winter\Tester\Components;
 
-use Cms\Classes\ComponentBase;
 use Cms\Classes\CodeBase;
+use Cms\Classes\ComponentBase;
 use Winter\Tester\Classes\Users;
 
 class Comments extends ComponentBase
@@ -20,7 +20,7 @@ public function componentDetails()
     {
         return [
             'name' => 'Blog Comments Dummy Component',
-            'description' => 'Displays the list of comments on a post.'
+            'description' => 'Displays the list of comments on a post.',
         ];
     }
 
@@ -28,7 +28,7 @@ public function posts()
     {
         return [
             ['title' => 'Lorum ipsum', 'content' => 'Post Content #1'],
-            ['title' => 'La Playa Nudista', 'content' => 'Second Post Content']
+            ['title' => 'La Playa Nudista', 'content' => 'Second Post Content'],
         ];
     }
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php b/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php
index 0939db6718..b2a7080309 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/ContentBlock.php
@@ -10,7 +10,7 @@ public function componentDetails()
     {
         return [
             'name' => 'Content Block Dummy Component',
-            'description' => 'Displays a editable content block.'
+            'description' => 'Displays a editable content block.',
         ];
     }
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php b/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php
index 79aac3a546..7b158ba63e 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/MainMenu.php
@@ -10,7 +10,7 @@ public function componentDetails()
     {
         return [
             'name' => 'Menu Dummy Component',
-            'description' => 'Displays a really cool menu.'
+            'description' => 'Displays a really cool menu.',
         ];
     }
 
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
index 50e2d5c68d..1ac95373d3 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
@@ -10,7 +10,7 @@ public function componentDetails()
     {
         return [
             'name' => 'Blog Post Dummy Component',
-            'description' => 'Displays a blog post.'
+            'description' => 'Displays a blog post.',
         ];
     }
 
@@ -19,8 +19,8 @@ public function defineProperties()
         return [
             'show-featured' => [
                  'description' => 'Display the post featured image or not',
-                 'default' => true
-            ]
+                 'default' => true,
+            ],
         ];
     }
 }
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php b/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php
index 21c2dd77fa..226df8d7f7 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/models/TestModel.php
@@ -2,7 +2,7 @@
 
 namespace Winter\Tester\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 class TestModel extends Model
 {
@@ -15,15 +15,15 @@ class TestModel extends Model
     ];
 
     public $belongsTo = [
-        'user' => TestUser::class
+        'user' => TestUser::class,
     ];
 
     public $hasOne = [
-        'phone' => TestPhone::class
+        'phone' => TestPhone::class,
     ];
 
     public $morphTo = [
-        'taggable' => []
+        'taggable' => [],
     ];
 
     public $rules = [
diff --git a/modules/system/tests/plugins/database/AttachManyModelTest.php b/modules/system/tests/plugins/database/AttachManyModelTest.php
index 43c0801f2c..f3c5878c4b 100644
--- a/modules/system/tests/plugins/database/AttachManyModelTest.php
+++ b/modules/system/tests/plugins/database/AttachManyModelTest.php
@@ -2,10 +2,10 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use System\Models\File as FileModel;
 use Database\Tester\Models\User;
-use Model;
+use System\Models\File as FileModel;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class AttachManyModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/AttachOneModelTest.php b/modules/system/tests/plugins/database/AttachOneModelTest.php
index fa683f1f3a..28a758793d 100644
--- a/modules/system/tests/plugins/database/AttachOneModelTest.php
+++ b/modules/system/tests/plugins/database/AttachOneModelTest.php
@@ -2,12 +2,12 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use System\Models\File as FileModel;
-use Database\Tester\Models\User;
 use Database\Tester\Models\SoftDeleteUser;
+use Database\Tester\Models\User;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Model;
+use System\Models\File as FileModel;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class AttachOneModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/BelongsToManyModelTest.php b/modules/system/tests/plugins/database/BelongsToManyModelTest.php
index e09d3814fe..980de23f3f 100644
--- a/modules/system/tests/plugins/database/BelongsToManyModelTest.php
+++ b/modules/system/tests/plugins/database/BelongsToManyModelTest.php
@@ -2,13 +2,13 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
+use Database\Tester\Models\Author;
 use Database\Tester\Models\Category;
 use Database\Tester\Models\Post as PostModel;
 use Database\Tester\Models\Role;
-use Database\Tester\Models\Author;
-use Model;
-use DB;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\DB;
 
 class BelongsToManyModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/BelongsToModelTest.php b/modules/system/tests/plugins/database/BelongsToModelTest.php
index 3bc0c82875..3dbcf6fb68 100644
--- a/modules/system/tests/plugins/database/BelongsToModelTest.php
+++ b/modules/system/tests/plugins/database/BelongsToModelTest.php
@@ -2,10 +2,10 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use Database\Tester\Models\Post;
 use Database\Tester\Models\Author;
-use Model;
+use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class BelongsToModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/DeferredBindingTest.php b/modules/system/tests/plugins/database/DeferredBindingTest.php
index 846da74f86..8d46505d88 100644
--- a/modules/system/tests/plugins/database/DeferredBindingTest.php
+++ b/modules/system/tests/plugins/database/DeferredBindingTest.php
@@ -2,11 +2,11 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use Database\Tester\Models\Post;
 use Database\Tester\Models\Author;
+use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 use Winter\Storm\Database\Models\DeferredBinding;
-use Model;
 
 class DeferredBindingTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/HasManyModelTest.php b/modules/system/tests/plugins/database/HasManyModelTest.php
index 3043101a09..18b67ac8e5 100644
--- a/modules/system/tests/plugins/database/HasManyModelTest.php
+++ b/modules/system/tests/plugins/database/HasManyModelTest.php
@@ -2,11 +2,11 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Author;
 use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
 use Winter\Storm\Database\Collection;
-use Model;
+use Winter\Storm\Database\Model;
 
 class HasManyModelTest extends PluginTestCase
 {
@@ -37,7 +37,7 @@ public function testSetRelationValue()
         $this->assertEquals($author->id, $post2->author_id);
         $this->assertEquals([
             'First post',
-            'Second post'
+            'Second post',
         ], $author->posts->lists('title'));
 
         // Set by primary key
@@ -47,7 +47,7 @@ public function testSetRelationValue()
         $post3 = Post::find($postId);
         $this->assertEquals($author->id, $post3->author_id);
         $this->assertEquals([
-            'Third post'
+            'Third post',
         ], $author->posts->lists('title'));
 
         // Nullify
@@ -61,7 +61,7 @@ public function testSetRelationValue()
         $author->posts = $post4;
         $this->assertEquals($author->id, $post4->author_id);
         $this->assertEquals([
-            'Fourth post'
+            'Fourth post',
         ], $author->posts->lists('title'));
     }
 
@@ -101,7 +101,7 @@ public function testDeferredBinding()
         $this->assertEquals(1, $author->posts()->count());
         $this->assertEquals($author->id, $post->author_id);
         $this->assertEquals([
-            'First post'
+            'First post',
         ], $author->posts->lists('title'));
 
         // New session
@@ -113,7 +113,7 @@ public function testDeferredBinding()
         $this->assertEquals(0, $author->posts()->withDeferred($sessionKey)->count());
         $this->assertEquals($author->id, $post->author_id);
         $this->assertEquals([
-            'First post'
+            'First post',
         ], $author->posts->lists('title'));
 
         // Commit deferred
diff --git a/modules/system/tests/plugins/database/HasManyThroughModelTest.php b/modules/system/tests/plugins/database/HasManyThroughModelTest.php
index 5ee7872a4c..7a585340d7 100644
--- a/modules/system/tests/plugins/database/HasManyThroughModelTest.php
+++ b/modules/system/tests/plugins/database/HasManyThroughModelTest.php
@@ -2,12 +2,12 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Author;
 use Database\Tester\Models\Country;
 use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
 use Winter\Storm\Database\Collection;
-use Model;
+use Winter\Storm\Database\Model;
 
 class HasManyThroughModelTest extends PluginTestCase
 {
@@ -45,14 +45,14 @@ public function testGet()
         $author2->save();
 
         $country = Country::with([
-            'posts'
+            'posts',
         ])->find($country->id);
 
         $this->assertEquals([
             $post1->id,
             $post2->id,
             $post3->id,
-            $post4->id
+            $post4->id,
         ], $country->posts->pluck('id')->toArray());
     }
 }
diff --git a/modules/system/tests/plugins/database/HasOneModelTest.php b/modules/system/tests/plugins/database/HasOneModelTest.php
index 9dc9491e9d..ddef7e8446 100644
--- a/modules/system/tests/plugins/database/HasOneModelTest.php
+++ b/modules/system/tests/plugins/database/HasOneModelTest.php
@@ -2,10 +2,10 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Author;
 use Database\Tester\Models\Phone;
-use Model;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class HasOneModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/HasOneThroughModelTest.php b/modules/system/tests/plugins/database/HasOneThroughModelTest.php
index 8fc3b15dec..cecfec5a66 100644
--- a/modules/system/tests/plugins/database/HasOneThroughModelTest.php
+++ b/modules/system/tests/plugins/database/HasOneThroughModelTest.php
@@ -2,11 +2,11 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Author;
 use Database\Tester\Models\Phone;
 use Database\Tester\Models\User;
-use Model;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class HasOneThroughModelTest extends PluginTestCase
 {
@@ -35,7 +35,7 @@ public function testGet()
         $author->save();
 
         $user = User::with([
-            'phone'
+            'phone',
         ])->find($user->id);
 
         $this->assertEquals($phone->id, $user->phone->id);
diff --git a/modules/system/tests/plugins/database/MorphManyModelTest.php b/modules/system/tests/plugins/database/MorphManyModelTest.php
index 254d32423a..71a52a58af 100644
--- a/modules/system/tests/plugins/database/MorphManyModelTest.php
+++ b/modules/system/tests/plugins/database/MorphManyModelTest.php
@@ -2,13 +2,13 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Author;
-use Database\Tester\Models\Tag;
-use Database\Tester\Models\Post;
 use Database\Tester\Models\EventLog;
+use Database\Tester\Models\Post;
+use Database\Tester\Models\Tag;
+use System\Tests\Bootstrap\PluginTestCase;
 use Winter\Storm\Database\Collection;
-use Model;
+use Winter\Storm\Database\Model;
 
 class MorphManyModelTest extends PluginTestCase
 {
@@ -43,7 +43,7 @@ public function testSetRelationValue()
         $this->assertEquals('Database\Tester\Models\Author', $event2->related_type);
         $this->assertEquals([
             'user-created',
-            'user-updated'
+            'user-updated',
         ], $author->event_log->lists('action'));
 
         // Set by primary key
@@ -54,7 +54,7 @@ public function testSetRelationValue()
         $this->assertEquals($author->id, $event3->related_id);
         $this->assertEquals('Database\Tester\Models\Author', $event3->related_type);
         $this->assertEquals([
-            'user-deleted'
+            'user-deleted',
         ], $author->event_log->lists('action'));
 
         // Nullify
@@ -70,7 +70,7 @@ public function testSetRelationValue()
         $this->assertEquals($author->id, $event4->related_id);
         $this->assertEquals('Database\Tester\Models\Author', $event4->related_type);
         $this->assertEquals([
-            'user-restored'
+            'user-restored',
         ], $author->event_log->lists('action'));
     }
 
@@ -125,7 +125,7 @@ public function testDeferredBinding()
         $this->assertEquals(1, $author->event_log()->count());
         $this->assertEquals($author->id, $event->related_id);
         $this->assertEquals([
-            'user-created'
+            'user-created',
         ], $author->event_log->lists('action'));
 
         $this->assertEquals(1, $author->tags()->count());
@@ -146,7 +146,7 @@ public function testDeferredBinding()
         $this->assertEquals(0, $author->event_log()->withDeferred($sessionKey)->count());
         $this->assertEquals($author->id, $event->related_id);
         $this->assertEquals([
-            'user-created'
+            'user-created',
         ], $author->event_log->lists('action'));
 
         $author->tags()->remove($tagForAuthor, $sessionKey);
diff --git a/modules/system/tests/plugins/database/MorphOneModelTest.php b/modules/system/tests/plugins/database/MorphOneModelTest.php
index 0c59f1b5bd..255668eb44 100644
--- a/modules/system/tests/plugins/database/MorphOneModelTest.php
+++ b/modules/system/tests/plugins/database/MorphOneModelTest.php
@@ -2,11 +2,11 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Author;
-use Database\Tester\Models\Post;
 use Database\Tester\Models\Meta;
-use Model;
+use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class MorphOneModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/MorphToModelTest.php b/modules/system/tests/plugins/database/MorphToModelTest.php
index ddc32b8f7f..06ad4cb4ea 100644
--- a/modules/system/tests/plugins/database/MorphToModelTest.php
+++ b/modules/system/tests/plugins/database/MorphToModelTest.php
@@ -2,11 +2,11 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use Database\Tester\Models\Post;
 use Database\Tester\Models\Author;
 use Database\Tester\Models\EventLog;
-use Model;
+use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class MorphToModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/NestedTreeModelTest.php b/modules/system/tests/plugins/database/NestedTreeModelTest.php
index d10326cb68..33ce0b9703 100644
--- a/modules/system/tests/plugins/database/NestedTreeModelTest.php
+++ b/modules/system/tests/plugins/database/NestedTreeModelTest.php
@@ -2,9 +2,9 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\CategoryNested;
-use Model;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class NestedTreeModelTest extends PluginTestCase
 {
@@ -54,7 +54,7 @@ public function testListsNested()
             6 => '&nbsp;&nbsp;&nbsp;Summer Breeze',
             7 => 'Category Green',
             8 => '&nbsp;&nbsp;&nbsp;Winter Snow',
-            9 => '&nbsp;&nbsp;&nbsp;Spring Trees'
+            9 => '&nbsp;&nbsp;&nbsp;Spring Trees',
         ], $array);
 
         CategoryNested::flushDuplicateCache();
@@ -69,7 +69,7 @@ public function testListsNested()
             6 => '--Summer Breeze',
             7 => 'Category Green',
             8 => '--Winter Snow',
-            9 => '--Spring Trees'
+            9 => '--Spring Trees',
         ], $array);
 
         CategoryNested::flushDuplicateCache();
@@ -84,7 +84,7 @@ public function testListsNested()
             'Summer Breeze' => '**Disccusion about the wind at the ocean.',
             'Category Green' => 'A root level test category',
             'Winter Snow' => '**Disccusion about the frosty snow flakes.',
-            'Spring Trees' => '**Disccusion about the blooming gardens.'
+            'Spring Trees' => '**Disccusion about the blooming gardens.',
         ], $array);
     }
 
@@ -100,7 +100,7 @@ public function testListsNestedFromCollection()
             6 => '...Summer Breeze (#6)',
             7 => 'Category Green (#7)',
             8 => '...Winter Snow (#8)',
-            9 => '...Spring Trees (#9)'
+            9 => '...Spring Trees (#9)',
         ], $array);
     }
 
@@ -115,27 +115,27 @@ public function seedSampleTree()
 
         $autumn = $orange->children()->create([
             'name' => 'Autumn Leaves',
-            'description' => 'Disccusion about the season of falling leaves.'
+            'description' => 'Disccusion about the season of falling leaves.',
         ]);
 
         $autumn->children()->create([
             'name' => 'September',
-            'description' => 'The start of the fall season.'
+            'description' => 'The start of the fall season.',
         ]);
 
         $autumn->children()->create([
             'name' => 'October',
-            'description' => 'The middle of the fall season.'
+            'description' => 'The middle of the fall season.',
         ]);
 
         $autumn->children()->create([
             'name' => 'November',
-            'description' => 'The end of the fall season.'
+            'description' => 'The end of the fall season.',
         ]);
 
         $orange->children()->create([
             'name' => 'Summer Breeze',
-            'description' => 'Disccusion about the wind at the ocean.'
+            'description' => 'Disccusion about the wind at the ocean.',
         ]);
 
         $green = CategoryNested::create([
@@ -145,12 +145,12 @@ public function seedSampleTree()
 
         $green->children()->create([
             'name' => 'Winter Snow',
-            'description' => 'Disccusion about the frosty snow flakes.'
+            'description' => 'Disccusion about the frosty snow flakes.',
         ]);
 
         $green->children()->create([
             'name' => 'Spring Trees',
-            'description' => 'Disccusion about the blooming gardens.'
+            'description' => 'Disccusion about the blooming gardens.',
         ]);
 
         Model::reguard();
diff --git a/modules/system/tests/plugins/database/NullableModelTest.php b/modules/system/tests/plugins/database/NullableModelTest.php
index e56d2ce01a..3a54be5b12 100644
--- a/modules/system/tests/plugins/database/NullableModelTest.php
+++ b/modules/system/tests/plugins/database/NullableModelTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\NullablePost;
+use System\Tests\Bootstrap\PluginTestCase;
 
 class NullableModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/PluginModelTest.php b/modules/system/tests/plugins/database/PluginModelTest.php
index c9c7d54fb3..b12c661fd3 100644
--- a/modules/system/tests/plugins/database/PluginModelTest.php
+++ b/modules/system/tests/plugins/database/PluginModelTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\Post;
+use System\Tests\Bootstrap\PluginTestCase;
 
 class PluginModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/RevisionableModelTest.php b/modules/system/tests/plugins/database/RevisionableModelTest.php
index 7f74614f2c..dadbe15c45 100644
--- a/modules/system/tests/plugins/database/RevisionableModelTest.php
+++ b/modules/system/tests/plugins/database/RevisionableModelTest.php
@@ -2,10 +2,10 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Carbon\Carbon;
 use Database\Tester\Models\RevisionablePost;
 use DateTime;
+use System\Tests\Bootstrap\PluginTestCase;
 
 class RevisionableModelTest extends PluginTestCase
 {
@@ -55,7 +55,7 @@ public function testUpdateMultipleFields()
             'slug' => 'hello-world',
             'description' => 'Good day, Commander',
             'is_published' => true,
-            'published_at' => new DateTime()
+            'published_at' => new DateTime(),
         ]);
 
         $this->assertEquals(0, $post->revision_history()->count());
@@ -75,7 +75,7 @@ public function testUpdateMultipleFields()
             'slug',
             'description',
             'is_published',
-            'published_at'
+            'published_at',
         ], $history->lists('field'));
     }
 
@@ -86,7 +86,7 @@ public function testExceedingRevisionLimit()
             'slug' => 'hello-world',
             'description' => 'Good day, Commander',
             'is_published' => true,
-            'published_at' => new DateTime()
+            'published_at' => new DateTime(),
         ]);
 
         $this->assertEquals(0, $post->revision_history()->count());
@@ -127,7 +127,7 @@ public function testRevisionDateCast()
     {
         $post = RevisionablePost::create([
             'title' => 'Hello World!',
-            'published_at' => Carbon::now()
+            'published_at' => Carbon::now(),
         ]);
         $this->assertEquals(0, $post->revision_history()->count());
 
diff --git a/modules/system/tests/plugins/database/SimpleTreeModelTest.php b/modules/system/tests/plugins/database/SimpleTreeModelTest.php
index 071660c2cb..7d8b493897 100644
--- a/modules/system/tests/plugins/database/SimpleTreeModelTest.php
+++ b/modules/system/tests/plugins/database/SimpleTreeModelTest.php
@@ -2,10 +2,9 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use Carbon\Carbon;
 use Database\Tester\Models\CategorySimple;
-use Model;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class SimpleTreeModelTest extends PluginTestCase
 {
@@ -119,7 +118,7 @@ public function testListsNested()
             16 => 'Graphic design',
             17 => '&nbsp;&nbsp;&nbsp;Photoshop',
             18 => '&nbsp;&nbsp;&nbsp;Illustrator',
-            19 => '&nbsp;&nbsp;&nbsp;Fireworks'
+            19 => '&nbsp;&nbsp;&nbsp;Fireworks',
         ], $array);
 
         $array = CategorySimple::listsNested('name', 'id', '--');
@@ -142,7 +141,7 @@ public function testListsNested()
             16 => 'Graphic design',
             17 => '--Photoshop',
             18 => '--Illustrator',
-            19 => '--Fireworks'
+            19 => '--Fireworks',
         ], $array);
 
         $array = CategorySimple::listsNested('id', 'name', '**');
@@ -165,7 +164,7 @@ public function testListsNested()
             'Graphic design' => '16',
             'Photoshop' => '**17',
             'Illustrator' => '**18',
-            'Fireworks' => '**19'
+            'Fireworks' => '**19',
         ], $array);
     }
 
@@ -200,7 +199,7 @@ public function testListsNestedFromCollection()
             16 => 'Graphic design (#16)',
             17 => '...Photoshop (#17)',
             18 => '...Illustrator (#18)',
-            19 => '...Fireworks (#19)'
+            19 => '...Fireworks (#19)',
         ], $array);
     }
 
@@ -210,7 +209,7 @@ public function seedSampleTree()
         Model::unguard();
 
         $webdev = CategorySimple::create([
-            'name' => 'Web development'
+            'name' => 'Web development',
         ]);
 
         $webdev->children()->create(['name' => 'HTML5']);
@@ -224,7 +223,7 @@ public function seedSampleTree()
         $winter->children()->create(['name' => 'November']);
 
         $mobdev = CategorySimple::create([
-            'name' => 'Mobile development'
+            'name' => 'Mobile development',
         ]);
 
         $mobdev->children()->create(['name' => 'iOS']);
@@ -233,7 +232,7 @@ public function seedSampleTree()
         $mobdev->children()->create(['name' => 'Android']);
 
         $design = CategorySimple::create([
-            'name' => 'Graphic design'
+            'name' => 'Graphic design',
         ]);
 
         $design->children()->create(['name' => 'Photoshop']);
diff --git a/modules/system/tests/plugins/database/SluggableModelTest.php b/modules/system/tests/plugins/database/SluggableModelTest.php
index bb67b20c3b..0911cdba59 100644
--- a/modules/system/tests/plugins/database/SluggableModelTest.php
+++ b/modules/system/tests/plugins/database/SluggableModelTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\SluggablePost;
+use System\Tests\Bootstrap\PluginTestCase;
 
 class SluggableModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/SoftDeleteModelTest.php b/modules/system/tests/plugins/database/SoftDeleteModelTest.php
index d375d011b9..75596a737b 100644
--- a/modules/system/tests/plugins/database/SoftDeleteModelTest.php
+++ b/modules/system/tests/plugins/database/SoftDeleteModelTest.php
@@ -2,15 +2,14 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
-use Database\Tester\Models\User;
 use Database\Tester\Models\Author;
-use Database\Tester\Models\UserWithAuthor;
 use Database\Tester\Models\SoftDeleteAuthor;
-use Database\Tester\Models\UserWithSoftAuthor;
+use Database\Tester\Models\UserWithAuthor;
 use Database\Tester\Models\UserWithAuthorAndSoftDelete;
+use Database\Tester\Models\UserWithSoftAuthor;
 use Database\Tester\Models\UserWithSoftAuthorAndSoftDelete;
-use Model;
+use System\Tests\Bootstrap\PluginTestCase;
+use Winter\Storm\Database\Model;
 
 class SoftDeleteModelTest extends PluginTestCase
 {
diff --git a/modules/system/tests/plugins/database/ValidationModelTest.php b/modules/system/tests/plugins/database/ValidationModelTest.php
index 1ea806c2ea..f34c08011c 100644
--- a/modules/system/tests/plugins/database/ValidationModelTest.php
+++ b/modules/system/tests/plugins/database/ValidationModelTest.php
@@ -2,8 +2,8 @@
 
 namespace System\Tests\Plugins\Database;
 
-use System\Tests\Bootstrap\PluginTestCase;
 use Database\Tester\Models\ValidationPost;
+use System\Tests\Bootstrap\PluginTestCase;
 
 class ValidationModelTest extends PluginTestCase
 {
@@ -23,7 +23,7 @@ public function testUniqueTableValidation()
         $post = ValidationPost::create([
             'title' => 'This is a new post',
             'slug' => 'post-1',
-            'description' => 'Testing...'
+            'description' => 'Testing...',
         ]);
 
         $this->assertNotFalse($post);
@@ -31,7 +31,7 @@ public function testUniqueTableValidation()
         $post2 = ValidationPost::create([
             'title' => 'this is another post with the same slug',
             'slug' => 'post-1',
-            'description' => 'testing....'
+            'description' => 'testing....',
         ]);
     }
 }
diff --git a/modules/system/tests/plugins/system/CustomValidatorRulesTest.php b/modules/system/tests/plugins/system/CustomValidatorRulesTest.php
index 483b0db350..e95ce2c9d3 100644
--- a/modules/system/tests/plugins/system/CustomValidatorRulesTest.php
+++ b/modules/system/tests/plugins/system/CustomValidatorRulesTest.php
@@ -3,7 +3,7 @@
 namespace System\Tests\Plugins\System;
 
 use System\Tests\Bootstrap\PluginTestCase;
-use Validator;
+use Winter\Storm\Support\Facades\Validator;
 
 class CustomValidatorRulesTest extends PluginTestCase
 {
@@ -20,15 +20,15 @@ public function setUp(): void
     public function testValidationUsingClosure()
     {
         $validData = [
-            'company' => 'ACME'
+            'company' => 'ACME',
         ];
 
         $invalidData = [
-            'company' => 'Acme'
+            'company' => 'Acme',
         ];
 
         $rules = [
-            'company' => 'uppercase'
+            'company' => 'uppercase',
         ];
 
         $validationWithValidData = Validator::make($validData, $rules);
@@ -41,15 +41,15 @@ public function testValidationUsingClosure()
     public function testValidationUsingRuleObject()
     {
         $validData = [
-            'name' => 'bob'
+            'name' => 'bob',
         ];
 
         $invalidData = [
-            'name' => 'karen'
+            'name' => 'karen',
         ];
 
         $rules = [
-            'name' => 'be_like_bob'
+            'name' => 'be_like_bob',
         ];
 
         $validationWithValidData = Validator::make($validData, $rules);
diff --git a/modules/system/tests/traits/ViewMakerTest.php b/modules/system/tests/traits/ViewMakerTest.php
index fc3c347fd3..9532f6a71c 100644
--- a/modules/system/tests/traits/ViewMakerTest.php
+++ b/modules/system/tests/traits/ViewMakerTest.php
@@ -107,7 +107,7 @@ public function testMakePartial()
                 'field' => (object) [
                     'label' => 'label',
                     'comment' => 'comment',
-                    'commentHtml' => false
+                    'commentHtml' => false,
                 ],
             ]);
             $this->assertEquals($expected, trim($contents));
diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index b89eb19fa1..f9bd1699c7 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -2,9 +2,9 @@
 
 namespace System\Traits;
 
+use System\Classes\Asset\Vite;
 use System\Classes\CombineAssets;
 use System\Classes\PluginManager;
-use System\Classes\Asset\Vite;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
 use Winter\Storm\Exception\SystemException;
@@ -66,7 +66,7 @@ public function makeAssets(string $type = null): ?string
                 $attributes = Html::attributes(array_merge(
                     [
                         'rel'  => 'stylesheet',
-                        'href' => $this->getAssetEntryBuildPath($asset)
+                        'href' => $this->getAssetEntryBuildPath($asset),
                     ],
                     array_except($asset['attributes'], $reserved)
                 ));
@@ -82,7 +82,7 @@ public function makeAssets(string $type = null): ?string
                         'rel'   => 'alternate',
                         'href'  => $this->getAssetEntryBuildPath($asset),
                         'title' => 'RSS',
-                        'type'  => 'application/rss+xml'
+                        'type'  => 'application/rss+xml',
                     ],
                     array_except($asset['attributes'], $reserved)
                 ));
@@ -95,7 +95,7 @@ public function makeAssets(string $type = null): ?string
             foreach ($this->orderAssets($this->assets['js']) as $asset) {
                 $attributes = Html::attributes(array_merge(
                     [
-                        'src' => $this->getAssetEntryBuildPath($asset)
+                        'src' => $this->getAssetEntryBuildPath($asset),
                     ],
                     array_except($asset['attributes'], $reserved)
                 ));
@@ -218,7 +218,7 @@ public function addVite(array|string $entrypoints, ?string $package = null): voi
         }
 
         $this->addAsset('vite', $package, [
-            'entrypoints' => $entrypoints
+            'entrypoints' => $entrypoints,
         ]);
     }
 
diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index 36975bf21c..b5d7ef1369 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -2,13 +2,13 @@
 
 namespace System\Traits;
 
-use Yaml;
-use File;
-use Lang;
-use Event;
-use SystemException;
+use Illuminate\Support\Facades\Lang;
 use stdClass;
-use Config;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Yaml;
 
 /**
  * Config Maker Trait
diff --git a/modules/system/traits/EventEmitter.php b/modules/system/traits/EventEmitter.php
index ac953fe62f..b808e32212 100644
--- a/modules/system/traits/EventEmitter.php
+++ b/modules/system/traits/EventEmitter.php
@@ -2,7 +2,7 @@
 
 namespace System\Traits;
 
-use Event;
+use Winter\Storm\Support\Facades\Event;
 
 /**
  * Adds system event related features to any class.
diff --git a/modules/system/traits/ResponseMaker.php b/modules/system/traits/ResponseMaker.php
index 4908c11327..0b311476fa 100644
--- a/modules/system/traits/ResponseMaker.php
+++ b/modules/system/traits/ResponseMaker.php
@@ -2,9 +2,9 @@
 
 namespace System\Traits;
 
-use Response;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Illuminate\Support\Facades\Response;
 use Symfony\Component\HttpFoundation\Response as BaseResponse;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 
 /**
  * Response Maker Trait
diff --git a/modules/system/traits/SecurityController.php b/modules/system/traits/SecurityController.php
index 60f5c9c078..968c21ca23 100644
--- a/modules/system/traits/SecurityController.php
+++ b/modules/system/traits/SecurityController.php
@@ -2,13 +2,12 @@
 
 namespace System\Traits;
 
-use Crypt;
-use Config;
-use Request;
-use Session;
 use Carbon\Carbon;
-use Symfony\Component\HttpFoundation\Response as BaseResponse;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Request;
+use Session;
 use Symfony\Component\HttpFoundation\Cookie;
+use Winter\Storm\Support\Facades\Config;
 
 /**
  * Security Controller Trait
diff --git a/modules/system/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php
index 15d6658b05..e2f1d26c17 100644
--- a/modules/system/traits/ViewMaker.php
+++ b/modules/system/traits/ViewMaker.php
@@ -2,12 +2,12 @@
 
 namespace System\Traits;
 
-use File;
-use Lang;
-use Block;
-use SystemException;
+use Illuminate\Support\Facades\Lang;
 use Throwable;
-use Config;
+use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Support\Facades\Block;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\File;
 
 /**
  * View Maker Trait
diff --git a/modules/system/twig/Engine.php b/modules/system/twig/Engine.php
index f285c61b57..141ff49b92 100644
--- a/modules/system/twig/Engine.php
+++ b/modules/system/twig/Engine.php
@@ -2,9 +2,9 @@
 
 namespace System\Twig;
 
+use Illuminate\Contracts\View\Engine as EngineInterface;
 use System\Twig\Loader as TwigLoader;
 use Twig\Environment as TwigEnvironment;
-use Illuminate\Contracts\View\Engine as EngineInterface;
 
 /**
  * View engine used by the system, used for converting .htm files to twig.
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 5c926eaeec..1c5057889f 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -2,13 +2,13 @@
 
 namespace System\Twig;
 
-use Url;
+use Illuminate\Support\Facades\URL;
 use System\Classes\ImageResizer;
-use System\Classes\MediaLibrary;
 use System\Classes\MarkupManager;
+use System\Classes\MediaLibrary;
+use Twig\Extension\AbstractExtension as TwigExtension;
 use Twig\TwigFilter as TwigSimpleFilter;
 use Twig\TwigFunction as TwigSimpleFunction;
-use Twig\Extension\AbstractExtension as TwigExtension;
 
 /**
  * The System Twig extension class implements common Twig functions and filters.
diff --git a/modules/system/twig/Loader.php b/modules/system/twig/Loader.php
index c7a3c99c94..f69374e335 100644
--- a/modules/system/twig/Loader.php
+++ b/modules/system/twig/Loader.php
@@ -2,13 +2,13 @@
 
 namespace System\Twig;
 
-use App;
 use Exception;
-use File;
+use Illuminate\Support\Facades\App;
 use InvalidArgumentException;
-use Twig\Source as TwigSource;
 use Twig\Error\LoaderError;
 use Twig\Loader\LoaderInterface as TwigLoaderInterface;
+use Twig\Source as TwigSource;
+use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Str;
 
 /**
diff --git a/modules/system/twig/MailPartialNode.php b/modules/system/twig/MailPartialNode.php
index 8dd52dd83b..2fed7aa4e2 100644
--- a/modules/system/twig/MailPartialNode.php
+++ b/modules/system/twig/MailPartialNode.php
@@ -2,8 +2,8 @@
 
 namespace System\Twig;
 
-use Twig\Node\Node as TwigNode;
 use Twig\Compiler as TwigCompiler;
+use Twig\Node\Node as TwigNode;
 
 /**
  * Represents a partial node
diff --git a/modules/system/twig/MailPartialTokenParser.php b/modules/system/twig/MailPartialTokenParser.php
index 7512153a74..4f034a9744 100644
--- a/modules/system/twig/MailPartialTokenParser.php
+++ b/modules/system/twig/MailPartialTokenParser.php
@@ -2,10 +2,10 @@
 
 namespace System\Twig;
 
+use Twig\Error\SyntaxError as TwigErrorSyntax;
 use Twig\Node\Node as TwigNode;
 use Twig\Token as TwigToken;
 use Twig\TokenParser\AbstractTokenParser as TwigTokenParser;
-use Twig\Error\SyntaxError as TwigErrorSyntax;
 
 /**
  * Parser for the `{% partial %}` Twig tag.
diff --git a/modules/system/twig/SecurityPolicy.php b/modules/system/twig/SecurityPolicy.php
index f336feff43..88511582de 100644
--- a/modules/system/twig/SecurityPolicy.php
+++ b/modules/system/twig/SecurityPolicy.php
@@ -3,10 +3,10 @@
 namespace System\Twig;
 
 use Twig\Markup;
-use Twig\Template;
-use Twig\Sandbox\SecurityPolicyInterface;
 use Twig\Sandbox\SecurityNotAllowedMethodError;
 use Twig\Sandbox\SecurityNotAllowedPropertyError;
+use Twig\Sandbox\SecurityPolicyInterface;
+use Twig\Template;
 
 /**
  * SecurityPolicy globally blocks accessibility of certain methods and properties.
diff --git a/phpcs.xml b/phpcs.xml
index 80d7734e2b..156b1bd2c0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -123,6 +123,23 @@
         <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
     </rule>
 
+    <!-- All arrays must have a trailing comma on the last item in the array -->
+    <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma" />
+    <!-- Imports should be alphabetically ordered -->
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses" />
+    <!-- Don't allow group use declarations as they make diffs ugly -->
+    <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
+    <!-- Don't allow use definitions for a class in the same namespace -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace" />
+    <!-- Don't allow starting backslash for imports as there's no need for them -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash" />
+    <!-- Don't allow unused imports (using them in docblocks is OK)-->
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+        <properties>
+            <property name="searchAnnotations" value="true" />
+        </properties>
+    </rule>
+
     <arg name="extensions" value="php" />
     <arg name="colors" />
 
diff --git a/plugins/winter/demo/Plugin.php b/plugins/winter/demo/Plugin.php
index 45de94ebf5..7b0cd8cc89 100644
--- a/plugins/winter/demo/Plugin.php
+++ b/plugins/winter/demo/Plugin.php
@@ -16,14 +16,14 @@ public function pluginDetails()
             'name'        => 'Winter Demo',
             'description' => 'Provides features used by the provided demonstration theme.',
             'author'      => 'Alexey Bobkov, Samuel Georges',
-            'icon'        => 'icon-leaf'
+            'icon'        => 'icon-leaf',
         ];
     }
 
     public function registerComponents()
     {
         return [
-            '\Winter\Demo\Components\Todo' => 'demoTodo'
+            '\Winter\Demo\Components\Todo' => 'demoTodo',
         ];
     }
 }
diff --git a/plugins/winter/demo/components/Todo.php b/plugins/winter/demo/components/Todo.php
index e1dab41f3e..d6fd143afd 100644
--- a/plugins/winter/demo/components/Todo.php
+++ b/plugins/winter/demo/components/Todo.php
@@ -2,9 +2,9 @@
 
 namespace Winter\Demo\Components;
 
-use Flash;
 use ApplicationException;
 use Cms\Classes\ComponentBase;
+use Flash;
 
 class Todo extends ComponentBase
 {
@@ -12,7 +12,7 @@ public function componentDetails()
     {
         return [
             'name'        => 'Todo List',
-            'description' => 'Implements a simple to-do list.'
+            'description' => 'Implements a simple to-do list.',
         ];
     }
 
@@ -25,8 +25,8 @@ public function defineProperties()
                 'default'           => 10,
                 'type'              => 'string',
                 'validationPattern' => '^[0-9]+$',
-                'validationMessage' => 'The Max Items value is required and should be integer.'
-            ]
+                'validationMessage' => 'The Max Items value is required and should be integer.',
+            ],
         ];
     }
 

From dbf6019284649712211aa1c33f10493f896ba76f Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 10:17:56 +0800
Subject: [PATCH 03/30] Use Composer-derived PHPCS, udpate GitHub Actions

---
 .github/workflows/code-quality.yaml    |  4 +-
 .github/workflows/tests.yml            | 65 +++-----------------------
 .github/workflows/utilities/phpcs-pr   |  2 +-
 .github/workflows/utilities/phpcs-push |  2 +-
 4 files changed, 11 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
index 7d745ec75b..13dbfc726e 100644
--- a/.github/workflows/code-quality.yaml
+++ b/.github/workflows/code-quality.yaml
@@ -29,7 +29,9 @@ jobs:
         with:
           php-version: 8.0
           extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
-          tools: phpcs
+
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --no-progress --no-scripts
 
       - name: Run code quality checks (on push)
         if: github.event_name == 'push'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6dd83f4063..69970d3261 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,6 +7,10 @@ on:
       - develop
   pull_request:
 
+concurrency:
+  group: phpunit-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   frontendTests:
     strategy:
@@ -28,22 +32,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Checkout changes
-        uses: actions/checkout@v3
-
-      - name: Setup extension cache
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ env.phpVersion }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -64,17 +53,6 @@ jobs:
         if: github.head_ref == '1.2' || github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
         run: php ./.github/workflows/utilities/library-switcher "1.2.x-dev as 1.2"
 
-      - name: Setup dependency cache
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts
 
@@ -104,28 +82,8 @@ jobs:
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
-      - name: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
-        uses: actions/checkout@v2
-
-      - name: Setup extension cache
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.phpVersion }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -149,17 +107,6 @@ jobs:
         if: github.head_ref == '1.2' || github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
         run: php ./.github/workflows/utilities/library-switcher "1.2.x-dev as 1.2"
 
-      - name: Setup dependency cache
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts
 
diff --git a/.github/workflows/utilities/phpcs-pr b/.github/workflows/utilities/phpcs-pr
index 231930c4f8..1446ffbf1d 100755
--- a/.github/workflows/utilities/phpcs-pr
+++ b/.github/workflows/utilities/phpcs-pr
@@ -30,7 +30,7 @@ if (!count($files)) {
 }
 
 // Run all changed files through the PHPCS code sniffer and generate a CSV report
-$csv = shell_exec('phpcs --colors -nq --report="csv" --extensions="php" ' . implode(' ', $files));
+$csv = shell_exec('./vendor/bin/phpcs --colors -nq --report="csv" --extensions="php" ' . implode(' ', $files));
 $lines = array_map(function ($row) {
     return array_map(function ($column) {
         return trim($column, '"');
diff --git a/.github/workflows/utilities/phpcs-push b/.github/workflows/utilities/phpcs-push
index fe51c44c2b..475a4e3fc6 100755
--- a/.github/workflows/utilities/phpcs-push
+++ b/.github/workflows/utilities/phpcs-push
@@ -30,7 +30,7 @@ if (!count($files)) {
 }
 
 // Run all changed files through the PHPCS code sniffer and generate a CSV report
-$csv = shell_exec('phpcs --colors -nq --report="csv" --extensions="php" ' . implode(' ', $files));
+$csv = shell_exec('./vendor/bin/phpcs --colors -nq --report="csv" --extensions="php" ' . implode(' ', $files));
 $lines = array_map(function ($row) {
     return array_map(function ($column) {
         return trim($column, '"');

From ce14395eeaee5fe6bd86767b75f167b293a43658 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 10:19:02 +0800
Subject: [PATCH 04/30] Update GitHub Actions

---
 .github/workflows/code-quality.yaml |  4 +--
 .github/workflows/manifest.yml      | 40 ++---------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
index 13dbfc726e..552ec80d2f 100644
--- a/.github/workflows/code-quality.yaml
+++ b/.github/workflows/code-quality.yaml
@@ -20,7 +20,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Checkout changes
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -45,7 +45,7 @@ jobs:
     name: JavaScript
     steps:
       - name: Checkout changes
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             fetch-depth: 0
 
diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
index 72597a5329..1ad51ca43e 100644
--- a/.github/workflows/manifest.yml
+++ b/.github/workflows/manifest.yml
@@ -15,28 +15,8 @@ jobs:
       extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
       key: winter-cms-cache-develop
     steps:
-      - name: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
-        uses: actions/checkout@v3
-
-      - name: Setup extension cache
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ env.phpVersion }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -44,17 +24,6 @@ jobs:
           php-version: ${{ env.phpVersion }}
           extensions: ${{ env.extensions }}
 
-      - name: Setup dependency cache
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts
 
@@ -74,13 +43,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: updateManifest
     steps:
-      - name: Cancel previous incomplete runs
-        uses: styfle/cancel-workflow-action@0.8.0
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout changes
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: wintercms/meta
           ref: master

From 87171ca3aa6bd313b576949635d9ae20a8c7e7d7 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 10:21:58 +0800
Subject: [PATCH 05/30] Reset modules before checking code quality

---
 .github/workflows/code-quality.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
index 552ec80d2f..833b5fb59c 100644
--- a/.github/workflows/code-quality.yaml
+++ b/.github/workflows/code-quality.yaml
@@ -33,6 +33,11 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-scripts
 
+      - name: Reset modules
+        run: |
+          git reset --hard
+          git clean -fd
+
       - name: Run code quality checks (on push)
         if: github.event_name == 'push'
         run: ./.github/workflows/utilities/phpcs-push ${{ github.sha }}

From e23c0b238f62db44df58fd91e825946f8b01e2e5 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 15:31:51 +0800
Subject: [PATCH 06/30] Exclude some rules for partials and views

---
 .../relation/partials/_relation.php           |  2 +-
 modules/backend/layouts/_custom_styles.php    |  6 +--
 modules/system/partials/_settings_menu.php    |  3 +-
 phpcs.xml                                     | 52 +++++++++++++++++++
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/modules/backend/formwidgets/relation/partials/_relation.php b/modules/backend/formwidgets/relation/partials/_relation.php
index ba4a87bc83..909fcaf3a1 100644
--- a/modules/backend/formwidgets/relation/partials/_relation.php
+++ b/modules/backend/formwidgets/relation/partials/_relation.php
@@ -1,3 +1,3 @@
 <div class="relation-widget" id="<?= $this->getId() ?>">
     <?= $this->makePartial('~/modules/backend/widgets/form/partials/_field_' . $field->type . '.php', ['field' => $field]) ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/backend/layouts/_custom_styles.php b/modules/backend/layouts/_custom_styles.php
index c908ac31da..5feb7a53a0 100644
--- a/modules/backend/layouts/_custom_styles.php
+++ b/modules/backend/layouts/_custom_styles.php
@@ -1,8 +1,6 @@
 <?php
-
-    use Backend\Models\BrandSetting;
-    use Backend\Models\EditorSetting;
-
+use Backend\Models\BrandSetting;
+use Backend\Models\EditorSetting;
 ?>
 <?php if (BrandSetting::isConfigured() || BrandSetting::isBaseConfigured()): ?>
     <style>
diff --git a/modules/system/partials/_settings_menu.php b/modules/system/partials/_settings_menu.php
index 997f347a95..ed702a2270 100644
--- a/modules/system/partials/_settings_menu.php
+++ b/modules/system/partials/_settings_menu.php
@@ -1,5 +1,4 @@
 <?php
-
-    $systemItems = System\Classes\SettingsManager::instance()->listItems('system');
+$systemItems = System\Classes\SettingsManager::instance()->listItems('system');
 ?>
 <?= $this->makePartial('~/modules/system/partials/_settings_menu_items.php', ['items' => $systemItems]); ?>
diff --git a/phpcs.xml b/phpcs.xml
index 156b1bd2c0..1b73fbd814 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -37,7 +37,9 @@
         <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
@@ -71,7 +73,9 @@
         <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
@@ -92,7 +96,9 @@
         <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
@@ -113,7 +119,53 @@
         <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
         <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR12.Files.FileHeader.SpacingAfterBlock">
+        <!--
+        Partials don't need to follow spacing rules for heading blocks (use cases)
+        -->
+        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR12.Files.OpenTag.NotAlone">
+        <!--
+        Partials may use PHP tags inline
+        -->
+        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
         <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>

From b2ffbe957e7d4ad8b54708c9d007386f7829a12a Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 15:56:15 +0800
Subject: [PATCH 07/30] Add rule for array indentation

---
 modules/backend/lang/de/lang.php              |  8 ++---
 modules/backend/lang/es-ar/lang.php           |  2 +-
 modules/backend/lang/fr/lang.php              |  8 ++---
 modules/backend/lang/id/lang.php              |  2 +-
 modules/backend/lang/ja/lang.php              | 10 +++---
 modules/backend/lang/sv/lang.php              |  2 +-
 modules/backend/models/UserRole.php           |  4 +--
 modules/backend/widgets/MediaManager.php      | 32 +++++++++----------
 modules/cms/classes/CmsObject.php             |  2 +-
 modules/cms/lang/fa/lang.php                  |  2 +-
 modules/cms/widgets/AssetList.php             |  2 +-
 modules/system/ServiceProvider.php            |  6 ++--
 modules/system/lang/es-ar/lang.php            | 24 +++++++-------
 modules/system/lang/sv/lang.php               |  2 +-
 modules/system/models/PluginVersion.php       |  8 ++---
 .../system/tests/classes/MediaLibraryTest.php |  6 ++--
 .../winter/tester/components/Archive.php      |  4 +--
 .../plugins/winter/tester/components/Post.php |  4 +--
 phpcs.xml                                     | 22 +++++++++++++
 19 files changed, 88 insertions(+), 62 deletions(-)

diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
index 9532914bdb..6063a693f2 100644
--- a/modules/backend/lang/de/lang.php
+++ b/modules/backend/lang/de/lang.php
@@ -500,10 +500,10 @@
         'email' => 'E-Mail',
     ],
     'filter' => [
-      'all' => 'Alle',
-      'options_method_not_exists' => 'Die Modelklasse :model muss eine Methode :method() definiert haben, welche die Optionen für den Filter ":filter" zurückgibt.',
-      'date_all' => 'Ganzen Zeitraum',
-      'number_all' => 'Alle Zahlen',
+        'all' => 'Alle',
+        'options_method_not_exists' => 'Die Modelklasse :model muss eine Methode :method() definiert haben, welche die Optionen für den Filter ":filter" zurückgibt.',
+        'date_all' => 'Ganzen Zeitraum',
+        'number_all' => 'Alle Zahlen',
     ],
     'import_export' => [
         'upload_csv_file' => '1. CSV-Datei hochladen',
diff --git a/modules/backend/lang/es-ar/lang.php b/modules/backend/lang/es-ar/lang.php
index 946d8b0b89..ee257412dc 100644
--- a/modules/backend/lang/es-ar/lang.php
+++ b/modules/backend/lang/es-ar/lang.php
@@ -248,7 +248,7 @@
         'email' => 'Email',
     ],
     'filter' => [
-      'all' => 'Todo',
+        'all' => 'Todo',
     ],
     'media' => [
         'rename_popup_title' => 'Renombrar',
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index 0e3f19c40a..71b3ca6fbf 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -504,10 +504,10 @@
         'email' => 'Adresse e-mail',
     ],
     'filter' => [
-      'all' => 'tous',
-      'options_method_not_exists' => "La classe du modèle :model doit définir une méthode :method() qui retourne les options pour le filtre ':filter'.",
-      'date_all' => 'toute la période',
-      'number_all' => 'tous les nombres',
+        'all' => 'tous',
+        'options_method_not_exists' => "La classe du modèle :model doit définir une méthode :method() qui retourne les options pour le filtre ':filter'.",
+        'date_all' => 'toute la période',
+        'number_all' => 'tous les nombres',
     ],
     'import_export' => [
         'upload_csv_file' => '1. Envoyer un fichier CSV',
diff --git a/modules/backend/lang/id/lang.php b/modules/backend/lang/id/lang.php
index 59557e4e17..a9da95dd29 100644
--- a/modules/backend/lang/id/lang.php
+++ b/modules/backend/lang/id/lang.php
@@ -295,7 +295,7 @@
         'email' => 'Surel',
     ],
     'filter' => [
-      'all' => 'semua',
+        'all' => 'semua',
     ],
     'media' => [
         'rename_popup_title' => 'Ganti nama',
diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php
index a926a308a0..053d20eacb 100644
--- a/modules/backend/lang/ja/lang.php
+++ b/modules/backend/lang/ja/lang.php
@@ -501,10 +501,10 @@
         'email' => 'メール',
     ],
     'filter' => [
-      'all' => 'すべて',
-      'options_method_not_exists' => "モデルクラス :model は ':filter' フィルタのオプションを返すメソッド :method() を定義する必要があります。",
-      'date_all' => '全期間',
-      'number_all' => '全数',
+        'all' => 'すべて',
+        'options_method_not_exists' => "モデルクラス :model は ':filter' フィルタのオプションを返すメソッド :method() を定義する必要があります。",
+        'date_all' => '全期間',
+        'number_all' => '全数',
     ],
     'import_export' => [
         'upload_csv_file' => '1.CSVファイルをアップロードする',
@@ -632,7 +632,7 @@
         'folder_or_file_exist' => '指定された名前のフォルダまたはファイルはすでに存在しています',
         'move_empty' => '移動するアイテムを選択してください。',
         'move_popup_title' => 'ファイルまたはフォルダの移動',
-         'move_popup_title' => 'ファイルまたはフォルダの移動',
+        'move_popup_title' => 'ファイルまたはフォルダの移動',
         'move_destination' => '移動先フォルダ',
         'please_select_move_dest' => '保存先フォルダを選択してください',
         'move_dest_src_match' => '他の保存先フォルダを選択してください',
diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
index 35c82a07be..b6f588408e 100644
--- a/modules/backend/lang/sv/lang.php
+++ b/modules/backend/lang/sv/lang.php
@@ -310,7 +310,7 @@
         'email' => 'E-post',
     ],
     'filter' => [
-      'all' => 'alla',
+        'all' => 'alla',
     ],
     'permissions' => [
         'manage_media' => 'Hantera media',
diff --git a/modules/backend/models/UserRole.php b/modules/backend/models/UserRole.php
index 2c72a0f390..e4a002ac4b 100644
--- a/modules/backend/models/UserRole.php
+++ b/modules/backend/models/UserRole.php
@@ -77,8 +77,8 @@ public function isSystemRole()
         // Winter default system roles
         if (
             $this->is_system || in_array($this->code, [
-            self::CODE_DEVELOPER,
-            self::CODE_PUBLISHER,
+                self::CODE_DEVELOPER,
+                self::CODE_PUBLISHER,
             ])
         ) {
             return true;
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index 5364e0ad1e..c64dea69ef 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -929,11 +929,11 @@ protected function setFilter(string $filter): void
     {
         if (
             !in_array($filter, [
-            self::FILTER_ALL,
-            MediaLibraryItem::FILE_TYPE_IMAGE,
-            MediaLibraryItem::FILE_TYPE_AUDIO,
-            MediaLibraryItem::FILE_TYPE_DOCUMENT,
-            MediaLibraryItem::FILE_TYPE_VIDEO,
+                self::FILTER_ALL,
+                MediaLibraryItem::FILE_TYPE_IMAGE,
+                MediaLibraryItem::FILE_TYPE_AUDIO,
+                MediaLibraryItem::FILE_TYPE_DOCUMENT,
+                MediaLibraryItem::FILE_TYPE_VIDEO,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -993,9 +993,9 @@ protected function setSortBy(string $sortBy): void
     {
         if (
             !in_array($sortBy, [
-            MediaLibrary::SORT_BY_TITLE,
-            MediaLibrary::SORT_BY_SIZE,
-            MediaLibrary::SORT_BY_MODIFIED,
+                MediaLibrary::SORT_BY_TITLE,
+                MediaLibrary::SORT_BY_SIZE,
+                MediaLibrary::SORT_BY_MODIFIED,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1024,8 +1024,8 @@ protected function setSortDirection($sortDirection): void
     {
         if (
             !in_array($sortDirection, [
-            MediaLibrary::SORT_DIRECTION_ASC,
-            MediaLibrary::SORT_DIRECTION_DESC,
+                MediaLibrary::SORT_DIRECTION_ASC,
+                MediaLibrary::SORT_DIRECTION_DESC,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1086,9 +1086,9 @@ protected function setSelectionParams($selectionMode, $selectionWidth, $selectio
     {
         if (
             !in_array($selectionMode, [
-            self::SELECTION_MODE_NORMAL,
-            self::SELECTION_MODE_FIXED_RATIO,
-            self::SELECTION_MODE_FIXED_SIZE,
+                self::SELECTION_MODE_NORMAL,
+                self::SELECTION_MODE_FIXED_RATIO,
+                self::SELECTION_MODE_FIXED_SIZE,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
@@ -1178,9 +1178,9 @@ protected function setViewMode(string $viewMode): void
     {
         if (
             !in_array($viewMode, [
-            self::VIEW_MODE_GRID,
-            self::VIEW_MODE_LIST,
-            self::VIEW_MODE_TILES,
+                self::VIEW_MODE_GRID,
+                self::VIEW_MODE_LIST,
+                self::VIEW_MODE_TILES,
             ])
         ) {
             throw new ApplicationException('Invalid input data');
diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index a35cdc13c2..9e38a972a3 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -340,7 +340,7 @@ protected function throwHalcyonSaveException(Exception $ex)
             ]);
         } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidFileNameException) {
             throw new ValidationException([
-               'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name' => $ex->getInvalidFileName()]),
+                'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name' => $ex->getInvalidFileName()]),
             ]);
         } elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\FileExistsException) {
             throw new ApplicationException(
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index 929057507d..300b24f1be 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -189,7 +189,7 @@
         'hidden_comment' => 'صفحات مخفی فقط برای کاربران وارد شده به سیستم نمایش داده می شود.',
         'enter_fullscreen' => 'حالت تمام صفحه',
         'exit_fullscreen' => 'خروج از حالت تمام صفحه',
-         'open_searchbox' => 'نمایش جستجو',
+        'open_searchbox' => 'نمایش جستجو',
         'close_searchbox'  => 'بستن جستجو',
         'open_replacebox' => 'نمایش جایگزینی',
         'close_replacebox'  => 'بستن جایگزینی',
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index 429a2ec193..94c519a406 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -77,7 +77,7 @@ protected function loadAssets()
     public function render()
     {
         return $this->makePartial('body', [
-           'data' => $this->getData(),
+            'data' => $this->getData(),
         ]);
     }
 
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 346f57f5d6..c9867e4a7f 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -224,7 +224,8 @@ protected function registerMarkupTags()
                     }
 
                     return twig_date_converter($env, $value, $timezone);
-                }, 'options' => ['needs_environment' => true]],
+                }, 'options' => ['needs_environment' => true],
+                ],
 
                 // Classes
                 'array_*'        => ['Arr', '*'],
@@ -252,7 +253,8 @@ protected function registerMarkupTags()
                     }
 
                     return twig_date_format_filter($env, $value, $format, $timezone);
-                }, 'options' => ['needs_environment' => true]],
+                }, 'options' => ['needs_environment' => true],
+                ],
                 'md'             => function ($value) {
                     return (is_string($value) && $value !== '') ? Markdown::parse($value) : '';
                 },
diff --git a/modules/system/lang/es-ar/lang.php b/modules/system/lang/es-ar/lang.php
index 1f6cbc43a9..51f062d27e 100644
--- a/modules/system/lang/es-ar/lang.php
+++ b/modules/system/lang/es-ar/lang.php
@@ -18,18 +18,18 @@
         'name' => 'Sistema',
         'menu_label' => 'Sistema',
         'categories' => [
-        'cms' => 'CMS',
-        'misc' => 'Miscelánea',
-        'logs' => 'Registros',
-        'mail' => 'Correo',
-        'shop' => 'Comprar',
-        'team' => 'Equipo',
-        'users' => 'Usuarios',
-        'system' => 'Sistema',
-        'social' => 'Social',
-        'events' => 'Eventos',
-        'customers' => 'Clientes',
-        'my_settings' => 'Mis configuraciones',
+            'cms' => 'CMS',
+            'misc' => 'Miscelánea',
+            'logs' => 'Registros',
+            'mail' => 'Correo',
+            'shop' => 'Comprar',
+            'team' => 'Equipo',
+            'users' => 'Usuarios',
+            'system' => 'Sistema',
+            'social' => 'Social',
+            'events' => 'Eventos',
+            'customers' => 'Clientes',
+            'my_settings' => 'Mis configuraciones',
         ],
     ],
     'plugin' => [
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index 286f0ae588..a5afd725dc 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -60,7 +60,7 @@
             'label' => 'Tilläggsnamn',
             'help' => 'Namnge tillägget efter dess unika kod. Exempelvis Winter.Blog',
         ],
-        ],
+    ],
     'plugins' => [
         'manage' => 'Hantera tillägg',
         'enable_or_disable' => 'Aktivera eller inaktivera',
diff --git a/modules/system/models/PluginVersion.php b/modules/system/models/PluginVersion.php
index 4d984e40e2..0b7cb57f4d 100644
--- a/modules/system/models/PluginVersion.php
+++ b/modules/system/models/PluginVersion.php
@@ -102,10 +102,10 @@ public function afterFetch()
                 foreach ($activeFlags as $flag => $enabled) {
                     if (
                         in_array($flag, [
-                        PluginManager::DISABLED_MISSING,
-                        PluginManager::DISABLED_REPLACED,
-                        PluginManager::DISABLED_REPLACEMENT_FAILED,
-                        PluginManager::DISABLED_MISSING_DEPENDENCIES,
+                            PluginManager::DISABLED_MISSING,
+                            PluginManager::DISABLED_REPLACED,
+                            PluginManager::DISABLED_REPLACEMENT_FAILED,
+                            PluginManager::DISABLED_MISSING_DEPENDENCIES,
                         ])
                     ) {
                         $this->disabledBySystem = true;
diff --git a/modules/system/tests/classes/MediaLibraryTest.php b/modules/system/tests/classes/MediaLibraryTest.php
index a7cfe2e3c5..f8627a1cee 100644
--- a/modules/system/tests/classes/MediaLibraryTest.php
+++ b/modules/system/tests/classes/MediaLibraryTest.php
@@ -133,13 +133,15 @@ protected function setUpStorage()
         config(['filesystems.disks.test_local' => [
             'driver' => 'local',
             'root'   => storage_path('app'),
-        ]]);
+        ],
+        ]);
 
         config(['cms.storage.media' => [
             'disk'   => 'test_local',
             'folder' => 'media',
             'path'   => '/storage/app/media',
-        ]]);
+        ],
+        ]);
     }
 
     protected function copyMedia()
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
index d94a999a59..b6ff85759d 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Archive.php
@@ -18,8 +18,8 @@ public function defineProperties()
     {
         return [
             'posts-per-page' => [
-                 'description' => 'This will set the posts to display per page',
-                 'default' => 10,
+                'description' => 'This will set the posts to display per page',
+                'default' => 10,
             ],
             'page-number-param' => [
                 'description' => 'The router parameter for getting the pagination page number',
diff --git a/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php b/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
index 1ac95373d3..7899b0388b 100644
--- a/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
+++ b/modules/system/tests/fixtures/plugins/winter/tester/components/Post.php
@@ -18,8 +18,8 @@ public function defineProperties()
     {
         return [
             'show-featured' => [
-                 'description' => 'Display the post featured image or not',
-                 'default' => true,
+                'description' => 'Display the post featured image or not',
+                'default' => true,
             ],
         ];
     }
diff --git a/phpcs.xml b/phpcs.xml
index 1b73fbd814..1add84cec2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -175,6 +175,28 @@
         <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
     </rule>
 
+    <rule ref="Generic.Arrays.ArrayIndent">
+        <!--
+        Partials may format arrays differently to improve readability within HTML code
+        -->
+        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
+    </rule>
+
     <!-- All arrays must have a trailing comma on the last item in the array -->
     <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma" />
     <!-- Imports should be alphabetically ordered -->

From 7b72f82bfd63e028e40490988d1a27ff28558342 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 23 Aug 2024 15:58:03 +0800
Subject: [PATCH 08/30] Fix reference to File facade

---
 modules/system/models/MailLayout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/models/MailLayout.php b/modules/system/models/MailLayout.php
index 9d870791f5..4fb557a2a1 100644
--- a/modules/system/models/MailLayout.php
+++ b/modules/system/models/MailLayout.php
@@ -2,12 +2,12 @@
 
 namespace System\Models;
 
-use File as FileHelper;
 use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Mail\MailParser;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Mail layout

From 52a824f4a143c54129fc6d369aaa69422437a3f0 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 2 Sep 2024 09:45:18 +0800
Subject: [PATCH 09/30] Split off Winter CMS code style ruleset to its own XML

This will allow us to use the ruleset in plugins as well
---
 phpcs.base.xml | 184 +++++++++++++++++++++++++++++++++++++++++
 phpcs.xml      | 217 +------------------------------------------------
 2 files changed, 188 insertions(+), 213 deletions(-)
 create mode 100644 phpcs.base.xml

diff --git a/phpcs.base.xml b/phpcs.base.xml
new file mode 100644
index 0000000000..45dd99163a
--- /dev/null
+++ b/phpcs.base.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0"?>
+<ruleset name="WinterCMS">
+    <description>The coding standard for Winter CMS.</description>
+    <rule ref="PSR12">
+        <!--
+        Exceptions to the PSR-2 guidelines as per our Developer Guide:
+        https://wintercms.com/docs/v1.2/docs/architecture/developer-guide#exceptions-to-the-standard
+        -->
+        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
+
+        <!--  We're not enforcing a line length limit -->
+        <exclude name="Generic.Files.LineLength" />
+    </rule>
+
+    <rule ref="Squiz.ControlStructures.ControlSignature">
+        <!-- We use 0 spaces before the colon for short (alternative) tags -->
+        <properties>
+            <property name="requiredSpacesBeforeColon" value="0" />
+        </properties>
+    </rule>
+
+    <rule ref="Generic.Formatting.SpaceAfterNot">
+        <!-- We do not allow a space after a logical NOT operator (ie. `if (! $this->exists) {` will be a code smell)-->
+        <properties>
+            <property name="spacing" value="0" />
+        </properties>
+    </rule>
+
+    <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen">
+        <!--
+        Ignore correct spacing for control structure in partial templates - spacing may be useful for templates to
+        easily deduce HTML code that is conditional
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
+        <!-- Migration files and tests do not need a namespace defined  -->
+        <exclude-pattern>*/updates/*\.php</exclude-pattern>
+        <exclude-pattern>*/updates/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/database/migrations/*\.php</exclude-pattern>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
+        <!--
+        Test fixtures and cases can have multiple classes defined, only if they are directly related to the test, or are
+        extended classes
+        -->
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR2.Files.ClosingTag.NotAllowed">
+        <!--
+        Partials may finish on a closing tag, especially when using the short echo "<?= ?>" tag. We'll allow this.
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLineCASE">
+        <!--
+        Partials may have HTML within switch/case statements, which look neater when inline. PHPCS also has difficulty
+        interpreting a short echo tag on a new line within a switch/case statement.
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR2.ControlStructures.SwitchDeclaration.BreakNotNewLine">
+        <!--
+        Partials may have HTML within switch/case statements, which look neater when inline. PHPCS also has difficulty
+        interpreting a short echo tag on a new line within a switch/case statement.
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR12.Files.FileHeader.SpacingAfterBlock">
+        <!--
+        Partials don't need to follow spacing rules for heading blocks (use cases)
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR12.Files.OpenTag.NotAlone">
+        <!--
+        Partials may use PHP tags inline
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisIndent">
+        <!--
+        Partials can be a little more lenient with closing parenthesis indentation if it looks better within HTML templating code
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="Generic.Arrays.ArrayIndent">
+        <!--
+        Partials may format arrays differently to improve readability within HTML code
+        -->
+        <exclude-pattern>*/behaviors/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/components/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/controllers/*/*\.php</exclude-pattern>
+        <exclude-pattern>*/formwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/reportwidgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/widgets/*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/layouts/*\.php</exclude-pattern>
+        <exclude-pattern>*/partials/*\.php</exclude-pattern>
+        <exclude-pattern>*/views/*\.php</exclude-pattern>
+    </rule>
+
+    <!-- All arrays must have a trailing comma on the last item in the array -->
+    <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma" />
+    <!-- Imports should be alphabetically ordered -->
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses" />
+    <!-- Don't allow group use declarations as they make diffs ugly -->
+    <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
+    <!-- Don't allow use definitions for a class in the same namespace -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace" />
+    <!-- Don't allow starting backslash for imports as there's no need for them -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash" />
+    <!-- Don't allow unused imports (using them in docblocks is OK)-->
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+        <properties>
+            <property name="searchAnnotations" value="true" />
+        </properties>
+    </rule>
+</ruleset>
diff --git a/phpcs.xml b/phpcs.xml
index 1add84cec2..8d043a1227 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,218 +1,9 @@
 <?xml version="1.0"?>
-<ruleset name="Winter CMS">
-    <description>The coding standard for Winter CMS.</description>
-    <rule ref="PSR12">
-        <!--
-        Exceptions to the PSR-2 guidelines as per our Developer Guide:
-        https://wintercms.com/docs/v1.2/docs/architecture/developer-guide#exceptions-to-the-standard
-        -->
-        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
+<ruleset name="WinterCMSCore">
+    <description>The coding standard for Winter CMS core.</description>
 
-        <!--  We're not enforcing a line length limit -->
-        <exclude name="Generic.Files.LineLength" />
-    </rule>
-
-    <rule ref="Squiz.ControlStructures.ControlSignature">
-        <!-- We use 0 spaces before the colon for short (alternative) tags -->
-        <properties>
-            <property name="requiredSpacesBeforeColon" value="0" />
-        </properties>
-    </rule>
-
-    <rule ref="Generic.Formatting.SpaceAfterNot">
-        <!-- We do not allow a space after a logical NOT operator (ie. `if (! $this->exists) {` will be a code smell)-->
-        <properties>
-            <property name="spacing" value="0" />
-        </properties>
-    </rule>
-
-    <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen">
-        <!--
-        Ignore correct spacing for control structure in partial templates - spacing may be useful for templates to
-        easily deduce HTML code that is conditional
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
-        <!-- Migration files and tests do not need a namespace defined -->
-        <exclude-pattern>*/database/migrations/*\.php</exclude-pattern>
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <!--
-        Test fixtures and cases can have multiple classes defined, only if they are directly related to the test, or are
-        extended classes
-        -->
-        <exclude-pattern>*/tests/*</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR2.Files.ClosingTag.NotAllowed">
-        <!--
-        Partials may finish on a closing tag, especially when using the short echo "<?= ?>" tag. We'll allow this.
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLineCASE">
-        <!--
-        Partials may have HTML within switch/case statements, which look neater when inline. PHPCS also has difficulty
-        interpreting a short echo tag on a new line within a switch/case statement.
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR2.ControlStructures.SwitchDeclaration.BreakNotNewLine">
-        <!--
-        Partials may have HTML within switch/case statements, which look neater when inline. PHPCS also has difficulty
-        interpreting a short echo tag on a new line within a switch/case statement.
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR12.Files.FileHeader.SpacingAfterBlock">
-        <!--
-        Partials don't need to follow spacing rules for heading blocks (use cases)
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR12.Files.OpenTag.NotAlone">
-        <!--
-        Partials may use PHP tags inline
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="Generic.Arrays.ArrayIndent">
-        <!--
-        Partials may format arrays differently to improve readability within HTML code
-        -->
-        <exclude-pattern>*/modules/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/layouts/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/modules/*/views/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/behaviors/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/components/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/controllers/*/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/formwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/reportwidgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/widgets/*/partials/*\.php</exclude-pattern>
-        <exclude-pattern>*/plugins/*/*/partials/*\.php</exclude-pattern>
-    </rule>
-
-    <!-- All arrays must have a trailing comma on the last item in the array -->
-    <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma" />
-    <!-- Imports should be alphabetically ordered -->
-    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses" />
-    <!-- Don't allow group use declarations as they make diffs ugly -->
-    <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
-    <!-- Don't allow use definitions for a class in the same namespace -->
-    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace" />
-    <!-- Don't allow starting backslash for imports as there's no need for them -->
-    <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash" />
-    <!-- Don't allow unused imports (using them in docblocks is OK)-->
-    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
-        <properties>
-            <property name="searchAnnotations" value="true" />
-        </properties>
-    </rule>
+    <!-- Import Winter CMS code style ruleset -->
+    <rule ref="./phpcs.base.xml" />
 
     <arg name="extensions" value="php" />
     <arg name="colors" />

From a6b814b644ea912d961899fa2e1e09e5281c4416 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 2 Sep 2024 09:46:00 +0800
Subject: [PATCH 10/30] Remove partial from exclusion list

With new ruleset, it now passes
---
 modules/backend/widgets/mediamanager/partials/_item-icon.php | 2 +-
 phpcs.xml                                                    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/backend/widgets/mediamanager/partials/_item-icon.php b/modules/backend/widgets/mediamanager/partials/_item-icon.php
index 9b789b8158..b11b869931 100644
--- a/modules/backend/widgets/mediamanager/partials/_item-icon.php
+++ b/modules/backend/widgets/mediamanager/partials/_item-icon.php
@@ -15,7 +15,7 @@
                 <!-- Extension text node -->
                 <text class="file-icon-extension" x="43%" y="170px" dominant-baseline="middle" text-anchor="middle"><?= strtoupper($extension) ?></text>
             </svg>
-        <?php else :?>
+        <?php else: ?>
             <i class="<?= $itemIconClass ?>"></i>
         <?php endif ?>
     </div>
diff --git a/phpcs.xml b/phpcs.xml
index 8d043a1227..4732eb4837 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -19,8 +19,6 @@
     <exclude-pattern>modules/system/tests/fixtures/manifest/*</exclude-pattern>
     <!-- Ignore this view file as fixing the issues in here will break the template -->
     <exclude-pattern>modules/system/views/exception.php</exclude-pattern>
-    <!-- Ignore this view file as PHPCS wants line 8 to have 44 spaces instead of 12, clearly insane -->
-    <exclude-pattern>modules/backend/widgets/mediamanager/partials/_item-icon.php</exclude-pattern>
     <!-- Ignore this test case completely as it's testing a parse error -->
     <exclude-pattern>tests/fixtures/plugins/testvendor/goto/Plugin.php</exclude-pattern>
 </ruleset>

From 236c4596303cf1e0a6df94a6d9f8e8abf9132f0f Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 2 Sep 2024 11:16:31 +0800
Subject: [PATCH 11/30] Add "winter:sniff" command

This command will allow developers to check code style against the Winter CMS code style rules in both the core and installed plugins.
---
 modules/system/ServiceProvider.php            |   1 +
 modules/system/console/WinterSniff.php        | 279 ++++++++++++++++++
 .../scaffold/phpcs/phpcs.core.xml.stub        |  24 ++
 .../console/scaffold/phpcs/phpcs.xml.stub     |  10 +
 4 files changed, 314 insertions(+)
 create mode 100644 modules/system/console/WinterSniff.php
 create mode 100644 modules/system/console/scaffold/phpcs/phpcs.core.xml.stub
 create mode 100644 modules/system/console/scaffold/phpcs/phpcs.xml.stub

diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index c9867e4a7f..4b04e1708a 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -316,6 +316,7 @@ protected function registerConsole()
         $this->registerConsoleCommand('winter.version', \System\Console\WinterVersion::class);
         $this->registerConsoleCommand('winter.manifest', \System\Console\WinterManifest::class);
         $this->registerConsoleCommand('winter.test', \System\Console\WinterTest::class);
+        $this->registerConsoleCommand('winter.sniff', \System\Console\WinterSniff::class);
 
         $this->registerConsoleCommand('plugin.install', \System\Console\PluginInstall::class);
         $this->registerConsoleCommand('plugin.remove', \System\Console\PluginRemove::class);
diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
new file mode 100644
index 0000000000..a3d3d69479
--- /dev/null
+++ b/modules/system/console/WinterSniff.php
@@ -0,0 +1,279 @@
+<?php
+
+namespace System\Console;
+
+use Illuminate\Support\Facades\File;
+use Symfony\Component\Process\Exception\ProcessSignaledException;
+use Symfony\Component\Process\ExecutableFinder;
+use Symfony\Component\Process\Process;
+use System\Classes\PluginManager;
+
+/**
+ * Console command to check code style and formatting issues.
+ *
+ * If a plugin is provided, this command will search for a `phpcs.xml file inside the plugin's directory. If not found,
+ * the user will be prompted to create one if they wish.
+ */
+class WinterSniff extends BaseScaffoldCommand
+{
+    /**
+     * @var string|null The default command name for lazy loading.
+     */
+    protected static $defaultName = 'winter:sniff';
+
+    /**
+     * @var string The console command name.
+     */
+    protected $name = 'winter:sniff';
+
+    /**
+     * The console command description.
+     */
+    protected $description = 'Validates source code to ensure a consistent coding style.';
+
+    /**
+     * @var string The console command signature as ignoreValidationErrors causes options not to be registered.
+     */
+    protected $signature = 'winter:sniff
+        {paths?* : The path to the files and/or directories to check, if you wish to limit the scope of files checked.}
+        {?--c|config= : Path to a custom PHPCS configuration XML file}
+        {?--p|plugin= : Checks the coding style of a plugin}
+        {?--e|no-warnings : Ignore warnings and only show errors}
+        {?--s|summary : Display a summary of the results}
+    ';
+
+    protected $stubs = [
+        'scaffold/phpcs/phpcs.xml.stub' => 'phpcs.xml',
+    ];
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        // Register aliases for backwards compatibility with October
+        $this->setAliases(['winter:phpcs']);
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @throws \Winter\Storm\Exception\ApplicationException
+     * @return int|void
+     */
+    public function handle()
+    {
+        $configFile = $this->getConfigFile();
+
+        if (!File::exists($configFile)) {
+            $this->error(sprintf('No configuration file found. Exiting.', $configFile));
+            return 1;
+        }
+
+        $phpCs = $this->findPhpCsExecutable();
+
+        if (is_null($phpCs)) {
+            $this->error('Unable to find the `phpcs` executable. Please ensure that you have installed the developer
+            dependencies through Composer.');
+            return 1;
+        }
+
+        $phpCsArgs = $this->buildPhpCsArgs($phpCs, $configFile);
+
+        ini_set('memory_limit', '512M');
+        $process = new Process($phpCsArgs, base_path());
+
+        // Set an unlimited timeout
+        $process->setTimeout(0);
+
+        // Attempt to set tty mode, catch and warn with the exception message if unsupported
+        try {
+            $process->setTty(true);
+        } catch (\Throwable $e) {
+            $this->warn($e->getMessage());
+        }
+
+        $exitCode = 1;
+
+        try {
+            $exitCode = $process->run(function ($type, $line) {
+                $this->output->write($line);
+            });
+        } catch (ProcessSignaledException $e) {
+            if (extension_loaded('pcntl') && $e->getSignal() !== SIGINT) {
+                throw $e;
+            }
+
+            return 1;
+        }
+
+        if ($exitCode === 0) {
+            return $this->components->info('No coding style issues found.');
+        }
+    }
+
+    /**
+     * Gets the config file path.
+     *
+     * If the config file is not found, the user will be prompted to create one if they wish.
+     */
+    protected function getConfigFile(): ?string
+    {
+        $path = $this->expectedConfigPath();
+
+        if (!File::exists($path)) {
+            $this->warn(sprintf('Configuration file %s not found.', $path));
+
+            if ($this->confirm('Would you like to create a new configuration file?')) {
+                $this->createConfigFile();
+            }
+        }
+
+        return $path;
+    }
+
+    /**
+     * Determines the expected path for the config file.
+     *
+     * For plugins, this will be a "phpcs.xml" file inside the plugin's directory. For the core, this will be a
+     * "phpcs.xml" file in the root directory of the project.
+     */
+    protected function expectedConfigPath(): ?string
+    {
+        if ($this->option('config')) {
+            return $this->option('config');
+        }
+
+        if ($this->option('plugin')) {
+            $pluginPath = PluginManager::instance()->getPluginPath($this->getPluginIdentifier());
+
+            if (is_null($pluginPath)) {
+                $this->error(sprintf('Plugin %s not found.', $this->getPluginIdentifier()));
+            }
+
+            return $pluginPath . '/phpcs.xml';
+        }
+
+        return base_path('phpcs.xml');
+    }
+
+    /**
+     * Creates a new configuration file for PHPCS.
+     */
+    protected function createConfigFile(): void
+    {
+        if ($this->option('plugin')) {
+            $this->vars = [
+                'plugin' => $this->getPluginIdentifier(),
+                'plugin_code' => str_replace('.', '_', $this->getPluginIdentifier()),
+            ];
+            $this->makeStub('scaffold/phpcs/phpcs.xml.stub');
+            return;
+        }
+
+        File::copy(
+            __DIR__ . '/scaffold/phpcs/phpcs.core.xml.stub',
+            $this->option('config') ?? base_path('phpcs.xml')
+        );
+    }
+
+    protected function getDestinationForStub(string $stubName): string
+    {
+        if ($this->option('config')) {
+            return $this->option('config');
+        }
+
+        return parent::getDestinationForStub($stubName);
+    }
+
+    public function getPluginIdentifier($identifier = null): string
+    {
+        $pluginManager = PluginManager::instance();
+        $pluginName = $identifier ?? $this->option('plugin');
+        $pluginName = $pluginManager->normalizeIdentifier($pluginName);
+
+        if (!$pluginManager->hasPlugin($pluginName)) {
+            $this->error(sprintf('Plugin %s not found.', $this->getPluginIdentifier()));
+        }
+
+        return $pluginName;
+    }
+
+    /**
+     * Finds the `phpcs` executable in the system.
+     *
+     * This should be in the `vendor/bin` directory of the project, if the project has developer dependencies installed
+     * through Composer.
+     */
+    protected function findPhpCsExecutable(): ?string
+    {
+        return (new ExecutableFinder())
+            ->find(
+                'phpcs',
+                base_path('vendor/bin/phpcs'),
+                [
+                    base_path('vendor'),
+                ]
+            );
+    }
+
+    /**
+     * Gets the base path where files and directories will be checked.
+     *
+     * If the `--plugin` option is provided, this will return the path to the plugin. Otherwise, it will return the base
+     * path of the project.
+     *
+     * @return string
+     */
+    protected function getBasePath(): string
+    {
+        if ($this->option('plugin')) {
+            $pluginPath = PluginManager::instance()->getPluginPath($this->getPluginIdentifier());
+
+            if (is_null($pluginPath)) {
+                $this->error(sprintf('Plugin %s not found.', $this->getPluginIdentifier()));
+            }
+
+            return $pluginPath;
+        }
+
+        return base_path();
+    }
+
+    /**
+     * Builds the arguments to pass to the `phpcs` executable.
+     *
+     * @return string[]
+     */
+    protected function buildPhpCsArgs(string $phpCs, string $configFile): array
+    {
+        $args = [
+            $phpCs,
+            '-d',
+            'memory_limit=512M',
+            '--basepath=' . $this->getBasePath(),
+            '--standard=' . $configFile,
+        ];
+
+        if ($this->option('no-warnings')) {
+            $args[] = '--warning-severity=0';
+        }
+
+        if ($this->option('summary')) {
+            $args[] = '--report=summary';
+        }
+
+        $args = array_merge(
+            $args,
+            $this->argument('paths') ?: (
+            ($this->option('plugin'))
+                ? [PluginManager::instance()->getPluginPath($this->getPluginIdentifier())]
+                : []
+            )
+        );
+
+        return $args;
+    }
+}
diff --git a/modules/system/console/scaffold/phpcs/phpcs.core.xml.stub b/modules/system/console/scaffold/phpcs/phpcs.core.xml.stub
new file mode 100644
index 0000000000..4732eb4837
--- /dev/null
+++ b/modules/system/console/scaffold/phpcs/phpcs.core.xml.stub
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset name="WinterCMSCore">
+    <description>The coding standard for Winter CMS core.</description>
+
+    <!-- Import Winter CMS code style ruleset -->
+    <rule ref="./phpcs.base.xml" />
+
+    <arg name="extensions" value="php" />
+    <arg name="colors" />
+
+    <file>bootstrap/</file>
+    <file>config/</file>
+    <file>modules/</file>
+    <file>plugins/winter/demo/</file>
+
+    <!-- Ignore vendor files -->
+    <exclude-pattern>*/vendor/*</exclude-pattern>
+    <!-- Ignore manifest test fixtures -->
+    <exclude-pattern>modules/system/tests/fixtures/manifest/*</exclude-pattern>
+    <!-- Ignore this view file as fixing the issues in here will break the template -->
+    <exclude-pattern>modules/system/views/exception.php</exclude-pattern>
+    <!-- Ignore this test case completely as it's testing a parse error -->
+    <exclude-pattern>tests/fixtures/plugins/testvendor/goto/Plugin.php</exclude-pattern>
+</ruleset>
diff --git a/modules/system/console/scaffold/phpcs/phpcs.xml.stub b/modules/system/console/scaffold/phpcs/phpcs.xml.stub
new file mode 100644
index 0000000000..62611d7fa9
--- /dev/null
+++ b/modules/system/console/scaffold/phpcs/phpcs.xml.stub
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ruleset name="{{ plugin_code }}">
+    <description>Coding style for {{ plugin }}.</description>
+
+    <!-- Import Winter CMS code style ruleset -->
+    <rule ref="./phpcs.base.xml" />
+
+    <arg name="extensions" value="php" />
+    <arg name="colors" />
+</ruleset>

From 9d1b92f758caa2b28e817a7a6e2a73bfcb532dfd Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Sat, 7 Dec 2024 13:05:49 +0800
Subject: [PATCH 12/30] Fix remaining code smells

---
 modules/backend/widgets/Lists.php             |   2 +-
 modules/cms/classes/Page.php                  |   2 +-
 modules/cms/classes/Theme.php                 |   2 +-
 modules/cms/console/CreateTheme.php           |  12 +-
 .../system/classes/asset/PackageManager.php   |   2 +-
 modules/system/console/CreateFactory.php      |   4 +-
 .../system/console/asset/npm/NpmInstall.php   |   1 -
 modules/system/console/asset/npm/NpmRun.php   |   4 +-
 .../system/console/asset/npm/NpmUpdate.php    |   3 +-
 .../system/console/asset/npm/NpmVersion.php   |   1 -
 .../system/console/asset/vite/ViteWatch.php   |   2 -
 .../tests/console/CreateCommandTest.php       |   3 +-
 .../console/asset/mix/MixInstallTest.php      |  18 +-
 .../console/asset/npm/NpmInstallTest.php      |   8 +-
 .../tests/console/asset/npm/NpmRunTest.php    |   4 +-
 .../tests/console/asset/npm/NpmUpdateTest.php |   4 +-
 .../console/asset/vite/ViteInstallTest.php    |  19 +-
 .../system/tests/twig/SecurityPolicyTest.php  | 191 +++++++++++-------
 modules/system/twig/SecurityPolicy.php        |   6 +-
 19 files changed, 160 insertions(+), 128 deletions(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index f20ed71378..bc96bc7b7d 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -1225,7 +1225,7 @@ public function getColumnValue($record, $column)
     {
         $value = $this->getColumnValueRaw($record, $column);
 
-        $customMethod = 'eval'. studly_case($column->type) .'TypeValue';
+        $customMethod = 'eval' . studly_case($column->type) . 'TypeValue';
         if ($this->methodExists($customMethod)) {
             $value = $this->{$customMethod}($record, $column, $value);
         } else {
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 47179630df..ad8af486e2 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -203,7 +203,7 @@ public static function resolveMenuItem(object $item, string $url, Theme $theme,
                 return null;
             }
 
-            $controller = Controller::getController() ?: new Controller;
+            $controller = Controller::getController() ?: new Controller();
             $pageUrl = $controller->pageUrl($item->reference, [], $routePersistence);
 
             $result = [];
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 6491b275cc..a57ceb04be 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -684,7 +684,7 @@ public function getDatasource(): DatasourceInterface
     public function __get($name)
     {
         if (in_array(strtolower($name), ['id', 'path', 'dirname', 'config', 'formconfig', 'previewimageurl'])) {
-            $method = 'get'. ucfirst($name);
+            $method = 'get' . ucfirst($name);
             return $this->$method();
         }
 
diff --git a/modules/cms/console/CreateTheme.php b/modules/cms/console/CreateTheme.php
index 84e5552b15..561f03faf1 100644
--- a/modules/cms/console/CreateTheme.php
+++ b/modules/cms/console/CreateTheme.php
@@ -178,8 +178,8 @@ protected function tailwindPostCreate(string $processor): void
                     '--no-interaction' => true,
                     '--force' => true,
                     '--silent' => true,
-                    '--tailwind' => true
-                ]
+                    '--tailwind' => true,
+                ],
             ],
             // Ensure all require packages are available for the new theme and add the new theme to our npm workspaces
             $processor . ':install' => [
@@ -188,8 +188,8 @@ protected function tailwindPostCreate(string $processor): void
                     'assetPackage' => ['theme-' . $this->getNameInput()],
                     '--no-interaction' => true,
                     '--silent' => false,
-                    '--disable-tty' => true
-                ]
+                    '--disable-tty' => true,
+                ],
             ],
             // Run an initial compile to ensure styles are available for first load
             $processor . ':compile' => [
@@ -198,8 +198,8 @@ protected function tailwindPostCreate(string $processor): void
                     '--package' => ['theme-' . $this->getNameInput()],
                     '--no-interaction' => true,
                     '--silent' => true,
-                ]
-            ]
+                ],
+            ],
         ];
 
         foreach ($commands as $command => $data) {
diff --git a/modules/system/classes/asset/PackageManager.php b/modules/system/classes/asset/PackageManager.php
index d405c37ae4..ee63455418 100644
--- a/modules/system/classes/asset/PackageManager.php
+++ b/modules/system/classes/asset/PackageManager.php
@@ -351,7 +351,7 @@ public function registerPackage(string $name, string $path, string $type = 'mix'
         $this->packages[$type][$name] = [
             'path' => $path,
             'package' => $package,
-            'config' => $config
+            'config' => $config,
         ];
     }
 
diff --git a/modules/system/console/CreateFactory.php b/modules/system/console/CreateFactory.php
index 25bffba7fa..3a6da1bf24 100644
--- a/modules/system/console/CreateFactory.php
+++ b/modules/system/console/CreateFactory.php
@@ -1,6 +1,6 @@
-<?php namespace System\Console;
+<?php
 
-use System\Console\BaseScaffoldCommand;
+namespace System\Console;
 
 class CreateFactory extends BaseScaffoldCommand
 {
diff --git a/modules/system/console/asset/npm/NpmInstall.php b/modules/system/console/asset/npm/NpmInstall.php
index da697e42ae..47ff24fd53 100644
--- a/modules/system/console/asset/npm/NpmInstall.php
+++ b/modules/system/console/asset/npm/NpmInstall.php
@@ -2,7 +2,6 @@
 
 namespace System\Console\Asset\Npm;
 
-use System\Console\Asset\Npm\NpmCommand;
 use Winter\Storm\Exception\SystemException;
 
 class NpmInstall extends NpmCommand
diff --git a/modules/system/console/asset/npm/NpmRun.php b/modules/system/console/asset/npm/NpmRun.php
index cd45313acd..64abe9bddb 100644
--- a/modules/system/console/asset/npm/NpmRun.php
+++ b/modules/system/console/asset/npm/NpmRun.php
@@ -2,8 +2,6 @@
 
 namespace System\Console\Asset\Npm;
 
-use System\Console\Asset\Npm\NpmCommand;
-
 class NpmRun extends NpmCommand
 {
     /**
@@ -31,7 +29,7 @@ class NpmRun extends NpmCommand
      * @var array List of commands that this command replaces (aliases)
      */
     protected $replaces = [
-        'mix:run'
+        'mix:run',
     ];
 
     /**
diff --git a/modules/system/console/asset/npm/NpmUpdate.php b/modules/system/console/asset/npm/NpmUpdate.php
index f578c5c4c1..c1263bf24a 100644
--- a/modules/system/console/asset/npm/NpmUpdate.php
+++ b/modules/system/console/asset/npm/NpmUpdate.php
@@ -2,7 +2,6 @@
 
 namespace System\Console\Asset\Npm;
 
-use System\Console\Asset\Npm\NpmCommand;
 use Winter\Storm\Exception\SystemException;
 
 class NpmUpdate extends NpmCommand
@@ -32,7 +31,7 @@ class NpmUpdate extends NpmCommand
      * @inheritDoc
      */
     public $replaces = [
-        'mix:update'
+        'mix:update',
     ];
 
     /**
diff --git a/modules/system/console/asset/npm/NpmVersion.php b/modules/system/console/asset/npm/NpmVersion.php
index 78e4a4a0b7..f119c53f74 100644
--- a/modules/system/console/asset/npm/NpmVersion.php
+++ b/modules/system/console/asset/npm/NpmVersion.php
@@ -3,7 +3,6 @@
 namespace System\Console\Asset\Npm;
 
 use Symfony\Component\Process\Process;
-use System\Console\Asset\Npm\NpmCommand;
 
 class NpmVersion extends NpmCommand
 {
diff --git a/modules/system/console/asset/vite/ViteWatch.php b/modules/system/console/asset/vite/ViteWatch.php
index 7542df322f..a3350d27db 100644
--- a/modules/system/console/asset/vite/ViteWatch.php
+++ b/modules/system/console/asset/vite/ViteWatch.php
@@ -2,8 +2,6 @@
 
 namespace System\Console\Asset\Vite;
 
-use Winter\Storm\Support\Facades\File;
-
 class ViteWatch extends ViteCompile
 {
     /**
diff --git a/modules/system/tests/console/CreateCommandTest.php b/modules/system/tests/console/CreateCommandTest.php
index 4bb186ba4a..b65947f17d 100644
--- a/modules/system/tests/console/CreateCommandTest.php
+++ b/modules/system/tests/console/CreateCommandTest.php
@@ -2,9 +2,8 @@
 
 namespace System\Tests\Console;
 
-use File;
-use InvalidArgumentException;
 use System\Tests\Bootstrap\TestCase;
+use Winter\Storm\Support\Facades\File;
 
 class CreateCommandTest extends TestCase
 {
diff --git a/modules/system/tests/console/asset/mix/MixInstallTest.php b/modules/system/tests/console/asset/mix/MixInstallTest.php
index 1494610628..31b161ebec 100644
--- a/modules/system/tests/console/asset/mix/MixInstallTest.php
+++ b/modules/system/tests/console/asset/mix/MixInstallTest.php
@@ -46,7 +46,7 @@ public function testMixInstallMissingPackageJson(): void
         $this->artisan('mix:install', [
             'assetPackage' => ['theme-assettest'],
             '--package-json' => '/some/file',
-            '--no-install' => true
+            '--no-install' => true,
         ])
             ->expectsOutputToContain('The supplied --package-json path does not exist.')
             ->assertExitCode(1);
@@ -58,7 +58,7 @@ public function testMixInstallSinglePackage(): void
             $this->artisan('mix:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('laravel-mix was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsOutput('Adding theme-assettest (modules/system/tests/fixtures/themes/assettest) to the workspaces.packages property in package.json')
@@ -81,7 +81,7 @@ public function testMixInstallMultiplePackages(): void
             $this->artisan('mix:install', [
                 'assetPackage' => ['theme-assettest', 'theme-npmtest'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('laravel-mix was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsOutput('Adding theme-assettest (modules/system/tests/fixtures/themes/assettest) to the workspaces.packages property in package.json')
@@ -109,7 +109,7 @@ public function testMixInstallMissingPackage(): void
             $this->artisan('mix:install', [
                 'assetPackage' => ['theme-assettest2'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->assertExitCode(1);
         });
@@ -121,7 +121,7 @@ public function testMixInstallRelativePath(): void
             $this->artisan('mix:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => 'modules/system/tests/package.json',
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('laravel-mix was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsOutput('Adding theme-assettest (modules/system/tests/fixtures/themes/assettest) to the workspaces.packages property in package.json')
@@ -135,15 +135,15 @@ public function testMixInstallIgnoredPackage(): void
             $packageJson = json_decode(File::get($this->jsonPath), JSON_OBJECT_AS_ARRAY);
             $packageJson['workspaces'] = [
                 'ignoredPackages' => [
-                    'modules/system/tests/fixtures/themes/assettest'
-                ]
+                    'modules/system/tests/fixtures/themes/assettest',
+                ],
             ];
             File::put($this->jsonPath, json_encode($packageJson, JSON_PRETTY_PRINT));
 
             $this->artisan('mix:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('laravel-mix was not found as a dependency in package.json, would you like to add it?', false)
                 ->expectsOutput('The requested package theme-assettest (modules/system/tests/fixtures/themes/assettest) is ignored, remove it from package.json to continue.')
@@ -165,7 +165,7 @@ public function testMixInstallWithNpmInstall(): void
             $this->artisan('mix:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => $this->jsonPath,
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->expectsQuestion('laravel-mix was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsOutput('Adding theme-assettest (modules/system/tests/fixtures/themes/assettest) to the workspaces.packages property in package.json')
diff --git a/modules/system/tests/console/asset/npm/NpmInstallTest.php b/modules/system/tests/console/asset/npm/NpmInstallTest.php
index 611ab20df7..c926cd365f 100644
--- a/modules/system/tests/console/asset/npm/NpmInstallTest.php
+++ b/modules/system/tests/console/asset/npm/NpmInstallTest.php
@@ -56,7 +56,7 @@ public function testNpmInstallSingle(): void
             $this->artisan('npm:install', [
                 'package' => 'theme-npmtest',
                 'npmArgs' => ['is-odd'],
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->assertExitCode(0);
 
@@ -92,7 +92,7 @@ public function testNpmInstallMultiple(): void
             $this->artisan('npm:install', [
                 'package' => 'theme-npmtest',
                 'npmArgs' => ['is-odd', 'is-even'],
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->assertExitCode(0);
 
@@ -132,7 +132,7 @@ public function testNpmInstallSingleDev(): void
                 'package' => 'theme-npmtest',
                 'npmArgs' => ['is-odd'],
                 '--dev' => true,
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->assertExitCode(0);
 
@@ -169,7 +169,7 @@ public function testNpmInstallMultipleDev(): void
                 'package' => 'theme-npmtest',
                 'npmArgs' => ['is-odd', 'is-even'],
                 '--dev' => true,
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->assertExitCode(0);
 
diff --git a/modules/system/tests/console/asset/npm/NpmRunTest.php b/modules/system/tests/console/asset/npm/NpmRunTest.php
index 51f699dbb0..9b81e00f81 100644
--- a/modules/system/tests/console/asset/npm/NpmRunTest.php
+++ b/modules/system/tests/console/asset/npm/NpmRunTest.php
@@ -32,7 +32,7 @@ public function testNpmRunScript(): void
         $this->artisan('npm:run', [
             'package' => 'theme-npmtest',
             'script' => 'testScript',
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('> echo "Winter says $((1+2))"')
             ->expectsOutputToContain('Winter says 3')
@@ -47,7 +47,7 @@ public function testNpmRunScriptFailed(): void
         $this->artisan('npm:run', [
             'package' => 'theme-npmtest',
             'script' => 'testMissingScript',
-            '--disable-tty' => true
+            '--disable-tty' => true,
         ])
             ->expectsOutputToContain('Script "testMissingScript" is not defined in package "theme-npmtest"')
             ->assertExitCode(1);
diff --git a/modules/system/tests/console/asset/npm/NpmUpdateTest.php b/modules/system/tests/console/asset/npm/NpmUpdateTest.php
index 38b63d9827..b8f9df6cb0 100644
--- a/modules/system/tests/console/asset/npm/NpmUpdateTest.php
+++ b/modules/system/tests/console/asset/npm/NpmUpdateTest.php
@@ -55,7 +55,7 @@ public function testNpmUpdate(): void
             // Update the contents of package.json to include a package at an old patch
             $packageJson = json_decode(File::get($this->jsonPath), JSON_OBJECT_AS_ARRAY);
             $packageJson['dependencies'] = [
-                'is-odd' => '^3.0.0'
+                'is-odd' => '^3.0.0',
             ];
             File::put($this->jsonPath, json_encode($packageJson, JSON_PRETTY_PRINT));
 
@@ -63,7 +63,7 @@ public function testNpmUpdate(): void
             $this->artisan('npm:update', [
                 'package' => 'theme-npmtest',
                 '--save' => true,
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->assertExitCode(0);
 
diff --git a/modules/system/tests/console/asset/vite/ViteInstallTest.php b/modules/system/tests/console/asset/vite/ViteInstallTest.php
index 7d97ccf107..da4acebf15 100644
--- a/modules/system/tests/console/asset/vite/ViteInstallTest.php
+++ b/modules/system/tests/console/asset/vite/ViteInstallTest.php
@@ -9,6 +9,7 @@
 
 class ViteInstallTest extends TestCase
 {
+    protected string $fixturePath;
     protected string $jsonPath;
     protected string $lockPath;
     protected string $backupPath;
@@ -45,7 +46,7 @@ public function testViteInstallMissingPackageJson(): void
         $this->artisan('vite:install', [
             'assetPackage' => ['theme-assettest'],
             '--package-json' => '/some/file',
-            '--no-install' => true
+            '--no-install' => true,
         ])
             ->expectsOutputToContain('The supplied --package-json path does not exist.')
             ->assertExitCode(1);
@@ -57,7 +58,7 @@ public function testViteInstallSinglePackage(): void
             $this->artisan('vite:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('vite was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsQuestion('laravel-vite-plugin was not found as a dependency in package.json, would you like to add it?', true)
@@ -82,7 +83,7 @@ public function testViteInstallMultiplePackages(): void
             $this->artisan('vite:install', [
                 'assetPackage' => ['theme-assettest', 'theme-npmtest'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('vite was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsQuestion('laravel-vite-plugin was not found as a dependency in package.json, would you like to add it?', true)
@@ -113,7 +114,7 @@ public function testViteInstallMissingPackage(): void
             $this->artisan('vite:install', [
                 'assetPackage' => ['theme-assettest2'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->assertExitCode(1);
         });
@@ -125,7 +126,7 @@ public function testViteInstallRelativePath(): void
             $this->artisan('vite:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => 'modules/system/tests/package.json',
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('vite was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsQuestion('laravel-vite-plugin was not found as a dependency in package.json, would you like to add it?', true)
@@ -140,8 +141,8 @@ public function testViteInstallIgnoredPackage(): void
             $packageJson = json_decode(File::get($this->jsonPath), JSON_OBJECT_AS_ARRAY);
             $packageJson['workspaces'] = [
                 'ignoredPackages' => [
-                    'modules/system/tests/fixtures/themes/assettest'
-                ]
+                    'modules/system/tests/fixtures/themes/assettest',
+                ],
             ];
 
             File::put($this->jsonPath, json_encode($packageJson, JSON_PRETTY_PRINT));
@@ -149,7 +150,7 @@ public function testViteInstallIgnoredPackage(): void
             $this->artisan('vite:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => $this->jsonPath,
-                '--no-install' => true
+                '--no-install' => true,
             ])
                 ->expectsQuestion('vite was not found as a dependency in package.json, would you like to add it?', false)
                 ->expectsQuestion('laravel-vite-plugin was not found as a dependency in package.json, would you like to add it?', false)
@@ -172,7 +173,7 @@ public function testViteInstallWithNpmInstall(): void
             $this->artisan('vite:install', [
                 'assetPackage' => ['theme-assettest'],
                 '--package-json' => $this->jsonPath,
-                '--disable-tty' => true
+                '--disable-tty' => true,
             ])
                 ->expectsQuestion('vite was not found as a dependency in package.json, would you like to add it?', true)
                 ->expectsQuestion('laravel-vite-plugin was not found as a dependency in package.json, would you like to add it?', true)
diff --git a/modules/system/tests/twig/SecurityPolicyTest.php b/modules/system/tests/twig/SecurityPolicyTest.php
index 7fcd8018d9..5c038fc289 100644
--- a/modules/system/tests/twig/SecurityPolicyTest.php
+++ b/modules/system/tests/twig/SecurityPolicyTest.php
@@ -65,11 +65,14 @@ public function testCannotWriteToAModel()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set modelTest = model.setAttribute("test", "value") %}
-        ', [
-            'model' => new \Winter\Storm\Database\Model(),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.setAttribute("test", "value") %}
+            ',
+            [
+                'model' => new \Winter\Storm\Database\Model(),
+            ]
+        );
     }
 
     public function testCanReadFromAModel()
@@ -77,12 +80,15 @@ public function testCanReadFromAModel()
         $model = new \Winter\Storm\Database\Model();
         $model->test = 'value';
 
-        $result = trim($this->renderTwigInCmsController('
-            {% set modelTest = model.getAttribute("test") %}
-            {{- modelTest -}}
-        ', [
-            'model' => $model,
-        ]));
+        $result = trim($this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.getAttribute("test") %}
+                {{- modelTest -}}
+            ',
+            [
+                'model' => $model,
+            ]
+        ));
         $this->assertEquals('value', $result);
     }
 
@@ -95,11 +101,14 @@ public function testCannotFillAModel()
             $model->addFillable('test');
             $model->test = 'value';
 
-            $this->renderTwigInCmsController('
-                {% set modelTest = model.fill({ test: \'value2\' }) %}
-            ', [
-                'model' => new \Winter\Storm\Database\Model(),
-            ]);
+            $this->renderTwigInCmsController(
+                '
+                    {% set modelTest = model.fill({ test: \'value2\' }) %}
+                ',
+                [
+                    'model' => new \Winter\Storm\Database\Model(),
+                ]
+            );
         } catch (\Twig\Sandbox\SecurityNotAllowedMethodError $e) {
             // Ensure value hasn't changed
             $this->assertEquals('value', $model->test);
@@ -111,22 +120,28 @@ public function testCannotSaveAModel()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set modelTest = model.save() %}
-        ', [
-            'model' => new \Winter\Storm\Database\Model(),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.save() %}
+            ',
+            [
+                'model' => new \Winter\Storm\Database\Model(),
+            ]
+        );
     }
 
     public function testCannotPushAModel()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set modelTest = model.push() %}
-        ', [
-            'model' => new \Winter\Storm\Database\Model(),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.push() %}
+            ',
+            [
+                'model' => new \Winter\Storm\Database\Model(),
+            ]
+        );
     }
 
     public function testCannotUpdateAModel()
@@ -137,44 +152,56 @@ public function testCannotUpdateAModel()
         $model->addFillable('test');
         $model->test = 'value';
 
-        $this->renderTwigInCmsController('
-            {% set modelTest = model.update({ test: \'value2\' }) %}
-        ', [
-            'model' => $model,
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.update({ test: \'value2\' }) %}
+            ',
+            [
+                'model' => $model,
+            ]
+        );
     }
 
     public function testCannotDeleteAModel()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set modelTest = model.delete() %}
-        ', [
-            'model' => new \Winter\Storm\Database\Model(),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.delete() %}
+            ',
+            [
+                'model' => new \Winter\Storm\Database\Model(),
+            ]
+        );
     }
 
     public function testCannotForceDeleteAModel()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set modelTest = model.forceDelete() %}
-        ', [
-            'model' => new \Winter\Storm\Database\Model(),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set modelTest = model.forceDelete() %}
+            ',
+            [
+                'model' => new \Winter\Storm\Database\Model(),
+            ]
+        );
     }
 
     public function testCannotExtendAModelWithABehaviour()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set model = model.extendClassWith("Winter\Storm\Database\Behaviors\Encryptable") %}
-        ', [
-            'model' => new \Winter\Storm\Database\Model(),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set model = model.extendClassWith("Winter\Storm\Database\Behaviors\Encryptable") %}
+            ',
+            [
+                'model' => new \Winter\Storm\Database\Model(),
+            ]
+        );
     }
 
     public function testExtendingModelBeforePassingIntoTwigShouldStillWork()
@@ -184,11 +211,14 @@ public function testExtendingModelBeforePassingIntoTwigShouldStillWork()
             return 'foo';
         });
 
-        $result = trim($this->renderTwigInCmsController('
-            {{- model.foo() -}}
-        ', [
-            'model' => $model,
-        ]));
+        $result = trim($this->renderTwigInCmsController(
+            '
+                {{- model.foo() -}}
+            ',
+            [
+                'model' => $model,
+            ]
+        ));
         $this->assertEquals('foo', $result);
     }
 
@@ -206,42 +236,51 @@ public function testCannotDeleteInDatasource()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set datasource = datasource.delete() %}
-        ', [
-            'datasource' => new FileDatasource(
-                base_path('modules/system/tests/fixtures/themes/test'),
-                new Filesystem()
-            ),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set datasource = datasource.delete() %}
+            ',
+            [
+                'datasource' => new FileDatasource(
+                    base_path('modules/system/tests/fixtures/themes/test'),
+                    new Filesystem()
+                ),
+            ]
+        );
     }
 
     public function testCannotInsertInDatasource()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set datasource = datasource.insert() %}
-        ', [
-            'datasource' => new FileDatasource(
-                base_path('modules/system/tests/fixtures/themes/test'),
-                new Filesystem()
-            ),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set datasource = datasource.insert() %}
+            ',
+            [
+                'datasource' => new FileDatasource(
+                    base_path('modules/system/tests/fixtures/themes/test'),
+                    new Filesystem()
+                ),
+            ]
+        );
     }
 
     public function testCannotUpdateInDatasource()
     {
         $this->expectException(\Twig\Sandbox\SecurityNotAllowedMethodError::class);
 
-        $this->renderTwigInCmsController('
-            {% set datasource = datasource.update() %}
-        ', [
-            'datasource' => new FileDatasource(
-                base_path('modules/system/tests/fixtures/themes/test'),
-                new Filesystem()
-            ),
-        ]);
+        $this->renderTwigInCmsController(
+            '
+                {% set datasource = datasource.update() %}
+            ',
+            [
+                'datasource' => new FileDatasource(
+                    base_path('modules/system/tests/fixtures/themes/test'),
+                    new Filesystem()
+                ),
+            ]
+        );
     }
 
     public function testCannotChangeThemeDirectory()
@@ -262,7 +301,7 @@ protected function renderTwigInCmsController(string $source, array $vars = [])
             'this' => [
                 'controller' => $controller,
                 'page' => new Page(),
-                'theme' => new Theme()
+                'theme' => new Theme(),
             ],
         ] + $vars);
     }
diff --git a/modules/system/twig/SecurityPolicy.php b/modules/system/twig/SecurityPolicy.php
index 3a25ae2832..6dedd2b718 100644
--- a/modules/system/twig/SecurityPolicy.php
+++ b/modules/system/twig/SecurityPolicy.php
@@ -7,11 +7,11 @@
 use Illuminate\Database\Eloquent\Model as DbModel;
 use Twig\Markup;
 use Twig\Sandbox\SecurityNotAllowedFunctionError;
-use Twig\Template;
-use Twig\Sandbox\SecurityPolicyInterface;
 use Twig\Sandbox\SecurityNotAllowedMethodError;
 use Twig\Sandbox\SecurityNotAllowedPropertyError;
 use Twig\Sandbox\SecurityNotAllowedTagError;
+use Twig\Sandbox\SecurityPolicyInterface;
+use Twig\Template;
 use Winter\Storm\Halcyon\Datasource\DatasourceInterface;
 use Winter\Storm\Halcyon\Model as HalcyonModel;
 
@@ -86,7 +86,7 @@ final class SecurityPolicy implements SecurityPolicyInterface
         Theme::class => [
             'setDirName',
             'registerHalcyonDatasource',
-            'getDatasource'
+            'getDatasource',
         ],
     ];
 

From b1a5a795761be90b3aeeae86da2eb14c72ba8ced Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Sat, 7 Dec 2024 13:10:26 +0800
Subject: [PATCH 13/30] Change alias command

---
 modules/system/console/WinterSniff.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
index a3d3d69479..622a8b55e8 100644
--- a/modules/system/console/WinterSniff.php
+++ b/modules/system/console/WinterSniff.php
@@ -46,16 +46,10 @@ class WinterSniff extends BaseScaffoldCommand
         'scaffold/phpcs/phpcs.xml.stub' => 'phpcs.xml',
     ];
 
-    /**
-     * Create a new command instance.
-     */
-    public function __construct()
-    {
-        parent::__construct();
+    protected $replaces = [
+        'winter:phpcs',
+    ];
 
-        // Register aliases for backwards compatibility with October
-        $this->setAliases(['winter:phpcs']);
-    }
 
     /**
      * Execute the console command.

From 1da2568858ed78b4d3b15dd501272bdc7e0aa545 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Sat, 7 Dec 2024 02:03:16 -0600
Subject: [PATCH 14/30] Add support for `--fix` option to `sniff` command

---
 modules/system/console/WinterSniff.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
index 622a8b55e8..782c311c98 100644
--- a/modules/system/console/WinterSniff.php
+++ b/modules/system/console/WinterSniff.php
@@ -39,6 +39,7 @@ class WinterSniff extends BaseScaffoldCommand
         {?--c|config= : Path to a custom PHPCS configuration XML file}
         {?--p|plugin= : Checks the coding style of a plugin}
         {?--e|no-warnings : Ignore warnings and only show errors}
+        {--fix : Automatically fix detected errors where able by use of the phpcbf command}
         {?--s|summary : Display a summary of the results}
     ';
 
@@ -48,6 +49,7 @@ class WinterSniff extends BaseScaffoldCommand
 
     protected $replaces = [
         'winter:phpcs',
+        'sniff',
     ];
 
 
@@ -203,10 +205,11 @@ public function getPluginIdentifier($identifier = null): string
      */
     protected function findPhpCsExecutable(): ?string
     {
+        $binFile = $this->option('fix') ? 'phpcbf' : 'phpcs';
         return (new ExecutableFinder())
             ->find(
-                'phpcs',
-                base_path('vendor/bin/phpcs'),
+                $binFile,
+                base_path("vendor/bin/$binFile"),
                 [
                     base_path('vendor'),
                 ]

From 51af67de59d2e013b42496fdc757edee6d84a851 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Sat, 7 Dec 2024 02:04:02 -0600
Subject: [PATCH 15/30] Alias `winter:test` to `test`

---
 modules/system/console/WinterTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/console/WinterTest.php b/modules/system/console/WinterTest.php
index 7b01c3bb05..3fc55c798c 100644
--- a/modules/system/console/WinterTest.php
+++ b/modules/system/console/WinterTest.php
@@ -2,11 +2,11 @@
 
 namespace System\Console;
 
-use Illuminate\Console\Command;
 use Symfony\Component\Process\Exception\ProcessSignaledException;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\Process;
 use System\Classes\PluginManager;
+use Winter\Storm\Console\Command;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Filesystem\PathResolver;
 use Winter\Storm\Support\Facades\Config;
@@ -52,6 +52,10 @@ class WinterTest extends Command
      */
     protected $phpUnitExec = null;
 
+    protected $replaces = [
+        'test',
+    ];
+
     /**
      * Create a new command instance.
      *

From 0ae77a875bb7870332938ed804daefb1865e3754 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 11 Dec 2024 06:08:59 -0600
Subject: [PATCH 16/30] Improve / relocate PHPCS stubs

---
 modules/system/console/WinterSniff.php        |  4 ++--
 .../scaffold/phpcs/phpcs.core.xml.stub        | 24 -------------------
 .../{phpcs.xml.stub => phpcs.plugin.xml.stub} |  2 +-
 .../scaffold/phpcs/phpcs.project.xml.stub     | 16 +++++++++++++
 .../system/phpcs.base.xml                     |  0
 phpcs.xml                                     |  2 +-
 6 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 modules/system/console/scaffold/phpcs/phpcs.core.xml.stub
 rename modules/system/console/scaffold/phpcs/{phpcs.xml.stub => phpcs.plugin.xml.stub} (81%)
 create mode 100644 modules/system/console/scaffold/phpcs/phpcs.project.xml.stub
 rename phpcs.base.xml => modules/system/phpcs.base.xml (100%)

diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
index 782c311c98..f1c985e958 100644
--- a/modules/system/console/WinterSniff.php
+++ b/modules/system/console/WinterSniff.php
@@ -165,12 +165,12 @@ protected function createConfigFile(): void
                 'plugin' => $this->getPluginIdentifier(),
                 'plugin_code' => str_replace('.', '_', $this->getPluginIdentifier()),
             ];
-            $this->makeStub('scaffold/phpcs/phpcs.xml.stub');
+            $this->makeStub('scaffold/phpcs/phpcs.plugin.xml.stub');
             return;
         }
 
         File::copy(
-            __DIR__ . '/scaffold/phpcs/phpcs.core.xml.stub',
+            __DIR__ . '/scaffold/phpcs/phpcs.project.xml.stub',
             $this->option('config') ?? base_path('phpcs.xml')
         );
     }
diff --git a/modules/system/console/scaffold/phpcs/phpcs.core.xml.stub b/modules/system/console/scaffold/phpcs/phpcs.core.xml.stub
deleted file mode 100644
index 4732eb4837..0000000000
--- a/modules/system/console/scaffold/phpcs/phpcs.core.xml.stub
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="WinterCMSCore">
-    <description>The coding standard for Winter CMS core.</description>
-
-    <!-- Import Winter CMS code style ruleset -->
-    <rule ref="./phpcs.base.xml" />
-
-    <arg name="extensions" value="php" />
-    <arg name="colors" />
-
-    <file>bootstrap/</file>
-    <file>config/</file>
-    <file>modules/</file>
-    <file>plugins/winter/demo/</file>
-
-    <!-- Ignore vendor files -->
-    <exclude-pattern>*/vendor/*</exclude-pattern>
-    <!-- Ignore manifest test fixtures -->
-    <exclude-pattern>modules/system/tests/fixtures/manifest/*</exclude-pattern>
-    <!-- Ignore this view file as fixing the issues in here will break the template -->
-    <exclude-pattern>modules/system/views/exception.php</exclude-pattern>
-    <!-- Ignore this test case completely as it's testing a parse error -->
-    <exclude-pattern>tests/fixtures/plugins/testvendor/goto/Plugin.php</exclude-pattern>
-</ruleset>
diff --git a/modules/system/console/scaffold/phpcs/phpcs.xml.stub b/modules/system/console/scaffold/phpcs/phpcs.plugin.xml.stub
similarity index 81%
rename from modules/system/console/scaffold/phpcs/phpcs.xml.stub
rename to modules/system/console/scaffold/phpcs/phpcs.plugin.xml.stub
index 62611d7fa9..db87d2389b 100644
--- a/modules/system/console/scaffold/phpcs/phpcs.xml.stub
+++ b/modules/system/console/scaffold/phpcs/phpcs.plugin.xml.stub
@@ -3,7 +3,7 @@
     <description>Coding style for {{ plugin }}.</description>
 
     <!-- Import Winter CMS code style ruleset -->
-    <rule ref="./phpcs.base.xml" />
+    <rule ref="../../../modules/system/phpcs.base.xml" />
 
     <arg name="extensions" value="php" />
     <arg name="colors" />
diff --git a/modules/system/console/scaffold/phpcs/phpcs.project.xml.stub b/modules/system/console/scaffold/phpcs/phpcs.project.xml.stub
new file mode 100644
index 0000000000..668a190d21
--- /dev/null
+++ b/modules/system/console/scaffold/phpcs/phpcs.project.xml.stub
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="MyWinterProject">
+    <description>The coding standard for this project, powered by Winter CMS.</description>
+
+    <!-- Import Winter CMS core code style ruleset -->
+    <rule ref="./modules/system/phpcs.base.xml" />
+
+    <arg name="extensions" value="php" />
+    <arg name="colors" />
+
+    <file>config/</file>
+    <!-- <file>plugins/myauthor/*</file> -->
+
+    <!-- Ignore vendor files -->
+    <exclude-pattern>*/vendor/*</exclude-pattern>
+</ruleset>
diff --git a/phpcs.base.xml b/modules/system/phpcs.base.xml
similarity index 100%
rename from phpcs.base.xml
rename to modules/system/phpcs.base.xml
diff --git a/phpcs.xml b/phpcs.xml
index 4732eb4837..62ac10089b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -3,7 +3,7 @@
     <description>The coding standard for Winter CMS core.</description>
 
     <!-- Import Winter CMS code style ruleset -->
-    <rule ref="./phpcs.base.xml" />
+    <rule ref="./modules/system/phpcs.base.xml" />
 
     <arg name="extensions" value="php" />
     <arg name="colors" />

From 1dd04fc820226fe494cdc7dfdeb1e15fce9edea5 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 11 Dec 2024 06:09:15 -0600
Subject: [PATCH 17/30] Update composer scripts

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 74f2565c9a..ba899b71fa 100644
--- a/composer.json
+++ b/composer.json
@@ -57,13 +57,13 @@
             "@php artisan package:discover"
         ],
         "test": [
-            "phpunit --stop-on-failure"
+            "@php artisan test -- --stop-on-failure"
         ],
         "lint": [
             "parallel-lint --exclude vendor --exclude storage --exclude modules/system/tests/fixtures/plugins/testvendor/goto/Plugin.php ."
         ],
         "sniff": [
-            "phpcs --colors -nq --report=\"full\" --extensions=\"php\""
+            "@php artisan sniff"
         ]
     },
     "minimum-stability": "dev",

From f2e7289f3e6750b87824f20bb725901407c64848 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 11 Dec 2024 07:04:16 -0600
Subject: [PATCH 18/30] Add class constant visibility

---
 modules/backend/behaviors/FormController.php  |  6 ++--
 .../backend/behaviors/RelationController.php  |  6 ++--
 .../TranscodeFilter.php                       |  2 +-
 modules/backend/classes/FormField.php         |  4 +--
 modules/backend/classes/FormTabs.php          |  6 ++--
 modules/backend/formwidgets/ColorPicker.php   |  2 +-
 modules/backend/formwidgets/TagList.php       |  6 ++--
 modules/backend/models/BrandSetting.php       | 12 ++++----
 modules/backend/models/Preference.php         |  2 +-
 modules/backend/models/UserGroup.php          |  2 +-
 modules/backend/models/UserRole.php           |  4 +--
 modules/backend/widgets/MediaManager.php      | 16 +++++------
 .../widgets/form/partials/_field_range.php    |  2 +-
 modules/cms/classes/Layout.php                |  2 +-
 modules/cms/classes/Theme.php                 |  4 +--
 modules/cms/models/ThemeLog.php               |  6 ++--
 modules/cms/twig/DebugExtension.php           |  8 +++---
 modules/cms/widgets/TemplateList.php          |  2 +-
 modules/system/classes/MarkupManager.php      |  6 ++--
 modules/system/classes/MediaLibrary.php       | 10 +++----
 modules/system/classes/MediaLibraryItem.php   | 12 ++++----
 modules/system/classes/SettingsManager.php    | 28 +++++++++----------
 modules/system/classes/VersionManager.php     |  6 ++--
 .../system/console/asset/npm/NpmVersion.php   |  2 +-
 modules/system/models/MailBrandSetting.php    | 24 ++++++++--------
 modules/system/models/MailSetting.php         |  8 +++---
 .../tests/classes/PluginManagerTest.php       |  8 +++---
 27 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index e484ef9353..645332cb62 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -46,17 +46,17 @@ class FormController extends ControllerBehavior
     /**
      * @var string Default context for "create" pages.
      */
-    const CONTEXT_CREATE = 'create';
+    public const CONTEXT_CREATE = 'create';
 
     /**
      * @var string Default context for "update" pages.
      */
-    const CONTEXT_UPDATE = 'update';
+    public const CONTEXT_UPDATE = 'update';
 
     /**
      * @var string Default context for "preview" pages.
      */
-    const CONTEXT_PREVIEW = 'preview';
+    public const CONTEXT_PREVIEW = 'preview';
 
     /**
      * @var \Backend\Classes\Controller|FormController Reference to the back end controller.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 112c1795d1..337e114a42 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -35,17 +35,17 @@ class RelationController extends ControllerBehavior
     /**
      * @var const Postback parameter for the active relationship field.
      */
-    const PARAM_FIELD = '_relation_field';
+    public const PARAM_FIELD = '_relation_field';
 
     /**
      * @var const Postback parameter for the active management mode.
      */
-    const PARAM_MODE = '_relation_mode';
+    public const PARAM_MODE = '_relation_mode';
 
     /**
      * @var const Postback parameter for read only mode.
      */
-    const PARAM_EXTRA_CONFIG = '_relation_extra_config';
+    public const PARAM_EXTRA_CONFIG = '_relation_extra_config';
 
     /**
      * @var Backend\Widgets\Search Reference to the search widget object.
diff --git a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
index f32248befe..95c4678c1e 100644
--- a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
+++ b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
@@ -13,7 +13,7 @@
  */
 class TranscodeFilter extends php_user_filter
 {
-    const FILTER_NAME = 'winter.csv.transcode.';
+    public const FILTER_NAME = 'winter.csv.transcode.';
 
     protected $encodingFrom = 'auto';
 
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index d861e144b3..3a19e814a5 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -21,12 +21,12 @@ class FormField
     /**
      * @var int Value returned when the form field should not contribute any save data.
      */
-    const NO_SAVE_DATA = -1;
+    public const NO_SAVE_DATA = -1;
 
     /**
      * @var string A special character in yaml config files to indicate a field higher in hierarchy
      */
-    const HIERARCHY_UP = '^';
+    public const HIERARCHY_UP = '^';
 
     /**
      * @var string Form field name.
diff --git a/modules/backend/classes/FormTabs.php b/modules/backend/classes/FormTabs.php
index 462671ad4d..0e96caedf8 100644
--- a/modules/backend/classes/FormTabs.php
+++ b/modules/backend/classes/FormTabs.php
@@ -16,9 +16,9 @@
  */
 class FormTabs implements IteratorAggregate, ArrayAccess
 {
-    const SECTION_OUTSIDE = 'outside';
-    const SECTION_PRIMARY = 'primary';
-    const SECTION_SECONDARY = 'secondary';
+    public const SECTION_OUTSIDE = 'outside';
+    public const SECTION_PRIMARY = 'primary';
+    public const SECTION_SECONDARY = 'secondary';
 
     /**
      * @var string Specifies the form section these tabs belong to.
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
index 068bdbc696..457b1dadcc 100644
--- a/modules/backend/formwidgets/ColorPicker.php
+++ b/modules/backend/formwidgets/ColorPicker.php
@@ -18,7 +18,7 @@
 class ColorPicker extends FormWidgetBase
 {
     // All color formats supported
-    const ALL_FORMATS = ['cmyk', 'hex', 'hsl', 'rgb'];
+    public const ALL_FORMATS = ['cmyk', 'hex', 'hsl', 'rgb'];
 
     //
     // Configurable properties
diff --git a/modules/backend/formwidgets/TagList.php b/modules/backend/formwidgets/TagList.php
index 8841d29393..755d83e166 100644
--- a/modules/backend/formwidgets/TagList.php
+++ b/modules/backend/formwidgets/TagList.php
@@ -12,9 +12,9 @@ class TagList extends FormWidgetBase
 {
     use \Backend\Traits\FormModelWidget;
 
-    const MODE_ARRAY = 'array';
-    const MODE_STRING = 'string';
-    const MODE_RELATION = 'relation';
+    public const MODE_ARRAY = 'array';
+    public const MODE_STRING = 'string';
+    public const MODE_RELATION = 'relation';
 
     //
     // Configurable properties
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index bd39d837dc..abb5d103e8 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -52,13 +52,13 @@ class BrandSetting extends Model
      */
     public $cacheKey = 'backend::brand.custom_css';
 
-    const PRIMARY_COLOR   = '#34495e'; // Wet Asphalt
-    const SECONDARY_COLOR = '#e67e22'; // Pumpkin
-    const ACCENT_COLOR    = '#3498db'; // Peter River
+    public const PRIMARY_COLOR   = '#34495e'; // Wet Asphalt
+    public const SECONDARY_COLOR = '#e67e22'; // Pumpkin
+    public const ACCENT_COLOR    = '#3498db'; // Peter River
 
-    const INLINE_MENU   = 'inline';
-    const TILE_MENU     = 'tile';
-    const COLLAPSE_MENU = 'collapse';
+    public const INLINE_MENU   = 'inline';
+    public const TILE_MENU     = 'tile';
+    public const COLLAPSE_MENU = 'collapse';
 
     /**
      * Validation rules
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index 03fa8f453d..954dcdc3de 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -22,7 +22,7 @@ class Preference extends Model
 {
     use \Winter\Storm\Database\Traits\Validation;
 
-    const DEFAULT_THEME = 'twilight';
+    public const DEFAULT_THEME = 'twilight';
 
     /**
      * @var array Behaviors implemented by this model.
diff --git a/modules/backend/models/UserGroup.php b/modules/backend/models/UserGroup.php
index 76970e9d17..3d0ed71d12 100644
--- a/modules/backend/models/UserGroup.php
+++ b/modules/backend/models/UserGroup.php
@@ -12,7 +12,7 @@
  */
 class UserGroup extends GroupBase
 {
-    const CODE_OWNERS = 'owners';
+    public const CODE_OWNERS = 'owners';
 
     /**
      * @var string The database table used by the model.
diff --git a/modules/backend/models/UserRole.php b/modules/backend/models/UserRole.php
index e4a002ac4b..1675bd07b7 100644
--- a/modules/backend/models/UserRole.php
+++ b/modules/backend/models/UserRole.php
@@ -13,8 +13,8 @@
  */
 class UserRole extends RoleBase
 {
-    const CODE_DEVELOPER = 'developer';
-    const CODE_PUBLISHER = 'publisher';
+    public const CODE_DEVELOPER = 'developer';
+    public const CODE_PUBLISHER = 'publisher';
 
     /**
      * @var string The database table used by the model.
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index c64dea69ef..05dd1f0219 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -25,17 +25,17 @@ class MediaManager extends WidgetBase
     use \Backend\Traits\UploadableWidget;
     use \Backend\Traits\PreferenceMaker;
 
-    const FOLDER_ROOT = '/';
+    public const FOLDER_ROOT = '/';
 
-    const VIEW_MODE_GRID = 'grid';
-    const VIEW_MODE_LIST = 'list';
-    const VIEW_MODE_TILES = 'tiles';
+    public const VIEW_MODE_GRID = 'grid';
+    public const VIEW_MODE_LIST = 'list';
+    public const VIEW_MODE_TILES = 'tiles';
 
-    const SELECTION_MODE_NORMAL = 'normal';
-    const SELECTION_MODE_FIXED_RATIO = 'fixed-ratio';
-    const SELECTION_MODE_FIXED_SIZE = 'fixed-size';
+    public const SELECTION_MODE_NORMAL = 'normal';
+    public const SELECTION_MODE_FIXED_RATIO = 'fixed-ratio';
+    public const SELECTION_MODE_FIXED_SIZE = 'fixed-size';
 
-    const FILTER_ALL = 'all';
+    public const FILTER_ALL = 'all';
 
     /**
      * @var boolean Determines whether the widget is in readonly mode or not.
diff --git a/modules/backend/widgets/form/partials/_field_range.php b/modules/backend/widgets/form/partials/_field_range.php
index 77f774821b..8370131227 100644
--- a/modules/backend/widgets/form/partials/_field_range.php
+++ b/modules/backend/widgets/form/partials/_field_range.php
@@ -28,7 +28,7 @@
     <span style="position: absolute; transform: translateX(-50%)"></span>
     <script>
         (() => {
-            const input = document.getElementById("<?= $field->getId() ?>");
+            public const input = document.getElementById("<?= $field->getId() ?>");
             input.addEventListener("input", function () {
                 this.nextElementSibling.innerHTML = this.value;
                 var pos = ((this.value - <?= $min ?>) / (<?= $max ?> - <?= $min ?>) * 100);
diff --git a/modules/cms/classes/Layout.php b/modules/cms/classes/Layout.php
index f2c6500198..5af5ab4e38 100644
--- a/modules/cms/classes/Layout.php
+++ b/modules/cms/classes/Layout.php
@@ -13,7 +13,7 @@ class Layout extends CmsCompoundObject
     /**
      * Fallback layout name.
      */
-    const FALLBACK_FILE_NAME = 'fallback';
+    public const FALLBACK_FILE_NAME = 'fallback';
 
     /**
      * @var string The container name associated with the model, eg: pages.
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index a57ceb04be..202d9eaaf4 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -60,8 +60,8 @@ class Theme extends CmsObject
      */
     protected $defaultExtension = 'yaml';
 
-    const ACTIVE_KEY = 'cms::theme.active';
-    const EDIT_KEY = 'cms::theme.edit';
+    public const ACTIVE_KEY = 'cms::theme.active';
+    public const EDIT_KEY = 'cms::theme.edit';
 
     /**
      * Loads the theme.
diff --git a/modules/cms/models/ThemeLog.php b/modules/cms/models/ThemeLog.php
index 4cceaabc36..ef4007dd87 100644
--- a/modules/cms/models/ThemeLog.php
+++ b/modules/cms/models/ThemeLog.php
@@ -17,9 +17,9 @@
  */
 class ThemeLog extends Model
 {
-    const TYPE_CREATE = 'create';
-    const TYPE_UPDATE = 'update';
-    const TYPE_DELETE = 'delete';
+    public const TYPE_CREATE = 'create';
+    public const TYPE_UPDATE = 'update';
+    public const TYPE_DELETE = 'delete';
 
     /**
      * @var string The database table used by the model.
diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php
index 5724bf348e..edbf94bf24 100644
--- a/modules/cms/twig/DebugExtension.php
+++ b/modules/cms/twig/DebugExtension.php
@@ -15,10 +15,10 @@
 
 class DebugExtension extends TwigExtension
 {
-    const PAGE_CAPTION = 'Page variables';
-    const ARRAY_CAPTION = 'Array variables';
-    const OBJECT_CAPTION = 'Object variables';
-    const COMPONENT_CAPTION = 'Component variables';
+    public const PAGE_CAPTION = 'Page variables';
+    public const ARRAY_CAPTION = 'Array variables';
+    public const OBJECT_CAPTION = 'Object variables';
+    public const COMPONENT_CAPTION = 'Component variables';
 
     /**
      * @var integer Helper for rendering table row styles.
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index 457a518774..110ec98c7b 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -21,7 +21,7 @@ class TemplateList extends WidgetBase
     use \Backend\Traits\SelectableWidget;
     use \Backend\Traits\CollapsableWidget;
 
-    const SORTING_FILENAME = 'fileName';
+    public const SORTING_FILENAME = 'fileName';
 
     protected $searchTerm = false;
 
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index cf030380df..7b1f05fafd 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -24,9 +24,9 @@ class MarkupManager
 {
     use \Winter\Storm\Support\Traits\Singleton;
 
-    const EXTENSION_FILTER = 'filters';
-    const EXTENSION_FUNCTION = 'functions';
-    const EXTENSION_TOKEN_PARSER = 'tokens';
+    public const EXTENSION_FILTER = 'filters';
+    public const EXTENSION_FUNCTION = 'functions';
+    public const EXTENSION_TOKEN_PARSER = 'tokens';
 
     /**
      * @var array Cache of registration callbacks.
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index ca446b4035..c1c62e8d3a 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -25,11 +25,11 @@ class MediaLibrary
 {
     use \Winter\Storm\Support\Traits\Singleton;
 
-    const SORT_BY_TITLE = 'title';
-    const SORT_BY_SIZE = 'size';
-    const SORT_BY_MODIFIED = 'modified';
-    const SORT_DIRECTION_ASC = 'asc';
-    const SORT_DIRECTION_DESC = 'desc';
+    public const SORT_BY_TITLE = 'title';
+    public const SORT_BY_SIZE = 'size';
+    public const SORT_BY_MODIFIED = 'modified';
+    public const SORT_DIRECTION_ASC = 'asc';
+    public const SORT_DIRECTION_DESC = 'desc';
 
     /**
      * @var string Cache key
diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php
index b6566a96d6..ef09a9cf7f 100644
--- a/modules/system/classes/MediaLibraryItem.php
+++ b/modules/system/classes/MediaLibraryItem.php
@@ -15,13 +15,13 @@
  */
 class MediaLibraryItem
 {
-    const TYPE_FILE = 'file';
-    const TYPE_FOLDER = 'folder';
+    public const TYPE_FILE = 'file';
+    public const TYPE_FOLDER = 'folder';
 
-    const FILE_TYPE_IMAGE = 'image';
-    const FILE_TYPE_VIDEO = 'video';
-    const FILE_TYPE_AUDIO = 'audio';
-    const FILE_TYPE_DOCUMENT = 'document';
+    public const FILE_TYPE_IMAGE = 'image';
+    public const FILE_TYPE_VIDEO = 'video';
+    public const FILE_TYPE_AUDIO = 'audio';
+    public const FILE_TYPE_DOCUMENT = 'document';
 
     /**
      * @var string Specifies the item path relative to the Library root.
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index c8b7bda076..0ad0b26556 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -21,20 +21,20 @@ class SettingsManager
     /**
      * Allocated category types
      */
-    const CATEGORY_CMS = 'system::lang.system.categories.cms';
-    const CATEGORY_MISC = 'system::lang.system.categories.misc';
-    const CATEGORY_MAIL = 'system::lang.system.categories.mail';
-    const CATEGORY_LOGS = 'system::lang.system.categories.logs';
-    const CATEGORY_SHOP = 'system::lang.system.categories.shop';
-    const CATEGORY_TEAM = 'system::lang.system.categories.team';
-    const CATEGORY_USERS = 'system::lang.system.categories.users';
-    const CATEGORY_SOCIAL = 'system::lang.system.categories.social';
-    const CATEGORY_SYSTEM = 'system::lang.system.categories.system';
-    const CATEGORY_EVENTS = 'system::lang.system.categories.events';
-    const CATEGORY_BACKEND = 'system::lang.system.categories.backend';
-    const CATEGORY_CUSTOMERS = 'system::lang.system.categories.customers';
-    const CATEGORY_MYSETTINGS = 'system::lang.system.categories.my_settings';
-    const CATEGORY_NOTIFICATIONS = 'system::lang.system.categories.notifications';
+    public const CATEGORY_CMS = 'system::lang.system.categories.cms';
+    public const CATEGORY_MISC = 'system::lang.system.categories.misc';
+    public const CATEGORY_MAIL = 'system::lang.system.categories.mail';
+    public const CATEGORY_LOGS = 'system::lang.system.categories.logs';
+    public const CATEGORY_SHOP = 'system::lang.system.categories.shop';
+    public const CATEGORY_TEAM = 'system::lang.system.categories.team';
+    public const CATEGORY_USERS = 'system::lang.system.categories.users';
+    public const CATEGORY_SOCIAL = 'system::lang.system.categories.social';
+    public const CATEGORY_SYSTEM = 'system::lang.system.categories.system';
+    public const CATEGORY_EVENTS = 'system::lang.system.categories.events';
+    public const CATEGORY_BACKEND = 'system::lang.system.categories.backend';
+    public const CATEGORY_CUSTOMERS = 'system::lang.system.categories.customers';
+    public const CATEGORY_MYSETTINGS = 'system::lang.system.categories.my_settings';
+    public const CATEGORY_NOTIFICATIONS = 'system::lang.system.categories.notifications';
 
     /**
      * @var array Cache of registration callbacks.
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index cb4c40115e..3a1ef0f3b4 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -26,13 +26,13 @@ class VersionManager
     /**
      * Value when no updates are found.
      */
-    const NO_VERSION_VALUE = 0;
+    public const NO_VERSION_VALUE = 0;
 
     /**
      * Morph types for history table.
      */
-    const HISTORY_TYPE_COMMENT = 'comment';
-    const HISTORY_TYPE_SCRIPT = 'script';
+    public const HISTORY_TYPE_COMMENT = 'comment';
+    public const HISTORY_TYPE_SCRIPT = 'script';
 
     /**
      * @var \Illuminate\Console\OutputStyle
diff --git a/modules/system/console/asset/npm/NpmVersion.php b/modules/system/console/asset/npm/NpmVersion.php
index f119c53f74..823a824041 100644
--- a/modules/system/console/asset/npm/NpmVersion.php
+++ b/modules/system/console/asset/npm/NpmVersion.php
@@ -6,7 +6,7 @@
 
 class NpmVersion extends NpmCommand
 {
-    const NPM_MINIMUM_SUPPORTED_VERSION = '7.0';
+    public const NPM_MINIMUM_SUPPORTED_VERSION = '7.0';
 
     /**
      * @var string|null The default command name for lazy loading.
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index 89506af4cc..f69d801477 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -43,18 +43,18 @@ class MailBrandSetting extends Model
      */
     public $cacheKey = 'system::mailbrand.custom_css';
 
-    const WHITE_COLOR = '#fff';
-    const BODY_BG = '#f5f8fa';
-    const PRIMARY_BG = '#3498db';
-    const POSITIVE_BG = '#31ac5f';
-    const NEGATIVE_BG = '#ab2a1c';
-    const HEADER_COLOR = '#bbbfc3';
-    const HEADING_COLOR = '#2f3133';
-    const TEXT_COLOR = '#74787e';
-    const LINK_COLOR = '#0181b9';
-    const FOOTER_COLOR = '#aeaeae';
-    const BORDER_COLOR = '#edeff2';
-    const PROMOTION_BORDER_COLOR = '#9ba2ab';
+    public const WHITE_COLOR = '#fff';
+    public const BODY_BG = '#f5f8fa';
+    public const PRIMARY_BG = '#3498db';
+    public const POSITIVE_BG = '#31ac5f';
+    public const NEGATIVE_BG = '#ab2a1c';
+    public const HEADER_COLOR = '#bbbfc3';
+    public const HEADING_COLOR = '#2f3133';
+    public const TEXT_COLOR = '#74787e';
+    public const LINK_COLOR = '#0181b9';
+    public const FOOTER_COLOR = '#aeaeae';
+    public const BORDER_COLOR = '#edeff2';
+    public const PROMOTION_BORDER_COLOR = '#9ba2ab';
 
     /**
      * Validation rules
diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php
index e0f45bcc5c..72a738d5e1 100644
--- a/modules/system/models/MailSetting.php
+++ b/modules/system/models/MailSetting.php
@@ -15,10 +15,10 @@ class MailSetting extends Model
 {
     use \Winter\Storm\Database\Traits\Validation;
 
-    const MODE_LOG       = 'log';
-    const MODE_MAIL      = 'mail';
-    const MODE_SENDMAIL  = 'sendmail';
-    const MODE_SMTP      = 'smtp';
+    public const MODE_LOG       = 'log';
+    public const MODE_MAIL      = 'mail';
+    public const MODE_SENDMAIL  = 'sendmail';
+    public const MODE_SMTP      = 'smtp';
 
     /**
      * @var array Behaviors implemented by this model.
diff --git a/modules/system/tests/classes/PluginManagerTest.php b/modules/system/tests/classes/PluginManagerTest.php
index 8aacfedfa1..859fe2bdad 100644
--- a/modules/system/tests/classes/PluginManagerTest.php
+++ b/modules/system/tests/classes/PluginManagerTest.php
@@ -8,10 +8,10 @@
 
 class PluginManagerTest extends PluginManagerTestCase
 {
-    const INSTALLED_PLUGIN_COUNT = 17;
-    const ENABLED_PLUGIN_COUNT = 14;
-    const PLUGIN_NAMESPACE_COUNT = 18;
-    const PLUGIN_VENDOR_COUNT = 5;
+    public const INSTALLED_PLUGIN_COUNT = 17;
+    public const ENABLED_PLUGIN_COUNT = 14;
+    public const PLUGIN_NAMESPACE_COUNT = 18;
+    public const PLUGIN_VENDOR_COUNT = 5;
 
     //
     // Tests

From 041dbb11453186346e664dda24b252d02388be8e Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 11 Dec 2024 07:30:51 -0600
Subject: [PATCH 19/30] Fix remaining warnings

---
 .../behaviors/importexportcontroller/TranscodeFilter.php      | 2 ++
 modules/backend/tests/models/ExportModelTest.php              | 4 ----
 modules/backend/tests/models/ImportModelTest.php              | 4 ----
 phpcs.xml                                                     | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
index 95c4678c1e..d25ff53916 100644
--- a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
+++ b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
@@ -4,7 +4,9 @@
 
 use php_user_filter;
 
+// phpcs:disable
 stream_filter_register(TranscodeFilter::FILTER_NAME . "*", TranscodeFilter::class);
+// phpcs:enable
 
 /**
  * Transcode stream filter.
diff --git a/modules/backend/tests/models/ExportModelTest.php b/modules/backend/tests/models/ExportModelTest.php
index d89b43381e..43c1bc305f 100644
--- a/modules/backend/tests/models/ExportModelTest.php
+++ b/modules/backend/tests/models/ExportModelTest.php
@@ -6,10 +6,6 @@
 use Illuminate\Http\Request;
 use System\Tests\Bootstrap\TestCase;
 
-if (!class_exists('Model')) {
-    class_alias('Winter\Storm\Database\Model', 'Model');
-}
-
 class ExampleExportModel extends ExportModel
 {
     public function exportData($columns, $sessionKey = null)
diff --git a/modules/backend/tests/models/ImportModelTest.php b/modules/backend/tests/models/ImportModelTest.php
index c57dce1c05..86f59ee7dc 100644
--- a/modules/backend/tests/models/ImportModelTest.php
+++ b/modules/backend/tests/models/ImportModelTest.php
@@ -6,10 +6,6 @@
 use System\Models\File as FileModel;
 use System\Tests\Bootstrap\PluginTestCase;
 
-if (!class_exists('Model')) {
-    class_alias('Winter\Storm\Database\Model', 'Model');
-}
-
 class ExampleImportModel extends ImportModel
 {
     public $rules = [];
diff --git a/phpcs.xml b/phpcs.xml
index 62ac10089b..feb43bb07e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,7 +8,6 @@
     <arg name="extensions" value="php" />
     <arg name="colors" />
 
-    <file>bootstrap/</file>
     <file>config/</file>
     <file>modules/</file>
     <file>plugins/winter/demo/</file>

From 61b127fb85dbabe5307c68bd8584d080507a47d0 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 11 Dec 2024 07:31:04 -0600
Subject: [PATCH 20/30] Add progress flag to phpcs

---
 modules/system/console/WinterSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
index f1c985e958..a4a1189ad0 100644
--- a/modules/system/console/WinterSniff.php
+++ b/modules/system/console/WinterSniff.php
@@ -248,7 +248,7 @@ protected function buildPhpCsArgs(string $phpCs, string $configFile): array
     {
         $args = [
             $phpCs,
-            '-d',
+            '-dp',
             'memory_limit=512M',
             '--basepath=' . $this->getBasePath(),
             '--standard=' . $configFile,

From 33a151866aba82865f9e8b99bccc9c2337d81af9 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 01:52:43 -0600
Subject: [PATCH 21/30] Add initial version of NoGlobalAliasesSniffTest

---
 .../Phpcs/Sniffs/NoGlobalAliasesSniff.php     | 180 ++++++++++++++++++
 .../Tests/Sniffs/NoGlobalAliasesSniffTest.php |  36 ++++
 .../Sniffs/NoGlobalAliasesSniffUnitTest.fixed |  12 ++
 .../Sniffs/NoGlobalAliasesSniffUnitTest.inc   |  12 ++
 modules/system/aliases.php                    |  14 +-
 modules/system/phpcs.base.xml                 |   2 +
 6 files changed, 251 insertions(+), 5 deletions(-)
 create mode 100644 modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php
 create mode 100644 modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php
 create mode 100644 modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
 create mode 100644 modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.inc

diff --git a/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php b/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php
new file mode 100644
index 0000000000..213459cd35
--- /dev/null
+++ b/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace System\Console\Sniffs;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class NoGlobalAliasesSniff implements Sniff
+{
+    /**
+     * Global aliases loaded from the aliases.php file.
+     *
+     * @var array
+     */
+    private $aliases = [];
+
+    /**
+     * Load aliases from the aliases.php file.
+     */
+    public function __construct()
+    {
+        $aliasesFile = __DIR__ . '/../../aliases.php';
+        if (file_exists($aliasesFile)) {
+            $this->aliases = include $aliasesFile;
+        }
+    }
+
+    /**
+     * Register tokens to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return [T_USE];
+    }
+
+    /**
+     * Process the file for global alias usage.
+     *
+     * @param File $phpcsFile
+     * @param int  $stackPtr
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // Determine if the use statement is at the top of the file or within a class
+        $isTopLevelUse = $this->isTopLevelUse($phpcsFile, $stackPtr);
+
+        if (!$isTopLevelUse) {
+            // This is a trait import, check if the alias is already imported
+            $this->processTraitUse($phpcsFile, $stackPtr);
+            return;
+        }
+
+        // Detect the full use statement
+        $endOfStatement = $phpcsFile->findEndOfStatement($stackPtr);
+
+        // Build the `use` statement without trailing semicolon
+        $useStatement = '';
+        for ($i = $stackPtr + 1; $i < $endOfStatement; $i++) {
+            $useStatement .= $phpcsFile->getTokens()[$i]['content'];
+        }
+
+        // Normalize the use statement and remove "as" aliases
+        $useStatement = trim(preg_replace('/\s+as\s+\w+$/i', '', $useStatement));
+
+        // $phpcsFile->addError(
+        //     $useStatement . var_export(isset($this->aliases[$useStatement]), true),
+        //     $stackPtr,
+        //     'NoGlobalAliases'
+        // );
+
+        // Check if the use statement matches a key in the aliases
+        foreach ($this->aliases as $alias => $fullyQualifiedName) {
+            if ($useStatement === $alias) {
+                $fix = $phpcsFile->addFixableWarning(
+                    "Avoid using global class alias '{$alias}'. Use '{$fullyQualifiedName}' instead.",
+                    $stackPtr,
+                    'NoGlobalAliases'
+                );
+
+                if ($fix) {
+                    $phpcsFile->fixer->beginChangeset();
+
+                    // Check if the original `use` statement includes an alias (e.g., `as $alias`)
+                    $asPosition = $phpcsFile->findNext(T_AS, $stackPtr, $endOfStatement);
+                    if ($asPosition !== false) {
+                        // Retain the alias by capturing everything after "as"
+                        $alias = $phpcsFile->getTokensAsString($asPosition, $endOfStatement - $asPosition);
+                        $replacement = ' ' . $fullyQualifiedName . ' ' . trim($alias) . ';';
+                    } else {
+                        // No alias, replace with the fully qualified name directly
+                        $replacement = ' ' . $fullyQualifiedName . ';';
+                    }
+
+                    // Replace the `use` statement
+                    $phpcsFile->fixer->replaceToken($stackPtr + 1, $replacement);
+
+                    // Remove any extra tokens between `use` and the end of the statement
+                    for ($i = $stackPtr + 2; $i <= $endOfStatement; $i++) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->endChangeset();
+                }
+
+                return;
+            }
+        }
+    }
+
+    /**
+     * Determine if the current use statement is at the top of the file.
+     *
+     * @param File $phpcsFile
+     * @param int  $stackPtr
+     * @return bool
+     */
+    private function isTopLevelUse(File $phpcsFile, int $stackPtr): bool
+    {
+        $prevClassToken = $phpcsFile->findPrevious([T_CLASS, T_TRAIT, T_INTERFACE], $stackPtr);
+        return $prevClassToken === false;
+    }
+
+    /**
+     * Process trait imports within a class.
+     *
+     * @param File $phpcsFile
+     * @param int  $stackPtr
+     */
+    private function processTraitUse(File $phpcsFile, int $stackPtr)
+    {
+        $endOfStatement = $phpcsFile->findEndOfStatement($stackPtr);
+        $traitUse = $phpcsFile->getTokensAsString($stackPtr + 1, $endOfStatement - $stackPtr);
+        $traitUse = trim($traitUse);
+
+        // Extract the short name of the trait
+        $classParts = explode('\\', $traitUse);
+        $alias = end($classParts);
+
+        // Check if the alias matches a key in the aliases
+        if (isset($this->aliases[$alias]) && !$this->isAlreadyImported($phpcsFile, $alias, $stackPtr)) {
+            $phpcsFile->addWarning(
+                "Trait '{$alias}' matches a global alias. Ensure it is explicitly imported at the top of the file.",
+                $stackPtr,
+                'TraitMatchesAlias'
+            );
+        }
+    }
+
+    /**
+     * Check if a short alias has already been imported at the top of the file.
+     *
+     * @param File $phpcsFile
+     * @param string $alias
+     * @param int $stackPtr
+     * @return bool
+     */
+    private function isAlreadyImported(File $phpcsFile, string $alias, int $stackPtr): bool
+    {
+        // Iterate over previous `use` statements at the top of the file
+        $prevUse = $phpcsFile->findPrevious(T_USE, $stackPtr - 1);
+        while ($prevUse !== false) {
+            $endOfStatement = $phpcsFile->findEndOfStatement($prevUse);
+            $useStatement = $phpcsFile->getTokensAsString($prevUse + 1, $endOfStatement - $prevUse);
+
+            // Normalize and extract the alias
+            $classParts = explode('\\', trim(preg_replace('/\s+as\s+\w+$/i', '', $useStatement)));
+            $importedAlias = end($classParts);
+
+            if ($importedAlias === $alias) {
+                return true; // Found an existing import
+            }
+
+            $prevUse = $phpcsFile->findPrevious(T_USE, $prevUse - 1);
+        }
+
+        return false;
+    }
+}
diff --git a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php
new file mode 100644
index 0000000000..04f8a6d5a0
--- /dev/null
+++ b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace System\Phpcs\Tests\Sniffs;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class NoGlobalAliasesSniffTest extends AbstractSniffUnitTest
+{
+    /**
+     * Returns the lines where errors should occur.
+     *
+     * @return array<int, int> Line numbers as keys, number of errors as values.
+     */
+    public function getErrorList(): array
+    {
+        return [
+            3 => 1, // Global alias Config
+            4 => 1, // Global alias Lang
+            5 => 1, // Global alias URL
+            9 => 0, // Fully-qualified import (no error)
+            10 => 1, // Global alias Yaml
+            14 => 0, // Trait imported (no error)
+            15 => 1, // Trait conflicts with alias
+        ];
+    }
+
+    /**
+     * Returns the lines where warnings should occur.
+     *
+     * @return array<int, int> Line numbers as keys, number of warnings as values.
+     */
+    public function getWarningList(): array
+    {
+        return [];
+    }
+}
diff --git a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
new file mode 100644
index 0000000000..e78902f80c
--- /dev/null
+++ b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
@@ -0,0 +1,12 @@
+<?php
+
+use Winter\Storm\Support\Facades\Config as MyConfig;
+use Illuminate\Support\Facades\Lang as MyLang;
+use Winter\Storm\Support\Facades\URL;
+use Winter\Storm\Support\Arr;
+use Winter\Storm\Support\Facades\Yaml;
+
+class Example
+{
+    use Config;
+}
diff --git a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.inc b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.inc
new file mode 100644
index 0000000000..81958f8446
--- /dev/null
+++ b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.inc
@@ -0,0 +1,12 @@
+<?php
+
+use Config as MyConfig;
+use Lang as MyLang;
+use URL;
+use Winter\Storm\Support\Arr;
+use Yaml;
+
+class Example
+{
+    use Config;
+}
diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index 3a644a3339..a9941b833b 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -17,9 +17,9 @@
     'Cookie'       => Illuminate\Support\Facades\Cookie::class,
     'Crypt'        => Illuminate\Support\Facades\Crypt::class,
     'Date'         => Illuminate\Support\Facades\Date::class,
-    'DB'           => Illuminate\Support\Facades\DB::class,
+    // 'DB'        => Illuminate\Support\Facades\DB::class,           // Replaced by Winter
     'Eloquent'     => Illuminate\Database\Eloquent\Model::class,
-    'Event'        => Illuminate\Support\Facades\Event::class,
+    // 'Event'     => Illuminate\Support\Facades\Event::class,        // Replaced by Winter
     // 'File'      => Illuminate\Support\Facades\File::class,         // Replaced by Winter
     // 'Gate'      => Illuminate\Support\Facades\Gate::class,         // Currently unsupported in Winter
     'Hash'         => Illuminate\Support\Facades\Hash::class,
@@ -41,7 +41,7 @@
     'Session'      => Illuminate\Support\Facades\Session::class,
     'Storage'      => Illuminate\Support\Facades\Storage::class,
     // 'Str'       => Illuminate\Support\Str::class,                  // Replaced by Winter
-    'URL'          => Illuminate\Support\Facades\URL::class,
+    // 'URL'       => Illuminate\Support\Facades\URL::class,       // Replaced by Winter
     // 'Validator' => Illuminate\Support\Facades\Validator::class,    // Replaced by Winter
     'View'         => Illuminate\Support\Facades\View::class,
 
@@ -56,8 +56,10 @@
     'BackendMenu'          => Backend\Facades\BackendMenu::class,
     'Block'                => Winter\Storm\Support\Facades\Block::class,
     'Cms'                  => Cms\Facades\Cms::class,
+    'DB'                   => Winter\Storm\Support\Facades\DB::class,
     'Config'               => Winter\Storm\Support\Facades\Config::class,
     'DbDongle'             => Winter\Storm\Support\Facades\DbDongle::class,
+    'Event'                => Winter\Storm\Support\Facades\Event::class,
     'File'                 => Winter\Storm\Support\Facades\File::class,
     'Flash'                => Winter\Storm\Support\Facades\Flash::class,
     'Form'                 => Winter\Storm\Support\Facades\Form::class,
@@ -71,8 +73,10 @@
     'Schema'               => Winter\Storm\Support\Facades\Schema::class,
     'Seeder'               => Winter\Storm\Database\Updates\Seeder::class,
     'Str'                  => Winter\Storm\Support\Str::class,
+    'Svg'                  => Winter\Storm\Support\Facades\Svg::class,
     'SystemException'      => Winter\Storm\Exception\SystemException::class,
     'Twig'                 => Winter\Storm\Support\Facades\Twig::class,
+    'URL'                  => Winter\Storm\Support\Facades\Url::class,
     'ValidationException'  => Winter\Storm\Exception\ValidationException::class,
     'Validator'            => Winter\Storm\Support\Facades\Validator::class,
     'Yaml'                 => Winter\Storm\Support\Facades\Yaml::class,
@@ -80,8 +84,8 @@
     /*
      * Backwards compatibility aliases
      */
-    'Db'             => Illuminate\Support\Facades\DB::class,
-    'Url'            => Illuminate\Support\Facades\URL::class,
+    'Db'             => Winter\Storm\Support\Facades\DB::class,
+    'Url'            => Winter\Storm\Support\Facades\URL::class,
     'TestCase'       => System\Tests\Bootstrap\TestCase::class,
     'PluginTestCase' => System\Tests\Bootstrap\PluginTestCase::class,
 
diff --git a/modules/system/phpcs.base.xml b/modules/system/phpcs.base.xml
index 45dd99163a..78c5c603da 100644
--- a/modules/system/phpcs.base.xml
+++ b/modules/system/phpcs.base.xml
@@ -181,4 +181,6 @@
             <property name="searchAnnotations" value="true" />
         </properties>
     </rule>
+    <!-- Don't allow importing global aliases -->
+    <rule ref="./modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php"/>
 </ruleset>

From afedfb96c6cfc6bccee8f9e4e244ea77630f7e5f Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 01:53:00 -0600
Subject: [PATCH 22/30] Add support for --parallel option to winter:sniff

---
 modules/system/console/WinterSniff.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
index a4a1189ad0..a22f7d0bda 100644
--- a/modules/system/console/WinterSniff.php
+++ b/modules/system/console/WinterSniff.php
@@ -41,6 +41,7 @@ class WinterSniff extends BaseScaffoldCommand
         {?--e|no-warnings : Ignore warnings and only show errors}
         {--fix : Automatically fix detected errors where able by use of the phpcbf command}
         {?--s|summary : Display a summary of the results}
+        {?--parallel= : The number of files to be checked simultaneously. Defaults to 1 (no parallel processing). If enabled, this option only takes effect if the PHP PCNTL (Process Control) extension is available.}
     ';
 
     protected $stubs = [
@@ -262,6 +263,10 @@ protected function buildPhpCsArgs(string $phpCs, string $configFile): array
             $args[] = '--report=summary';
         }
 
+        if ($this->option('parallel')) {
+            $args[] = '--parallel=' . (int) $this->option('parallel');
+        }
+
         $args = array_merge(
             $args,
             $this->argument('paths') ?: (

From 69f19e3e2682a074ff087925cf01be293e4d085f Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 01:58:22 -0600
Subject: [PATCH 23/30] Fix remaining global imports

---
 modules/backend/behaviors/RelationController.php | 2 +-
 modules/backend/models/Preference.php            | 2 +-
 modules/backend/traits/SessionMaker.php          | 2 +-
 modules/backend/widgets/Form.php                 | 2 +-
 modules/system/classes/ImageResizer.php          | 4 ++--
 modules/system/classes/MediaLibrary.php          | 2 +-
 modules/system/helpers/Cache.php                 | 2 +-
 modules/system/helpers/View.php                  | 2 +-
 modules/system/models/File.php                   | 2 +-
 modules/system/models/MailBrandSetting.php       | 2 +-
 modules/system/models/MailPartial.php            | 2 +-
 modules/system/models/MailTemplate.php           | 2 +-
 modules/system/traits/SecurityController.php     | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 337e114a42..c64a38f0a3 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -3,12 +3,12 @@
 namespace Backend\Behaviors;
 
 use Backend\Classes\ControllerBehavior;
-use Form as FormHelper;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Request;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Support\Facades\DB;
+use Winter\Storm\Support\Facades\Form as FormHelper;
 
 /**
  * Uses a combination of lists and forms for managing Model relations.
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index 954dcdc3de..6c6b729f2f 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -8,7 +8,7 @@
 use DirectoryIterator;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Lang;
-use Session;
+use Illuminate\Support\Facades\Session;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Support\Facades\Config;
 
diff --git a/modules/backend/traits/SessionMaker.php b/modules/backend/traits/SessionMaker.php
index 5751353bd2..09cd4cce91 100644
--- a/modules/backend/traits/SessionMaker.php
+++ b/modules/backend/traits/SessionMaker.php
@@ -2,7 +2,7 @@
 
 namespace Backend\Traits;
 
-use Session;
+use Illuminate\Support\Facades\Session;
 use Winter\Storm\Support\Str;
 
 /**
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index e500f5bc3b..7dd1590b9d 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -9,11 +9,11 @@
 use Backend\Classes\WidgetManager;
 use Backend\Facades\BackendAuth;
 use Exception;
-use Form as FormHelper;
 use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Html\Helper as HtmlHelper;
+use Winter\Storm\Support\Facades\Form as FormHelper;
 
 /**
  * Form Widget
diff --git a/modules/system/classes/ImageResizer.php b/modules/system/classes/ImageResizer.php
index e885b8db31..007458fe4f 100644
--- a/modules/system/classes/ImageResizer.php
+++ b/modules/system/classes/ImageResizer.php
@@ -3,17 +3,17 @@
 namespace System\Classes;
 
 use Exception;
-use File as FileHelper;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Storage;
 use System\Models\File as SystemFileModel;
 use Winter\Storm\Database\Attach\File as FileModel;
 use Winter\Storm\Database\Attach\Resizer as DefaultResizer;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Image Resizing class used for resizing any image resources accessible
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index c1c62e8d3a..406983405e 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -5,8 +5,8 @@
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Storage;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
diff --git a/modules/system/helpers/Cache.php b/modules/system/helpers/Cache.php
index 7f83d563e8..af4a771ae9 100644
--- a/modules/system/helpers/Cache.php
+++ b/modules/system/helpers/Cache.php
@@ -2,8 +2,8 @@
 
 namespace System\Helpers;
 
-use Cache as CacheFacade;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache as CacheFacade;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
 
diff --git a/modules/system/helpers/View.php b/modules/system/helpers/View.php
index b2bc429dfc..88a962f1ce 100644
--- a/modules/system/helpers/View.php
+++ b/modules/system/helpers/View.php
@@ -2,7 +2,7 @@
 
 namespace System\Helpers;
 
-use View as ViewFacade;
+use Illuminate\Support\Facades\View as ViewFacade;
 
 /**
  * This helper class is used to extract basic variables
diff --git a/modules/system/models/File.php b/modules/system/models/File.php
index 3e9db18426..d4c573f551 100644
--- a/modules/system/models/File.php
+++ b/modules/system/models/File.php
@@ -3,8 +3,8 @@
 namespace System\Models;
 
 use Backend\Controllers\Files;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
-use Storage;
 use Winter\Storm\Database\Attach\File as FileBase;
 use Winter\Storm\Support\Facades\Config;
 
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index f69d801477..9de00b16d1 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -3,11 +3,11 @@
 namespace System\Models;
 
 use Exception;
-use File as FileHelper;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Less_Parser;
 use Winter\Storm\Database\Model;
+use Winter\Storm\Support\Facades\File as FileHelper;
 use Winter\Storm\Support\Str;
 
 /**
diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
index a993dbfa3d..a85d3fbbe3 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -3,12 +3,12 @@
 namespace System\Models;
 
 use Exception;
-use File as FileHelper;
 use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Mail\MailParser;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Mail partial
diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
index 8ea8f55b15..b04b1ddfac 100644
--- a/modules/system/models/MailTemplate.php
+++ b/modules/system/models/MailTemplate.php
@@ -2,11 +2,11 @@
 
 namespace System\Models;
 
-use File as FileHelper;
 use Illuminate\Support\Facades\View;
 use System\Classes\MailManager;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Mail\MailParser;
+use Winter\Storm\Support\Facades\File as FileHelper;
 
 /**
  * Mail template
diff --git a/modules/system/traits/SecurityController.php b/modules/system/traits/SecurityController.php
index 968c21ca23..9c9d5e7921 100644
--- a/modules/system/traits/SecurityController.php
+++ b/modules/system/traits/SecurityController.php
@@ -5,7 +5,7 @@
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Request;
-use Session;
+use Illuminate\Support\Facades\Session;
 use Symfony\Component\HttpFoundation\Cookie;
 use Winter\Storm\Support\Facades\Config;
 

From bace8e7d0411697518e40d4366732480d905206f Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 01:59:52 -0600
Subject: [PATCH 24/30] Ignore the project's phpcs.xml file when exporting it
 as a new project

The core phpcs.xml is only relevant to core development, not projects using Winter. Running winter:sniff without a config file present will auto generate one from the stubs in the system module.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 1a7fadf6c9..4ae6ab295d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,4 @@
 .gitattributes export-ignore
 CHANGELOG.md export-ignore
 /package.json export-ignore
+phpcs.xml export-ignore

From 16d7cc2938f05804a780533910f2b18b4b517782 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 02:15:32 -0600
Subject: [PATCH 25/30] Fix overzealous find/replace

---
 modules/backend/widgets/form/partials/_field_range.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/widgets/form/partials/_field_range.php b/modules/backend/widgets/form/partials/_field_range.php
index 8370131227..77f774821b 100644
--- a/modules/backend/widgets/form/partials/_field_range.php
+++ b/modules/backend/widgets/form/partials/_field_range.php
@@ -28,7 +28,7 @@
     <span style="position: absolute; transform: translateX(-50%)"></span>
     <script>
         (() => {
-            public const input = document.getElementById("<?= $field->getId() ?>");
+            const input = document.getElementById("<?= $field->getId() ?>");
             input.addEventListener("input", function () {
                 this.nextElementSibling.innerHTML = this.value;
                 var pos = ((this.value - <?= $min ?>) / (<?= $max ?> - <?= $min ?>) * 100);

From 09b945e3d35839d8e70e275d848e187b67ac934e Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 02:17:52 -0600
Subject: [PATCH 26/30] Remove debug code

---
 modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php |  6 ------
 .../Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php  | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php b/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php
index 213459cd35..72994e75c0 100644
--- a/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php
+++ b/modules/system/Phpcs/Sniffs/NoGlobalAliasesSniff.php
@@ -64,12 +64,6 @@ public function process(File $phpcsFile, $stackPtr)
         // Normalize the use statement and remove "as" aliases
         $useStatement = trim(preg_replace('/\s+as\s+\w+$/i', '', $useStatement));
 
-        // $phpcsFile->addError(
-        //     $useStatement . var_export(isset($this->aliases[$useStatement]), true),
-        //     $stackPtr,
-        //     'NoGlobalAliases'
-        // );
-
         // Check if the use statement matches a key in the aliases
         foreach ($this->aliases as $alias => $fullyQualifiedName) {
             if ($useStatement === $alias) {
diff --git a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php
index 04f8a6d5a0..7bd8384f33 100644
--- a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php
+++ b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffTest.php
@@ -7,11 +7,11 @@
 class NoGlobalAliasesSniffTest extends AbstractSniffUnitTest
 {
     /**
-     * Returns the lines where errors should occur.
+     * Returns the lines where warnings should occur.
      *
-     * @return array<int, int> Line numbers as keys, number of errors as values.
+     * @return array<int, int> Line numbers as keys, number of warnings as values.
      */
-    public function getErrorList(): array
+    public function getWarningList(): array
     {
         return [
             3 => 1, // Global alias Config
@@ -25,11 +25,11 @@ public function getErrorList(): array
     }
 
     /**
-     * Returns the lines where warnings should occur.
+     * Returns the lines where errors should occur.
      *
-     * @return array<int, int> Line numbers as keys, number of warnings as values.
+     * @return array<int, int> Line numbers as keys, number of errors as values.
      */
-    public function getWarningList(): array
+    public function getErrorList(): array
     {
         return [];
     }

From 02c8469e0ce18f13e25c81e93ee7828f90a4c396 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Mon, 16 Dec 2024 02:27:15 -0600
Subject: [PATCH 27/30] Use Winter's Url facade instead of Laravel's

---
 modules/backend/helpers/Backend.php                           | 2 +-
 modules/backend/models/BrandSetting.php                       | 2 +-
 modules/cms/controllers/Index.php                             | 2 +-
 modules/cms/controllers/Themes.php                            | 2 +-
 modules/cms/helpers/Cms.php                                   | 2 +-
 modules/cms/twig/FrameworkNode.php                            | 2 +-
 modules/cms/twig/SnowboardNode.php                            | 2 +-
 modules/cms/widgets/AssetList.php                             | 2 +-
 .../Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed     | 2 +-
 modules/system/aliases.php                                    | 4 ++--
 modules/system/classes/CombineAssets.php                      | 2 +-
 modules/system/classes/ImageResizer.php                       | 2 +-
 modules/system/classes/MediaLibrary.php                       | 2 +-
 modules/system/classes/UpdateManager.php                      | 2 +-
 modules/system/models/File.php                                | 2 +-
 modules/system/tests/classes/ImageResizerTest.php             | 2 +-
 modules/system/twig/Extension.php                             | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php
index a22a5f5dd7..6ea2136f2f 100644
--- a/modules/backend/helpers/Backend.php
+++ b/modules/backend/helpers/Backend.php
@@ -7,12 +7,12 @@
 use Exception;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\DateTime as DateTimeHelper;
 use Winter\Storm\Router\Helper as RouterHelper;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Html;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Backend Helper
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index abb5d103e8..8b060c6849 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -7,11 +7,11 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\URL;
 use Less_Parser;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Brand settings that affect all users
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 8e98298b73..bc89e29860 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -22,13 +22,13 @@
 use Exception;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\DateTime;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Router\Router as StormRouter;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * CMS index
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index 9ef451846c..1816cba600 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -16,12 +16,12 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Facades\URL;
 use System\Classes\SettingsManager;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\ValidationException;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Str;
 
 /**
diff --git a/modules/cms/helpers/Cms.php b/modules/cms/helpers/Cms.php
index 732248a265..d3cca8df7e 100644
--- a/modules/cms/helpers/Cms.php
+++ b/modules/cms/helpers/Cms.php
@@ -3,8 +3,8 @@
 namespace Cms\Helpers;
 
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\URL;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * CMS Helper
diff --git a/modules/cms/twig/FrameworkNode.php b/modules/cms/twig/FrameworkNode.php
index 3b3c496b95..1da40feac0 100644
--- a/modules/cms/twig/FrameworkNode.php
+++ b/modules/cms/twig/FrameworkNode.php
@@ -2,11 +2,11 @@
 
 namespace Cms\Twig;
 
-use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
 use System\Models\Parameter;
 use Twig\Compiler as TwigCompiler;
 use Twig\Node\Node as TwigNode;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Represents a "framework" node
diff --git a/modules/cms/twig/SnowboardNode.php b/modules/cms/twig/SnowboardNode.php
index f0b78913ea..f73277fc2a 100644
--- a/modules/cms/twig/SnowboardNode.php
+++ b/modules/cms/twig/SnowboardNode.php
@@ -2,12 +2,12 @@
 
 namespace Cms\Twig;
 
-use Illuminate\Support\Facades\URL;
 use System\Classes\CombineAssets;
 use System\Models\Parameter;
 use Twig\Compiler as TwigCompiler;
 use Twig\Node\Node as TwigNode;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Represents a "snowboard" node
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index 94c519a406..a3f8ad170d 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -10,7 +10,6 @@
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\URL;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -18,6 +17,7 @@
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Input;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Str;
 
 /**
diff --git a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
index e78902f80c..71f5619b78 100644
--- a/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
+++ b/modules/system/Phpcs/Tests/Sniffs/NoGlobalAliasesSniffUnitTest.fixed
@@ -2,7 +2,7 @@
 
 use Winter\Storm\Support\Facades\Config as MyConfig;
 use Illuminate\Support\Facades\Lang as MyLang;
-use Winter\Storm\Support\Facades\URL;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Arr;
 use Winter\Storm\Support\Facades\Yaml;
 
diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index a9941b833b..af12794f3a 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -41,7 +41,7 @@
     'Session'      => Illuminate\Support\Facades\Session::class,
     'Storage'      => Illuminate\Support\Facades\Storage::class,
     // 'Str'       => Illuminate\Support\Str::class,                  // Replaced by Winter
-    // 'URL'       => Illuminate\Support\Facades\URL::class,       // Replaced by Winter
+    // 'URL'       => Illuminate\Support\Facades\URL::class,          // Replaced by Winter
     // 'Validator' => Illuminate\Support\Facades\Validator::class,    // Replaced by Winter
     'View'         => Illuminate\Support\Facades\View::class,
 
@@ -85,7 +85,7 @@
      * Backwards compatibility aliases
      */
     'Db'             => Winter\Storm\Support\Facades\DB::class,
-    'Url'            => Winter\Storm\Support\Facades\URL::class,
+    'Url'            => Winter\Storm\Support\Facades\Url::class,
     'TestCase'       => System\Tests\Bootstrap\TestCase::class,
     'PluginTestCase' => System\Tests\Bootstrap\PluginTestCase::class,
 
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index b59b0e8223..bd37e1ce85 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -17,7 +17,6 @@
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\Cache as CacheHelper;
 use Winter\Storm\Parse\Assetic\Cache\FilesystemCache;
 use Winter\Storm\Parse\Assetic\Filter\JavascriptImporter;
@@ -26,6 +25,7 @@
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Combiner class used for combining JavaScript and StyleSheet files.
diff --git a/modules/system/classes/ImageResizer.php b/modules/system/classes/ImageResizer.php
index 007458fe4f..84b1ce7308 100644
--- a/modules/system/classes/ImageResizer.php
+++ b/modules/system/classes/ImageResizer.php
@@ -6,7 +6,6 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\URL;
 use System\Models\File as SystemFileModel;
 use Winter\Storm\Database\Attach\File as FileModel;
 use Winter\Storm\Database\Attach\Resizer as DefaultResizer;
@@ -14,6 +13,7 @@
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
 use Winter\Storm\Support\Facades\File as FileHelper;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Image Resizing class used for resizing any image resources accessible
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index 406983405e..2f6c0d4223 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -6,11 +6,11 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\URL;
 use Winter\Storm\Exception\ApplicationException;
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Filesystem\Definitions as FileDefinitions;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 use Winter\Storm\Support\Str;
 use Winter\Storm\Support\Svg;
 
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 7bbf4bb533..e4cae38617 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -10,7 +10,6 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\URL;
 use System\Helpers\Cache as CacheHelper;
 use System\Models\Parameter;
 use System\Models\PluginVersion;
@@ -20,6 +19,7 @@
 use Winter\Storm\Support\Facades\File;
 use Winter\Storm\Support\Facades\Http;
 use Winter\Storm\Support\Facades\Schema;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * Update manager
diff --git a/modules/system/models/File.php b/modules/system/models/File.php
index d4c573f551..d150a54c5b 100644
--- a/modules/system/models/File.php
+++ b/modules/system/models/File.php
@@ -4,9 +4,9 @@
 
 use Backend\Controllers\Files;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\URL;
 use Winter\Storm\Database\Attach\File as FileBase;
 use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * File attachment model
diff --git a/modules/system/tests/classes/ImageResizerTest.php b/modules/system/tests/classes/ImageResizerTest.php
index c0b5d13237..1f14ff139a 100644
--- a/modules/system/tests/classes/ImageResizerTest.php
+++ b/modules/system/tests/classes/ImageResizerTest.php
@@ -6,7 +6,6 @@
 use Cms\Classes\Controller as CmsController;
 use Cms\Classes\Theme;
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
-use Illuminate\Support\Facades\URL;
 use System\Classes\ImageResizer;
 use System\Classes\MediaLibrary;
 use System\Models\File as FileModel;
@@ -14,6 +13,7 @@
 use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\Url;
 
 class ImageResizerTest extends PluginTestCase
 {
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 1c5057889f..16afe909e5 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -2,13 +2,13 @@
 
 namespace System\Twig;
 
-use Illuminate\Support\Facades\URL;
 use System\Classes\ImageResizer;
 use System\Classes\MarkupManager;
 use System\Classes\MediaLibrary;
 use Twig\Extension\AbstractExtension as TwigExtension;
 use Twig\TwigFilter as TwigSimpleFilter;
 use Twig\TwigFunction as TwigSimpleFunction;
+use Winter\Storm\Support\Facades\Url;
 
 /**
  * The System Twig extension class implements common Twig functions and filters.

From 6fe56713c29abb1331acfbf4c04bb51c7bbbeaf0 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 17 Dec 2024 17:18:36 -0600
Subject: [PATCH 28/30] Typo fix

---
 modules/system/console/WinterSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/console/WinterSniff.php b/modules/system/console/WinterSniff.php
index a22f7d0bda..163918c61b 100644
--- a/modules/system/console/WinterSniff.php
+++ b/modules/system/console/WinterSniff.php
@@ -11,7 +11,7 @@
 /**
  * Console command to check code style and formatting issues.
  *
- * If a plugin is provided, this command will search for a `phpcs.xml file inside the plugin's directory. If not found,
+ * If a plugin is provided, this command will search for a `phpcs.xml` file inside the plugin's directory. If not found,
  * the user will be prompted to create one if they wish.
  */
 class WinterSniff extends BaseScaffoldCommand

From fb92ce34b7fabfdaa7dc263de67a536b037c9044 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 17 Dec 2024 17:52:43 -0600
Subject: [PATCH 29/30] Allow use statements to reference classes in the same
 namespace

---
 modules/system/phpcs.base.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/system/phpcs.base.xml b/modules/system/phpcs.base.xml
index 78c5c603da..a559d78453 100644
--- a/modules/system/phpcs.base.xml
+++ b/modules/system/phpcs.base.xml
@@ -171,8 +171,6 @@
     <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses" />
     <!-- Don't allow group use declarations as they make diffs ugly -->
     <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
-    <!-- Don't allow use definitions for a class in the same namespace -->
-    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace" />
     <!-- Don't allow starting backslash for imports as there's no need for them -->
     <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash" />
     <!-- Don't allow unused imports (using them in docblocks is OK)-->

From 27207c27fb2b2fd1aee96dadb44ed9db8823649d Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 17 Dec 2024 18:10:47 -0600
Subject: [PATCH 30/30] Fix default scaffolding stub files to conform to coding
 standard

---
 .../backend/console/scaffold/controller/controller.stub   | 6 ++++--
 .../backend/console/scaffold/formwidget/formwidget.stub   | 4 +++-
 .../console/scaffold/reportwidget/reportwidget.stub       | 8 +++++---
 modules/system/console/scaffold/job/job.batched.stub      | 6 +++++-
 modules/system/console/scaffold/job/job.queued.stub       | 5 ++++-
 modules/system/console/scaffold/plugin/plugin.stub        | 6 ++----
 modules/system/console/scaffold/settings/model.stub       | 2 +-
 modules/system/console/scaffold/test/test.plugin.stub     | 2 +-
 8 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/modules/backend/console/scaffold/controller/controller.stub b/modules/backend/console/scaffold/controller/controller.stub
index 1d0b5c8cda..4d1522c387 100644
--- a/modules/backend/console/scaffold/controller/controller.stub
+++ b/modules/backend/console/scaffold/controller/controller.stub
@@ -1,7 +1,9 @@
-<?php namespace {{ plugin_namespace }}\Controllers;
+<?php
+
+namespace {{ plugin_namespace }}\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 
 /**
  * {{ title_name }} Backend Controller
diff --git a/modules/backend/console/scaffold/formwidget/formwidget.stub b/modules/backend/console/scaffold/formwidget/formwidget.stub
index 9fcf5045b0..091fb61976 100644
--- a/modules/backend/console/scaffold/formwidget/formwidget.stub
+++ b/modules/backend/console/scaffold/formwidget/formwidget.stub
@@ -1,4 +1,6 @@
-<?php namespace {{studly_author}}\{{studly_plugin}}\FormWidgets;
+<?php
+
+namespace {{studly_author}}\{{studly_plugin}}\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 
diff --git a/modules/backend/console/scaffold/reportwidget/reportwidget.stub b/modules/backend/console/scaffold/reportwidget/reportwidget.stub
index bfe197259e..f58a265e9c 100644
--- a/modules/backend/console/scaffold/reportwidget/reportwidget.stub
+++ b/modules/backend/console/scaffold/reportwidget/reportwidget.stub
@@ -1,4 +1,6 @@
-<?php namespace {{studly_author}}\{{studly_plugin}}\ReportWidgets;
+<?php
+
+namespace {{studly_author}}\{{studly_plugin}}\ReportWidgets;
 
 use Backend\Classes\ReportWidgetBase;
 use Exception;
@@ -29,7 +31,7 @@ class {{studly_name}} extends ReportWidgetBase
             ],
         ];
     }
-    
+
     /**
      * Adds widget specific asset files. Use $this->addJs() and $this->addCss()
      * to register new assets to include on the page.
@@ -38,7 +40,7 @@ class {{studly_name}} extends ReportWidgetBase
     protected function loadAssets()
     {
     }
-    
+
     /**
      * Renders the widget's primary contents.
      * @return string HTML markup supplied by this widget.
diff --git a/modules/system/console/scaffold/job/job.batched.stub b/modules/system/console/scaffold/job/job.batched.stub
index 64267f2737..165aac47d0 100644
--- a/modules/system/console/scaffold/job/job.batched.stub
+++ b/modules/system/console/scaffold/job/job.batched.stub
@@ -12,7 +12,11 @@ use Illuminate\Queue\SerializesModels;
 
 class {{studly_name}} implements ShouldQueue
 {
-    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Batchable;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * Create a new job instance.
diff --git a/modules/system/console/scaffold/job/job.queued.stub b/modules/system/console/scaffold/job/job.queued.stub
index 941db7fa73..e54510a81b 100644
--- a/modules/system/console/scaffold/job/job.queued.stub
+++ b/modules/system/console/scaffold/job/job.queued.stub
@@ -10,7 +10,10 @@ use Illuminate\Queue\SerializesModels;
 
 class {{studly_name}} implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * Create a new job instance.
diff --git a/modules/system/console/scaffold/plugin/plugin.stub b/modules/system/console/scaffold/plugin/plugin.stub
index b15df75f42..6819a474d3 100644
--- a/modules/system/console/scaffold/plugin/plugin.stub
+++ b/modules/system/console/scaffold/plugin/plugin.stub
@@ -2,7 +2,7 @@
 
 namespace {{ plugin_namespace }};
 
-use Backend;
+use Backend\Facades\Backend;
 use Backend\Models\UserRole;
 use System\Classes\PluginBase;
 
@@ -20,7 +20,7 @@ class Plugin extends PluginBase
             'name'        => '{{ plugin_id }}::lang.plugin.name',
             'description' => '{{ plugin_id }}::lang.plugin.description',
             'author'      => '{{ author }}',
-            'icon'        => 'icon-leaf'
+            'icon'        => 'icon-leaf',
         ];
     }
 
@@ -29,7 +29,6 @@ class Plugin extends PluginBase
      */
     public function register(): void
     {
-
     }
 
     /**
@@ -37,7 +36,6 @@ class Plugin extends PluginBase
      */
     public function boot(): void
     {
-
     }
 
     /**
diff --git a/modules/system/console/scaffold/settings/model.stub b/modules/system/console/scaffold/settings/model.stub
index 587f1c2e46..35f19dd14a 100644
--- a/modules/system/console/scaffold/settings/model.stub
+++ b/modules/system/console/scaffold/settings/model.stub
@@ -2,7 +2,7 @@
 
 namespace {{ plugin_namespace }}\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 /**
  * {{name}} Model
diff --git a/modules/system/console/scaffold/test/test.plugin.stub b/modules/system/console/scaffold/test/test.plugin.stub
index 50f2ff537c..1a9083ef8a 100644
--- a/modules/system/console/scaffold/test/test.plugin.stub
+++ b/modules/system/console/scaffold/test/test.plugin.stub
@@ -2,9 +2,9 @@
 
 namespace {{ plugin_namespace }}\Tests\Unit;
 
-use {{ plugin_namespace }}\Plugin;
 use System\Classes\PluginBase;
 use System\Tests\Bootstrap\PluginTestCase;
+use {{ plugin_namespace }}\Plugin;
 
 class PluginTest extends PluginTestCase
 {