diff --git a/templates/all_texts.gmi b/templates/all_texts.gmi
index 66063c6..c1f8bfe 100644
--- a/templates/all_texts.gmi
+++ b/templates/all_texts.gmi
@@ -1,5 +1,5 @@
 {% import "macros.tpl" category_url, tag_url, text_url, logo %}
-# {{ logo() }} Arna alkierios :: {% if lang == "sgs" %}Vėsė tekstā{% else %}All texts{% endif %}
+# {% if lang == "sgs" %}Vėsė tekstā{% else %}All texts{% endif %}
 
 {% for file in tree.Files %}{{ text_url(lang, file) }}{% endfor %}
 
diff --git a/templates/category.gmi b/templates/category.gmi
index e0e4270..b1416ed 100644
--- a/templates/category.gmi
+++ b/templates/category.gmi
@@ -1,5 +1,5 @@
 {% import "macros.tpl" category_url, tag_url, text_url, logo %}
-# {{ logo() }} Arna alkierios :: {{ path }}
+# {{ path }}
 
 {% if indexFile %}{{ indexFile.FormatContent()|safe }}
 
diff --git a/templates/en/about.gmi b/templates/en/about.gmi
index f65c7a1..4c678a4 100644
--- a/templates/en/about.gmi
+++ b/templates/en/about.gmi
@@ -1,5 +1,5 @@
 {% import "../macros.tpl" logo %}
-# {{ logo() }} Arna alkierios :: About
+# About
 
 I am Arns Udovič, also you can find me by Zordsdavini.
 
diff --git a/templates/en/index.gmi b/templates/en/index.gmi
index b3343e9..2486eff 100644
--- a/templates/en/index.gmi
+++ b/templates/en/index.gmi
@@ -1,7 +1,7 @@
 {% import "../macros.tpl" category_url, tag_url, text_url, logo %}
-# {{ logo() }} Arna alkierios
+# Arna alkierios
 
-Welcome to my capsule in Gemini space.
+Welcome to my capsule in Gemini space. {{ logo() }}
 
 > Če turietom būtė mon pruotinga cėtata :-P
 
diff --git a/templates/page.gmi b/templates/page.gmi
index 894a997..458af4d 100644
--- a/templates/page.gmi
+++ b/templates/page.gmi
@@ -1,13 +1,13 @@
 {% import "macros.tpl" category_url, tag_url, text_url, logo %}
-# {{ logo() }} Arna alkierios :: {{ file.File.Description }}
-
-{{ file.FormatContent()|safe }}
-
-🌙{{ file.File.Created}}
-{{ file.File.Copyright }}
+# {{ file.File.Description }}
 
 {% if file.File.Tags %}### {% if lang == "sgs" %}Žīmas{% else %}Tags{% endif %}
 {% for tag in file.File.Tags %}{{ tag_url(lang, tag, 0) }}
 {% endfor %} {% endif %}
+
+🌙{{ file.File.Created}}, {{ file.File.Copyright }}
+
+{{ file.FormatContent()|safe }}
+
 {{ category_url(lang, file.File.CategoryPath, file.File.Category|last, 0) }}
 => {% if lang == "sgs" %}/sgs 🏠 nomėi{% else %}/en 🏠 home{% endif %}
diff --git a/templates/search.gmi b/templates/search.gmi
index 9a72142..f5dcbe4 100644
--- a/templates/search.gmi
+++ b/templates/search.gmi
@@ -1,5 +1,5 @@
 {% import "macros.tpl" text_url, logo %}
-# {{ logo() }} Arna alkierios :: {% if lang == "sgs" %}Paėiška{% else %}Search{% endif %}
+# {% if lang == "sgs" %}Paėiška{% else %}Search{% endif %}
 
 {% if lang == "sgs" %}Ėiškuota vagol{% else %}Searched by{% endif %}: {{ q }}
 {% if tree.Files|length == 0 %}{% if lang == "sgs" %}Nieka narada{% else %}Nothing found{% endif %}...{% else %}
diff --git a/templates/sgs/about.gmi b/templates/sgs/about.gmi
index 22fd54e..25358e5 100644
--- a/templates/sgs/about.gmi
+++ b/templates/sgs/about.gmi
@@ -1,5 +1,5 @@
 {% import "../macros.tpl" logo %}
-# {{ logo() }} Arna alkierios :: Aple
+# Aple
 
 Eso Udovič Arns, dā vadėnamo Zordsdavini arba Ousėnio.
 
diff --git a/templates/sgs/index.gmi b/templates/sgs/index.gmi
index 71f367f..65132d7 100644
--- a/templates/sgs/index.gmi
+++ b/templates/sgs/index.gmi
@@ -1,7 +1,7 @@
 {% import "../macros.tpl" category_url, tag_url, text_url, logo %}
-# {{ logo() }} Arna alkierios
+# Arna alkierios
 
-Sveikė atvīkėn i mona kapsolė Gemini ertie.
+Sveikė atvīkėn i mona kapsolė Gemini ertie. {{ logo() }}
 
 > Če turietom būtė mon pruotinga cėtata :-P
 
diff --git a/templates/tag.gmi b/templates/tag.gmi
index 69bf515..4523a24 100644
--- a/templates/tag.gmi
+++ b/templates/tag.gmi
@@ -1,5 +1,5 @@
 {% import "macros.tpl" category_url, tag_url, text_url, logo %}
-# {{ logo() }} Arna alkierios :: [{{ tag }}]
+# [{{ tag }}]
 
 {% for file in tree.Files %}{{ text_url(lang, file) }}{% endfor %}
 {% if tree.Tags %}### {% if lang == "sgs" %}Žīmas{% else %}Tags{% endif %}