diff --git a/.discourse-compatibility b/.discourse-compatibility
new file mode 100644
index 00000000..0378769f
--- /dev/null
+++ b/.discourse-compatibility
@@ -0,0 +1,2 @@
+3.1.999: 1e5882a1541b932f9512f6a7d667b333c1708f53
+
diff --git a/about.json b/about.json
index 6e2b289d..26e8229b 100644
--- a/about.json
+++ b/about.json
@@ -4,7 +4,6 @@
   "license_url": null,
   "components": [
     "https://github.com/jordanvidrine/discourse-category-group-boxes.git",
-    "https://github.com/discourse/discourse-loading-slider.git",
     "https://github.com/discourse/discourse-clickable-topic.git",
     "https://github.com/discourse/discourse-search-banner.git"
   ],
diff --git a/common/common.scss b/common/common.scss
index 0eea6d13..aacff850 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -55,6 +55,24 @@
   }
 }
 
+// Ideally the search banner component should be set to use the below-site-header outlet,
+// but this ensures the default works too
+.above-main-container-outlet.search-banner {
+  .custom-search-banner-wrap {
+    padding: 1em 0 2em;
+    color: var(--tertiary);
+    .mobile-view & {
+      color: var(--secondary);
+    }
+    h1 {
+      margin-bottom: 0;
+    }
+    .search-widget {
+      margin-top: 2em;
+    }
+  }
+}
+
 // Main customizations
 .alert {
   margin: 1em 0;
@@ -91,6 +109,10 @@
   }
 }
 
+.discourse-tags {
+  gap: 0.5em;
+}
+
 .discourse-tag {
   font-size: $font-down-1;
   border-radius: 0.25em;
@@ -272,8 +294,8 @@ html body #main-outlet {
   }
 }
 
-.nav-pills > li a.active,
-.nav-pills > li > a {
+.nav-pills:not(.user-nav) > li a.active,
+.nav-pills:not(.user-nav) > li > a {
   border-radius: 0.5em;
 }
 
diff --git a/mobile/mobile.scss b/mobile/mobile.scss
index d149c348..7b9ae344 100644
--- a/mobile/mobile.scss
+++ b/mobile/mobile.scss
@@ -84,7 +84,6 @@ ol.category-breadcrumb {
 
 .topic-list .topic-list-data {
   padding: 1em 1em 0 1em;
-  width: calc(100% - 2em);
   max-width: unset;
 }
 
@@ -113,3 +112,67 @@ ol.category-breadcrumb {
   border-radius: 0.25em;
   margin-top: 1em;
 }
+
+.search-container .search-advanced .search-results {
+  padding: none;
+}
+
+.fps-result {
+  background: var(--secondary);
+  padding: 1em;
+  border-radius: 8px;
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
+  border: 1px solid rgba(var(--primary-rgb), 0.1);
+  margin-bottom: 0.5em;
+}
+
+.search-container .search-header {
+  border-top-right-radius: 8px;
+  border-top-left-radius: 8px;
+}
+
+.search-container .search-advanced .search-info {
+  padding-right: 1em;
+  padding-left: 1em;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+
+.full-width .contents .topic-list .topic-list-header tr {
+  background-color: var(--secondary);
+  border-radius: 8px;
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
+  border: 1px solid rgba(var(--primary-rgb), 0.1);
+  margin-bottom: 1em;
+}
+
+.topic-list .topic-item-stats {
+  flex-wrap: wrap;
+}
+
+.topic-list-item .discourse-tags {
+  order: 3;
+  width: 100%;
+  margin-top: 0.5em;
+}
+
+.full-width .contents .topic-list .topic-list-item .posts-map {
+  padding: 0;
+  .number {
+    margin: 0;
+  }
+}
+
+.full-width
+  .contents
+  .topic-list
+  .topic-list-body
+  .topic-list-item
+  .topic-list-data.posts {
+  width: unset;
+}
+
+.topic-list .topic-list-header .topic-list-data,
+.topic-list .topic-list-item .topic-list-data {
+  padding: 15px;
+}
diff --git a/scss/chat-desktop.scss b/scss/chat-desktop.scss
index 1c6c46b2..ca894bf0 100644
--- a/scss/chat-desktop.scss
+++ b/scss/chat-desktop.scss
@@ -11,6 +11,18 @@ html body.has-sidebar-page.has-full-page-chat {
   border: none !important;
 }
 
+.chat-channel {
+  height: calc(100vh - (var(--header-offset) + 6em));
+}
+
+.chat-composer__wrapper {
+  background: transparent;
+}
+
+.full-page-chat .chat-full-page-header {
+  border-radius: 1em 1em 0 0;
+}
+
 .has-full-page-chat #main-outlet.wrap {
   margin-bottom: 30px;
   padding-bottom: 0px !important;
diff --git a/scss/chat-mobile.scss b/scss/chat-mobile.scss
index 2261801d..c2ed5021 100644
--- a/scss/chat-mobile.scss
+++ b/scss/chat-mobile.scss
@@ -1,14 +1,5 @@
-html body.has-full-page-chat #main-outlet.wrap {
+html body.has-full-page-chat #main-outlet {
   width: 100% !important;
   padding: 0 !important;
   background-color: var(--secondary) !important;
 }
-
-html body.chat-enabled #main-outlet {
-  width: 100% !important;
-  padding: 0 !important;
-  background-color: var(--secondary) !important;
-  .chat-channels {
-    height: var(--full-page-chat-height);
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index 462cc800..08c5e861 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1694,9 +1694,9 @@ safe-buffer@~5.2.0:
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 semver@^6.1.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -1881,9 +1881,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 workerpool@^6.1.5:
   version "6.2.1"