diff --git a/src/main.js b/src/main.js
index 8944dba7..bdd53f5a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc21.7',
+	major: 4, minor: 0, revision: 0, extra: '-rc21.8',
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/clickable-mentions.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/clickable-mentions.scss
new file mode 100644
index 00000000..d4d37b81
--- /dev/null
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/clickable-mentions.scss
@@ -0,0 +1,7 @@
+.chat-line__message-mention {
+	cursor: pointer;
+
+	&:hover, &:focus {
+		text-decoration: underline;
+	}
+}
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/square-avatars.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/square-avatars.scss
index 395da169..f13a36d3 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/square-avatars.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/square-avatars.scss
@@ -1,4 +1,7 @@
-.tw-root--theme-dark .tw-avatar .tw-border-radius-rounded,
+.side-nav-card__avatar.tw-border-radius-rounded,
 .tw-avatar .tw-border-radius-rounded {
-	border-radius: 0 !important;
+	.tw-root--theme-dark &,
+	& {
+		border-radius: 0 !important;
+	}
 }
\ No newline at end of file
diff --git a/src/utilities/constants.js b/src/utilities/constants.js
index 0931cccf..d55cf4e5 100644
--- a/src/utilities/constants.js
+++ b/src/utilities/constants.js
@@ -70,7 +70,7 @@ export const REPLACEMENTS = {
 export const WS_CLUSTERS = {
 	Production: [
 		['wss://catbag.frankerfacez.com/', 0.25],
-		['wss://andknuckles.frankerfacez.com/', 1],
+		['wss://andknuckles.frankerfacez.com/', 0.8],
 		['wss://tuturu.frankerfacez.com/', 1],
 		['wss://lilz.frankerfacez.com/', 1],
 		['wss://yoohoo.frankerfacez.com/', 1]