diff --git a/server/model/monitor.js b/server/model/monitor.js
index 6c19f40..c8661cf 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -32,7 +32,7 @@ class Monitor extends BeanModel {
             notificationIDList[bean.notification_id] = true;
         }
 
-        const tags = await R.getAll("SELECT * FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [this.id]);
+        const tags = await R.getAll("SELECT mt.*, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [this.id]);
 
         return {
             id: this.id,
diff --git a/server/server.js b/server/server.js
index fc79d7e..245b34f 100644
--- a/server/server.js
+++ b/server/server.js
@@ -471,6 +471,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
 
                 let bean = R.dispense("tag")
                 bean.name = tag.name
+                bean.color = tag.color
                 await R.store(bean)
 
                 callback({
@@ -492,6 +493,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
 
                 let bean = await R.findOne("monitor", " id = ? ", [ tag.id ])
                 bean.name = tag.name
+                bean.color = tag.color
                 await R.store(bean)
 
                 callback({
@@ -581,6 +583,9 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
                     monitorID,
                 ])
 
+                // Cleanup unused Tags
+                await R.exec("delete from tag where ( select count(*) from monitor_tag mt where tag.id = mt.tag_id ) = 0");
+
                 callback({
                     ok: true,
                     msg: "Deleted Successfully.",
diff --git a/src/components/TagsManager.vue b/src/components/TagsManager.vue
index 3609293..9474a08 100644
--- a/src/components/TagsManager.vue
+++ b/src/components/TagsManager.vue
@@ -6,7 +6,7 @@
                 v-for="item in selectedTags"
                 :key="item.id"
                 :item="item"
-                :remove="removeTag"
+                :remove="deleteTag"
             />
         </div>
         <div>
@@ -79,9 +79,10 @@
             <input v-model="newDraftTag.value" class="form-control mb-2" :placeholder="$t('value (optional)')" />
             <div class="mb-2">
                 <button
+                    type="button"
                     class="btn btn-secondary float-end"
                     :disabled="processing || newDraftTag.invalid"
-                    @click="addDraftTag"
+                    @click.stop="addDraftTag"
                 >
                     {{ $t("Add") }}
                 </button>
@@ -93,6 +94,8 @@
 <script>
 import VueMultiselect from "vue-multiselect";
 import Tag from "../components/Tag.vue";
+import { useToast } from "vue-toastification"
+const toast = useToast()
 
 export default {
     components: {
@@ -113,7 +116,7 @@ export default {
         return {
             processing: false,
             newTags: [],
-            removeTags: [],
+            deleteTags: [],
             newDraftTag: {
                 name: null,
                 select: null,
@@ -129,7 +132,7 @@ export default {
             return this.tags;
         },
         selectedTags() {
-            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.removeTags.includes(tag.id));
+            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.id == tag.id));
         },
         colorOptions() {
             return [
@@ -167,13 +170,13 @@ export default {
         },
     },
     methods: {
-        removeTag(item) {
+        deleteTag(item) {
             if (item.new) {
                 // Undo Adding a new Tag
                 this.newTags = this.newTags.filter(tag => tag.name != item.name && tag.value != item.value);
             } else {
                 // Remove an Existing Tag
-                this.removeTags.push(item);
+                this.deleteTags.push(item);
             }
         },
         validateDraftTag() {
@@ -221,6 +224,79 @@ export default {
                     new: true,
                 })
             }
+        },
+        addTagAsync(newTag) {
+            return new Promise((resolve) => {
+                this.$root.getSocket().emit("addTag", newTag, resolve);
+            });
+        },
+        addMonitorTagAsync(tagId, monitorId, value) {
+            return new Promise((resolve) => {
+                this.$root.getSocket().emit("addMonitorTag", tagId, monitorId, value, resolve);
+            });
+        },
+        deleteMonitorTagAsync(tagId, monitorId) {
+            return new Promise((resolve) => {
+                this.$root.getSocket().emit("deleteMonitorTag", tagId, monitorId, resolve);
+            });
+        },
+        async submit(monitorId) {
+            console.log(`Submitting tag changes for monitor ${monitorId}...`);
+            this.processing = true;
+
+            for (const newTag of this.newTags) {
+                let tagId;
+                if (newTag.id == null) {
+                    let newTagResult;
+                    await this.addTagAsync(newTag).then((res) => {
+                        if (!res.ok) {
+                            toast.error(res.msg);
+                            newTagResult = false;
+                        }
+                        newTagResult = res.tag;
+                    });
+                    if (!newTagResult) {
+                        // abort
+                        this.processing = false;
+                        return;
+                    }
+                    tagId = newTagResult.id;
+                } else {
+                    tagId = newTag.id;
+                }
+
+                let newMonitorTagResult;
+                await this.addMonitorTagAsync(tagId, monitorId, newTag.value).then((res) => {
+                    if (!res.ok) {
+                        toast.error(res.msg);
+                        newMonitorTagResult = false;
+                    }
+                    newMonitorTagResult = true;
+                });
+                if (!newMonitorTagResult) {
+                    // abort
+                    this.processing = false;
+                    return;
+                }
+            }
+
+            for (const deleteTag of this.deleteTags) {
+                let deleteMonitorTagResult;
+                await this.deleteMonitorTagAsync(deleteTag.tag_id, deleteTag.monitor_id).then((res) => {
+                    if (!res.ok) {
+                        toast.error(res.msg);
+                        deleteMonitorTagResult = false;
+                    }
+                    deleteMonitorTagResult = true;
+                });
+                if (!deleteMonitorTagResult) {
+                    // abort
+                    this.processing = false;
+                    return;
+                }
+            }
+
+            this.processing = false;
         }
     },
 };
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 2e7c5c6..2be7d9e 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -159,7 +159,7 @@
                             </template>
 
                             <div class="my-3">
-                                <tags-manager :pre-selected-tags="monitor.tags" :tags="tags"></tags-manager>
+                                <tags-manager ref="tagsManager" :pre-selected-tags="monitor.tags" :tags="tags"></tags-manager>
                             </div>
 
                             <div class="mt-5 mb-1">
@@ -332,6 +332,8 @@ export default {
                     this.processing = false;
 
                     if (res.ok) {
+                        this.$refs.tagsManager.submit(res.monitorID);
+
                         toast.success(res.msg);
                         this.$router.push("/dashboard/" + res.monitorID)
                     } else {
@@ -340,6 +342,8 @@ export default {
 
                 })
             } else {
+                this.$refs.tagsManager.submit(this.monitor.id);
+
                 this.$root.getSocket().emit("editMonitor", this.monitor, (res) => {
                     this.processing = false;
                     this.$root.toastRes(res)