diff --git a/src/js/api/Client.js b/src/js/api/Client.js
index 116001a..f102fc4 100644
--- a/src/js/api/Client.js
+++ b/src/js/api/Client.js
@@ -1,11 +1,11 @@
 import axios from "axios"
 import { formatDate } from "utils"
 
-const baseURL = subdomain => {
+const baseURL = (subdomain) => {
   if (process.env.NODE_ENV === "production") {
     return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
   } else {
-    return `http://${encodeURIComponent(subdomain)}.mocoapp.localhost:3000/api/browser_extensions`
+    return `https://${encodeURIComponent(subdomain)}.mocoapp.com/api/browser_extensions`
   }
 }
 
@@ -27,7 +27,7 @@ export default class Client {
     })
   }
 
-  login = service =>
+  login = (service) =>
     this.#client.post("session", {
       api_key: this.#apiKey,
       remote_service: service?.name,
@@ -46,7 +46,7 @@ export default class Client {
       params: { date: `${formatDate(fromDate)}:${formatDate(toDate)}` },
     })
 
-  activitiesStatus = service => {
+  activitiesStatus = (service) => {
     if (!service) {
       return Promise.resolve({ data: { hours: 0 } })
     }
@@ -55,7 +55,7 @@ export default class Client {
     })
   }
 
-  createActivity = activity => this.#client.post("activities", { activity })
+  createActivity = (activity) => this.#client.post("activities", { activity })
 
-  stopTimer = timedActivity => this.#client.get(`activities/${timedActivity.id}/stop_timer`)
+  stopTimer = (timedActivity) => this.#client.get(`activities/${timedActivity.id}/stop_timer`)
 }
diff --git a/src/js/remoteServices.js b/src/js/remoteServices.js
index 9ac0b2d..f0ac7c1 100644
--- a/src/js/remoteServices.js
+++ b/src/js/remoteServices.js
@@ -122,18 +122,27 @@ export default {
     allowHostOverride: false,
   },
 
-  wunderlist: {
+  mstodo: {
     name: "wunderlist",
-    host: "https://www.wunderlist.com",
-    urlPatterns: [":host:/(webapp)#/tasks/:id(/*)"],
+    host: "https://to-do.office.com",
+    urlPatterns: [":host:/tasks/id/:id(*)"],
     description: (document) =>
-      document
-        .querySelector(".taskItem.selected .taskItem-titleWrapper-title")
-        ?.textContent?.trim(),
-    projectId: projectIdentifierBySelector(".taskItem.selected .taskItem-titleWrapper-title"),
+      document.querySelector(".detailHeader")?.textContent?.replace(projectRegex, "").trim(),
+    projectId: projectIdentifierBySelector(".detailHeader"),
     allowHostOverride: false,
   },
 
+  gitbase: {
+    name: "gitlab",
+    host: "https://gitbase.de",
+    urlPatterns: [":host:/:owner/:repo/issues/:id"],
+    description: (document) =>
+      document.querySelector("#issue-title")?.textContent?.replace(projectRegex, "").trim(),
+    projectId: projectIdentifierBySelector(".select-project.list a"),
+    allowHostOverride: false,
+  },
+
+  /*
   "gitlab-mr": {
     name: "gitlab",
     host: "https://gitlab.com",
@@ -161,6 +170,7 @@ export default {
     },
     allowHostOverride: true,
   },
+  */
 
   monday: {
     name: "monday",
diff --git a/src/js/utils/messageHandlers.js b/src/js/utils/messageHandlers.js
index d006a83..e6d48de 100644
--- a/src/js/utils/messageHandlers.js
+++ b/src/js/utils/messageHandlers.js
@@ -28,6 +28,8 @@ export function tabUpdated(tab, { messenger, settings }) {
   const service = matcher(tab.url)
   const apiClient = new ApiClient(settings)
 
+  // console.log(service)
+
   if (service?.match?.id) {
     messenger.postMessage(tab, { type: "requestService" })
 
@@ -67,7 +69,7 @@ export function settingsChanged(settings, { messenger }) {
   queryTabs({ currentWindow: true })
     .then(reject(isBrowserTab))
     .then(
-      forEach(tab => {
+      forEach((tab) => {
         messenger.postMessage(tab, { type: "closePopup" })
         tabUpdated(tab, { settings, messenger })
       }),
@@ -75,7 +77,7 @@ export function settingsChanged(settings, { messenger }) {
 }
 
 export function togglePopup(tab, { messenger }) {
-  return function({ isOpen, service } = {}) {
+  return function ({ isOpen, service } = {}) {
     if (isNil(isOpen)) {
       return
     }
diff --git a/webpack.chrome.config.js b/webpack.chrome.config.js
index ad719e8..d97890b 100644
--- a/webpack.chrome.config.js
+++ b/webpack.chrome.config.js
@@ -20,7 +20,7 @@ module.exports = (env) => {
                 ...manifest,
                 permissions: compact([
                   ...manifest.permissions,
-                  env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
+                  env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
                 ]),
                 options_ui: {
                   ...manifest.options_ui,
diff --git a/webpack.firefox.config.js b/webpack.firefox.config.js
index 6b55df9..80a7eb6 100644
--- a/webpack.firefox.config.js
+++ b/webpack.firefox.config.js
@@ -21,7 +21,7 @@ module.exports = (env) => {
                 ...manifest,
                 permissions: compact([
                   ...manifest.permissions,
-                  env.NODE_ENV === "development" ? "http://*.mocoapp.localhost/*" : null,
+                  env.NODE_ENV === "development" ? "https://*.mocoapp.com/*" : null,
                 ]),
                 options_ui: {
                   ...manifest.options_ui,