diff --git a/_includes/project_card.html b/_includes/project_card.html
index 3a05b95..16e0b95 100644
--- a/_includes/project_card.html
+++ b/_includes/project_card.html
@@ -2,31 +2,14 @@
     <div class="block cardshadow p-8 rounded-lg">
       <div class="tabs">
         <div class="tab">
-          <input class="dropinput" type="checkbox" id="card-{{ include.state }}-{{ forloop.index }}">
-          <label style="min-width: 90%; min-height: 150px; display: block;" class="absolute cursor-pointer" for="card-{{ include.state }}-{{ forloop.index }}">
+          <input class="dropinput" type="checkbox" id="card{{ include.state | prepend: '-' }}{{ include.project | prepend: '-' }}-{{ forloop.index }}">
+          <label style="min-width: 90%; min-height: 150px; display: block;" class="absolute cursor-pointer" for="card{{ include.state | prepend: '-' }}{{ include.project | prepend: '-' }}-{{ forloop.index }}">
             <img class="absolute right-0" style="margin-right: 1rem;" id="icon" src="{{ site.assets_url }}/icons/arrow.svg" alt="">
           </label>
           <div>
             <div class="flex">
               {% for tag in card.projects %}
-                {% assign tag_bg_strength = 100 %}
-                {% if tag == 'Portmaster' %}
-                  {% assign tag_color = 'blue' %}
-                {% elsif tag == 'SPN' %}
-                  {% assign tag_color = 'green' %}
-                {% elsif tag == 'Website' %}
-                  {% assign tag_color = 'pink' %}
-                {% elsif tag == 'Back Office' %}
-                  {% assign tag_color = 'gray' %}
-                  {% assign tag_bg_strength = 200 %}
-                {% elsif tag == 'Community' %}
-                  {% assign tag_color = 'purple' %}
-                {% elsif tag == 'Marketing' %}
-                  {% assign tag_color = 'orange' %}
-                {% endif %}
-                <span class="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium leading-5 bg-{{ tag_color }}-{{ tag_bg_strength }} text-{{ tag_color }}-800 mr-2">
-                  {{ tag }}
-                </span>
+                {% include tag.html tag=tag %}
               {% endfor %}
             </div>
             <div class="flex pt-6 items-center">
diff --git a/_includes/tag.html b/_includes/tag.html
new file mode 100644
index 0000000..c7fe25c
--- /dev/null
+++ b/_includes/tag.html
@@ -0,0 +1,18 @@
+{% assign tag_bg_strength = 100 %}
+{% if include.tag == 'Portmaster' %}
+  {% assign tag_color = 'blue' %}
+{% elsif include.tag == 'SPN' %}
+  {% assign tag_color = 'green' %}
+{% elsif include.tag == 'Website' %}
+  {% assign tag_color = 'pink' %}
+{% elsif include.tag == 'Back Office' %}
+  {% assign tag_color = 'gray' %}
+  {% assign tag_bg_strength = 200 %}
+{% elsif include.tag == 'Community' %}
+  {% assign tag_color = 'purple' %}
+{% elsif include.tag == 'Marketing' %}
+  {% assign tag_color = 'orange' %}
+{% endif %}
+<span class="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium leading-5 bg-{{ tag_color }}-{{ tag_bg_strength }} text-{{ tag_color }}-800 mr-2">
+  {{ include.tag }}
+</span>