diff --git a/Serenity b/Serenity
index 193a522d..902ff173 160000
--- a/Serenity
+++ b/Serenity
@@ -1 +1 @@
-Subproject commit 193a522da8221b90a476ca7ebe070f00e1c8485a
+Subproject commit 902ff17378f0ed005efd2f29401602c290e496ff
diff --git a/common-features b/common-features
index d2781082..314f1751 160000
--- a/common-features
+++ b/common-features
@@ -1 +1 @@
-Subproject commit d27810827322ad2374ae6bd5815f764a11e125e7
+Subproject commit 314f17512795746997250403e68a7c02e45a8c99
diff --git a/src/Serene.Web/Modules/Common/ScriptInit.ts b/src/Serene.Web/Modules/Common/ScriptInit.ts
index a2ec2d21..667d14eb 100644
--- a/src/Serene.Web/Modules/Common/ScriptInit.ts
+++ b/src/Serene.Web/Modules/Common/ScriptInit.ts
@@ -6,7 +6,6 @@ Config.rootNamespaces.push('Serene');
 EntityDialog.defaultLanguageList = siteLanguageList;
 HtmlContentEditor.CKEditorBasePath = "~/Serenity.Assets/Scripts/ckeditor/";
 gridDefaults.useCssVars = false;
-gridDefaults.useLegacyUI = true;
 
 let $ = getjQuery();
 if ($?.fn?.colorbox) {
diff --git a/src/Serene.Web/Modules/Membership/Account/Login/LoginPage.cshtml b/src/Serene.Web/Modules/Membership/Account/Login/LoginPage.cshtml
index ddb54be8..37119c43 100644
--- a/src/Serene.Web/Modules/Membership/Account/Login/LoginPage.cshtml
+++ b/src/Serene.Web/Modules/Membership/Account/Login/LoginPage.cshtml
@@ -20,7 +20,7 @@
 }
 
 <div class="s-full-page justify-content-center">
-    <div id="LoginPanel" class="s-container-tight s-Form flex-layout">
+    <div id="LoginPanel" class="s-container-tight">
 
     </div>
 </div>
diff --git a/src/Serene.Web/Modules/Membership/Account/SignUp/SignUpPage.cshtml b/src/Serene.Web/Modules/Membership/Account/SignUp/SignUpPage.cshtml
index fe9592c7..08ee32fb 100644
--- a/src/Serene.Web/Modules/Membership/Account/SignUp/SignUpPage.cshtml
+++ b/src/Serene.Web/Modules/Membership/Account/SignUp/SignUpPage.cshtml
@@ -6,7 +6,7 @@ Layout = MVC.Views.Shared._LayoutNoNavigation;
 }
 
 <div class="s-full-page justify-content-center">
-    <div id="SignUpPanel" class="s-container-narrow s-Form flex-layout">
+    <div id="SignUpPanel" class="s-container-narrow">
     </div>
 </div>
 
diff --git a/src/Serene.Web/appsettings.bundles.json b/src/Serene.Web/appsettings.bundles.json
index 0a3d189d..227b05db 100644
--- a/src/Serene.Web/appsettings.bundles.json
+++ b/src/Serene.Web/appsettings.bundles.json
@@ -5,9 +5,7 @@
         "~/Serenity.Assets/fonts/open-sans/open-sans.css",
         "~/Serenity.Assets/bootstrap/css/bootstrap.css",
         "~/Serenity.Assets/line-awesome/css/line-awesome-fa.min.css",
-        "~/Serenity.Assets/Content/css/select2.css",
         "~/Serenity.Assets/Content/toastr.css",
-        "~/Serenity.Assets/Content/slick.grid.css",
         "~/Serenity.Assets/nprogress/nprogress.css",
         "~/Serenity.Extensions/common-style.css",
         "~/Serenity.Extensions/index.css"
@@ -39,8 +37,8 @@
         "~/Serenity.Assets/Scripts/sortable.js",
         "~/Serenity.Assets/preact/preact.umd.js",
         "~/Serenity.Assets/mousetrap/mousetrap.js",
-        "~/Serenity.Extensions/common-theme.js",
         "~/Serenity.Corelib/index.global.js",
+        "~/Serenity.Extensions/common-theme.js",
         "~/Serenity.Extensions/index.js",
         "dynamic://ColumnAndFormBundle"
       ],
diff --git a/src/Serene.Web/wwwroot/Content/site/site.css b/src/Serene.Web/wwwroot/Content/site/site.css
index bdc783d7..a88da6f1 100644
--- a/src/Serene.Web/wwwroot/Content/site/site.css
+++ b/src/Serene.Web/wwwroot/Content/site/site.css
@@ -46,40 +46,3 @@
 .s-UserRoleDialog .ui-dialog-content {
   padding: 8px;
 }
-.s-PermissionCheckEditor .check-box {
-  background-image: url(../serenity/images/tick-empty.png);
-  background-position: center center;
-  width: 22px;
-  height: 22px;
-  margin: 0;
-}
-.s-PermissionCheckEditor .check-box.checked {
-  background-image: url(../serenity/images/tick-green.png);
-  background-position: center center;
-}
-.s-PermissionCheckEditor .check-box.checked.revoke {
-  background-image: url(../serenity/images/tick-red.png);
-  background-position: center center;
-}
-.s-PermissionCheckEditor .check-box.partial {
-  opacity: 0.8;
-}
-.s-PermissionCheckEditor .check-box.checked.partial {
-  background-image: url(images/tick-green-partial.png);
-}
-.s-PermissionCheckEditor .check-box.checked.revoke.partial {
-  background-image: url(images/tick-red-partial.png);
-}
-.s-PermissionCheckEditor .effective-permission {
-  cursor: default;
-  padding-left: 22px;
-  background-image: url(../serenity/images/check2.png);
-  background-repeat: no-repeat;
-  background-position: left center;
-}
-.s-PermissionCheckEditor .effective-permission.partial {
-  background-image: url(../serenity/images/checkbox-null.png);
-}
-.s-PermissionCheckEditor .effective-permission.deny {
-  background-image: url(../serenity/images/slash.png);
-}
\ No newline at end of file