diff --git a/_data/categories/accommodation.yml b/_data/categories/accommodation.yml
index fc00800b62471d198dfcec89f62b957b5687796f..8ece3d9c2a5edbc0dabec2c4a57bcfb52ce1f774 100644
--- a/_data/categories/accommodation.yml
+++ b/_data/categories/accommodation.yml
@@ -1,15 +1,15 @@
 ID: accommodation
 icon: 'help-circle'
 title:
-- en: 'accommodation'
-- de: 'Unterkunft'
+  en: 'accommodation'
+  de: 'Unterkunft'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - rooms:
-    - en: 'rooms'
-    - de: 'Räumlichkeiten'
-  - houses:
-    - en: 'houses'
-    - de: 'Ferienhäuser'
+  rooms:
+    en: 'rooms'
+    de: 'Räumlichkeiten'
+  houses:
+    en: 'houses'
+    de: 'Ferienhäuser'
diff --git a/_data/categories/art_and_culture.yml b/_data/categories/art_and_culture.yml
index 40270c570c91394def684cc1a27893cd8f61895e..5b0a2057be84bbecbe87b5e786b100583d88977d 100644
--- a/_data/categories/art_and_culture.yml
+++ b/_data/categories/art_and_culture.yml
@@ -1,15 +1,15 @@
 ID: art_and_culture
 icon: 'help-circle'
 title:
-- en: 'art & culture'
-- de: 'Kunst & Kultur'
+  en: 'art & culture'
+  de: 'Kunst & Kultur'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - artwork:
-    - en: 'artwork'
-    - de: 'Kunst'
-  - cultural-goods:
-    - en: 'cultural-goods'
-    - de: 'Kulturgüter'
+  artwork:
+    en: 'artwork'
+    de: 'Kunst'
+  cultural-goods:
+    en: 'cultural-goods'
+    de: 'Kulturgüter'
diff --git a/_data/categories/bodycare_and_health.yml b/_data/categories/bodycare_and_health.yml
index 27acef567b4c1be5f8be06cd3b5dfba7c2f19b20..89aeb4f98cdc7aac8e0ec8b6cbdbdceeab17e020 100644
--- a/_data/categories/bodycare_and_health.yml
+++ b/_data/categories/bodycare_and_health.yml
@@ -1,15 +1,15 @@
 ID: bodycare_and_health
 icon: 'help-circle'
 title:
-- en: 'bodycare & health'
-- de: 'Gesundheit & Pflege'
+  en: 'bodycare & health'
+  de: 'Gesundheit & Pflege'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - bodycare:
-    - en: 'bodycare'
-    - de: 'Körperpflege'
-  - health:
-    - en: 'health'
-    - de: 'Gesundheit'
+  bodycare:
+    en: 'bodycare'
+    de: 'Körperpflege'
+  health:
+    en: 'health'
+    de: 'Gesundheit'
diff --git a/_data/categories/clothing_and_lifestyle.yml b/_data/categories/clothing_and_lifestyle.yml
index b9d3fc2188a6ebf129a2e7909cfa16bbc8724f7c..a4e92c944874c2398999a2a6d3619f773cf5c416 100644
--- a/_data/categories/clothing_and_lifestyle.yml
+++ b/_data/categories/clothing_and_lifestyle.yml
@@ -1,21 +1,21 @@
 ID: clothing_and_lifestyle
 icon: 'help-circle'
 title:
-- en: 'clothing & lifestyles'
-- de: 'Kleidung & Lifestyle'
+  en: 'clothing & lifestyles'
+  de: 'Kleidung & Lifestyle'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - underwear:
-    - en: 'underwear'
-    - de: 'Unterwäsche'
-  - workwear:
-    - en: 'workwear'
-    - de: 'Arbeitskleidung'
-  - clothes:
-    - en: 'clothes'
-    - de: 'Kleidung'
-  - accessories:
-    - en: 'accessories'
-    - de: 'Zubehör'
+  underwear:
+    en: 'underwear'
+    de: 'Unterwäsche'
+  workwear:
+    en: 'workwear'
+    de: 'Arbeitskleidung'
+  clothes:
+    en: 'clothes'
+    de: 'Kleidung'
+  accessories:
+    en: 'accessories'
+    de: 'Zubehör'
diff --git a/_data/categories/digital_goods.yml b/_data/categories/digital_goods.yml
index 54a01a7241a6cab9d36526fc7f0f47bd288e024b..6e0a63abfcbb674a6d4cf6db5c354820a3a6dc66 100644
--- a/_data/categories/digital_goods.yml
+++ b/_data/categories/digital_goods.yml
@@ -1,12 +1,12 @@
 ID: digital_goods
 icon: 'help-circle'
 title:
