diff --git a/api/services.json b/api/services.json
index e30706d7..bd0237ac 100644
--- a/api/services.json
+++ b/api/services.json
@@ -254,7 +254,7 @@
         "titleBlink": false,
         "custom_domain": true
     },
-        {
+    {
         "id": "facebook",
         "logo": "facebook.png",
         "name": "Facebook",
@@ -503,7 +503,7 @@
         "type": "messaging",
         "allow_popups": false,
         "manual_notifications": false,
-        "js_unread": "function checkUnread(){if(document.querySelectorAll(\".akt .XU\").length>0){let e=0;document.querySelectorAll(\".akt .XU\").forEach(t=>e+=t.innerText&&parseInt(t.innerText)),updateBadge(e)}else updateBadge(document.querySelectorAll(\".SSPGKf.EyyDtb.Q6oXP:not(.oCHqfe) .PIw6Oe.EdWvwd.FVKzAb .SaMfhe.m9MHid\").length||0)}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
+        "js_unread": "function checkUnread(){if(document.querySelectorAll(\".akt .XU\").length>0){let e=0;document.querySelectorAll(\".akt .XU\").forEach(t=>e+=t.innerText&&parseInt(t.innerText)),updateBadge(e)}else updateBadge(document.querySelectorAll(\".SSPGKf.EyyDtb.Q6oXP:not(.oCHqfe) .PIw6Oe.EdWvwd.FVKzAb .SaMfhe.m9MHid\").length||0)}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3),window.trustedTypes&&window.trustedTypes.createPolicy&&window.trustedTypes.createPolicy(\"default\",{createHTML:(e,t)=>e});",
         "userAgent": "",
         "note": "",
         "titleBlink": true,
@@ -638,7 +638,7 @@
         "type": "messaging",
         "allow_popups": false,
         "manual_notifications": true,
-        "js_unread": "",
+        "js_unread": "function checkUnread(){var e=0;\"(\"===document.title[0]&&(e=parseInt(document.title.match(/\\(([^)]+)\\)/)[1])),updateBadge(e)}function updateBadge(e){0<e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
         "userAgent": "",
         "note": "",
         "titleBlink": false,
@@ -968,7 +968,7 @@
         "type": "email",
         "allow_popups": false,
         "manual_notifications": true,
-        "js_unread": "function checkUnread(){const e=document.querySelector(\".ms-FocusZone [role=tree] i[data-icon-name=Inbox]\").parentNode.lastElementChild,n=document.querySelectorAll(\".ms-FocusZone [role=tree]\")[1].children[1].querySelector(\"span span\"),t=e?e.innerText:n?n.innerText:0;updateBadge(parseInt(t,10)||0)}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
+        "js_unread": "function checkUnread(){const e=document.querySelector(\".ms-FocusZone [role=tree] i[data-icon-name=Inbox]\").parentNode.parentNode.lastElementChild,n=document.querySelectorAll(\".ms-FocusZone [role=tree]\")[1].children[1].querySelector(\"span span\"),t=e?e.innerText:n?n.innerText:0;updateBadge(parseInt(t,10)||0)}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
         "userAgent": "",
         "note": "",
         "titleBlink": false,
@@ -983,7 +983,7 @@
         "type": "email",
         "allow_popups": false,
         "manual_notifications": true,
-        "js_unread": "function checkUnread(){var e=null!==document.querySelector(\".ms-FocusZone i[data-icon-name=Inbox]\").parentNode.querySelector(\"span span\")?parseInt(document.querySelector(\".ms-FocusZone i[data-icon-name=Inbox]\").parentNode.querySelector(\"span span\").innerText):0;updateBadge(\"\"===e?0:parseInt(e))}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
+        "js_unread": "function checkUnread(){var e=null!==document.querySelector(\".ms-FocusZone i[data-icon-name=Inbox]\").parentNode.parentNode.querySelector(\"span span\")?parseInt(document.querySelector(\".ms-FocusZone i[data-icon-name=Inbox]\").parentNode.parentNode.querySelector(\"span span\").innerText):0;updateBadge(\"\"===e?0:parseInt(e))}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
         "userAgent": "",
         "note": "Please insert the cloud region you want to use. Can be \"com\", \"de\", etc.",
         "titleBlink": false,
@@ -1343,7 +1343,7 @@
         "type": "messaging",
         "allow_popups": false,
         "manual_notifications": false,
-        "js_unread": "function checkUnread(){var a=0;\"(\"===document.title[0]&&(a=parseInt(document.title.match(/\\(([^)]+)\\)/)[1])),updateBadge(a)}function updateBadge(b){0<b?rambox.setUnreadCount(b):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);Object.defineProperty(navigator.serviceWorker,\"register\",{value:()=>Promise.reject()});",
+        "js_unread": "function checkUnread(){var e=0;\"(\"===document.title[0]&&(e=parseInt(document.title.match(/\\(([^)]+)\\)/)[1])),updateBadge(e)}function updateBadge(e){0<e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3),navigator.serviceWorker.getRegistrations().then(function(e){for(let t of e)t.unregister()});",
         "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36",
         "note": "",
         "titleBlink": false,
@@ -1493,7 +1493,7 @@
         "type": "messaging",
         "allow_popups": false,
         "manual_notifications": false,
-        "js_unread": "function checkUnread(){const e=document.querySelectorAll(\"#pane-side ._23LrM\");let t=0;for(let n=0;n<e.length;n++)0===e[n].parentNode.parentNode.querySelectorAll('#pane-side *[data-icon=\"muted\"]').length&&t++;updateBadge(t)}function updateBadge(e){e&&e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3),(async()=>{try{const e=await window.navigator.serviceWorker.getRegistrations();for(const t of e)t.unregister()}catch(e){}})();var titleEl=document.querySelector(\".landing-title.version-title\");titleEl&&titleEl.innerHTML.includes(\"Google Chrome 60+\")&&window.location.reload(),document.body.scrollTop=0;",
+        "js_unread": "function checkUnread(){const e=document.querySelectorAll(\"#pane-side ._23LrM\");let t=0;for(let n=0;n<e.length;n++)0===e[n].parentNode.parentNode.querySelectorAll('#pane-side *[data-icon=\"muted\"]').length&&0===e[n].parentNode.parentNode.parentNode.querySelectorAll('#pane-side *[data-icon=\"archived\"]').length&&t++;updateBadge(t)}function updateBadge(e){e&&e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3),(async()=>{try{const e=await window.navigator.serviceWorker.getRegistrations();for(const t of e)t.unregister()}catch(e){}})();var titleEl=document.querySelector(\".landing-title.version-title\");titleEl&&titleEl.innerHTML.includes(\"Google Chrome 60+\")&&window.location.reload(),document.body.scrollTop=0;",
         "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36",
         "note": "",
         "titleBlink": false,
@@ -1584,7 +1584,7 @@
         "allow_popups": false,
         "manual_notifications": false,
         "js_unread": "",
-        "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36",
+        "userAgent": "",
         "note": "To enable desktop notifications, you have to go to Options inside Yahoo! Mail.",
         "titleBlink": false,
         "custom_domain": false
@@ -1658,7 +1658,7 @@
         "type": "email",
         "allow_popups": false,
         "manual_notifications": false,
-        "js_unread": "zmail.aInfo[zmail.accId].mailId = \"a\";",
+        "js_unread": "function checkUnread(){var e=document.querySelector(\".zmTreeCount\").innerText;updateBadge(e?parseInt(e):0)}function updateBadge(e){1<=e?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);",
         "userAgent": "",
         "note": "",
         "titleBlink": false,