diff --git a/templates/category.gmi b/templates/category.gmi
index 16b1f20..b5c51ca 100644
--- a/templates/category.gmi
+++ b/templates/category.gmi
@@ -8,11 +8,9 @@
 {{ indexFile.File.Lang }}{% endif %}
 
 {% for file in tree.RootFiles %}{% if file.Name != "index.md" %}{{ text_url(file) }}{% endif %}{% endfor %}
-{% if tree.Categories %}### {% if lang == "sgs" %}Kateguorėjės{% else %}Categories{% endif %}
 {% for cat, count in tree.Categories %}{{ category_url(tree.Path|add:"/"|add:cat, cat, count) }}
-{% endfor %} {% endif %}
-{% if tree.Tags %}### {% if lang == "sgs" %}Žīmas{% else %}Tags{% endif %}
+{% endfor %}
 {% for tag, count in tree.Tags %}{{ tag_url(tag, count) }}
-{% endfor %} {% endif %}
+{% endfor %}
 {% if tree.RootPath %}{{ category_url(tree.RootPath, tree.RootPath, 0) }}{% endif %}
 {{ home(lang) }}
diff --git a/templates/en/index.gmi b/templates/en/index.gmi
index 635bd08..fdc7117 100644
--- a/templates/en/index.gmi
+++ b/templates/en/index.gmi
@@ -8,13 +8,11 @@ Welcome to my capsule in Gemini space. {{ logo() }}
 
 => /a about
 
-{% if tree.Categories %}### Categories
 {% for cat, count in tree.Categories %}
-{{ category_url(cat, cat, count) }} {% endfor %} {% endif %}
+{{ category_url(cat, cat, count) }} {% endfor %}
 
-{% if tree.Tags %}### Tags
 {% for tag, count in tree.Tags %}
-{{ tag_url(tag, count) }} {% endfor %} {% endif %}
+{{ tag_url(tag, count) }} {% endfor %}
 
 {% if lastFiles %}### Last texts
 {% for file in lastFiles %}{{ text_url(file) }}{% endfor %}{% endif %}
diff --git a/templates/page.gmi b/templates/page.gmi
index 3d0b7ef..ab1b17c 100644
--- a/templates/page.gmi
+++ b/templates/page.gmi
@@ -1,9 +1,8 @@
 {% import "macros.tpl" category_url, tag_url, text_url, logo, home %}
 # {{ file.File.Description }}
 
-{% if file.File.Tags %}### {% if lang == "sgs" %}Žīmas{% else %}Tags{% endif %}
 {% for tag in file.File.Tags %}{{ tag_url(tag, 0) }}
-{% endfor %} {% endif %}
+{% endfor %}
 
 🌙{{ file.File.Created}}
 {{ file.File.Copyright }}
diff --git a/templates/sgs/index.gmi b/templates/sgs/index.gmi
index 3b514f8..ef2a812 100644
--- a/templates/sgs/index.gmi
+++ b/templates/sgs/index.gmi
@@ -8,13 +8,11 @@ Sveikė atvīkėn i mona kapsolė Gemini ertie. {{ logo() }}
 
 => /a aple
 
-{% if tree.Categories %}### Kateguorėjės
 {% for cat, count in tree.Categories %}
-{{ category_url(cat, cat, count) }} {% endfor %} {% endif %}
+{{ category_url(cat, cat, count) }} {% endfor %}
 
-{% if tree.Tags %}### Žīmas
 {% for tag, count in tree.Tags %}
-{{ tag_url(tag, count) }} {% endfor %} {% endif %}
+{{ tag_url(tag, count) }} {% endfor %}
 
 {% if lastFiles %}### Paskotėnē īrašā
 
diff --git a/templates/tag.gmi b/templates/tag.gmi
index 42cfdaa..d90de6b 100644
--- a/templates/tag.gmi
+++ b/templates/tag.gmi
@@ -2,7 +2,6 @@
 # [{{ tag }}]
 
 {% for file in tree.Files %}{{ text_url(file) }}{% endfor %}
-{% if tree.Tags %}### {% if lang == "sgs" %}Žīmas{% else %}Tags{% endif %}
 {% for tag, count in tree.Tags %}{{ tag_url(tag, count) }}
-{% endfor %} {% endif %}
+{% endfor %}
 {{ home(lang) }}