7 files changed, 38 insertions, 5 deletions
diff --git a/tuxlite_tbs/templates/archives.html b/tuxlite_tbs/templates/archives.html
index 20fcd87..9ec0673 100644
--- a/tuxlite_tbs/templates/archives.html
+++ b/tuxlite_tbs/templates/archives.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} <small>[archive]</small>{% endblock %}
+{% block title %}{{ SITENAME }} - Archives{% endblock %}
 {% block content %}
 
 <h1>Archives</h1>
diff --git a/tuxlite_tbs/templates/article.html b/tuxlite_tbs/templates/article.html
index b5f3a63..4289464 100644
--- a/tuxlite_tbs/templates/article.html
+++ b/tuxlite_tbs/templates/article.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
 {% block content %}
     <div class='article'>
         <div class="content-title">
diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html
index 62ffdaa..2ef2163 100644
--- a/tuxlite_tbs/templates/base.html
+++ b/tuxlite_tbs/templates/base.html
@@ -2,7 +2,7 @@
 <html lang="{{ DEFAULT_LANG }}">
 <head>
     <meta charset="utf-8">
-    <title>{% block windowtitle %}{{ SITENAME }}{% endblock %}</title>
+    <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
     <meta name="description" content="">
     <meta name="author" content="{{ AUTHOR }}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/tuxlite_tbs/templates/category.html b/tuxlite_tbs/templates/category.html
index 52215e6..56f8e93 100644
--- a/tuxlite_tbs/templates/category.html
+++ b/tuxlite_tbs/templates/category.html
@@ -1,2 +1,2 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} <small>{{ category }}</small>{% endblock %}
-\ No newline at end of file
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/tuxlite_tbs/templates/page.html b/tuxlite_tbs/templates/page.html
index df15a33..c4ef8bb 100644
--- a/tuxlite_tbs/templates/page.html
+++ b/tuxlite_tbs/templates/page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %} {% endblock %}
+{% block title %}{{ SITENAME }} - {{ page.title }}{% endblock %}
 {% block content %}        
 <section id="content" class="body">    
     <h2 class="content-title">
diff --git a/tuxlite_tbs/templates/sitemap.html b/tuxlite_tbs/templates/sitemap.html
new file mode 100644
index 0000000..e844e0b
--- /dev/null
+++ b/tuxlite_tbs/templates/sitemap.html
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+
+{% for article in articles %}
+  <url>
+    <loc>{{ SITEURL }}/{{ article.url }}</loc>
+    <priority>0.8</priority>
+  </url>
+
+  {% for translation in article.translations %}
+  <url>
+    <loc>{{ SITEURL }}/{{ translation.url }}</loc>
+    <priority>0.8</priority>
+  </url>
+  {% endfor %}
+{% endfor %}
+
+{% for page in pages %}
+  <url>
+    <loc>{{ SITEURL }}/{{ page.url }}</loc>
+    <priority>1.0</priority>
+  </url>
+
+  {% for translation in page.translations %}
+  <url>
+    <loc>{{ SITEURL }}/{{ translation.url }}</loc>
+    <priority>1.0</priority>
+  </url>
+  {% endfor %}
+{% endfor %}
+
+</urlset>
diff --git a/tuxlite_tbs/templates/tags.html b/tuxlite_tbs/templates/tags.html
index 94a5fc3..3ace8d6 100644
--- a/tuxlite_tbs/templates/tags.html
+++ b/tuxlite_tbs/templates/tags.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}{{ SITENAME }} <small>[tgs]</small>{% endblock %}
+{% block title %}{{ SITENAME }} - Tags{% endblock %}
 {% block content %}
 <ul>
 {% for tag, articles in tags|sort %}