-- en: 'digital goods'
-- de: 'Digitale Güter'
+  en: 'digital goods'
+  de: 'Digitale Güter'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - token:
-    - en: 'token'
-    - de: 'Token'
+  token:
+    en: 'token'
+    de: 'Token'
diff --git a/_data/categories/eat_and_drink.yml b/_data/categories/eat_and_drink.yml
index 368b7adee11a8fcece15bd18ea6d7839ba73968a..fb35d31c2940dfea50cf00aaa5af40e0b5ce1c03 100644
--- a/_data/categories/eat_and_drink.yml
+++ b/_data/categories/eat_and_drink.yml
@@ -1,18 +1,18 @@
 ID: eat_and_drink
 icon: 'help-circle'
 title:
-- en: 'eat & drink'
-- de: 'Essen & Trinken'
+  en: 'eat & drink'
+  de: 'Essen & Trinken'
 description:
-- en: 'Eat & Drink description'
-- de: 'Essen & Trinken Beschreibung'
+  en: 'Eat & Drink description'
+  de: 'Essen & Trinken Beschreibung'
 Tags:
-  - non-vegetarian:
-    - en: 'non-vegetarian'
-    - de: 'nicht vegetarisch'
-  - vegetarian:
-    - en: 'vegetarian'
-    - de: 'vegetarisch'
-  - vegan:
-    - en: 'vegan'
-    - de: 'vegan'
+  non-vegetarian:
+    en: 'non-vegetarian'
+    de: 'nicht vegetarisch'
+  vegetarian:
+    en: 'vegetarian'
+    de: 'vegetarisch'
+  vegan:
+    en: 'vegan'
+    de: 'vegan'
diff --git a/_data/categories/electronics.yml b/_data/categories/electronics.yml
index c1d1189164273e0b36ebd1fc156397c51437d7b5..c0ded12445b6ac07035bf3d330ac52181536c337 100644
--- a/_data/categories/electronics.yml
+++ b/_data/categories/electronics.yml
@@ -1,21 +1,21 @@
 ID: electronics
 icon: 'help-circle'
 title:
-- en: 'electronics'
-- de: 'Elektronik'
+  en: 'electronics'
+  de: 'Elektronik'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - home-electronics:
-    - en: 'home electronics'
-    - de: 'Heimelektronik'
-  - multimedia:
-    - en: 'multimedia'
-    - de: 'Multimedia'
-  - communication:
-    - en: 'communication'
-    - de: 'Kommunikation'
-  - illumination:
-    - en: 'illumination'
-    - de: 'Beleuchtung'
+  home-electronics:
+    en: 'home electronics'
+    de: 'Heimelektronik'
+  multimedia:
+    en: 'multimedia'
+    de: 'Multimedia'
+  communication:
+    en: 'communication'
+    de: 'Kommunikation'
+  illumination:
+    en: 'illumination'
+    de: 'Beleuchtung'
diff --git a/_data/categories/home_and_living.yml b/_data/categories/home_and_living.yml
index 39b65c1f72ea2dccb78b932155a794e0d38d70cd..ca0a46c7c5fffc951bd168fa33fbc2913601289d 100644
--- a/_data/categories/home_and_living.yml
+++ b/_data/categories/home_and_living.yml
@@ -1,24 +1,24 @@
 ID: home_and_living
 icon: 'help-circle'
 title:
-- en: 'home & living'
-- de: 'Wohnen & Leben'
+  en: 'home & living'
+  de: 'Wohnen & Leben'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - appliance:
-    - en: 'appliance'
-    - de: 'Geräte'
-  - construction:
-    - en: 'construction'
-    - de: 'Bau'
-  - interior:
-    - en: 'interior'
-    - de: 'Innenausstattung'
-  - supply:
-    - en: 'supply'
-    - de: 'Versorgung'
-  - storage:
-    - en: 'storage'
-    - de: 'Lagerung'
+  appliance:
+    en: 'appliance'
+    de: 'Geräte'
+  construction:
+    en: 'construction'
+    de: 'Bau'
+  interior:
+    en: 'interior'
+    de: 'Innenausstattung'
+  supply:
+    en: 'supply'
+    de: 'Versorgung'
+  storage:
+    en: 'storage'
+    de: 'Lagerung'
diff --git a/_data/categories/knowledge_and_information.yml b/_data/categories/knowledge_and_information.yml
index 2af4d431da4d3cac6a663030aedc79ac202f959a..49f576c65f0efb274b6686862ec71daa87c30241 100644
--- a/_data/categories/knowledge_and_information.yml
+++ b/_data/categories/knowledge_and_information.yml
@@ -1,15 +1,15 @@
 ID: knowledge_and_information
 icon: 'help-circle'
 title:
