diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8204667..92a907c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,20 @@ Releases prior to v2.0.1 are only documented on
 the [GitHub Release Page](https://github.com/rwth-acis/RequirementsBazaar-WebFrontend/releases)
 
 ## [Unreleased]
+
+## [2.6.1] - 2023-06-13
+
+### Added
+
+- Make priority labels customizable
+  [#282](https://github.com/rwth-acis/RequirementsBazaar-WebFrontend/pull/282)
+
+### Changed
+
+- Changed export dialog to choose if labels are exported
+  [commit 0c5c6b1f493ed7af2ea3c77a0c82673a2dcd0995](https://github.com/rwth-acis/RequirementsBazaar-WebFrontend/commit/0c5c6b1f493ed7af2ea3c77a0c82673a2dcd0995)
+
+
 ## [2.6.0] - 2023-05-10
 
 ### Added
diff --git a/package.json b/package.json
index 788e913..8f53e55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reqbaz",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "scripts": {
     "dev": "vite --port 3000",
     "dev-local-api": "vite --mode dev-local-api --port 3000",
diff --git a/src/components/ExportPopup.vue b/src/components/ExportPopup.vue
index 8a02ef5..f03beed 100644
--- a/src/components/ExportPopup.vue
+++ b/src/components/ExportPopup.vue
@@ -6,6 +6,8 @@
     </div>
     <label for="fileType">{{ t('fileType') }}</label>
     <Dropdown id="fileType" v-model="selectedFileType" :options="fileTypes" optionLabel="name" :required="true" />
+    <label for="tagHead">{{ t('tagHeader') }}</label>
+    <InputSwitch inputId="tagHead" v-model="checked" />
     <div class="footer">
       <Button :label="t('cancel')" @click="cancel" class="p-button-outlined p-ml-2 p-mr-2" />
       <Button :label="t('exportBtn')" @click="handleSubmit" />
@@ -20,405 +22,346 @@ import { useI18n } from 'vue-i18n';
 import Dropdown from 'primevue/dropdown';
 import * as pdfmake from 'pdfmake/build/pdfmake';
 import * as pdfFonts from 'pdfmake/build/vfs_fonts';
+import InputSwitch from 'primevue/inputswitch';
 
 export default defineComponent({
-  name: 'ExportPopup',
-  props: {
-    realizedRequirements: {
-      type: Array,
-      required: false,
-    },
-    activeRequirements: {
-      type: Array,
-      required: false,
-    },
-    id: {
-      type: Number,
-      required: true,
-    },
-    categoryName: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    isCategory: {
-      type: Boolean,
-      required: false,
-      default: true,
+    name: "ExportPopup",
+    props: {
+        realizedRequirements: {
+            type: Array,
+            required: false,
+        },
+        activeRequirements: {
+            type: Array,
+            required: false,
+        },
+        id: {
+            type: Number,
+            required: true,
+        },
+        categoryName: {
+            type: String,
+            required: false,
+            default: "",
+        },
+        isCategory: {
+            type: Boolean,
+            required: false,
+            default: true,
+        },
+        onCancel: Function as PropType<(x: string) => void>,
+        onSave: Function as PropType<(x: string) => void>, /* workaround for typing custom events */
     },
-    onCancel: Function as PropType<(x: string) => void>, /* workaround for typing custom events */
-    onSave: Function as PropType<(x: string) => void>, /* workaround for typing custom events */
-  },
-  emits: ['cancel', 'save'],
-  setup: ({ id, categoryName, realizedRequirements, activeRequirements, isCategory }, { emit }) => {
-    const { t } = useI18n({ useScope: 'global' });
-    const selectedReqType = ref({ name: t('exportRequirementsAll'), code: 'ALL' });
-    const submitted = ref(false);
-    const realized = realizedRequirements as Array<Requirement>
-    const active = activeRequirements as Array<Requirement>
-
-    const reqTypes = ref([
-      { name: t('exportRequirementsAll'), code: 'ALL' },
-      { name: t('exportRequirementsActive'), code: 'ACTIVE' },
-      { name: t('exportRequirementsCompleted'), code: 'COMPLETE' }
-    ]);
-
-    const selectedFileType = ref({ name: t('exportRequirementsPdf'), code: 'PDF' });
-    const fileTypes = ref([
-      { name: t('exportRequirementsPdf'), code: 'PDF' },
-      { name: t('exportRequirementsTex'), code: 'TEX' }
-    ]);
-
-    const cancel = () => {
-      emit('cancel');
-    }
-
-    const handleSubmit = () => {
-      submitted.value = true;
-      let chosenType = selectedReqType.value.code;
-      let chosenFileType = selectedFileType.value.code;
-
-      if (chosenFileType == "PDF") {
-        handlePdf(chosenType);
-      } else {
-        handleTex(chosenType);
-      }
-      emit('save');
-    }
-
-    function handlePdf(chosenType: string) {
-      if (isCategory) {
-        switch (chosenType) {
-          case "ALL":
-            exportRequirementsPdf(true, true);
-            break;
-          case "ACTIVE":
-            exportRequirementsPdf(false, false);
-            break;
-          case "COMPLETE":
-            exportRequirementsPdf(true, false);
-            break;
-        }
-      } else {
-        exportRequirementsPdf(false, false);
-      }
-    }
-
-    function handleTex(chosenType: string) {
-      if (isCategory) {
-        switch (chosenType) {
-          case "ALL":
-            exportRequirementsTex(true, true);
-            break;
-          case "ACTIVE":
-            exportRequirementsTex(false, false);
-            break;
-          case "COMPLETE":
-            exportRequirementsTex(true, false);
-            break;
-        }
-      } else {
-        exportRequirementsTex(false, false);
-      }
-    }
-
-    const exportRequirementsTex = (isCompleted: boolean, all: boolean) => {
-      console.log('Export TeX started...');
-      let key = isCategory ? 'headerExportCatActive' : "headerExportRequirement";
-      let fileName = isCategory ? "active_requirements" + "_" + id + ".tex" : "requirement" + "_" + id + ".tex";
-      let reqList = active;
-      if (all) {
-        key = 'headerExportCatAll';
-        fileName = "requirements" + "_" + id + ".tex";
-        reqList = realized.concat(active);
-      } else {
-        if (isCompleted) {
-          key = 'headerExportCatComplete';
-          fileName = "completed_requirements" + "_" + id + ".tex";
-          reqList = realized;
-        }
-      }
-      const texString = getTexString(reqList, key);
-      downloadTex(texString, fileName);
-      console.log('Export TeX finished');
-    }
-
-    function getTexString(reqList: Requirement[], key: string){
-            // create seperated lists for tags
-            const must = getMustRequirements(reqList);
-      const should = getShouldRequirements(reqList);
-      const could = getCouldRequirements(reqList);
-      const uncat = getUncatRequirements(reqList);
-      // strings for the latex Itemize
-      const header = '\\subsection*\{'+t(key) + " " + categoryName+'\}';
-      const beginItemize = '\n\\begin{itemize}\n';
-      const endItemize = '\n\\end{itemize}';
-
-      // bodys of the latex itemize
-      let texString = header
-
-      if(uncat.length != 0){
-        var bodyUncat = '';
-        for (let i = 0; i < uncat.length; i++) {
-          let name = makeTexCompatible(uncat[i].name, true)
-          let description = makeTexCompatible(uncat[i].description, false);
-          bodyUncat += '\t\\item \\textbf\{' + name + ':\} ' + description + '\n';
-        }
-        texString += beginItemize + bodyUncat + endItemize;
-      }
-      if(must.length!= 0){
-        var bodyMust = '';
-        for (let i = 0; i < must.length; i++) {
-          let name = makeTexCompatible(must[i].name, true)
-          let description = makeTexCompatible(must[i].description, false);
-          bodyMust += '\t\\item \\textbf\{' + name + ':\} ' + description + '\n';
-        }
-        texString += '\\paragraph\{Must:\}'+ beginItemize + bodyMust + endItemize;
-      }
-      if(should.length !=0){
-        var bodyShould = '';
-        for (let i = 0; i < should.length; i++) {
-          let name = makeTexCompatible(should[i].name, true)
-          let description = makeTexCompatible(should[i].description, false);
-          bodyShould += '\t\\item \\textbf\{' + name + ':\} ' + description + '\n';
+    emits: ["cancel", "save"],
+    setup: ({ id, categoryName, realizedRequirements, activeRequirements, isCategory }, { emit }) => {
+        const { t } = useI18n({ useScope: "global" });
+        const selectedReqType = ref({ name: t("exportRequirementsAll"), code: "ALL" });
+        const submitted = ref(false);
+        const checked = ref(false);
+        const realized = realizedRequirements as Array<Requirement>;
+        const active = activeRequirements as Array<Requirement>;
+        const reqTypes = ref([
+            { name: t("exportRequirementsAll"), code: "ALL" },
+            { name: t("exportRequirementsActive"), code: "ACTIVE" },
+            { name: t("exportRequirementsCompleted"), code: "COMPLETE" }
+        ]);
+        const selectedFileType = ref({ name: t("exportRequirementsPdf"), code: "PDF" });
+        const fileTypes = ref([
+            { name: t("exportRequirementsPdf"), code: "PDF" },
+            { name: t("exportRequirementsTex"), code: "TEX" }
+        ]);
+        const cancel = () => {
+            emit("cancel");
+        };
+        const handleSubmit = () => {
+            submitted.value = true;
+            let chosenType = selectedReqType.value.code;
+            let chosenFileType = selectedFileType.value.code;
+            if (chosenFileType == "PDF") {
+                handlePdf(chosenType, checked.value);
+            }
+            else {
+                handleTex(chosenType, checked.value);
+            }
+            emit("save");
+        };
+        function handlePdf(chosenType: string, isTagged: boolean) {
+            if (isCategory) {
+                switch (chosenType) {
+                    case "ALL":
+                        exportRequirementsPdf(true, true, isTagged);
+                        break;
+                    case "ACTIVE":
+                        exportRequirementsPdf(false, false, isTagged);
+                        break;
+                    case "COMPLETE":
+                        exportRequirementsPdf(true, false, isTagged);
+                        break;
+                }
+            }
+            else {
+                exportRequirementsPdf(false, false, isTagged);
+            }
         }
-        texString += '\\paragraph\{Should:\}'+ beginItemize + bodyShould + endItemize;
-      }
-      if(could.length!=0){
-        var bodyCould = '';
-        for (let i = 0; i < could.length; i++) {
-          let name = makeTexCompatible(could[i].name, true)
-          let description = makeTexCompatible(could[i].description, false);
-          bodyCould += '\t\\item \\textbf\{' + name + ':\} ' + description + '\n';
+        function handleTex(chosenType: string, isTagged:boolean) {
+            if (isCategory) {
+                switch (chosenType) {
+                    case "ALL":
+                        exportRequirementsTex(true, true,isTagged);
+                        break;
+                    case "ACTIVE":
+                        exportRequirementsTex(false, false,isTagged);
+                        break;
+                    case "COMPLETE":
+                        exportRequirementsTex(true, false,isTagged);
+                        break;
+                }
+            }
+            else {
+                exportRequirementsTex(false, false,isTagged);
+            }
         }
-        texString += '\\paragraph\{Could:\}'+ beginItemize + bodyCould + endItemize;
-      }
-      return texString;
-    }
-
-    function makeTexCompatible(text: string, name: boolean) {
-      text = text.split('\\\\').join('\\textbackslash ');
-      if (name) {
-        text = text.split('\\').join('\\textbackslash ');
-      }
-      text = text.split('{').join('\\{');
-      text = text.split('}').join('\\}');
-      text = text.split('<').join('\\textless');
-      text = text.split('>').join('\\textgreater');
-      text = text.split('%').join('\\%');
-      text = text.split('$').join('\\$');
-      text = text.split('&').join('\\&');
-      text = text.split('#').join('\\#');
-      text = text.split('|').join('\\textbar');
-      text = text.split('–').join('\\textendash');
-      text = text.split('¿').join('\\textquestiondown');
-      return text
-    }
-
-    function downloadTex(texString: string, fileName: string) {
-      let content = new Blob([texString], { type: 'text/plain' });
-      let saveFile = new File([content], fileName);
-
-      const objUrl = URL.createObjectURL(saveFile);
-      const atag = document.createElement('a');
-
-      atag.setAttribute('href', objUrl);
-      atag.setAttribute('download', fileName);
-      atag.click();
-    }
+        const exportRequirementsTex = (isCompleted: boolean, all: boolean, isTagged: boolean) => {
+            console.log("Export TeX started...");
+            let key = isCategory ? "headerExportCatActive" : "headerExportRequirement";
+            let fileName = isCategory ? "active_requirements" + "_" + id + ".tex" : "requirement" + "_" + id + ".tex";
+            let reqList = active;
+            if (all) {
+                key = "headerExportCatAll";
+                fileName = "requirements" + "_" + id + ".tex";
+                reqList = realized.concat(active);
+            }
+            else {
+                if (isCompleted) {
+                    key = "headerExportCatComplete";
+                    fileName = "completed_requirements" + "_" + id + ".tex";
+                    reqList = realized;
+                }
+            }
+            const texString = getTexString(reqList, key, isTagged);
+            downloadTex(texString, fileName);
+            console.log("Export TeX finished");
+        };
+        function getTexString(reqList: Requirement[], key: string, isTagged: boolean) {
+            // create map filtered by tags
+            var tagged: Map<string, Requirement[]>;
+            var uncat: Requirement[];
+            if(isTagged){
+              tagged = getFilteredTagRequirements(reqList);
+              uncat = getUncatRequirements(reqList);
+            } else {
+              tagged = new Map([]);;
+              uncat = reqList;
+            }
 
-    function getMustRequirements(reqs: Array<Requirement>) {
-      var must: Requirement[] = [];
-      reqs.forEach((req: Requirement) => {
-        if (req.tags && req.tags.length != 0) {
-          if (req.tags[0].name == 'Must') {
-            must.push(req);
-          }
+            // strings for the latex Itemize
+            const header = "\\subsection*{" + t(key) + " " + categoryName + "}";
+            const beginItemize = "\n\\begin{itemize}\n";
+            const endItemize = "\n\\end{itemize}";
+            // bodys of the latex itemize
+            let texString = header;
+            if (uncat.length != 0) {
+                var bodyUncat = "";
+                for (let i = 0; i < uncat.length; i++) {
+                    let name = makeTexCompatible(uncat[i].name, true);
+                    let description = makeTexCompatible(uncat[i].description, false);
+                    bodyUncat += "\t\\item \\textbf{" + name + ":} " + description + "\n";
+                }
+                texString += beginItemize + bodyUncat + endItemize;
+            }
+            tagged.forEach((reqs: Requirement[], key: string) => {
+                var bod = "";
+                for (let i = 0; i < reqs.length; i++) {
+                    let name = makeTexCompatible(reqs[i].name, true);
+                    let description = makeTexCompatible(reqs[i].description, false);
+                    bod += "\t\\item \\textbf{" + name + ":} " + description + "\n";
+                }
+                texString += "\\paragraph{" + key + ":}" + beginItemize + bod + endItemize;
+            });
+            return texString;
         }
-      });
-      return must;
-    }
-
-    function getShouldRequirements(reqs: Array<Requirement>) {
-      var should: Requirement[] = [];
-      reqs.forEach((req: Requirement) => {
-        if (req.tags && req.tags.length != 0) {
-          if (req.tags[0].name == 'Should') {
-            should.push(req);
-          }
+        function makeTexCompatible(text: string, name: boolean) {
+            text = text.split("\\\\").join("\\textbackslash ");
+            if (name) {
+                text = text.split("\\").join("\\textbackslash ");
+            }
+            text = text.split("{").join("\\{");
+            text = text.split("}").join("\\}");
+            text = text.split("<").join("\\textless");
+            text = text.split(">").join("\\textgreater");
+            text = text.split("%").join("\\%");
+            text = text.split("$").join("\\$");
+            text = text.split("&").join("\\&");
+            text = text.split("#").join("\\#");
+            text = text.split("|").join("\\textbar");
+            text = text.split("–").join("\\textendash");
+            text = text.split("¿").join("\\textquestiondown");
+            return text;
         }
-      });
-      return should;
-    }
-
-    function getCouldRequirements(reqs: Array<Requirement>) {
-      var could: Requirement[] = [];
-      reqs.forEach((req: Requirement) => {
-        if (req.tags && req.tags.length != 0) {
-          if (req.tags[0].name == 'Could') {
-            could.push(req);
-          }
+        function downloadTex(texString: string, fileName: string) {
+            let content = new Blob([texString], { type: "text/plain" });
+            let saveFile = new File([content], fileName);
+            const objUrl = URL.createObjectURL(saveFile);
+            const atag = document.createElement("a");
+            atag.setAttribute("href", objUrl);
+            atag.setAttribute("download", fileName);
+            atag.click();
         }
-      });
-      return could;
-    }
-
-    function getUncatRequirements(reqs: Array<Requirement>) {
-      var uncat: Requirement[] = [];
-      reqs.forEach((req: Requirement) => {
-        if (!req.tags || req.tags.length == 0) {
-          uncat.push(req);
+        function getFilteredTagRequirements(reqs: Array<Requirement>) {
+            var filtered = new Map<string, Requirement[]>();
+            reqs.forEach((req: Requirement) => {
+                if (req.tags && req.tags.length != 0) {
+                    if (filtered.has(req.tags[0].name)) {
+                        let reqList = filtered.get(req.tags[0].name);
+                        reqList?.push(req);
+                        filtered.set(req.tags[0].name, reqList!);
+                    }
+                    else {
+                        filtered.set(req.tags[0].name, [req]);
+                    }
+                }
+            });
+            return filtered;
         }
-      });
-      return uncat;
-    }
-
-    const exportRequirementsPdf = (isCompleted: boolean, all: boolean) => {
-      console.log('Export PDF started...');
-      let bodMust = [[{ text: t('formTitle'), bold: true }, { text: t('formDesc'), bold: true }]];
-      let bodShould = [[{ text: t('formTitle'), bold: true }, { text: t('formDesc'), bold: true }]];
-      let bodCould = [[{ text: t('formTitle'), bold: true }, { text: t('formDesc'), bold: true }]];
-      let bodUncat = [[{ text: t('formTitle'), bold: true }, { text: t('formDesc'), bold: true }]];
-
-      let header = isCategory ? { text: t('headerExportCatActive') + " " + categoryName + ":\n\n", style: 'header' } :
-        { text: t('headerExportRequirement') + " " + categoryName + ":\n\n", style: 'header' };
-      let fileName = isCategory ? "active_requirements" + "_" + id + ".pdf" : "requirement" + "_" + id + ".pdf";
-      let reqList = active;
-      if (all) {
-        header = { text: t('headerExportCatAll') + " " + categoryName + ":\n\n", style: 'header' };
-        fileName = "requirements" + "_" + id + ".pdf";
-        reqList = realized.concat(active);
-      } else {
-        if (isCompleted) {
-          header = { text: t('headerExportCatComplete') + " " + categoryName + ":\n\n", style: 'header' };
-          fileName = "completed_requirements" + "_" + id + ".pdf";
-          reqList = realized;
+        function getUncatRequirements(reqs: Array<Requirement>) {
+            var uncat: Requirement[] = [];
+            reqs.forEach((req: Requirement) => {
+                if (!req.tags || req.tags.length == 0) {
+                    uncat.push(req);
+                }
+            });
+            return uncat;
         }
-      }
-
-      // create seperated lists for tags
-      const must = getMustRequirements(reqList);
-      const should = getShouldRequirements(reqList);
-      const could = getCouldRequirements(reqList);
-      const uncat = getUncatRequirements(reqList);
-      const mustHeader = must.length!= 0? { text: 'Must:', fontSize: 14, bold: true, margin: [0, 10, 0, 5]}: undefined;
-      const shouldHeader = should.length!=0? { text: 'Should:', fontSize: 14, bold: true, margin: [0, 10, 0, 5] }: undefined;
-      const couldHeader = could.length!=0? { text: 'Could:', fontSize: 14, bold: true, margin: [0, 10, 0, 5] }: undefined;
-
-      must.forEach((req: Requirement) => {
-        bodMust.push([{ text: req.name.split('\\\\').join('\\'), bold: false },
-        { text: req.description.split('\\\\').join('\\'), bold: false }]);
-      })
-      should.forEach((req: Requirement) => {
-        bodShould.push([{ text: req.name.split('\\\\').join('\\'), bold: false },
-        { text: req.description.split('\\\\').join('\\'), bold: false }]);
-      })
-      could.forEach((req: Requirement) => {
-        bodCould.push([{ text: req.name.split('\\\\').join('\\'), bold: false },
-        { text: req.description.split('\\\\').join('\\'), bold: false }]);
-      })
-      uncat.forEach((req: Requirement) => {
-        bodUncat.push([{ text: req.name.split('\\\\').join('\\'), bold: false },
-        { text: req.description.split('\\\\').join('\\'), bold: false }]);
-      })
-
-      const docDefinition = {
-        content: [
-          header, uncat.length !=0?
-          {
-            layout: {
-              hLineColor: function (i, node) {
-                return (i === 0 || i === node.table.body.length || i == 1) ? 'black' : 'gray';
-              },
-              vLineColor: function (i, node) {
-                return (i === 0 || i === node.table.widths.length) ? 'black' : 'gray';
-              }
-            },
-            table: {
-              headerRows: 1,
-              widths: [100, '*'],
-              body: bodUncat
+        const exportRequirementsPdf = (isCompleted: boolean, all: boolean, isTagged: boolean) => {
+            console.log("Export PDF started...");
+            let bodUncat = [[{ text: t("formTitle"), bold: true }, { text: t("formDesc"), bold: true }]];
+            let header = isCategory ? { text: t("headerExportCatActive") + " " + categoryName + ":\n\n", style: "header" } :
+                { text: t("headerExportRequirement") + " " + categoryName + ":\n\n", style: "header" };
+            let fileName = isCategory ? "active_requirements" + "_" + id + ".pdf" : "requirement" + "_" + id + ".pdf";
+            let reqList = active;
+            if (all) {
+                header = { text: t("headerExportCatAll") + " " + categoryName + ":\n\n", style: "header" };
+                fileName = "requirements" + "_" + id + ".pdf";
+                reqList = realized.concat(active);
             }
-          }:undefined,
-          mustHeader,  must.length !=0?
-          {
-            layout: {
-              hLineColor: function (i, node) {
-                return (i === 0 || i === node.table.body.length || i == 1) ? 'black' : 'gray';
-              },
-              vLineColor: function (i, node) {
-                return (i === 0 || i === node.table.widths.length) ? 'black' : 'gray';
-              }
-            },
-            table: {
-              headerRows: 1,
-              widths: [100, '*'],
-              body: bodMust
+            else {
+                if (isCompleted) {
+                    header = { text: t("headerExportCatComplete") + " " + categoryName + ":\n\n", style: "header" };
+                    fileName = "completed_requirements" + "_" + id + ".pdf";
+                    reqList = realized;
+                }
             }
-          }: undefined,
-          shouldHeader, should.length !=0?
-          {
-            layout: {
-              hLineColor: function (i, node) {
-                return (i === 0 || i === node.table.body.length || i == 1) ? 'black' : 'gray';
-              },
-              vLineColor: function (i, node) {
-                return (i === 0 || i === node.table.widths.length) ? 'black' : 'gray';
-              }
-            },
-            table: {
-              headerRows: 1,
-              widths: [100, '*'],
-              body: bodShould
+            // create seperated lists for tags
+            var tagged: Map<string, Requirement[]>;
+            var uncat: Requirement[];
+            if(isTagged){
+              tagged = getFilteredTagRequirements(reqList);
+              uncat = getUncatRequirements(reqList);
+            } else {
+              tagged = new Map([]);;
+              uncat = reqList;
             }
-          }: undefined,
-          couldHeader, could.length != 0?
-          {
-            layout: {
-              hLineColor: function (i, node) {
-                return (i === 0 || i === node.table.body.length || i == 1) ? 'black' : 'gray';
-              },
-              vLineColor: function (i, node) {
-                return (i === 0 || i === node.table.widths.length) ? 'black' : 'gray';
-              }
-            },
-            table: {
-              headerRows: 1,
-              widths: [100, '*'],
-              body: bodCould
+            interface IpdfEl {
+                head: {
+                    text: string;
+                    fontSize: number;
+                    bold: boolean;
+                    margin: number[];
+                };
+                bod: {
+                    text: string;
+                    bold: boolean;
+                }[][];
             }
-          }:undefined,
-        ],
-        styles: {
-          header: {
-            fontSize: 18,
-            bold: true
-          }
-        }
-      };
-      pdfmake.createPdf(docDefinition, {},
-        {
-          // Default font should still be available
-          Roboto: {
-            normal: 'Roboto-Regular.ttf',
-            bold: 'Roboto-Medium.ttf',
-            italics: 'Roboto-Italic.ttf',
-            bolditalics: 'Roboto-Italic.ttf'
-          },
-          // Make sure you define all 4 components - normal, bold, italics, bolditalics - (even if they all point to the same font file)
-          TimesNewRoman: {
-            normal: 'Times-New-Roman-Regular.ttf',
-            bold: 'Times-New-Roman-Bold.ttf',
-            italics: 'Times-New-Roman-Italics.ttf',
-            bolditalics: 'Times-New-Roman-Italics.ttf'
-          }
-        },
-        pdfFonts.pdfMake.vfs).download(fileName);
-      console.log('Export PDF finished');
-    };
-
-    return { t, cancel, handleSubmit, reqTypes, selectedReqType, fileTypes, selectedFileType, submitted };
-  }
+            ;
+            var pdfElements: IpdfEl[] = [];
+            tagged.forEach((reqs: Requirement[], key: string) => {
+                let head = { text: key + ":", fontSize: 14, bold: true, margin: [0, 10, 0, 5] };
+                let bod = [[{ text: t("formTitle"), bold: true }, { text: t("formDesc"), bold: true }]];
+                for (let i = 0; i < reqs.length; i++) {
+                    bod.push([{ text: reqs[i].name.split("\\\\").join("\\"), bold: false }, { text: reqs[i].description.split("\\\\").join("\\"), bold: false }]);
+                }
+                pdfElements.push({ head, bod });
+            });
+            uncat.forEach((req: Requirement) => {
+                bodUncat.push([{ text: req.name.split("\\\\").join("\\"), bold: false }, { text: req.description.split("\\\\").join("\\"), bold: false }]);
+            });
+            var docDefinition = {
+                content: [
+                    header,
+                    uncat.length != 0 ?
+                        {
+                            layout: {
+                                hLineColor: function (i, node) {
+                                    return (i === 0 || i === node.table.body.length || i == 1) ? "black" : "gray";
+                                },
+                                vLineColor: function (i, node) {
+                                    return (i === 0 || i === node.table.widths.length) ? "black" : "gray";
+                                }
+                            },
+                            table: {
+                                headerRows: 1,
+                                widths: [100, "*"],
+                                body: bodUncat
+                            }
+                        } : undefined,
+                ],
+                styles: {
+                    header: {
+                        fontSize: 18,
+                        bold: true
+                    }
+                }
+            };
+            pdfElements.forEach((el: {
+                head: {
+                    text: string;
+                    fontSize: number;
+                    bold: boolean;
+                    margin: number[];
+                };
+                bod: {
+                    text: string;
+                    bold: boolean;
+                }[][];
+            }) => {
+                docDefinition.content.push(el.head, {
+                    layout: {
+                        hLineColor: function (i, node) {
+                            return (i === 0 || i === node.table.body.length || i == 1) ? "black" : "gray";
+                        },
+                        vLineColor: function (i, node) {
+                            return (i === 0 || i === node.table.widths.length) ? "black" : "gray";
+                        }
+                    },
+                    table: {
+                        headerRows: 1,
+                        widths: [100, "*"],
+                        body: el.bod
+                    }
+                });
+            });
+            pdfmake.createPdf(docDefinition, {}, {
+                // Default font should still be available
+                Roboto: {
+                    normal: "Roboto-Regular.ttf",
+                    bold: "Roboto-Medium.ttf",
+                    italics: "Roboto-Italic.ttf",
+                    bolditalics: "Roboto-Italic.ttf"
+                },
+                // Make sure you define all 4 components - normal, bold, italics, bolditalics - (even if they all point to the same font file)
+                TimesNewRoman: {
+                    normal: "Times-New-Roman-Regular.ttf",
+                    bold: "Times-New-Roman-Bold.ttf",
+                    italics: "Times-New-Roman-Italics.ttf",
+                    bolditalics: "Times-New-Roman-Italics.ttf"
+                }
+            }, pdfFonts.pdfMake.vfs).download(fileName);
+            console.log("Export PDF finished");
+        };
+        return { t, cancel, handleSubmit, reqTypes, selectedReqType, fileTypes, selectedFileType, submitted, checked };
+    },
+    components: { InputSwitch }
 })
 </script>
 
@@ -436,4 +379,8 @@ export default defineComponent({
   margin-bottom: 2%;
   margin-top: 1%;
 }
+.p-inputswitch{
+  margin-left: 5%;
+  margin-top: 1%;
+}
 </style>
diff --git a/src/components/ProjectTagsList.vue b/src/components/ProjectTagsList.vue
new file mode 100644
index 0000000..ac36103
--- /dev/null
+++ b/src/components/ProjectTagsList.vue
@@ -0,0 +1,338 @@
+<template>
+    <div class="card" v-if="tags">
+        <div v-if="isModifyTagsAllowed">
+            <Button :label="t('projectDetails-addTag')" icon="pi pi-plus" class="p-button-success p-my-3"
+                @click="openNewTagDialog" />
+        </div>
+
+        <DataTable :value="tags" rowGroupMode="subheader" groupRowsBy="name" sortMode="single" sortField="name"
+            :sortOrder="1" scrollable scrollHeight="800px">
+            <Column :exportable="false" header="Label">
+                <template #body="slotProps">
+                    <div class="role-field">
+                        <Badge :style="{ background: slotProps.data.colour }" :value=slotProps.data.name></Badge>
+                    </div>
+                </template>
+            </Column>
+            <Column :exportable="false" header="">
+                <template #body="slotProps">
+                        <div class="controls">
+                            <Button icon="pi pi-pencil"
+                                class="p-button-rounded p-button-success p-mr-2"
+                                @click="openEditTagDialog(slotProps.data)" v-if="isModifyTagsAllowed" />
+                            <Button icon="pi pi-trash"
+                                class="p-button-rounded p-button-danger" @click="confirmRemoveTag(slotProps.data)" v-if="isModifyTagsAllowed" />
+                        </div>
+                </template>
+            </Column>
+        </DataTable>
+    </div>
+
+    <Dialog v-model:visible="showAddTagDialog" :style="{ width: '450px' }" :header="t('projectDetails-addTag')"
+        :modal="true" class="p-fluid">
+        <div class="p-field">
+            <label for="name">{{ t('tagName') }}</label>
+            <InputText id="name" type="text" v-model="tagToAdd.name" />
+            <div class="input-errors" v-for="error of v$.tagToAdd.name.$errors" :key="error.$uid">
+                <small class="p-error">{{ error.$message.replace('Value', 'Name') }}</small>
+             </div>
+        </div>
+
+        <div class="p-field">
+            <label for="inventoryStatus" class="p-mb-3">{{ t('tagColour') }}</label>
+                <ColorPicker v-model="tagToAdd.colour" inputId="cp-hex" format="hex" class="colorPicker" />
+        </div>
+
+        <template #footer>
+            <div class="footer">
+                <ProgressBar mode="indeterminate" class="mb-3" v-if="inProgress" />
+                <Button :label="t('cancel')" icon="pi pi-times" class="p-button-outlined p-ml-2 p-mr-2"
+                    @click="showAddTagDialog = false" />
+                <Button :label="t('save')" icon="pi pi-check" @click="submitTag" />
+            </div>
+        </template>
+    </Dialog>
+
+    <Dialog v-model:visible="showEditTagDialog" :style="{ width: '450px' }" :header="t('projectDetails-editTag')" :modal="true"
+        class="p-fluid">
+        <div class="p-field">
+            <label for="name">{{ t('tagName') }}</label>
+            <InputText id="name" type="text" v-model="tagToEdit!.name" />
+            <div class="input-errors" v-for="error of vE$.tagToEdit.name.$errors" :key="error.$uid">
+                <small class="p-error">{{ error.$message.replace('Value', 'Name') }}</small>
+             </div>
+        </div>
+
+        <div class="p-field">
+            <label for="inventoryStatus" class="p-mb-3">{{ t('tagColour') }}</label>
+            <ColorPicker v-model="tagToEdit!.colour" inputId="cp-hex" format="hex" class="colorPicker" />
+        </div>
+
+        <template #footer>
+            <div class="footer">
+                <ProgressBar mode="indeterminate" class="mb-3" v-if="inProgress" />
+                <Button :label="t('cancel')" icon="pi pi-times" class="p-button-outlined p-ml-2 p-mr-2"
+                    @click="showEditTagDialog = false" />
+                <Button :label="t('save')" icon="pi pi-check" @click="submitUpdatedTag" />
+            </div>
+        </template>
+    </Dialog>
+
+    <Dialog v-model:visible="showRemoveTagDialog" :style="{ width: '450px' }" header="Confirm" :modal="true">
+        <div class="confirmation-content">
+            <i class="pi pi-exclamation-triangle p-mr-3" style="font-size: 2rem" />
+            <span v-if="tagToRemove">{{ t('projectDetails-areYouSureYouWantToRemoveTag') }}
+                <b>{{ tagToRemove.name }}</b> {{ t('projectDetails-fromTheProject') }}</span>
+        </div>
+        <template #footer>
+            <div class="footer">
+                <ProgressBar mode="indeterminate" class="mb-3" v-if="inProgress" />
+                <Button :label="t('no')" icon="pi pi-times" class="p-button-outlined p-ml-2 p-mr-2"
+                    @click="showRemoveTagDialog = false" />
+                <Button :label="t('yes')" icon="pi pi-check" @click="removeTag(tagToRemove)" />
+            </div>
+        </template>
+    </Dialog>
+</template>
+
+<script lang="ts">
+import { computed, ref, defineComponent, onMounted } from 'vue'
+import { useStore } from 'vuex';
+import { useI18n } from 'vue-i18n';
+import { ActionTypes } from '../store/actions';
+import {Tag, User } from '../types/bazaar-api';
+import { required } from "@vuelidate/validators";
+import { useVuelidate } from "@vuelidate/core";
+
+
+export default defineComponent({
+    name: 'ProjectTagsList',
+    props: {
+        projectId: { type: Number, required: true },
+    },
+    setup: ({ projectId }) => {
+        const store = useStore();
+        const { t } = useI18n({ useScope: 'global' });
+        const oidcIsAuthenticated = computed(() => store.getters['oidcStore/oidcIsAuthenticated']);
+        const oidcUser = computed(() => store.getters['oidcStore/oidcUser']);
+
+        onMounted(() => {
+            //(input as any).value.$el.focus();
+            console.log("mounted");
+        });
+
+        const project = computed(() => store.getters.getProjectById(projectId));
+        store.dispatch(ActionTypes.FetchProject, projectId);
+
+        const inProgress = ref(false);
+
+        var tags = computed(() => store.getters.getProjectTags(projectId));
+        store.dispatch(ActionTypes.FetchTags, projectId);
+
+        const tagToRemove = ref();
+        const showRemoveTagDialog = ref(false);
+
+        const confirmRemoveTag = (tag: Tag) => {
+            tagToRemove.value = tag;
+
+            showRemoveTagDialog.value = true;
+        };
+
+        const removeTag = (tag: Tag) => {
+            inProgress.value = true;
+            store.dispatch(ActionTypes.RemoveTag, { projectId: projectId, tagId: tag.id })
+                .then(() => {
+                    showRemoveTagDialog.value = false;
+                    inProgress.value = false;
+                });
+            inProgress.value = false;
+        };
+
+        const showAddTagDialog = ref(false);
+        const tagSubmitted = ref(false);
+        const tagToAdd = ref<Tag>({
+            id: -1,
+            projectId: projectId,
+            name: "New Tag",
+            colour: "#0000" // default
+        });
+        const rulesAdd = {
+              tagToAdd: {
+                name: { required },
+                },
+            };
+        const rulesEdit = {
+              tagToEdit: {
+                name: { required },
+                },
+            };
+        const tagToEdit = ref<Tag>();
+
+
+        const v$ = useVuelidate(rulesAdd, { tagToAdd });
+        const openNewTagDialog = () => {
+            tagToAdd.value = {
+                id: -1,
+                projectId: projectId,
+                name: "New Tag",
+                colour: "#447500" // default
+            };
+            tagSubmitted.value = false;
+            showAddTagDialog.value = true;
+        };
+
+        const submitTag = async () => {
+            tagSubmitted.value = true;
+            const isFormCorrect = await v$.value.$validate();
+
+            if (!isFormCorrect) {
+                return;
+            }
+            else{
+                if (!tagToAdd.value!.colour.startsWith("#")) {
+                    tagToAdd.value.colour = "#" + tagToAdd.value.colour;
+                }
+                inProgress.value = true;
+            }
+            store.dispatch(ActionTypes.CreateTag, { projectId: projectId, id: tagToAdd.value!.id, name: tagToAdd.value.name, colour: tagToAdd.value.colour })
+                .then(() => {
+                    showAddTagDialog.value = false;
+                    inProgress.value = false;
+                });
+            inProgress.value = false;
+        };
+
+        const showEditTagDialog = ref(false);
+        const vE$ = useVuelidate(rulesEdit, { tagToEdit });
+
+        const openEditTagDialog = (tag: Tag) => {
+            // IMPORTANT: clone here so we do not modify a Vuex state object!
+            tagToEdit.value = {
+                id: tag.id,
+                projectId: projectId,
+                colour: tag.colour,
+                name: tag.name
+            };
+            showEditTagDialog.value = true;
+        };
+
+        const submitUpdatedTag = async () => {
+            tagSubmitted.value = true;
+            const isFormCorrect = await vE$.value.$validate();
+
+            if (!isFormCorrect) {
+                return;
+            }
+            else{
+                inProgress.value = true;
+                if (!tagToEdit.value!.colour.startsWith("#")) {
+                    tagToEdit.value!.colour = "#" + tagToEdit.value!.colour;
+                }
+            }
+            store.dispatch(ActionTypes.UpdateTag, {
+                projectId: projectId, id: tagToEdit.value!.id, name: tagToEdit.value!.name, colour: tagToEdit.value!.colour
+            })
+                .then(() => {
+                    showEditTagDialog.value = false;
+                    inProgress.value = false;
+                });
+            inProgress.value = false;
+        };
+        const isModifyTagsAllowed = computed(() => {
+            const role = project.value.userContext?.userRole;
+            return oidcIsAuthenticated.value && (role === 'ProjectAdmin' || role === 'ProjectManager');
+        });
+
+        return {
+            t,
+            oidcIsAuthenticated,
+            oidcUser,
+            tags,
+            showRemoveTagDialog,
+            showAddTagDialog,
+            confirmRemoveTag,
+            removeTag,
+            tagToRemove,
+            openNewTagDialog,
+            tagToAdd,
+            tagSubmitted,
+            submitTag,
+            inProgress,
+            openEditTagDialog,
+            tagToEdit,
+            showEditTagDialog,
+            submitUpdatedTag,
+            v$,
+            vE$,
+            isModifyTagsAllowed
+        };
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+
+.footer {
+  text-align: end;
+  margin-top: 2%;
+}
+
+.footer ::v-deep(.p-button) {
+  width: auto;
+}
+.role-field {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.role-field .controls {
+    margin-top: .75em;
+}
+
+.user-field {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+}
+
+.colorPicker{
+    display: flex;
+}
+
+.user-field .name {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.user-field .user-id {
+    margin-top: 0.5em;
+}
+.custom-colorpicker {
+  opacity: 1; /* Reset the opacity */
+  cursor: not-allowed; /* Reset the cursor */
+  background-color: #f4f4f4; /* Set the desired background color for the disabled state */
+  color: #333; /* Set the desired text color for the disabled state */
+}
+
+@media (min-width: 768px) {
+    .role-field {
+        flex-direction: row;
+    }
+
+    .role-field .controls {
+        margin-left: 1em;
+        display: flex;
+        margin-top: .75em;
+    }
+
+    .user-field {
+        flex-direction: row;
+    }
+
+    .user-field .name {
+        margin-right: 0.5em;
+    }
+}
+</style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 0123d22..0d3d178 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -64,13 +64,19 @@
     "projectDetails-showOnGitHub": "Show on GitHub",
     "projectDetails-joinDevelopmentOnGithub": "Join Development on GitHub",
     "projectDetails-members": "Members",
+    "projectDetails-tags": "Labels",
     "projectDetails-allCategories": "All Categories",
     "projectDetails-addMember": "AddMember",
+    "projectDetails-addTag": "Add Label",
+    "projectDetails-editTag": "Edit Label",
+    "tagName":"Name",
+    "tagColour":"Color",
     "projectDetails-chooseUserName": "Choose a user name",
     "projectDetails-userNameIsRequired": "Username is required.",
     "projectDetails-selectRole": "Select a Role",
     "projectDetails-warningRemoveYourself": "You'll remove yourself from the project!",
-    "projectDetails-areYouSureYouWantToRemove": "Are you sure you want to remove member",
+    "projectDetails-areYouSureYouWantToRemove": "Are you sure you want to remove label",
+    "projectDetails-areYouSureYouWantToRemoveTag": "Are you sure you want to remove tag",
     "projectDetails-fromTheProject": "from the project?",
 
     "categoryDetails-activeRequirements": "Active Requirements",
@@ -278,6 +284,7 @@
     "fileType": "Export format:",
     "exportCategory": "Export Category",
     "exportRequirement": "Export Requirement",
+    "tagHeader": "Use labels as header:",
 
     "QUEST": "Quest completed!",
     "ACHIEVEMENT": "Achievement completed!",
diff --git a/src/main.ts b/src/main.ts
index 740434f..14f2879 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -38,6 +38,7 @@ import Dialog from 'primevue/dialog';
 import Dropdown from 'primevue/dropdown';
 import Editor from 'primevue/editor';
 import InputText from 'primevue/inputtext';
+import InputSwitch from 'primevue/inputswitch';
 import Menu from 'primevue/menu';
 import OverlayPanel from 'primevue/overlaypanel';
 import ScrollTop from 'primevue/scrolltop';
@@ -48,6 +49,7 @@ import TabView from 'primevue/tabview';
 import TabPanel from 'primevue/tabpanel';
 import DataTable from 'primevue/datatable';
 import Column from 'primevue/column';
+import ColorPicker from 'primevue/colorpicker';
 import Toolbar from 'primevue/toolbar';
 import ProgressBar from 'primevue/progressbar';
 import ProgressSpinner from 'primevue/progressspinner';
@@ -144,5 +146,7 @@ app.component('Timeline', Timeline);
 
 app.component('Autocounter', Vue3Autocounter);
 app.component('Toast', Toast);
+app.component('ColorPicker', ColorPicker);
+app.component('InputSwitch', InputSwitch);
 
 app.mount('#app');
diff --git a/src/store/actions.ts b/src/store/actions.ts
index 6a82312..f7a6b82 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -3,7 +3,7 @@ import { Mutations, MutationType } from './mutations';
 import { State } from './state';
 
 import { bazaarApi, ProjectMemberRole, UserVote } from '../api/bazaar';
-import { Projects, Categories, Requirements, Project, Category, Requirement, Comment, HttpResponse, ProjectMember } from '../types/bazaar-api';
+import { Projects, Categories, Requirements, Project, Category, Requirement, Comment, HttpResponse, ProjectMember,Tag } from '../types/bazaar-api';
 import { activitiesApi } from '../api/activities';
 
 export enum ActionTypes {
@@ -14,6 +14,10 @@ export enum ActionTypes {
   FollowProject = 'FOLLOW_PROJECT',
   CreateProject = 'CREATE_PROJECT',
   UpdateProject = 'UPDATE_PROJECT',
+  CreateTag = 'CREATE_TAG',
+  UpdateTag = 'UPDATE_Tag',
+  RemoveTag = 'REMOVE_Tag',
+
   FetchCategoriesOfProject = 'FETCH_CATEGORIES',
   FetchCategory = 'FETCH_CATEGORY',
   FollowCategory = 'FOLLOW_CATEGORY',
@@ -124,6 +128,11 @@ type RemoveProjectMemberParameters = {
   userId: number;
 }
 
+type RemoveTagParameters = {
+  projectId: number;
+  tagId: number;
+}
+
 export type Actions = {
   [ActionTypes.FetchProjects](context: ActionAugments, payload: ProjectsRequestParameters): void;
   [ActionTypes.FetchTags](context: ActionAugments, projectId: number): void;
@@ -132,6 +141,9 @@ export type Actions = {
   [ActionTypes.FollowProject](context: ActionAugments, payload: FollowResourceParameters): void;
   [ActionTypes.CreateProject](context: ActionAugments, payload: Project): void;
   [ActionTypes.UpdateProject](context: ActionAugments, payload: Project): void;
+  [ActionTypes.CreateTag](context: ActionAugments, payload: Tag): void;
+  [ActionTypes.UpdateTag](context: ActionAugments, payload: Tag): void;
+  [ActionTypes.RemoveTag](context: ActionAugments, parameters: RemoveTagParameters): void;
   [ActionTypes.FetchCategoriesOfProject](context: ActionAugments, payload: CategoriesRequestParameters): void;
   [ActionTypes.FetchCategory](context: ActionAugments, categoryId: number): void;
   [ActionTypes.FollowCategory](context: ActionAugments, payload: FollowResourceParameters): void;
@@ -237,6 +249,28 @@ export const actions: ActionTree<State, State> & Actions = {
     }
   },
 
+  async [ActionTypes.CreateTag]({ commit }, tag) {
+    const response = await bazaarApi.projects.createTag(tag.projectId, tag);
+    if (response.data && response.status === 201) {
+      commit(MutationType.SetTag, response.data);
+    }
+
+  },
+
+  async [ActionTypes.UpdateTag]({ dispatch }, tag) {
+    const response = await bazaarApi.projects.editTag(tag.projectId, tag);
+    if (response.status === 204) {
+      dispatch(ActionTypes.FetchTags, tag.projectId);
+    }
+  },
+
+  async [ActionTypes.RemoveTag]({ commit }, parameters) {
+    const response = await bazaarApi.projects.removeTag(parameters.projectId, parameters.tagId);
+    if (response.status === 204 || response.status === 200) {
+      commit(MutationType.RemoveTag, {projectId: parameters.projectId, tagId: parameters.tagId});
+    }
+  },
+
   async [ActionTypes.FetchCategory]({ commit }, categoryId) {
     const response = await bazaarApi.categories.getCategory(categoryId);
     if (response.data && response.status === 200) {
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
index 5136cf0..47d6531 100644
--- a/src/store/mutations.ts
+++ b/src/store/mutations.ts
@@ -42,6 +42,8 @@ export enum MutationType {
   _AddUnhandledError = 'ADD_UNHANDLED_ERROR',
   AddNotification = 'ADD_NOTIFICATION',
   SetGfNotification = 'SET_GFNOTIFICATION',
+  RemoveTag = 'REMOVE_TAG',
+  SetTag = 'SET_TAG',
 
 }
 
@@ -50,6 +52,11 @@ type RemoveProjectMemberParameters = {
   userId: number;
 }
 
+type RemoveTagParameters = {
+  projectId: number;
+  tagId: number;
+}
+
 /*
  * TODO Fix type definitions of Mutations. Parameter types are ignored! (see actions for how to do it)
  */
@@ -81,6 +88,9 @@ export type Mutations = {
   [MutationType.SetRequirementDevelopers](state: State, {requirementId, developers}): void;
   [MutationType.SetProjectMembers](state: State, {projectId: number, members: any }): void;
   [MutationType.RemoveProjectMember](state: State, parameters: RemoveProjectMemberParameters): void;
+  [MutationType.RemoveTag](state: State, parameters: RemoveTagParameters): void;
+  [MutationType.SetTag](state: State, tag: Tag): void;
+
 
   [MutationType.SetFeaturedProjects](state: State, featuredProjects: Project[]): void;
 
@@ -159,6 +169,19 @@ export const mutations: MutationTree<State> & Mutations = {
     });
   },
 
+  [MutationType.SetTag](state, tag) {
+      state.tags[tag.projectId][tag.id] = tag;
+  },
+
+  [MutationType.RemoveTag](state, {projectId, tagId}) {
+    if (!state.tags[projectId]) {
+      // Project tags are not tracked in local state
+      return;
+    }
+
+    delete state.tags[projectId][tagId];
+  },
+
   [MutationType.SetCategory](state, category) {
     if (category.id) {
       if(category.gamificationNotifications?.length != 0){
diff --git a/src/types/bazaar-api.ts b/src/types/bazaar-api.ts
index 9943cc6..9bb7f91 100644
--- a/src/types/bazaar-api.ts
+++ b/src/types/bazaar-api.ts
@@ -839,6 +839,36 @@ export namespace Projects {
     export type RequestHeaders = {};
     export type ResponseBody = Tag;
   }
+  /**
+   * No description
+   * @tags projects
+   * @name EditTag
+   * @summary This method edits a tag of a given project.
+   * @request PUT:/projects/{projectId}/tags
+   * @secure
+   */
+    export namespace EditTag {
+      export type RequestParams = { projectId: number };
+      export type RequestQuery = {};
+      export type RequestBody = Tag;
+      export type RequestHeaders = {};
+      export type ResponseBody = void;
+    }
+  /**
+   * No description
+   * @tags projects
+   * @name RemoveTag
+   * @summary This method allows to delete a project tag.
+   * @request DELETE:/projects/{projectId}/tags/{tagId}
+   * @secure
+   */
+  export namespace RemoveTag {
+    export type RequestParams = { projectId: number; tagId: number };
+    export type RequestQuery = {};
+    export type RequestBody = never;
+    export type RequestHeaders = {};
+    export type ResponseBody = void;
+  }
   /**
    * No description
    * @tags projects
@@ -2331,6 +2361,43 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params,
       }),
 
+    /**
+     * No description
+     *
+     * @tags projects
+     * @name EditTag
+     * @summary This method edits a tag of a given project.
+     * @request PUT:/projects/{projectId}/tags
+     * @secure
+     */
+    editTag: (projectId: number, body: Tag, params: RequestParams = {}) =>
+    this.request<Tag, void>({
+      path: `/projects/${projectId}/tags`,
+      method: "PUT",
+      body: body,
+      secure: true,
+      type: ContentType.Json,
+      format: "json",
+      ...params,
+    }),
+
+    /**
+     * No description
+     *
+     * @tags projects
+     * @name RemoveTag
+     * @summary This method allows to remove a project tag.
+     * @request DELETE:/projects/{projectId}/tags/{memberUserId}
+     * @secure
+     */
+        removeTag: (projectId: number, tagId: number, params: RequestParams = {}) =>
+        this.request<void, void>({
+          path: `/projects/${projectId}/tags/${tagId}`,
+          method: "DELETE",
+          secure: true,
+          ...params,
+        }),
+
     /**
      * No description
      *
diff --git a/src/views/Category.vue b/src/views/Category.vue
index 78c91fe..63305fd 100644
--- a/src/views/Category.vue
+++ b/src/views/Category.vue
@@ -18,7 +18,7 @@
       @save="categoryEditorSaved">
     </CategoryEditor>
   </Dialog>
-  <Dialog :header="t('exportCategory')" v-model:visible="displayExportPopup" :breakpoints="{'960px': '75vw', '640px': '100vw'}" :style="{width: '25vw'}" :modal="true">
+  <Dialog :header="t('exportCategory')" v-model:visible="displayExportPopup" :breakpoints="{'1080px': '120vw', '640px': '120vw'}" :style="{width: '30vw'}" :modal="true">
     <ExportPopup
       :categoryName="category?.name"
       :id="category?.id"
diff --git a/src/views/Project.vue b/src/views/Project.vue
index bf24a67..5c08464 100644
--- a/src/views/Project.vue
+++ b/src/views/Project.vue
@@ -79,9 +79,12 @@
         </div>
       </div>
     </div>
-    <div v-if="!showCategories">
+    <div v-if="!showCategories && !showTags">
       <ProjectMembersList v-if="project" :projectId="project.id" />
     </div>
+    <div v-if="!showCategories && showTags">
+      <ProjectTagsList v-if="project" :projectId="project.id" />
+    </div>
   </div>
 
   <Dialog v-model:visible="showAddRepositoryDialog" :style="{width: '450px'}" :header="t('linkRepository-dialogHeader')" :modal="true" class="p-fluid">
@@ -150,6 +153,7 @@ import CategoryCard from '../components/CategoryCard.vue';
 import ProjectEditor from '../components/ProjectEditor.vue';
 import CategoryEditor from '../components/CategoryEditor.vue';
 import ProjectMembersList from '../components/ProjectMembersList.vue';
+import ProjectTagsList from '../components/ProjectTagsList.vue';
 import ProjectBreadcrumbNav from '@/components/ProjectBreadcrumbNav.vue';
 
 import { Project } from '@/types/bazaar-api';
@@ -162,6 +166,7 @@ export default defineComponent({
     CategoryEditor,
     ProjectMembersList,
     ProjectBreadcrumbNav,
+    ProjectTagsList,
   },
   name: 'Project',
   props: {
@@ -177,6 +182,9 @@ export default defineComponent({
     const project = computed(() => store.getters.getProjectById(projectId));
     store.dispatch(ActionTypes.FetchProject, projectId);
     const showCategories = computed(() => route.params.members ? false : true);
+    const showTags = computed(() => route.params.members == 'tags' ? true:false);
+
+
 
     // read values for the timeline
     const hook_id_value = computed(() => project.value?.additionalProperties?.hook_id);
@@ -278,12 +286,19 @@ export default defineComponent({
       to: `/projects/${projectId}/members`
     };
 
+    const TAGS_TAB_LABEL = t('projectDetails-tags');
+    const TAGS_TAB_ITEM = {
+      label: TAGS_TAB_LABEL,
+      to: `/projects/${projectId}/tags`
+    };
+
     const tabItems = ref([
       {
         label: t('projectDetails-allCategories'), // was: 'Overview'
         to: `/projects/${projectId}`
       },
-      MEMBERS_TAB_ITEM
+      MEMBERS_TAB_ITEM,
+      TAGS_TAB_ITEM,
     ]);
 
     const projectEditorName = ref('');
@@ -297,13 +312,17 @@ export default defineComponent({
       //const role = project.value.userContext?.projectRole;
       //if (['ProjectAdmin', 'SystemAdmin'].includes(role)) {
       const membersItemId = tabItems.value.findIndex(item => item.label === MEMBERS_TAB_LABEL);
+      const tagsItemId = tabItems.value.findIndex(item => item.label === TAGS_TAB_LABEL);
+
       if (!oidcIsAuthenticated.value && membersItemId > -1) {
         tabItems.value.splice(membersItemId, 1);
+        tabItems.value.splice(tagsItemId, 2);
       }
       if (oidcIsAuthenticated.value) {
         if (membersItemId === -1) {
-          // user is authentivated and memebrs tab not visible yet -> add to tab items
+          // user is authenticated and memebers tab not visible yet -> add to tab items
           tabItems.value.push(MEMBERS_TAB_ITEM);
+          tabItems.value.push(TAGS_TAB_ITEM);
         }
       }
     });
@@ -544,6 +563,7 @@ export default defineComponent({
       projectEditorCanceled,
       projectEditorSaved,
       showCategories,
+      showTags,
       connectToGithub,
       timelineEvents,
       newReleaseAvailable,