diff --git a/css/style.css b/css/style.css
index 5561429..ec76102 100644
--- a/css/style.css
+++ b/css/style.css
@@ -26,20 +26,20 @@ webview {
     -webkit-app-region: drag;
     margin: 0;
     display: flex;
-    background-color: #23272A;
+    background-color: #212226;
     width: 100%;
     height: 3%;
   }
   
 .menu-button-container {
-    background-color: #23272A;
+    background-color: #212226;
     display: flex;
     align-items: center;
     flex-grow: 1;
 }
 
 .status {
-    background-color: #23272A;
+    background-color: #212226;
     color: #FFFFFF;
     display: flex;
     justify-content: center;
@@ -48,7 +48,7 @@ webview {
 }
 
 .window-controls-container {
-    background-color: #23272A;
+    background-color: #212226;
     display: flex;
     justify-content: flex-end;
     align-items: center;
diff --git a/main.js b/main.js
index e8bbd07..d8e4431 100644
--- a/main.js
+++ b/main.js
@@ -73,26 +73,14 @@ app.on('activate', function () {
 let isTalking = false
 let isConnected = false
 
-function muteDelay() {
-  return new Promise((resolve) => {
-    setTimeout(function(){
-      return resolve(true)
-    }, 1300); // big fat push to talk delay .com
-  })
-}
-
 function muteMic() {
   if (isConnected === true) {
     return new Promise((resolve) => {
       if (isTalking === false) {
-        muteDelay().then(val => {
-          if (isTalking === false) {
-            console.log("Muted")
-            mainWindow.webContents.send('ping', 'mic-closed')
-            mainWindow.setTitle("MUTED")
-            return resolve(true)
-          }
-        })
+        console.log("Muted")
+        mainWindow.webContents.send('ping', 'mic-closed')
+        mainWindow.setTitle("MUTED")
+        return resolve(true)
       }
     })
   }
@@ -132,6 +120,8 @@ ioHook.on('mouseup', event => {
 ipcMain.on('asynchronous-message', (event, msg) => {
   if (msg === 'connected') {
     isConnected = true
+    isTalking = false
+    muteMic()
   }
 
   if (msg === 'disconnected') {
@@ -139,6 +129,16 @@ ipcMain.on('asynchronous-message', (event, msg) => {
     isTalking = false
   }
 
+  if (msg === 'self-muted') {
+    console.log("self-muted")
+    isConnected = false
+  }
+
+  if (msg === 'self-unmuted') {
+    console.log("self-unmuted")
+    isConnected = true
+  }
+
   if (msg === 'DOMready') {
       mainWindow.webContents.send('devMode', devMode)
   }
diff --git a/renderer.js b/renderer.js
index 5928eb5..8343f36 100644
--- a/renderer.js
+++ b/renderer.js
@@ -1,5 +1,12 @@
 const { remote, ipcRenderer } = require('electron')
 
+function removeBloat(webview) {
+    webview.executeJavaScript(`
+    document.getElementsByClassName("anchor-3Z-8Bb anchorUnderlineOnHover-2ESHQB")[0].remove();
+    document.getElementsByClassName("contents-18-Yxp button-3AYNKb button-2vd_v_")[0].remove();
+    `)
+}
+
 onload = () => {
     const webview = document.querySelector('webview')
 
@@ -16,7 +23,7 @@ onload = () => {
              }else {
                  console.log("waiting for load")
              }
-         }, 1500);
+         }, 500);
          `)
     });
 
@@ -32,12 +39,59 @@ onload = () => {
             ipcRenderer.send('asynchronous-message', 'disconnected')
         }
 
-        // Execute JS into the webview after login to remove the download button at the bottom of the server list.
+        if (e.message === "muted") {
+            console.log("Self Muted in Discord")
+            ipcRenderer.send('asynchronous-message', 'self-muted')
+        }
+
+        if (e.message === "unmuted") {
+            console.log("Self Muted in Discord")
+            ipcRenderer.send('asynchronous-message', 'self-unmuted')
+        }
+
+        if (e.message === "signalingState => stable, negotiation needed: false") {
+            console.log("Mute/Unmute")
+            removeBloat(webview)
+            webview.executeJavaScript(`
+            if (document.querySelectorAll('[aria-label="Mute"]').length === 0){
+                console.log("muted")
+            }else {
+                console.log("unmuted")
+            }
+            `)
+        }
+
+        if (e.message === "DOM changed") {
+            removeBloat(webview)
+        }
+
+        // Execute JS into the webview after login
+        // Removes download button and help button
         if (e.message === "discord-load-complete") {
             webview.executeJavaScript(`
-                let a = document.getElementsByClassName("listItem-2P_4kh");
-                a[a.length-1].innerHTML = "";
+            document.getElementsByClassName("listItem-2P_4kh")[document.getElementsByClassName("listItem-2P_4kh").length - 1].remove();
+
+            const targetNode = document.getElementsByClassName("scroller-2FKFPG firefoxFixScrollFlex-cnI2ix systemPad-3UxEGl scroller-2TZvBN")[0]
+
+            const config = { attributes: true, childList: true, subtree: true };
+            
+            const callback = function(mutationsList, observer) {
+                for(let mutation of mutationsList) {
+                    if (mutation.type === 'childList') {
+                        console.log('DOM changed');
+                    }
+                    else if (mutation.type === 'attributes') {
+                        console.log('DOM changed');
+                    }
+                }
+            };
+            
+            const observer = new MutationObserver(callback);
+            
+            observer.observe(targetNode, config);   
+
             `)
+            removeBloat(webview)
         }
     })
 
@@ -55,9 +109,9 @@ onload = () => {
             console.log("not talking")
             webview.sendInputEvent({keyCode: 'Backspace', type: 'keyUp'});
             webview.sendInputEvent({keyCode: 'Backspace', type: 'char'});
-            document.getElementById("title-bar-status").style.backgroundColor = "#23272A"
-            document.getElementById("title-bar-controls").style.backgroundColor = "#23272A"
-            document.getElementById("title-bar").style.backgroundColor = "#23272A"
+            document.getElementById("title-bar-status").style.backgroundColor = "#212226"
+            document.getElementById("title-bar-controls").style.backgroundColor = "#212226"
+            document.getElementById("title-bar").style.backgroundColor = "#212226"
 
         }
     })