-- en: 'knowledge & information'
-- de: 'Wissen & Information'
+  en: 'knowledge & information'
+  de: 'Wissen & Information'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - soft-media:
-    - en: 'soft media'
-    - de: 'elektronische Medien'
-  - hard-media:
-    - en: 'hard media'
-    - de: 'nicht-elektronische Medien'
+  soft-media:
+    en: 'soft media'
+    de: 'elektronische Medien'
+  hard-media:
+    en: 'hard media'
+    de: 'nicht-elektronische Medien'
diff --git a/_data/categories/landscaping.yml b/_data/categories/landscaping.yml
index e757014cf5ee4ab09dd09419569afe96c4461c01..5f469d89c9eb36862903624404cd2fc97792fd93 100644
--- a/_data/categories/landscaping.yml
+++ b/_data/categories/landscaping.yml
@@ -1,15 +1,15 @@
 ID: landscaping
 icon: 'help-circle'
 title:
-- en: 'landscaping'
-- de: 'Landschaftsbau'
+  en: 'landscaping'
+  de: 'Landschaftsbau'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - furnishing:
-    - en: 'furnishing'
-    - de: 'Ausstattung'
-  - horticulture:
-    - en: 'horticulture'
-    - de: 'Gartenbau'
+  furnishing:
+    en: 'furnishing'
+    de: 'Ausstattung'
+  horticulture:
+    en: 'horticulture'
+    de: 'Gartenbau'
diff --git a/_data/categories/learning_and_development.yml b/_data/categories/learning_and_development.yml
index bf46341d6d99afbac3497c9021d6e9f56e262205..35e387b6c28d7d34ed3dcc5cfb1af90970b0da80 100644
--- a/_data/categories/learning_and_development.yml
+++ b/_data/categories/learning_and_development.yml
@@ -1,15 +1,15 @@
 ID: learning_and_development
 icon: 'help-circle'
 title:
-- en: 'learning & development'
-- de: 'Lernen & Entwicklung'
+  en: 'learning & development'
+  de: 'Lernen & Entwicklung'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - workshops:
-    - en: 'workshops'
-    - de: 'Workshops'
-  - teaching:
-    - en: 'teaching'
-    - de: 'Training'
+  workshops:
+    en: 'workshops'
+    de: 'Workshops'
+  teaching:
+    en: 'teaching'
+    de: 'Training'
diff --git a/_data/categories/mobility_and_transport.yml b/_data/categories/mobility_and_transport.yml
index 6d8e96dff772278b7c2eb8546892d54203134e1f..21a25791e09b5a8863e3e7e2ccf2d82384b15f9e 100644
--- a/_data/categories/mobility_and_transport.yml
+++ b/_data/categories/mobility_and_transport.yml
@@ -1,21 +1,21 @@
 ID: mobility_and_transport
 icon: 'help-circle'
 title:
-  - en: 'mobility and transport'
-  - de: 'Mobilität und Transport'
+  en: 'mobility and transport'
+  de: 'Mobilität und Transport'
 description:
-  - en: ''
-  - de: ''
+  en: ''
+  de: ''
 Tags:
-  - accessories:
-    - en: 'accessories'
-    - de: 'Zubehör'
-  - bicycles:
-    - en: 'bicycles'
-    - de: 'Fahrräder'
-  - cars:
-    - en: 'cars'
-    - de: 'Automobile'
-  - ships:
-    - en: 'ships'
-    - de: 'Wasserfahrzeuge'
+  accessories:
+    en: 'accessories'
+    de: 'Zubehör'
+  bicycles:
+    en: 'bicycles'
+    de: 'Fahrräder'
+  cars:
+    en: 'cars'
+    de: 'Automobile'
+  ships:
+    en: 'ships'
+    de: 'Wasserfahrzeuge'
diff --git a/_data/categories/services.yml b/_data/categories/services.yml
index bc918fbd2e35ec4de648b9dc4d7f0c82582ec199..2366d2f0b937b79434b1432d9fa6db8509c845ea 100644
--- a/_data/categories/services.yml
+++ b/_data/categories/services.yml
@@ -1,27 +1,27 @@
 ID: services
 icon: 'help-circle'
 title:
