diff --git a/CHANGELOG-nightly.md b/CHANGELOG-nightly.md
index 65e04d92..432b0a20 100644
--- a/CHANGELOG-nightly.md
+++ b/CHANGELOG-nightly.md
@@ -1,3 +1,11 @@
+### 3.1.18
+
+-   Fixed 7TV emotes not showing in Kick chat due to a Kick UI change affecting the username element selector
+
+### 3.1.17
+
+-   Fixed "Hide Bits Buttons" setting not working due to Twitch UI changes
+
 ### 3.1.16.2000
 
 -   Updated Firefox extension URL in onboarding
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1749794a..12cf7133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 3.1.18
+
+-   Fixed 7TV emotes not showing in Kick chat due to a Kick UI change affecting the username element selector
+
+### 3.1.17
+
+-   Fixed "Hide Bits Buttons" setting not working due to Twitch UI changes
+
 ### 3.1.16
 
 -   Fixed emote menu not showing emotes with same name but different casing
diff --git a/src/common/Logger.ts b/src/common/Logger.ts
index c8605aee..857089d4 100644
--- a/src/common/Logger.ts
+++ b/src/common/Logger.ts
@@ -17,6 +17,9 @@ export class Logger {
 	}
 
 	private print(type: LogType, text: string[], extraCSS: string[], objects?: object[]): void {
+		if (import.meta.env.MODE === "production" && (type === "info" || type === "debug")) {
+			return;
+		}
 		if (this.pipe) {
 			this.pipe(type, text, extraCSS, objects);
 			return;
diff --git a/src/site/kick.com/modules/chat/ChatObserver.vue b/src/site/kick.com/modules/chat/ChatObserver.vue
index f0a84686..e0c02631 100644
--- a/src/site/kick.com/modules/chat/ChatObserver.vue
+++ b/src/site/kick.com/modules/chat/ChatObserver.vue
@@ -66,7 +66,7 @@ function patchMessageElement(el: HTMLDivElement & { __seventv?: boolean }, noBuf
 	const entryID = isDefaultReactMessageProps(props) ? props.messageId : props;
 	const userID = props.sender.id.toString();
 	const username = props.sender.username;
-	const usernameEl = el.querySelector<HTMLSpanElement>("div.inline-flex > button[title]")!;
+	const usernameEl = el.querySelector<HTMLSpanElement>("div.inline-flex > button.font-bold")!;
 	const textElements = el.querySelectorAll<HTMLSpanElement>("span.font-normal");
 
 	const bind: ChatMessageBinding = {
diff --git a/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue b/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue
index a9a9eb59..ded235a1 100644
--- a/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue
+++ b/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue
@@ -196,6 +196,7 @@ export const config = [
 }
 
 .seventv-hide-bits-buttons {
+	button[aria-label="Bits and Points Balances"],
 	button[data-a-target="bits-button"],
 	button[data-a-target="top-nav-get-bits-button"] {
 		display: none !important;