diff --git a/dist/index.css b/dist/index.css
index 4dc73d45..caa38f92 100644
--- a/dist/index.css
+++ b/dist/index.css
@@ -126,7 +126,6 @@ main {
 }
 [color]:not([color=standard])[selected].fill-color {
   color: var(--primary);
-  background-color: var(--surface);
 }
 [color]:not([color=standard]).subtle-background {
   --luma: var(--subtle-luma);
diff --git a/src/Model/chatModel.ts b/src/Model/chatModel.ts
index 8ba04161..b5e50924 100644
--- a/src/Model/chatModel.ts
+++ b/src/Model/chatModel.ts
@@ -5,6 +5,7 @@ import StorageModel, { storageKeys } from "./storageModel";
 import ChatListModel from "./chatListModel";
 import { Color } from "../ViewModel/colors";
 import ConnectionModel from "./connectionModel";
+import { Message } from "udn-frontend";
 import SettingsModel from "./settingsModel";
 import { checkIsValidObject } from "./Utility/typeSafety";
 import { createTimestamp } from "./Utility/utility";
diff --git a/src/ViewModel/connectionViewModel.tsx b/src/ViewModel/connectionViewModel.tsx
index 7def32ee..4b7868b5 100644
--- a/src/ViewModel/connectionViewModel.tsx
+++ b/src/ViewModel/connectionViewModel.tsx
@@ -45,8 +45,6 @@ export default class ConnectionViewModel {
     }
   };
 
-  messageHandler = (data: Message): void => {};
-
   // methods
   connect = (): void => {
     this.connectToAddress(this.serverAddressInput.value);
@@ -85,6 +83,5 @@ export default class ConnectionViewModel {
     this.updatePreviousAddresses();
 
     connectionModel.setConnectionChangeHandler(this.connectionChangeHandler);
-    connectionModel.setMessageHandler(this.messageHandler);
   }
 }
diff --git a/src/colors.css b/src/colors.css
index 6208e09a..542292f0 100644
--- a/src/colors.css
+++ b/src/colors.css
@@ -56,7 +56,6 @@
 
 [color]:not([color="standard"])[selected].fill-color {
   color: var(--primary);
-  background-color: var(--surface);
 }
 
 /* subtle */