-- en: 'services'
-- de: 'Dienstleistungen'
+  en: 'services'
+  de: 'Dienstleistungen'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - craft:
-    - en: 'craft'
-    - de: 'Handwerk'
-  - social:
-    - en: 'social'
-    - de: 'Soziales'
-  - styling:
-    - en: 'styling'
-    - de: 'Styling'
-  - design:
-    - en: 'design'
-    - de: 'Design'
-  - repair:
-    - en: 'repair'
-    - de: 'Reparatur'
-  - guidance:
-    - en: 'guidance'
-    - de: 'Anleitung'
+  craft:
+    en: 'craft'
+    de: 'Handwerk'
+  social:
+    en: 'social'
+    de: 'Soziales'
+  styling:
+    en: 'styling'
+    de: 'Styling'
+  design:
+    en: 'design'
+    de: 'Design'
+  repair:
+    en: 'repair'
+    de: 'Reparatur'
+  guidance:
+    en: 'guidance'
+    de: 'Anleitung'
diff --git a/_data/categories/tools_and_materials.yml b/_data/categories/tools_and_materials.yml
index e1f06667a97ff9ba7b3f708bc7ef733a6047aadc..1a82d40fb05cb07374bb2f0a4610aac46bb1b12a 100644
--- a/_data/categories/tools_and_materials.yml
+++ b/_data/categories/tools_and_materials.yml
@@ -1,18 +1,18 @@
 ID: tools_and_materials
 icon: 'help-circle'
 title:
-- en: 'tools & materials'
-- de: 'Werkzeuge & Materialien'
+  en: 'tools & materials'
+  de: 'Werkzeuge & Materialien'
 description:
-- en: ''
-- de: ''
+  en: ''
+  de: ''
 Tags:
-  - tools:
-    - en: 'tools'
-    - de: 'Werkzeuge'
-  - materials:
-    - en: 'materials'
-    - de: 'Materialien'
-  - storage:
-    - en: 'storage'
-    - de: 'Lagerung'
+  tools:
+    en: 'tools'
+    de: 'Werkzeuge'
+  materials:
+    en: 'materials'
+    de: 'Materialien'
+  storage:
+    en: 'storage'
+    de: 'Lagerung'
diff --git a/_includes/overview.html b/_includes/overview.html
index e5c49dbe22f717c801133342e6d6a95e9e488c9d..a760330e5f8b9c9c96a0924eed7ef35bb207e4ee 100644
--- a/_includes/overview.html
+++ b/_includes/overview.html
@@ -10,11 +10,9 @@
   {% for c in cat %}
 
   {% capture ID %}{{ site.data.categories[c].ID }}{% endcapture %}
-      <li class="li-tags li-tag-{{ID}}" title="{{ ID }}" onclick="get_by_tag(['{{ID}}'])">{{ site.data.categories[c].title | map: include.ln }} [{{ site.tags[ID] | size }}]</li>
+      <li class="li-tags li-tag-{{ID}}" title="{{ ID }}" onclick="get_by_tag(['{{ID}}'])">{{ site.data.categories[c].title[include.ln] }} [{{ site.tags[ID] | size }}]</li>
       {% for tag in site.data.categories[c].Tags %}
-         {% for t in tag %}
-         <tags class="li-subtags li-subtag-of-{{ID}} d-none li-tag-{{t[0]}}" title="{{ t[0] }}" onclick="get_by_tag(['{{ID}}', '{{t[0]}}'])"><span class="feather-icon icon-tag"></span>{{ t[1] | map: include.ln }}</tags>
-         {% endfor %}
+         <tags class="li-subtags li-subtag-of-{{ID}} d-none li-tag-{{tag[0]}}" title="{{ tag[0] }}" onclick="get_by_tag(['{{ID}}', '{{tag[0]}}'])"><span class="feather-icon icon-tag"></span>{{ tag[1] | map: include.ln }}</tags>
       {% endfor %}
   {% endfor %}
     </ul>
@@ -51,7 +49,8 @@
               {% if forloop.index == 1 %}
                 {{ site.data.categories | map: o.tags[0] | map: "title" | map: include.ln }}
               {% else %}
-                {{ site.data.categories | map: o.tags[0] | map: "Tags" | map: tag | map: include.ln }}
+                {% capture Tag %}{{ site.data.categories | map: o.tags[0] | map: "Tags" | map: tag | map: include.ln }}{% endcapture %}
+                {% if Tag == '' %}<custom>{{ tag }}</custom>{% else %}{{ Tag }}{% endif %}
               {% endif %}
             </tags>
           {% endfor %}</small><br>
diff --git a/css/main.scss b/css/main.scss
index 5e7b0ad59ccc952d9ba00342b1fcee157aa54c1f..3c2d876db40213fa6e2dd665c0161b32dd3bf13f 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -188,6 +188,10 @@ tags {
   color: royalblue;
 }
 
+tags custom {
+  font-weight: bold;
+}
+
 tags.clickable {
   cursor: pointer;
 }